Merge remote-tracking branch 'origin/master'

app/src/main/assets/web/vue/assets/config-7c50f05c.js

@@ -1 +1 @@
-import{u as n,A as r}from"./index-cd2ecf19.js";import"./vendor-b52b0953.js";const i=n();i.setMiniInterface(window.innerWidth<750);window.onresize=()=>{i.setMiniInterface(window.innerWidth<750)};r.getReadConfig().then(a=>{var e=a.data.data;if(e){const t=n();let o=JSON.parse(e),s=t.config;o=Object.assign(s,o),t.setConfig(o)}});
+import{u as n,A as r}from"./index-cbd182e6.js";import"./vendor-8be1f5fb.js";const i=n();i.setMiniInterface(window.innerWidth<750);window.onresize=()=>{i.setMiniInterface(window.innerWidth<750)};r.getReadConfig().then(a=>{var e=a.data.data;if(e){const t=n();let o=JSON.parse(e),s=t.config;o=Object.assign(s,o),t.setConfig(o)}});

app/src/main/assets/web/vue/assets/index-964f1746.css

@@ -1 +1 @@
-.el-link[data-v-aee57c78]{padding:4px}.el-text[data-v-aee57c78]{padding-top:20px}.tool[data-v-2f7954aa]{display:flex;margin:4px 0;justify-content:center}#source-list[data-v-2f7954aa]{margin-top:6px;height:calc(100vh - 119px)}#source-list[data-v-2f7954aa] .el-checkbox{margin-bottom:4px;width:100%}.error[data-v-2f7954aa]{border-color:var(--el-color-error)!important;color:var(--el-color-error)!important;--el-checkbox-checked-text-color: var(--el-color-error);--el-checkbox-checked-bg-color: var(--el-color-error);--el-checkbox-checked-input-border-color: var(--el-color-error)}[data-v-fe904689] #debug-text{height:calc(100vh - 86px)}[data-v-7e91a802] .el-input{width:100%}[data-v-7e91a802] #source-json{height:calc(100vh - 50px)}[data-v-dcce2457] .el-tabs__header{margin-bottom:5px}.flex-space-between[data-v-18524ea3]{display:flex;justify-content:space-between;align-items:baseline}.flex-column-center[data-v-18524ea3]{display:flex;flex-direction:column;justify-content:center}.menu>.el-button[data-v-18524ea3]{margin:4px;padding:1em;width:6em}.hotkeys-item .title[data-v-18524ea3]{width:5em;display:flex;justify-content:flex-end;margin-right:1em}.hotkeys-item__content[data-v-18524ea3]{display:flex;flex-wrap:wrap;flex:1}.hotkeys-item__content div[data-v-18524ea3]{margin-bottom:1em}.hotkeys-item__content span[data-v-18524ea3]{margin:.5em}[data-v-d4af52d7] .el-tab-pane{height:calc(100vh - 55px);padding-top:15px;padding-right:5px;overflow-y:auto}[data-v-d4af52d7] .el-tabs__header{margin:0}kbd{background-color:#fcfcfc;border-radius:3px;border:1px solid hsl(0deg,0%,80%);padding:4px 5px;font-weight:700}code{background-color:#f2f1f1;padding:.125rem .25rem;border-radius:.25rem;font-size:.835rem}body{padding:0;margin:0}.el-tabs__header{position:sticky;top:0px;z-index:2;background-color:#fff}.editor[data-v-ef32d41f]{display:flex;height:100vh;overflow:hidden}.editor .left[data-v-ef32d41f]{flex:1;margin-left:20px}.editor .right[data-v-ef32d41f]{flex:1;width:360px;margin-right:20px}.editor #loading[data-v-ef32d41f]{position:fixed;top:100px;left:90vw}
+.el-link[data-v-aee57c78]{padding:4px}.el-text[data-v-aee57c78]{padding-top:20px}.error[data-v-4f0ba808]{border-color:var(--el-color-error)!important;color:var(--el-color-error)!important;--el-checkbox-checked-text-color: var(--el-color-error);--el-checkbox-checked-bg-color: var(--el-color-error);--el-checkbox-checked-input-border-color: var(--el-color-error)}.tool[data-v-794cdcb4]{display:flex;margin:4px 0;justify-content:center}#source-list[data-v-794cdcb4]{margin-top:6px;height:calc(100vh - 119px)}#source-list[data-v-794cdcb4] .el-checkbox{margin-bottom:4px;width:100%}[data-v-fe904689] #debug-text{height:calc(100vh - 86px)}[data-v-7e91a802] .el-input{width:100%}[data-v-7e91a802] #source-json{height:calc(100vh - 50px)}[data-v-dcce2457] .el-tabs__header{margin-bottom:5px}.flex-space-between[data-v-18524ea3]{display:flex;justify-content:space-between;align-items:baseline}.flex-column-center[data-v-18524ea3]{display:flex;flex-direction:column;justify-content:center}.menu>.el-button[data-v-18524ea3]{margin:4px;padding:1em;width:6em}.hotkeys-item .title[data-v-18524ea3]{width:5em;display:flex;justify-content:flex-end;margin-right:1em}.hotkeys-item__content[data-v-18524ea3]{display:flex;flex-wrap:wrap;flex:1}.hotkeys-item__content div[data-v-18524ea3]{margin-bottom:1em}.hotkeys-item__content span[data-v-18524ea3]{margin:.5em}[data-v-d4af52d7] .el-tab-pane{height:calc(100vh - 55px);padding-top:15px;padding-right:5px;overflow-y:auto}[data-v-d4af52d7] .el-tabs__header{margin:0}kbd{background-color:#fcfcfc;border-radius:3px;border:1px solid hsl(0deg,0%,80%);padding:4px 5px;font-weight:700}code{background-color:#f2f1f1;padding:.125rem .25rem;border-radius:.25rem;font-size:.835rem}body{padding:0;margin:0}.el-tabs__header{position:sticky;top:0px;z-index:2;background-color:#fff}.editor[data-v-ef32d41f]{display:flex;height:100vh;overflow:hidden}.editor .left[data-v-ef32d41f]{flex:1;margin-left:20px}.editor .right[data-v-ef32d41f]{flex:1;width:360px;margin-right:20px}.editor #loading[data-v-ef32d41f]{position:fixed;top:100px;left:90vw}

app/src/main/assets/web/vue/index.html

@@ -4,10 +4,10 @@
         <meta charset="UTF-8" />
         <link rel="icon" href="./favicon.ico" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-      <script type="module" crossorigin src="./assets/index-cd2ecf19.js"></script>
+      <script type="module" crossorigin src="./assets/index-cbd182e6.js"></script>
-      <link rel="modulepreload" crossorigin href="./assets/vendor-b52b0953.js">
+      <link rel="modulepreload" crossorigin href="./assets/vendor-8be1f5fb.js">
       <link rel="stylesheet" href="./assets/vendor-6f0d1692.css">
-      <link rel="stylesheet" href="./assets/index-672d9891.css">
+      <link rel="stylesheet" href="./assets/index-964f1746.css">
     </head>
 
     <body>

app/src/main/java/io/legado/app/web/socket/BookSourceDebugWebSocket.kt

@@ -65,6 +65,10 @@ class BookSourceDebugWebSocket(handshakeRequest: NanoHTTPD.IHTTPSession) :
                         Debug.callback = this@BookSourceDebugWebSocket
                         Debug.startDebug(this, it, key)
                     }
+                } else {
+                    send("数据必须为Json格式")
+                    close(NanoWSD.WebSocketFrame.CloseCode.NormalClosure, "调试结束", false)
+                    return@launch
                 }
             }
         }

modules/web/src/api/index.js

@@ -98,7 +98,7 @@ const debug = (
   const socket = new WebSocket(url);
 
   socket.onopen = () => {
-    socket.send(`{"tag":"${sourceUrl}", "key":"${searchKey}"}`);
+    socket.send(JSON.stringify({ tag: sourceUrl, key: searchKey }));
   };
   socket.onmessage = ({ data }) => onReceive(data);
 

modules/web/src/components/SourceItem.vue

@@ -5,7 +5,6 @@
     :label="source"
     :class="{ error: errorPushSources.includes(source) }"
     @change="handleSourceClick(source)"
-    :key="source.bookSourceUrl"
   >
     {{ source.bookSourceName || source.sourceName }}
   </el-checkbox>
@@ -19,3 +18,12 @@ const handleSourceClick = source => {
   store.changeCurrentSource(source)
 }
 </script>
+<style lang="scss" scoped>
+.error {
+  border-color: var(--el-color-error) !important;
+  color: var(--el-color-error) !important;
+  --el-checkbox-checked-text-color: var(--el-color-error);
+  --el-checkbox-checked-bg-color: var(--el-color-error);
+  --el-checkbox-checked-input-border-color: var(--el-color-error);
+}
+</style>

modules/web/src/components/SourceList.vue

@@ -31,7 +31,7 @@
   <el-checkbox-group id="source-list" v-model="sourceSelect">
     <virtual-list
       style="height: 100%; overflow-y: auto; overflow-x: hidden;"
-      :data-key="'bookSourceUrl'"
+      :data-key="(source) => source.bookSourceUrl || source.sourceUrl"
       :data-sources="sourcesFiltered"
       :data-component="SourceItem"
       :estimate-size="45"
@@ -44,6 +44,7 @@ import { Folder, Delete, Download, Search } from "@element-plus/icons-vue";
 import { isSourceContains } from "../utils/souce";
 import VirtualList from 'vue3-virtual-scroll-list';
 import SourceItem from "./SourceItem.vue";
+
 const store = useSourceStore();
 const sourceSelect = ref([]);
 const searchKey = ref("");
@@ -129,11 +130,4 @@ const outExport = () => {
   }
 }
 
-.error {
-  border-color: var(--el-color-error) !important;
-  color: var(--el-color-error) !important;
-  --el-checkbox-checked-text-color: var(--el-color-error);
-  --el-checkbox-checked-bg-color: var(--el-color-error);
-  --el-checkbox-checked-input-border-color: var(--el-color-error);
-}
 </style>