dsh-pocket 1.7.1 → 1.7.2

package/lib/tunnel.mjs

@@ -292,15 +292,24 @@ export async function resolveCloudflared({ home, onPhase = () => {}, signal } =
   if (cloudflaredOnPath()) return 'cloudflared';
   const dshHome = home ?? process.env.DSH_HOME ?? join(homedir(), '.dsh');
   const cacheDir = join(dshHome, 'dsh-pocket', 'bin');
-  const bin = join(cacheDir, `cloudflared${platformBinary().ext}`);
-  try {
-    await access(bin);
-    return bin; // 缓存命中，秒开
-  } catch { /* 缓存缺失，下载 */ }
+  const { os, a, ext } = platformBinary();
+  // 缓存命中，兼容两种文件名（issue #15）：
+  // 1) 本插件下载时写入的 bin 名：cloudflared.exe
+  // 2) 手动放置的**发布资产名**：cloudflared-windows-amd64.exe（与下载失败的错误提示一致）
+  const candidates = [
+    join(cacheDir, `cloudflared${ext}`),
+    join(cacheDir, `cloudflared-${os}-${a}${ext}`),
+  ];
+  for (const bin of candidates) {
+    try {
+      await access(bin);
+      return bin; // 缓存命中，秒开
+    } catch { /* 继续找下一个 */ }
+  }
   onPhase('downloading');
   await mkdir(cacheDir, { recursive: true });
   if (!downloading) {
-    downloading = downloadCloudflared(bin, signal).finally(() => { downloading = null; });
+    downloading = downloadCloudflared(join(cacheDir, `cloudflared${ext}`), signal).finally(() => { downloading = null; });
   }
   return downloading;
 }

package/package.json

@@ -76,5 +76,5 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "1.7.1"
+  "version": "1.7.2"
 }