@xiaoqiong0v0/opencode-ssh-tool 0.6.16 → 0.6.18

package/dist/payload.js

@@ -0,0 +1,114 @@
+// 载荷解析：term_cli exec / send 的输入来源（内联文本 / base64 / 本地文件）
+// 目的：复杂引号、目标 shell 转义（PowerShell/cmd）以及以 "-" 开头的载荷，
+// 无法靠 CLI 外层分词安全表达时，用 base64 或本地文件把 payload 原样带进来。
+import { readFile } from "node:fs/promises";
+import { homedir } from "node:os";
+import { join } from "node:path";
+/**
+ * 载荷解析错误：只携带机器可读 code，展示文案由调用方按语言生成。
+ */
+export class PayloadError extends Error {
+    code;
+    /**
+     * @param code 错误码（conflict / base64 / file）
+     * @param message 内部诊断信息（不直接展示给用户）
+     */
+    constructor(code, message) {
+        super(message);
+        this.name = "PayloadError";
+        this.code = code;
+    }
+}
+/** 严格 base64 字符集：仅标准字母表、末尾最多两个补位符（长度另校验 4 的倍数） */
+const BASE64_RE = /^[A-Za-z0-9+/]*={0,2}$/;
+/**
+ * 展开开头的 ~（"~" / "~/" / "~\\"）为当前用户 home 目录；其他路径原样返回。
+ * @param path 用户传入的文件路径
+ * @returns 展开后的路径
+ */
+function expandHome(path) {
+    if (path === "~")
+        return homedir();
+    if (path.startsWith("~/") || path.startsWith("~\\"))
+        return join(homedir(), path.slice(2));
+    return path;
+}
+/**
+ * 严格解码 UTF-8 载荷：拒绝非法字节序列与 NUL，剥掉开头的 UTF-8 BOM。
+ * 目的：避免 UTF-16LE（PowerShell `Out-File` 默认）等非 UTF-8 文件被当成“带 NUL 的乱码”静默发送，
+ * 也避免 BOM 变成载荷首字符 U+FEFF。
+ * @param bytes 原始字节
+ * @param code 出错时归属的错误码（base64 / file）
+ * @returns 解码后的文本（无 BOM）
+ * @throws {PayloadError} 非法 UTF-8 或含 NUL
+ */
+function decodeUtf8(bytes, code) {
+    let text;
+    try {
+        // ignoreBOM=true：保留 BOM 由下面统一剥离，避免依赖 TextDecoder 的默认行为
+        text = new TextDecoder("utf-8", { fatal: true, ignoreBOM: true }).decode(bytes);
+    }
+    catch (e) {
+        const reason = e instanceof Error ? e.message : String(e);
+        throw new PayloadError("decode", `invalid UTF-8 ${code} payload: ${reason}`);
+    }
+    if (text.charCodeAt(0) === 0xfeff)
+        text = text.slice(1);
+    if (text.includes("\u0000")) {
+        throw new PayloadError("decode", `payload ${code} contains NUL (likely UTF-16 or binary); save it as UTF-8`);
+    }
+    return text;
+}
+/**
+ * 归一 exec 载荷的换行：仅把 CRLF（\r\n）折成 \n。
+ * 仅用于 exec 的 base64/file 载荷；send raw 必须保持原样，故不调用本函数。
+ * @param text 载荷文本
+ * @returns CRLF 已归一为 LF 的文本
+ */
+export function normalizeExecText(text) {
+    return text.replace(/\r\n/g, "\n");
+}
+/**
+ * 解析 term_cli 的载荷来源。
+ * - 默认：positional 原样作为文本，raw=false（send 仍会解释 \n / \xHH 等转义）；
+ * - --base64：忽略空白后严格校验并解码为 UTF-8 文本，raw=true；
+ * - --file：读取插件进程本机的 UTF-8 文件，raw=true（不读远程文件）；
+ * 两者都严格解码：剥开头的 U+FEFF，非法 UTF-8 或含 NUL 时报错（不静默发送）；
+ * - --base64 与 --file 互斥。
+ * 空载荷不在此报错（由调用方按 cli_need_* 文案处理）。
+ * @param positional 位置参数拼接后的内联文本
+ * @param opts base64 / file 选项
+ * @returns 解析结果（文本、是否原样、来源）
+ * @throws {PayloadError} 选项冲突、base64 非法或文件读取失败
+ */
+export async function resolvePayload(positional, opts) {
+    if (opts.base64 && opts.file) {
+        throw new PayloadError("conflict", "--base64 and --file are mutually exclusive");
+    }
+    if (opts.base64) {
+        // 允许用户把 base64 按行/空格折行传入；去掉所有空白后再严格校验
+        const compact = positional.replace(/\s+/g, "");
+        if (!BASE64_RE.test(compact) || compact.length % 4 !== 0) {
+            throw new PayloadError("base64", "invalid base64 payload");
+        }
+        return {
+            text: decodeUtf8(Buffer.from(compact, "base64"), "base64"),
+            raw: true,
+            source: "base64",
+        };
+    }
+    if (opts.file) {
+        const resolved = expandHome(opts.file);
+        let bytes;
+        try {
+            bytes = await readFile(resolved);
+        }
+        catch (e) {
+            const reason = e instanceof Error ? e.message : String(e);
+            throw new PayloadError("file", `cannot read ${resolved}: ${reason}`);
+        }
+        return { text: decodeUtf8(bytes, "file"), raw: true, source: "file" };
+    }
+    return { text: positional, raw: false, source: "text" };
+}
+//# sourceMappingURL=payload.js.map

package/dist/payload.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"payload.js","sourceRoot":"","sources":["../src/payload.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,oDAAoD;AACpD,mDAAmD;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAA;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAkBhC;;GAEG;AACH,MAAM,OAAO,YAAa,SAAQ,KAAK;IAC5B,IAAI,CAAkB;IAE/B;;;OAGG;IACH,YAAY,IAAsB,EAAE,OAAe;QACjD,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,IAAI,GAAG,cAAc,CAAA;QAC1B,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;IAClB,CAAC;CACF;AAED,kDAAkD;AAClD,MAAM,SAAS,GAAG,wBAAwB,CAAA;AAE1C;;;;GAIG;AACH,SAAS,UAAU,CAAC,IAAY;IAC9B,IAAI,IAAI,KAAK,GAAG;QAAE,OAAO,OAAO,EAAE,CAAA;IAClC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;IAC1F,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,UAAU,CAAC,KAAa,EAAE,IAAuB;IACxD,IAAI,IAAY,CAAA;IAChB,IAAI,CAAC;QACH,uDAAuD;QACvD,IAAI,GAAG,IAAI,WAAW,CAAC,OAAO,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACjF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;QACzD,MAAM,IAAI,YAAY,CAAC,QAAQ,EAAE,iBAAiB,IAAI,aAAa,MAAM,EAAE,CAAC,CAAA;IAC9E,CAAC;IACD,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM;QAAE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;IACvD,IAAI,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,YAAY,CAAC,QAAQ,EAAE,WAAW,IAAI,2DAA2D,CAAC,CAAA;IAC9G,CAAC;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,iBAAiB,CAAC,IAAY;IAC5C,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;AACpC,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAAkB,EAClB,IAAyC;IAEzC,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,YAAY,CAAC,UAAU,EAAE,4CAA4C,CAAC,CAAA;IAClF,CAAC;IAED,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,sCAAsC;QACtC,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAC9C,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACzD,MAAM,IAAI,YAAY,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAA;QAC5D,CAAC;QACD,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,QAAQ,CAAC;YAC1D,GAAG,EAAE,IAAI;YACT,MAAM,EAAE,QAAQ;SACjB,CAAA;IACH,CAAC;IAED,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;QACd,MAAM,QAAQ,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,KAAa,CAAA;QACjB,IAAI,CAAC;YACH,KAAK,GAAG,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAA;QAClC,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,MAAM,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;YACzD,MAAM,IAAI,YAAY,CAAC,MAAM,EAAE,eAAe,QAAQ,KAAK,MAAM,EAAE,CAAC,CAAA;QACtE,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;IACvE,CAAC;IAED,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;AACzD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xiaoqiong0v0/opencode-ssh-tool",
-  "version": "0.6.16",
+  "version": "0.6.18",
   "type": "module",
   "description": "长驻交互式 SSH 会话工具插件，远程命令受 opencode 权限管控",
   "files": [
@@ -14,6 +14,7 @@
   },
   "scripts": {
     "build": "tsc && node web/build.mjs",
+    "test": "npm run build && node --test test/cli-args.test.mjs test/payload.test.mjs",
     "prepublishOnly": "npm run build"
   },
   "repository": {
@@ -40,7 +41,6 @@
     "@xterm/headless": "^5.5.0",
     "@xterm/xterm": "^5.5.0",
     "ssh2": "^1.16.0",
-    "string-argv": "^0.3.2",
     "ws": "^8.21.3"
   },
   "peerDependencies": {