Improve:Surge模块管理和万象方案更新的路径问题优化

BlackCCCat · BlackCCCat · commit 1e3bbd3ffd8f · 2026-02-12T12:17:59.000+08:00
diff --git a/Rime-Wanxiang-Updater/components/HomeView.tsx b/Rime-Wanxiang-Updater/components/HomeView.tsx
@@ -100,18 +100,21 @@ export function HomeView() {
     const selected = current.schemeEdition === "base" ? "base" : `pro (${current.proSchemeKey})`
     setLocalSelectedScheme(selected)
 
-    let installRoot = current.hamsterRootPath
+    let installRoot = ""
     try {
       const { rimeDir } = await detectRimeDir(current)
       if (rimeDir) installRoot = rimeDir
     } catch {}
+    if (!installRoot && !current.hamsterBookmarkName) {
+      installRoot = current.hamsterRootPath
+    }
 
     const candidates: string[] = []
     if (installRoot) candidates.push(installRoot)
-    if (current.hamsterRootPath && current.hamsterRootPath !== installRoot) {
+    if (!current.hamsterBookmarkName && current.hamsterRootPath && current.hamsterRootPath !== installRoot) {
       candidates.push(current.hamsterRootPath)
     }
-    if (current.hamsterRootPath) {
+    if (!current.hamsterBookmarkName && current.hamsterRootPath) {
       candidates.push(
         Path.join(current.hamsterRootPath, "RimeUserData", "wanxiang"),
         Path.join(current.hamsterRootPath, "RIME", "Rime"),
diff --git a/Rime-Wanxiang-Updater/components/SettingsView.tsx b/Rime-Wanxiang-Updater/components/SettingsView.tsx
@@ -197,9 +197,12 @@ export function SettingsView(props: {
       setBookmarkIdx(idx >= 0 ? idx : 0)
       if (idx >= 0) {
         const matched = cleaned[idx]
-        const resolved = fm?.bookmarkedPath
-          ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [matched.name])) ?? matched.path)
-          : matched.path
+        const canUseByName = fm?.bookmarkExists
+          ? !!(await callMaybeAsync(fm.bookmarkExists, fm, [matched.name]))
+          : true
+        const resolved = fm?.bookmarkedPath && canUseByName
+          ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [matched.name])) ?? "")
+          : (matched.name ? "" : matched.path)
         const pathChanged = resolved !== targetPath || matched.name !== targetName
         if (pathChanged) {
           setCfg((c) => ({ ...c, hamsterRootPath: resolved, hamsterBookmarkName: matched.name }))
@@ -210,10 +213,17 @@ export function SettingsView(props: {
           } catch {}
         }
       } else if (!targetPath) {
+        const first = cleaned[0]
+        const canUseByName = fm?.bookmarkExists
+          ? !!(await callMaybeAsync(fm.bookmarkExists, fm, [first.name]))
+          : true
+        const resolved = fm?.bookmarkedPath && canUseByName
+          ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [first.name])) ?? first.path)
+          : first.path
         setCfg((c) => ({
           ...c,
-          hamsterRootPath: cleaned[0].path,
-          hamsterBookmarkName: cleaned[0].name,
+          hamsterRootPath: resolved,
+          hamsterBookmarkName: first.name,
         }))
       }
     } else {
@@ -308,9 +318,16 @@ export function SettingsView(props: {
                   if (b?.path) {
                     ;(async () => {
                       const fm: any = (globalThis as any).FileManager ?? Runtime.FileManager
-                      const resolved = fm?.bookmarkedPath
-                        ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [b.name])) ?? b.path)
-                        : b.path
+                      const canUseByName = fm?.bookmarkExists
+                        ? !!(await callMaybeAsync(fm.bookmarkExists, fm, [b.name]))
+                        : true
+                      const resolved = fm?.bookmarkedPath && canUseByName
+                        ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [b.name])) ?? "")
+                        : (b.name ? "" : b.path)
+                      if (!resolved) {
+                        showInfo("书签不可用", "书签路径不可用，请在设置页重新选择书签文件夹。")
+                        return
+                      }
                       const next: AppConfig = {
                         ...cfg,
                         hamsterRootPath: resolved,
diff --git a/Rime-Wanxiang-Updater/utils/hamster.tsx b/Rime-Wanxiang-Updater/utils/hamster.tsx
@@ -19,11 +19,19 @@ async function resolveBookmarkPath(rawPath: string, bookmarkName?: string): Prom
   const fm = Runtime.FileManager
   const raw = String(rawPath ?? "").trim()
   const name = String(bookmarkName ?? "").trim()
+  if (!raw && !name) return ""
   if (!fm?.bookmarkedPath) return raw
   try {
     if (name) {
-      const resolvedByName = await callMaybeAsync(fm.bookmarkedPath, fm, [name])
-      if (resolvedByName) return String(resolvedByName)
+      let nameExists = true
+      if (fm?.bookmarkExists) {
+        const existed = await callMaybeAsync(fm.bookmarkExists, fm, [name])
+        nameExists = !!existed
+      }
+      if (nameExists) {
+        const resolvedByName = await callMaybeAsync(fm.bookmarkedPath, fm, [name])
+        if (resolvedByName) return String(resolvedByName)
+      }
     }
   } catch {}
   if (!fm?.getAllFileBookmarks) return raw
@@ -43,6 +51,8 @@ async function resolveBookmarkPath(rawPath: string, bookmarkName?: string): Prom
       if (match?.path) return String(match.path)
     }
   } catch {}
+  // 配置了书签名但无法解引用时，不再回退旧路径（避免用到失效授权路径）
+  if (name) return ""
   return raw
 }
 
diff --git a/Rime-Wanxiang-Updater/utils/update_tasks.tsx b/Rime-Wanxiang-Updater/utils/update_tasks.tsx
@@ -192,11 +192,14 @@ function dictPattern(cfg: AppConfig): string {
 }
 
 async function requireInstallRoot(cfg: AppConfig): Promise<string> {
-  if (cfg.hamsterRootPath) return cfg.hamsterRootPath
   try {
     const { rimeDir } = await detectRimeDir(cfg)
     if (rimeDir) return rimeDir
   } catch {}
+  if (cfg.hamsterBookmarkName) {
+    throw new Error("书签路径不可用，请在设置页重新选择书签文件夹")
+  }
+  if (cfg.hamsterRootPath) return cfg.hamsterRootPath
   throw new Error("未选择安装目录（请到设置选择文件夹）")
 }
 
diff --git a/Rime-Wanxiang-Updater/utils/updater.tsx b/Rime-Wanxiang-Updater/utils/updater.tsx
@@ -86,6 +86,9 @@ export async function doUpdate(
   params.onStage?.("解析目录...")
   const { engine, rimeDir } = await detectRimeDir(cfg)
   const installRoot = getInstallRoot(cfg)
+  if (!rimeDir && cfg.hamsterBookmarkName) {
+    throw new Error("书签路径不可用，请在设置页重新选择书签文件夹")
+  }
   const installDir = rimeDir || installRoot
   if (!installDir) throw new Error("未选择安装路径（请到设置里选择文件夹）")
 
diff --git a/Surge-Module-Manager/components/HomeView.tsx b/Surge-Module-Manager/components/HomeView.tsx
@@ -105,12 +105,21 @@ export function HomeView() {
     return idx > 0 ? String(m.filePath).slice(0, idx) : undefined
   }
 
-  async function refreshModules() {
-    await ensureStorage()
-    const resolved = await getModulesDirResolved()
-    setResolvedBaseDir(resolved)
-    const list = sortModules(await loadModules())
-    setModules(list)
+  async function refreshModules(resetStageOnSuccess = false) {
+    try {
+      await ensureStorage()
+      const resolved = await getModulesDirResolved()
+      setResolvedBaseDir(resolved)
+      const list = sortModules(await loadModules())
+      setModules(list)
+      if (resetStageOnSuccess) {
+        setStage("就绪")
+        setProgress("")
+      }
+    } catch (e: any) {
+      setModules([])
+      setStage(String(e?.message ?? e))
+    }
   }
 
   useEffect(() => {
@@ -137,13 +146,13 @@ export function HomeView() {
           initial={loadConfig()}
           onDone={(next) => {
             setCfg(next)
-            void refreshModules()
+            void refreshModules(true)
           }}
         />
       ),
     })
     setCfg(loadConfig())
-    await refreshModules()
+    await refreshModules(true)
   }
 
   async function addModule() {
diff --git a/Surge-Module-Manager/components/SettingsView.tsx b/Surge-Module-Manager/components/SettingsView.tsx
@@ -127,7 +127,10 @@ export function SettingsView(props: {
       setBookmarkIdx(idx >= 0 ? idx : 0)
       if (idx >= 0) {
         const matched = cleaned[idx]
-        const resolved = fm?.bookmarkedPath
+        const canUseByName = fm?.bookmarkExists
+          ? !!(await callMaybeAsync(fm.bookmarkExists, fm, [matched.name]))
+          : true
+        const resolved = fm?.bookmarkedPath && canUseByName
           ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [matched.name])) ?? matched.path)
           : matched.path
         const pathChanged = resolved !== targetPath || matched.name !== targetName
@@ -141,7 +144,10 @@ export function SettingsView(props: {
         }
       } else if (!targetPath) {
         const first = cleaned[0]
-        const resolved = fm?.bookmarkedPath
+        const canUseByName = fm?.bookmarkExists
+          ? !!(await callMaybeAsync(fm.bookmarkExists, fm, [first.name]))
+          : true
+        const resolved = fm?.bookmarkedPath && canUseByName
           ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [first.name])) ?? first.path)
           : first.path
         setCfg((c) => ({ ...c, baseDir: resolved, baseBookmarkName: first.name }))
@@ -278,7 +284,10 @@ function deleteCategoryAt(indices: number[]) {
                   if (b?.path) {
                     void (async () => {
                       const fm: any = (globalThis as any).FileManager
-                      const resolved = fm?.bookmarkedPath
+                      const canUseByName = fm?.bookmarkExists
+                        ? !!(await callMaybeAsync(fm.bookmarkExists, fm, [b.name]))
+                        : true
+                      const resolved = fm?.bookmarkedPath && canUseByName
                         ? String((await callMaybeAsync(fm.bookmarkedPath, fm, [b.name])) ?? b.path)
                         : b.path
                       const next: AppConfig = { ...cfg, baseDir: resolved, baseBookmarkName: b.name }
diff --git a/Surge-Module-Manager/utils/storage.tsx b/Surge-Module-Manager/utils/storage.tsx
@@ -60,12 +60,20 @@ export function getModulesDir(): string {
 async function resolveBookmarkedPath(rawPath: string, bookmarkName?: string): Promise<string> {
   const fm = fmOrThrow()
   const raw = String(rawPath ?? "").trim()
-  if (!raw) return ""
+  const name = String(bookmarkName ?? "").trim()
+  if (!raw && !name) return ""
   if (!fm?.bookmarkedPath) return raw
 
-  if (bookmarkName) {
-    const byName = await callMaybeAsync(fm.bookmarkedPath, fm, [bookmarkName])
-    if (byName) return String(byName)
+  if (name) {
+    let nameExists = true
+    if (fm?.bookmarkExists) {
+      const existed = await callMaybeAsync(fm.bookmarkExists, fm, [name])
+      nameExists = !!existed
+    }
+    if (nameExists) {
+      const byName = await callMaybeAsync(fm.bookmarkedPath, fm, [name])
+      if (byName) return String(byName)
+    }
   }
   if (!fm?.getAllFileBookmarks) return raw
 
@@ -75,25 +83,36 @@ async function resolveBookmarkedPath(rawPath: string, bookmarkName?: string): Pr
   const match = arr.find((b: any) => {
     const p = normalizePath(String(b?.path ?? ""))
     const n = String(b?.name ?? "")
-    return (p && p === target) || (bookmarkName ? n === bookmarkName : false)
+    return (p && p === target) || (name ? n === name : false)
   })
-  if (!match?.name) return raw
-  const resolved = await callMaybeAsync(fm.bookmarkedPath, fm, [match.name])
-  return resolved ? String(resolved) : raw
+  if (match?.name) {
+    const resolved = await callMaybeAsync(fm.bookmarkedPath, fm, [match.name])
+    if (resolved) return String(resolved)
+  }
+
+  // If bookmark name is configured but cannot be resolved, do not trust stale raw path.
+  if (name) return ""
+  return raw
 }
 
 export async function getModulesDirResolved(baseDir?: string): Promise<string> {
   const cfg = loadConfig()
   const configured = String(cfg.baseDir ?? "").trim()
+  const bookmarkName = String(cfg.baseBookmarkName ?? "").trim()
   const target = String(baseDir ?? "").trim()
   if (!configured && !target) return getModulesDir()
 
   if (!target) {
-    return configured ? await resolveBookmarkedPath(configured, cfg.baseBookmarkName) : getModulesDir()
+    if (!configured) return getModulesDir()
+    const resolved = await resolveBookmarkedPath(configured, bookmarkName)
+    if (resolved) return resolved
+    return bookmarkName ? "" : configured
   }
 
   if (configured && normalizePath(target) === normalizePath(configured)) {
-    return await resolveBookmarkedPath(target, cfg.baseBookmarkName)
+    const resolved = await resolveBookmarkedPath(target, bookmarkName)
+    if (resolved) return resolved
+    return bookmarkName ? "" : target
   }
   return target
 }
@@ -123,6 +142,9 @@ export async function ensureStorage(): Promise<void> {
   const cfg = loadConfig()
   if (cfg.baseDir) {
     const resolved = await getModulesDirResolved(cfg.baseDir)
+    if (!resolved) {
+      throw new Error("书签路径不可用，请在设置页重新选择书签文件夹")
+    }
     await ensureDir(resolved)
     return
   }

Original file line number	Diff line number	Diff line change
`@@ -192,11 +192,14 @@ function dictPattern(cfg: AppConfig): string {`
`192`	`192`	`}`
`193`	`193`
`194`	`194`	`async function requireInstallRoot(cfg: AppConfig): Promise<string> {`
`195`		`- if (cfg.hamsterRootPath) return cfg.hamsterRootPath`
`196`	`195`	`try {`
`197`	`196`	`const { rimeDir } = await detectRimeDir(cfg)`
`198`	`197`	`if (rimeDir) return rimeDir`
`199`	`198`	`} catch {}`
	`199`	`+ if (cfg.hamsterBookmarkName) {`
	`200`	`+ throw new Error("书签路径不可用，请在设置页重新选择书签文件夹")`
	`201`	`+ }`
	`202`	`+ if (cfg.hamsterRootPath) return cfg.hamsterRootPath`
`200`	`203`	`throw new Error("未选择安装目录（请到设置选择文件夹）")`
`201`	`204`	`}`
`202`	`205`