@zhangfengshun/dsh-remote-ssh 2.1.4 → 2.1.5

package/lib/client.js

@@ -1078,6 +1078,53 @@ window.__ModuleLoader__.load({
         return function () { if (el.parentNode) el.parentNode.removeChild(el); };
       });
 
+      // better-sidebar 0.15+ 的文件上传 UI 把原始字节流 POST 到 /sidebar/upload。
+      // 远程工作区会话的文件树显示的是本地镜像目录，better-sidebar 会把上传写进
+      // 本地镜像而不会到达远程。这里包装 fetch：目标目录位于某个远程工作区镜像
+      // 目录内时，把该上传请求重定向到 /remote-ssh/upload（走 SSH 上传到远端）。
+      ctx.effect(function () {
+        if (typeof window === "undefined" || typeof window.fetch !== "function") return;
+        var nativeFetch = window.fetch.bind(window);
+        var mirrors = [];
+        function refreshMirrors() {
+          api("listWorkspaces").then(function (r) {
+            if (r && r.ok && Array.isArray(r.workspaces)) {
+              mirrors = r.workspaces.map(function (w) {
+                return String(w && w.mirrorPath || "").replace(/\\/g, "/").replace(/\/+$/g, "").toLowerCase();
+              }).filter(Boolean);
+            }
+          }).catch(function () {});
+        }
+        refreshMirrors();
+        var timer = setInterval(refreshMirrors, 30000);
+        function patchedFetch(input, init) {
+          var raw = typeof input === "string" ? input : (input && input.url);
+          if (typeof raw === "string") {
+            try {
+              var u = new URL(raw, window.location.origin);
+              if (u.pathname === "/sidebar/upload") {
+                var dir = (u.searchParams.get("dir") || "").replace(/\\/g, "/").replace(/\/+$/g, "").toLowerCase();
+                var cwd = (u.searchParams.get("cwd") || "").replace(/\\/g, "/").replace(/\/+$/g, "").toLowerCase();
+                for (var i = 0; i < mirrors.length; i++) {
+                  var m = mirrors[i];
+                  var hit = (dir && (dir === m || dir.indexOf(m + "/") === 0)) || (cwd && (cwd === m || cwd.indexOf(m + "/") === 0));
+                  if (hit) {
+                    var target = new URL("/remote-ssh/upload" + u.search, window.location.origin);
+                    return nativeFetch(target.toString(), init);
+                  }
+                }
+              }
+            } catch (e) {}
+          }
+          return nativeFetch(input, init);
+        }
+        window.fetch = patchedFetch;
+        return function () {
+          clearInterval(timer);
+          if (window.fetch === patchedFetch) window.fetch = nativeFetch;
+        };
+      }, "dsh-remote-ssh: redirect remote-workspace uploads");
+
       if (betterSidebar) {
         // 远程文件编辑器页签（隐藏页签，仅由代码打开，每个远程文件单开一栏）。
         // remssh:files 和 remssh:term 已移除：远程文件由内置「文件」页签直接 SSH 读写，

package/lib/index.js

@@ -1672,6 +1672,76 @@ function apply(ctx, config) {
     }), "dsh-remote-ssh: intercept /sidebar/api/" + m);
   });
 
+  // ---- better-sidebar 0.15+ 文件上传：远程工作区目录直接 SSH 上传到远端 ----
+  // better-sidebar 的上传 UI 把原始字节流 POST 到它自己的 /sidebar/upload 路由，
+  // 由本插件客户端将远程镜像目录下的这类请求转发到 /remote-ssh/upload。
+  const REMOTE_UPLOAD_LIMIT = 134217728; // 与 better-sidebar 的上传上限一致
+
+  /** dir/cwd 是否位于某个远程工作区的本地镜像目录之下（大小写不敏感）。 */
+  function matchRemoteWorkspace(dir, cwd) {
+    const norm = (p) => String(p || "").replace(/\\/g, "/").replace(/\/+$/, "").toLowerCase();
+    const nd = norm(dir);
+    const nc = norm(cwd);
+    if (!nd && !nc) return null;
+    const workspaces = settingsFace.read().workspaces || [];
+    for (const w of workspaces) {
+      const m = norm(w.mirrorPath);
+      if (!m) continue;
+      if ((nd && (nd === m || nd.startsWith(m + "/"))) || (nc && (nc === m || nc.startsWith(m + "/")))) return w;
+    }
+    return null;
+  }
+
+  async function handleRemoteUpload(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; }
+    try {
+      const url = new URL(req.url || "/", "http://dsh.internal");
+      const dir = url.searchParams.get("dir") || "";
+      const relativePath = (url.searchParams.get("relativePath") || "").replace(/\\/g, "/");
+      const cwd = url.searchParams.get("cwd") || "";
+      if (!dir || relativePath.trim() === "") { writeJson(res, 400, { ok: false, error: { code: "bad-request", message: "dir and relativePath are required" } }); return; }
+      const ws = matchRemoteWorkspace(dir, cwd);
+      if (!ws) { writeJson(res, 400, { ok: false, error: { code: "fs-error", message: "not a remote workspace directory" } }); return; }
+      const remoteInfo = readRemoteInfoSync(ws.mirrorPath);
+      const profile = remoteInfo && getProfile(remoteInfo.profileId);
+      if (!remoteInfo || !profile) { writeJson(res, 500, { ok: false, error: { code: "internal", message: "remote workspace profile not found" } }); return; }
+      let rel = relativePath;
+      if (rel.startsWith("/")) rel = rel.slice(1);
+      if (rel.split("/").some((seg) => seg === "..")) { writeJson(res, 400, { ok: false, error: { code: "bad-request", message: "relativePath must stay below the upload directory" } }); return; }
+      const remoteDir = localToRemote(dir, ws.mirrorPath, remoteInfo.remotePath);
+      const target = remoteDir.replace(/\/+$/, "") + (rel ? "/" + rel : "");
+      const parent = target.slice(0, Math.max(target.lastIndexOf("/"), 0));
+      // 读取原始字节流（File/Blob 直传，二进制安全）
+      const chunks = [];
+      let size = 0;
+      for await (const chunk of req) {
+        const b = Buffer.from(chunk);
+        size += b.length;
+        if (size > REMOTE_UPLOAD_LIMIT) { writeJson(res, 413, { ok: false, error: { code: "too-large", message: "upload exceeds the remote upload limit (" + REMOTE_UPLOAD_LIMIT + " bytes)" } }); return; }
+        chunks.push(b);
+      }
+      const payloadBase64 = Buffer.concat(chunks).toString("base64");
+      // 远端建父目录
+      if (parent && parent !== remoteDir.replace(/\/+$/, "")) {
+        const mk = await runPooled(profile, "mkdir -p " + shellQuotePath(parent), undefined, 65536);
+        if (!mk.ok) { writeJson(res, 500, { ok: false, error: { code: "fs-error", message: String(mk.error || mk.stdout || "mkdir failed").trim() } }); return; }
+      }
+      // 二进制安全落地：base64 -d 还原后写入目标文件
+      const w = await runPooled(profile, "base64 -d > " + shellQuotePath(target), payloadBase64, REMOTE_UPLOAD_LIMIT);
+      if (!w.ok) { writeJson(res, 500, { ok: false, error: { code: "fs-error", message: String(w.error || w.stdout || "remote write failed").trim() } }); return; }
+      writeOk(res, { path: dir.replace(/\\/g, "/").replace(/\/+$/, "") + "/" + rel, size: size });
+    } catch (e) {
+      writeJson(res, 400, { ok: false, error: { code: "fs-error", message: String(e && e.message ? e.message : e) } });
+    }
+  }
+
+  ctx.effect(() => ctx.webServer.register({
+    kind: "exact",
+    path: "/remote-ssh/upload",
+    handler: function (req, res) { return handleRemoteUpload(req, res); }
+  }), "dsh-remote-ssh: /remote-ssh/upload route");
+
   // ---- 清理 ----
   ctx.effect(() => () => {
     clearInterval(idleTimer);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "2.1.4",
+  "version": "2.1.5",
   "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",