From ea90444b94c7717fe9eddee2f6ba793335d72034 Mon Sep 17 00:00:00 2001
From: jianjian <jja8@jja8.cn>
Date: Tue, 23 May 2023 19:59:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/server.js                              | 88 +++++++++++++++--
 web/DrawImg.html                              | 14 +++
 web/Write.html                                | 14 +++
 web/css/DrawImg.css                           | 99 +++++++++++++++++++
 web/css/Wtite.css                             | 98 ++++++++++++++++++
 web/css/bing.css                              |  2 +-
 web/js/DrawImg.js                             |  4 +
 web/js/NewBingGoGo.js                         | 17 +---
 web/js/Wtite.js                               |  2 +
 web/js/module/ChatRecord/ChatRecord.js        |  2 +-
 .../module/aToos/{DateFormat.js => AToos.js}  | 17 +++-
 11 files changed, 330 insertions(+), 27 deletions(-)
 rename web/js/module/aToos/{DateFormat.js => AToos.js} (61%)

diff --git a/server/server.js b/server/server.js
index 1751a08..12aeacf 100644
--- a/server/server.js
+++ b/server/server.js
@@ -1,3 +1,6 @@
+let serverConfig = {};//用于预加载，来加速页面打开
+let serverConfigOk = false;
+
 self.addEventListener("fetch",function(event) {
     if (event.request.url.startsWith(chrome.runtime.getURL(''))){
         event.respondWith(handleRequest(event.request))
@@ -6,6 +9,72 @@ self.addEventListener("fetch",function(event) {
    // console.log(event);
 });
 
+
+/**
+ * 当链接更新时重新预加载
+ * */
+chrome.storage.onChanged.addListener(async (c,l) =>{
+    if(l!=="local"){
+        return;
+    }
+    if(!c.GoGoUrl){
+        return;
+    }
+    loadServerConfig().then()
+})
+/**
+ * 加载服务器配置
+ * */
+async function loadServerConfig(){
+    if(serverConfigOk==='loading'){
+        return;
+    }
+    serverConfigOk = 'loading'
+    //先从本地加载
+    try {
+        serverConfig = await (await fetch(chrome.runtime.getURL('/web/resource/config.json'))).json();
+    }catch (error){
+        console.warn(error);
+    }
+
+    //去魔法链接服务加
+    while (true){
+        let conf;
+        let mUrl
+        try {
+            mUrl = uRLTrue(await getMagicUrl());
+            let re = await fetch(mUrl+'/web/resource/config.json');
+            if(re && re.ok){
+                conf = await re.json();
+            }
+        }catch (error){
+            console.warn(error);
+        }
+        if(!mUrl){ // 如果没有魔法链接则加载失败
+            serverConfigOk = false;
+            return;
+        }
+        try {
+            if(mUrl!==uRLTrue(await getMagicUrl())){//如果魔法链接变化了则重新加载
+                continue;
+            }
+            if (!conf){//没有配置则加载失败
+                serverConfigOk = false;
+                return;
+            }else {//否则加载成功
+                serverConfig = conf;
+                serverConfigOk = true;
+                return;
+            }
+        }catch (error){//错误了则加载失败
+            console.warn(error);
+            serverConfigOk = false;
+            return;
+        }
+    }
+}
+loadServerConfig().then();
+
 async function handleRequest(request){
     let url = new URL(request.url);
 
@@ -25,17 +94,16 @@ async function handleRequest(request){
 
     //server配置请求
     if(url.pathname==='/web/resource/config.json'){
-        let re;
-        try {
-            let mUrl = uRLTrue(await getMagicUrl()) ;
-            re = await fetch(mUrl+'/web/resource/config.json');
-        }catch (error){
-            console.warn(re);
+        if(!serverConfigOk){
+            loadServerConfig().then();
         }
-        if(!re || !re.ok){
-            re = await fetch(chrome.runtime.getURL('/web/resource/config.json'));
-        }
-        return re
+        return new Response(JSON.stringify(serverConfig),{
+            status: 200,
+            statusText: 'ok',
+            headers: {
+                "content-type": "application/json"
+            }
+        });
     }
 
     //web请求
diff --git a/web/DrawImg.html b/web/DrawImg.html
index 7792437..bc1cafa 100644
--- a/web/DrawImg.html
+++ b/web/DrawImg.html
@@ -8,6 +8,20 @@
   <script src="./js/other/stats.js" async="async"></script>
 </head>
 <body>
+<!--加载动画-->
+<div id="load">
+  <div class="mesh-loader">
+    <div class="set-one">
+      <div class="circle"></div>
+      <div class="circle"></div>
+    </div>
+    <div class="set-two">
+      <div class="circle"></div>
+      <div class="circle"></div>
+    </div>
+  </div>
+</div>
+
 <div id="background" class="b"></div>
 <div id="head">
   <div id='head-img-div'>
diff --git a/web/Write.html b/web/Write.html
index e8ab65a..a9432f1 100644
--- a/web/Write.html
+++ b/web/Write.html
@@ -17,6 +17,20 @@
 </head>
 
 <body>
+<!--加载动画-->
+<div id="load">
+    <div class="mesh-loader">
+        <div class="set-one">
+            <div class="circle"></div>
+            <div class="circle"></div>
+        </div>
+        <div class="set-two">
+            <div class="circle"></div>
+            <div class="circle"></div>
+        </div>
+    </div>
+</div>
+
 <div id="background" class="b"></div>
 <div id="head">
     <div id='head-img-div'>
diff --git a/web/css/DrawImg.css b/web/css/DrawImg.css
index e2a01d0..48baff3 100644
--- a/web/css/DrawImg.css
+++ b/web/css/DrawImg.css
@@ -58,6 +58,105 @@ body {
     color: #ff8300;
 }
 
+/*加载动画*/
+#load{
+    position: fixed;
+    z-index: 9999;
+    height: 100vh;
+    width: 100vw;
+    background: #ebf6ff;
+    opacity: 1;
+    transition: opacity 0.5s;
+}
+#load.loaded{
+    opacity: 0;
+}
+#load .mesh-loader {
+    overflow: hidden;
+    height: 100%;
+    width: 100%;
+}
+
+#load .mesh-loader .circle {
+    width: 25px;
+    height: 25px;
+    position: absolute;
+    background: #03A9F4;
+    border-radius: 50%;
+    margin: -12.5px;
+    -webkit-animation: mesh 3s ease-in-out infinite;
+    animation: mesh 3s ease-in-out infinite -1.5s;
+}
+
+#load .mesh-loader > div .circle:last-child {
+    -webkit-animation-delay: 0s;
+    animation-delay: 0s;
+}
+
+#load .mesh-loader > div {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+}
+
+#load .mesh-loader > div:last-child {
+    -webkit-transform: rotate(90deg);
+    transform: rotate(90deg);
+}
+
+@-webkit-keyframes mesh {
+    0% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+    }
+    50% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+    50.00001% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+@keyframes mesh {
+    0% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+    }
+    50% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+    50.00001% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+
 /* 背景*/
 
 #background {
diff --git a/web/css/Wtite.css b/web/css/Wtite.css
index 51b77df..ce7ba05 100644
--- a/web/css/Wtite.css
+++ b/web/css/Wtite.css
@@ -72,6 +72,104 @@ div.markdown-body {
     color: #ff8300;
 }
 
+/*加载动画*/
+#load{
+    position: fixed;
+    z-index: 9999;
+    height: 100vh;
+    width: 100vw;
+    background: #ebf6ff;
+    opacity: 1;
+    transition: opacity 0.5s;
+}
+#load.loaded{
+    opacity: 0;
+}
+#load .mesh-loader {
+    overflow: hidden;
+    height: 100%;
+    width: 100%;
+}
+
+#load .mesh-loader .circle {
+    width: 25px;
+    height: 25px;
+    position: absolute;
+    background: #03A9F4;
+    border-radius: 50%;
+    margin: -12.5px;
+    -webkit-animation: mesh 3s ease-in-out infinite;
+    animation: mesh 3s ease-in-out infinite -1.5s;
+}
+
+#load .mesh-loader > div .circle:last-child {
+    -webkit-animation-delay: 0s;
+    animation-delay: 0s;
+}
+
+#load .mesh-loader > div {
+    position: absolute;
+    top: 50%;
+    left: 50%;
+}
+
+#load .mesh-loader > div:last-child {
+    -webkit-transform: rotate(90deg);
+    transform: rotate(90deg);
+}
+
+@-webkit-keyframes mesh {
+    0% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+    }
+    50% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+    50.00001% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+@keyframes mesh {
+    0% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(0);
+        transform: rotate(0);
+    }
+    50% {
+        -webkit-transform-origin: 50% -100%;
+        transform-origin: 50% -100%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+    50.00001% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform-origin: 50% 200%;
+        transform-origin: 50% 200%;
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
 
 /* 背景*/
 
diff --git a/web/css/bing.css b/web/css/bing.css
index 8179a64..8bcb3c5 100644
--- a/web/css/bing.css
+++ b/web/css/bing.css
@@ -109,7 +109,7 @@ div.markdown-body {
 
 /*加载动画*/
 #load{
-    position: absolute;
+    position: fixed;
     z-index: 9999;
     height: 100vh;
     width: 100vw;
diff --git a/web/js/DrawImg.js b/web/js/DrawImg.js
index be1a697..4efd32b 100644
--- a/web/js/DrawImg.js
+++ b/web/js/DrawImg.js
@@ -1,4 +1,5 @@
 import generateImages from "./module/generateImages.js";
+import {LoadAnimation} from "./module/aToos/AToos.js";
 
 
 window.addEventListener('load',()=>{
@@ -50,4 +51,7 @@ window.addEventListener('load',()=>{
         isDrawing = false;
         startDraw.innerText = '开始作图';
     }
+
+
+    LoadAnimation.loaded(document.getElementById('load'));
 })
\ No newline at end of file
diff --git a/web/js/NewBingGoGo.js b/web/js/NewBingGoGo.js
index e688213..26b9e1f 100644
--- a/web/js/NewBingGoGo.js
+++ b/web/js/NewBingGoGo.js
@@ -10,6 +10,7 @@ import ChatRecordWorker from "./module/ChatRecord/ChatRecordWorker.js";
 import ChatFirstMessages from "./module/BingChat/ChatFirstMessages.js";
 import ChatOptionsSets from "./module/BingChat/ChatOptionsSets.js";
 import nBGGFetch from "./module/nBGGFetch.js";
+import {LoadAnimation} from "./module/aToos/AToos.js";
 
 /**
  * 给bingChat加载服务器配置
@@ -55,19 +56,6 @@ function domLoadServerConfig(h1,h2,p,serverConfig){
     hasShow(p,serverConfig['p']);
 }
 
-/**
- * 页面加载完成
- * @param loaded {HTMLElement}
- */
-function loaded(loaded){
-     if (loaded){
-         loaded.classList.add('loaded');
-         setTimeout(()=>{
-             loaded.remove()
-         },500)
-     }
-}
-
 //页面加载完成之后执行
 window.addEventListener('load',async ()=>{
     //窗口更新滚动
@@ -361,7 +349,8 @@ window.addEventListener('load',async ()=>{
     reSetStartChatMessage().then();
     input_update_input_text_sstyle_show_update();
     cueWordManager.loadcueWorld().then();
-    loaded(document.getElementById('load'));
+
+    LoadAnimation.loaded(document.getElementById('load'));
 });
 
 
diff --git a/web/js/Wtite.js b/web/js/Wtite.js
index 1281351..aa59572 100644
--- a/web/js/Wtite.js
+++ b/web/js/Wtite.js
@@ -3,6 +3,7 @@ import TitleWorker from './module/TitleWorker.js'
 import BingChat from './module/BingChat/BingChat.js';
 import ChatFirstMessages from "./module/BingChat/ChatFirstMessages.js";
 import ChatOptionsSets_Write from "./module/BingChat/ChatOptionsSets_Write.js";
+import {LoadAnimation} from "./module/aToos/AToos.js";
 
 /*控制按钮组选择，当选中新的按钮时回调函数*/
 function selectButtonFunRetrun(buttonGroup, returnFun) {
@@ -180,6 +181,7 @@ window.addEventListener('load',()=>{
 
 
     reSetStartChatMessage().then();
+    LoadAnimation.loaded(document.getElementById('load'));
 });
 
 
diff --git a/web/js/module/ChatRecord/ChatRecord.js b/web/js/module/ChatRecord/ChatRecord.js
index d0d5740..73b37ca 100644
--- a/web/js/module/ChatRecord/ChatRecord.js
+++ b/web/js/module/ChatRecord/ChatRecord.js
@@ -1,4 +1,4 @@
-import DateFormat from "../aToos/DateFormat.js";
+import {DateFormat} from "../aToos/AToos.js";
 
 /**
  * 一个聊天记录类
diff --git a/web/js/module/aToos/DateFormat.js b/web/js/module/aToos/AToos.js
similarity index 61%
rename from web/js/module/aToos/DateFormat.js
rename to web/js/module/aToos/AToos.js
index 3640a81..dcccb8b 100644
--- a/web/js/module/aToos/DateFormat.js
+++ b/web/js/module/aToos/AToos.js
@@ -1,7 +1,7 @@
 /**
  * 时间格式化的工具类
  * */
-export default class DateFormat{
+export class DateFormat{
     /**
      * 将时间格式化
      * @param date 要格式化的时间
@@ -16,4 +16,19 @@ export default class DateFormat{
         let seconds = date.getSeconds();
         return year + "-" + month + "-" + day + " " + hours + "-" + minutes + "-" + seconds;
     }
+}
+
+export class LoadAnimation{
+    /**
+     * 页面加载完成
+     * @param loaded {HTMLElement}
+     */
+    static loaded(loaded){
+        if (loaded){
+            loaded.classList.add('loaded');
+            setTimeout(()=>{
+                loaded.remove()
+            },500)
+        }
+    }
 }
\ No newline at end of file
-- 
Gitee


From ca254c95d7fd792ebe5aa8c4308e816d79a20fda Mon Sep 17 00:00:00 2001
From: jianjian <jja8@jja8.cn>
Date: Tue, 23 May 2023 20:03:10 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=80=9F=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 2cf1df2..8f0733a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
     "name": "NewBingGoGo",
     "description": "一个基于微软NewBing接口的浏览器AI对话插件",
-    "version": "2023.5.23.1",
+    "version": "2023.5.23.2",
     "manifest_version": 3,
     "permissions": [
         "storage",
-- 
Gitee