@zhangfengshun/dsh-remote-ssh 2.0.3 → 2.0.4

package/lib/index.js

@@ -1545,91 +1545,94 @@ function apply(ctx, config) {
     return { kind: "text", content: r.content || "", truncated: !!r.truncated };
   }
 
-  ctx.effect(() => ctx.webServer.register({
-    kind: "prefix",
-    path: "/sidebar/api/fs.",
-    handler: async (req, res) => {
-      if (!isTrusted(req)) { writeJson(res, 403, { ok: false, error: { code: "forbidden", message: "forbidden" } }); return; }
-      if (req.method !== "POST") { writeJson(res, 405, { ok: false, error: { code: "method-error", message: "method not allowed" } }); return; }
-      const pathname = new URL(req.url || "/", "http://dsh.internal").pathname;
-      const method = "fs." + pathname.slice("/sidebar/api/fs.".length);
-      let payload;
-      try { payload = await readJsonBody(req); }
-      catch (e) { writeJson(res, 400, { ok: false, error: { code: "bad-request", message: String(e && e.message ? e.message : e) } }); return; }
-      try {
-        // 获取会话 cwd
-        const sessionId = payload && payload.sessionId;
-        let sessionCwd = payload && payload.cwd;
-        if ((!sessionCwd || sessionCwd === "") && sessionId) {
-          const sessions = ctx.get("sessions");
-          const session = sessions ? sessions.get(sessionId) : null;
-          sessionCwd = session && session.header && session.header.cwd;
-        }
-        // 如果 sessionCwd 还是空，尝试用 payload.path 的父目录（文件操作时 path 是文件路径）
-        if ((!sessionCwd || sessionCwd === "") && payload && payload.path) {
-          sessionCwd = payload.path;
-        }
-        // 检查是否远程工作区
-        const remoteInfo = readRemoteInfoSync(sessionCwd);
-        // 如果 cwd 本身没有 .remote-ssh.json，尝试从 payload.path 向上查找
-        let remoteInfoFromPath = remoteInfo;
-        if (!remoteInfo && payload && payload.path) {
-          remoteInfoFromPath = readRemoteInfoSync(payload.path);
-        }
-        ctx.logger?.info("[dsh-remote-ssh] fs.* intercept: method=" + method + " sessionId=" + sessionId + " cwd=" + sessionCwd + " payload.path=" + (payload && payload.path) + " remoteInfo=" + (remoteInfo ? "YES" : "NO") + " remoteInfoFromPath=" + (remoteInfoFromPath ? "YES" : "NO"));
-        let result;
-        if (remoteInfoFromPath && remoteInfoFromPath.keyPath && remoteInfoFromPath.host && remoteInfoFromPath.user) {
-          const actualRemoteInfo = remoteInfo || remoteInfoFromPath;
-          const actualCwd = sessionCwd || (payload && payload.path) || "";
-          // ---- 远程工作区：走 SSH ----
-          const profile = getProfile(actualRemoteInfo.profileId);
-          if (!profile) { writeJson(res, 500, { ok: false, error: { code: "internal", message: "remote profile not found" } }); return; }
-          if (method === "fs.tree") {
-            const localPath = payload.path || actualCwd;
-            const rp = localToRemote(localPath, actualCwd, actualRemoteInfo.remotePath);
-            result = await remoteListForSidebar(profile, rp, localPath);
-          } else if (method === "fs.read") {
-            const localPath = payload.path || actualCwd;
-            const rp = localToRemote(localPath, actualCwd, actualRemoteInfo.remotePath);
-            result = await remoteReadForSidebar(profile, rp);
-          } else if (method === "fs.write") {
-            const localPath = payload.path || actualCwd;
-            const rp = localToRemote(localPath, actualCwd, actualRemoteInfo.remotePath);
-            result = await remoteWriteFile(runPooled, profile, rp, payload.content || "");
-          } else if (method === "fs.search") {
-            const rp = actualRemoteInfo.remotePath;
-            const r = await remoteGlob(runPooled, profile, "*" + (payload.query || "") + "*", rp);
-            result = { entries: (r.files || []).map(function (f) {
-              return { path: join(actualCwd, f), isDir: false };
-            }), truncated: !!r.truncated };
-          } else {
-            writeJson(res, 404, { ok: false, error: { code: "not-found", message: "unknown method " + method } }); return;
-          }
+  // exact 路由优先于 prefix 路由匹配，所以每个 fs.* 端点注册一个 exact 路由即可拦截。
+  // webServer prefix 匹配要求 pathname 以 prefix+"/" 开头，但 fs.tree 用的是点分隔符，
+  // 所以无法用 prefix 拦截，必须用 exact。
+  async function interceptFsHandler(req, res, method) {
+    if (!isTrusted(req)) { writeJson(res, 403, { ok: false, error: { code: "forbidden", message: "forbidden" } }); return; }
+    if (req.method !== "POST") { writeJson(res, 405, { ok: false, error: { code: "method-error", message: "method not allowed" } }); return; }
+    let payload;
+    try { payload = await readJsonBody(req); }
+    catch (e) { writeJson(res, 400, { ok: false, error: { code: "bad-request", message: String(e && e.message ? e.message : e) } }); return; }
+    try {
+      // 获取会话 cwd
+      const sessionId = payload && payload.sessionId;
+      let sessionCwd = payload && payload.cwd;
+      if ((!sessionCwd || sessionCwd === "") && sessionId) {
+        const sessions = ctx.get("sessions");
+        const session = sessions ? sessions.get(sessionId) : null;
+        sessionCwd = session && session.header && session.header.cwd;
+      }
+      // 如果 sessionCwd 还是空，尝试用 payload.path（文件操作时 path 包含工作区路径）
+      if ((!sessionCwd || sessionCwd === "") && payload && payload.path) {
+        sessionCwd = payload.path;
+      }
+      // 检查是否远程工作区：先查 sessionCwd，再查 payload.path
+      let remoteInfo = readRemoteInfoSync(sessionCwd);
+      let remoteBase = sessionCwd;
+      if (!remoteInfo && payload && payload.path) {
+        remoteInfo = readRemoteInfoSync(payload.path);
+        remoteBase = payload.path;
+      }
+      console.log("[dsh-remote-ssh] intercept " + method + ": sessionId=" + sessionId + " cwd=" + sessionCwd + " path=" + (payload && payload.path) + " remote=" + (remoteInfo ? "YES" : "NO"));
+      let result;
+      if (remoteInfo && remoteInfo.keyPath && remoteInfo.host && remoteInfo.user) {
+        // ---- 远程工作区：走 SSH ----
+        const profile = getProfile(remoteInfo.profileId);
+        if (!profile) { writeJson(res, 500, { ok: false, error: { code: "internal", message: "remote profile not found: " + remoteInfo.profileId } }); return; }
+        if (method === "fs.tree") {
+          const localPath = payload.path || sessionCwd;
+          const rp = localToRemote(localPath, remoteBase, remoteInfo.remotePath);
+          result = await remoteListForSidebar(profile, rp, localPath);
+        } else if (method === "fs.read") {
+          const localPath = payload.path || sessionCwd;
+          const rp = localToRemote(localPath, remoteBase, remoteInfo.remotePath);
+          result = await remoteReadForSidebar(profile, rp);
+        } else if (method === "fs.write") {
+          const localPath = payload.path || sessionCwd;
+          const rp = localToRemote(localPath, remoteBase, remoteInfo.remotePath);
+          result = await remoteWriteFile(runPooled, profile, rp, payload.content || "");
+        } else if (method === "fs.search") {
+          const rp = remoteInfo.remotePath;
+          const r = await remoteGlob(runPooled, profile, "*" + (payload.query || "") + "*", rp);
+          result = { entries: (r.files || []).map(function (f) {
+            return { path: join(remoteBase, f), isDir: false };
+          }), truncated: !!r.truncated };
         } else {
-          // ---- 本地工作区：走本地 fs ----
-          if (method === "fs.tree") {
-            const p = payload.path || sessionCwd;
-            result = await localListDir(p, LIST_LIMIT);
-          } else if (method === "fs.read") {
-            result = await localReadText(payload.path, READ_LIMIT);
-          } else if (method === "fs.write") {
-            result = await localWriteFile(payload.path, payload.content || "");
-          } else if (method === "fs.search") {
-            result = await localSearchFiles(sessionCwd, payload.query || "");
-          } else {
-            writeJson(res, 404, { ok: false, error: { code: "not-found", message: "unknown method " + method } }); return;
-          }
+          writeJson(res, 404, { ok: false, error: { code: "not-found", message: "unknown method " + method } }); return;
         }
-        if (result && result.ok === false) {
-          writeJson(res, 400, { ok: false, error: { code: "fs-error", message: result.error || "operation failed" } });
+      } else {
+        // ---- 本地工作区：走本地 fs ----
+        if (method === "fs.tree") {
+          const p = payload.path || sessionCwd;
+          result = await localListDir(p, LIST_LIMIT);
+        } else if (method === "fs.read") {
+          result = await localReadText(payload.path, READ_LIMIT);
+        } else if (method === "fs.write") {
+          result = await localWriteFile(payload.path, payload.content || "");
+        } else if (method === "fs.search") {
+          result = await localSearchFiles(sessionCwd, payload.query || "");
         } else {
-          writeOk(res, result);
+          writeJson(res, 404, { ok: false, error: { code: "not-found", message: "unknown method " + method } }); return;
         }
-      } catch (e) {
-        writeJson(res, 400, { ok: false, error: { code: "fs-error", message: String(e && e.message ? e.message : e) } });
       }
+      if (result && result.ok === false) {
+        writeJson(res, 400, { ok: false, error: { code: "fs-error", message: result.error || "operation failed" } });
+      } else {
+        writeOk(res, result);
+      }
+    } catch (e) {
+      writeJson(res, 400, { ok: false, error: { code: "fs-error", message: String(e && e.message ? e.message : e) } });
     }
-  }), "dsh-remote-ssh: intercept /sidebar/api/fs.* for remote workspaces");
+  }
+
+  ["fs.tree", "fs.read", "fs.write", "fs.search"].forEach(function (m) {
+    ctx.effect(() => ctx.webServer.register({
+      kind: "exact",
+      path: "/sidebar/api/" + m,
+      handler: function (req, res) { return interceptFsHandler(req, res, m); }
+    }), "dsh-remote-ssh: intercept /sidebar/api/" + m);
+  });
 
   // ---- 清理 ----
   ctx.effect(() => () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "DSH web plugin: VSCode Remote-SSH-like remote development (SSH to supercomputers/servers, remote workspace, file explorer, integrated terminal), integrated with dsh-better-sidebar and DSH settings.",
   "keywords": [
     "dsh",