Merge branch 'master' into master

Author: Rhilip

package.json

@@ -46,13 +46,13 @@
     "@webext-core/job-scheduler": "^1.0.0",
     "@webext-core/messaging": "^2.3.0",
     "@webext-core/storage": "^1.2.0",
-    "axios": "^1.13.6",
+    "axios": "^1.14.0",
     "crypto-js": "^4.2.0",
     "date-fns": "^4.1.0",
     "echarts": "^6.0.0",
     "es-toolkit": "^1.45.1",
     "file-saver": "^2.0.5",
-    "filesize": "^11.0.14",
+    "filesize": "^11.0.15",
     "idb": "^8.0.3",
     "jszip": "^3.10.1",
     "konva": "^10.2.3",
@@ -93,7 +93,7 @@
     "tsx": "^4.21.0",
     "typescript": "~6.0.2",
     "vite": "^6.4.1",
-    "vite-plugin-node-polyfills": "^0.25.0",
+    "vite-plugin-node-polyfills": "^0.26.0",
     "vite-plugin-vue-devtools": "^8.1.1",
     "vite-plugin-vuetify": "^2.1.3",
     "vite-plugin-web-extension": "4.5.0",

pnpm-lock.yaml

@@ -337,26 +337,34 @@ export const useMetadataStore = defineStore("metadata", {
       await this.$save();
     },
 
-    async addSite(siteId: TSiteID, siteConfig: ISiteUserConfig) {
+    async addSite(siteId: TSiteID, siteConfig: ISiteUserConfig, options?: { reBuildMap?: boolean }) {
+      const { reBuildMap = true } = options ?? {};
+
       delete siteConfig.valid;
       this.sites[siteId] = siteConfig;
-      await this.buildSiteHostMap();
-      await this.buildSiteNameMap();
+
+      if (reBuildMap) {
+        await this.buildSiteMapCache(false);
+      }
+
       await this.$save();
     },
 
-    async removeSite(siteId: TSiteID) {
+    async removeSite(siteId: TSiteID, options?: { reBuildMap?: boolean }) {
+      const { reBuildMap = true } = options ?? {};
+
       delete this.sites[siteId];
-      await this.buildSiteHostMap();
-      await this.buildSiteNameMap();
+
+      if (reBuildMap) {
+        await this.buildSiteMapCache(false);
+      }
+
       await this.$save();
     },
 
     /**
      * 在添加、编辑站点时调用，重新生成 host 对站点的映射，
      * 便于 content-script 等其他地方通过 (await extStorage.getItem('metadata')).siteHostMap[host] 获取站点 ID
-     *
-     * Note: 对于在本commit之前就安装了插件的站点，需要重新编辑站点配置一次才能生成该映射
      */
     async buildSiteHostMap() {
       const siteHostMap: Record<TSiteHost, TSiteID> = {};
@@ -389,6 +397,15 @@ export const useMetadataStore = defineStore("metadata", {
       this.siteNameMap = siteNameMap;
     },
 
+    async buildSiteMapCache(save: boolean = false) {
+      await this.buildSiteNameMap();
+      await this.buildSiteHostMap();
+
+      if (save) {
+        await this.$save();
+      }
+    },
+
     async addSearchSolution(solution: ISearchSolutionMetadata) {
       this.solutions[solution.id] = solution;
       await this.$save();

src/entries/options/stores/metadata.ts

@@ -41,7 +41,7 @@ function editClientConfig() {
       </v-card-title>
       <v-divider />
       <v-card-text>
-        <Editor v-model="clientConfig" />
+        <Editor v-if="clientConfig" v-model="clientConfig" />
       </v-card-text>
       <v-divider />
       <v-card-actions>

src/entries/options/views/Settings/SetBackup/EditDialog.vue

@@ -17,15 +17,22 @@ const emits = defineEmits<{
 }>();
 
 const clientMeta = computedAsync<IBackupMetadata<any>>(
-  async () => await getBackupServerMetaData(clientConfig.value!.type),
-  {} as IBackupMetadata<any>,
+  async () => {
+    const clientType = clientConfig.value?.type;
+    if (!clientType) {
+      return { requiredField: [] } as IBackupMetadata<any>;
+    }
+    return await getBackupServerMetaData(clientType);
+  },
+  { requiredField: [] } as IBackupMetadata<any>,
 );
 
 const formValid = ref<boolean>(false);
 
 async function checkConnect() {
-  if (formValid) {
-    const client = await getBackupServer(clientConfig.value!);
+  const clientType = clientConfig.value?.type;
+  if (formValid.value && clientConfig.value && clientType) {
+    const client = await getBackupServer(clientConfig.value);
     return await client.ping();
   }
   return false;

src/entries/options/views/Settings/SetBackup/Editor.vue

@@ -20,9 +20,8 @@ const isFormValid = ref<boolean>(false);
 const storedSiteUserConfig = ref<ISiteUserConfig & { valid?: boolean }>({ valid: false });
 provide("storedSiteUserConfig", storedSiteUserConfig);
 
-function patchSite() {
-  metadataStore.addSite(props.siteId, storedSiteUserConfig.value);
-  metadataStore.$save();
+async function patchSite() {
+  await metadataStore.addSite(props.siteId, storedSiteUserConfig.value);
   showDialog.value = false;
 }
 

src/entries/options/views/Settings/SetSite/EditDialog.vue

@@ -14,11 +14,13 @@ import AddDialog from "./AddDialog.vue";
 import EditDialog from "./EditDialog.vue";
 import EditSearchEntryList from "./EditSearchEntryList.vue";
 import OneClickImportDialog from "./OneClickImportDialog.vue";
+import RebuildMapDialog from "./RebuildMapDialog.vue";
 import SiteFavicon from "@/options/components/SiteFavicon/Index.vue";
 import DeleteDialog from "@/options/components/DeleteDialog.vue";
 import NavButton from "@/options/components/NavButton.vue";
 
-import { allAddedSiteInfo, type ISiteTableItem } from "@/options/views/Settings/SetSite/utils.ts"; // <-- 数据来源
+// 数据来源
+import { allAddedSiteInfo, type ISiteTableItem } from "./utils.ts";
 
 const { t } = useI18n();
 
@@ -30,6 +32,7 @@ const showAddDialog = ref<boolean>(false);
 const showEditDialog = ref<boolean>(false);
 const showDeleteDialog = ref<boolean>(false);
 const showOneClickImportDialog = ref<boolean>(false);
+const showRebuildMapDialog = ref<boolean>(false);
 
 const tableHeader = computed(() => {
   const baseHeaders = [
@@ -146,6 +149,13 @@ async function flushSiteFavicon(siteId: TSiteID | TSiteID[]) {
           @click="() => flushSiteFavicon(tableSelected)"
         />
 
+        <NavButton
+          :text="t('SetSite.index.reBuildMap')"
+          color="indigo"
+          icon="mdi-wrench"
+          @click="showRebuildMapDialog = true"
+        />
+
         <v-spacer />
         <v-text-field
           v-model="tableWaitFilterRef"
@@ -343,6 +353,7 @@ async function flushSiteFavicon(siteId: TSiteID | TSiteID[]) {
   <DeleteDialog v-model="showDeleteDialog" :to-delete-ids="toDeleteIds" :confirm-delete="confirmDeleteSite" />
   <EditDialog v-model="showEditDialog" :site-id="toEditId!" />
   <OneClickImportDialog v-model="showOneClickImportDialog" />
+  <RebuildMapDialog v-model="showRebuildMapDialog" />
 </template>
 
 <style scoped lang="scss"></style>

src/entries/options/views/Settings/SetSite/Index.vue

@@ -84,7 +84,7 @@ async function doAutoImport() {
   importStatus.value.isWorking = true;
   importStatus.value.failed = [];
 
-  // 遍历所有需要添加的站点
+  // 遍历所有需要添加的站点，在遍历过程中我们不更新 siteHostMap 和 siteNameMap
   for (const site of importStatus.value.toWork) {
     if (importStatus.value.success.includes(site)) {
       continue; // 如果已经添加成功，则跳过
@@ -101,13 +101,15 @@ async function doAutoImport() {
 
       // 对于 public 站点，不需要额外测试是否能够搜索
       if (siteMetadata.type === "public") {
-        await metadataStore.addSite(site, siteUserConfig); // 直接将该站点设置存入 metadataStore
+        // 直接将该站点设置存入 metadataStore
+        await metadataStore.addSite(site, siteUserConfig, { reBuildMap: false }); // 抑制 site{Name, Host}Map 更新
         isThisSiteSuccess = true;
       } else {
         // 遍历所有 private site 预设的 urls ，找到用户实际使用的 url
         for (const siteUrl of siteMetadata.urls) {
           siteUserConfig.url = siteUrl;
-          await metadataStore.addSite(site, siteUserConfig); // 临时将该设置存入 metadataStore
+          // 临时将该设置存入 metadataStore
+          await metadataStore.addSite(site, siteUserConfig, { reBuildMap: false });
           const { status: testStatus } = await sendMessage("getSiteSearchResult", { siteId: site });
           if (testStatus === EResultParseStatus.success) {
             isThisSiteSuccess = true; // 如果搜索成功，说明该站点可以自动添加
@@ -120,7 +122,8 @@ async function doAutoImport() {
         importStatus.value.success.push(site);
       } else {
         importStatus.value.failed.push(site);
-        await metadataStore.removeSite(site); // 如果搜索失败，说明该站点不能自动添加，移除在 metadataStore 中临时添加的配置项
+        // 如果搜索失败，说明该站点不能自动添加，移除在 metadataStore 中临时添加的配置项
+        await metadataStore.removeSite(site, { reBuildMap: false });
       }
     } catch (e) {
       importStatus.value.failed.push(site);
@@ -131,7 +134,13 @@ async function doAutoImport() {
   importStatus.value.isWorking = false;
   importStatus.value.toWork = [];
 
-  runtimeStore.showSnakebar(t("SetSite.oneClickImportDialog.importComplete", { count: importStatus.value.success.length }), { color: "success" });
+  // 所有导入完成，重构 site{Host, Name}Map
+  await metadataStore.buildSiteMapCache(true);
+
+  runtimeStore.showSnakebar(
+    t("SetSite.oneClickImportDialog.importComplete", { count: importStatus.value.success.length }),
+    { color: "success" },
+  );
 }
 
 async function dialogEnter() {