dsh-crossterm 0.3.35 → 0.3.37

package/lib/bus.js

@@ -22,7 +22,7 @@ import os from 'node:os'
 import path from 'node:path'
 import crypto from 'node:crypto'
 
-export const VERSION = '0.3.35'
+export const VERSION = '0.3.37'
 
 /** DSH 的家目录：与宿主其它状态（sessions / profiles）同一个根，多终端天然共享 */
 export function dshHome() {

package/lib/web.js

@@ -129,14 +129,34 @@ async function latestVersion() {
   throw new Error(last || 'unknown')
 }
 
-function run(cmd, args, cwd) {
+// 子进程输出解码：中文 Windows 控制台默认 CP936（GBK），直接当 UTF-8 读会变成 ����。
+// 先按整段 UTF-8 严格解码，失败再退回 GBK；顺带清掉 ANSI 控制符与 \r 进度残留。
+function decodeOutput(buffer) {
+  if (!buffer || buffer.length === 0) return ''
+  let text
+  try {
+    text = new TextDecoder('utf-8', { fatal: true }).decode(buffer)
+  } catch {
+    try {
+      text = new TextDecoder('gbk').decode(buffer)
+    } catch {
+      text = buffer.toString('utf8')
+    }
+  }
+  // eslint-disable-next-line no-control-regex
+  return text.replace(/\u001b\[[0-9;?]*[A-Za-z]/g, '').replace(/\r/g, '\n')
+}
+
+function run(cmd, args, cwd, opts) {
   return new Promise((resolve) => {
-    let out = ''
+    const chunks = []
+    let size = 0
     let child
+    const shell = opts && typeof opts.shell === 'boolean' ? opts.shell : process.platform === 'win32'
     try {
       child = spawn(cmd, args, {
         cwd,
-        shell: process.platform === 'win32',
+        shell,
         windowsHide: true,
       })
     } catch (error) {
@@ -144,16 +164,67 @@ function run(cmd, args, cwd) {
       return
     }
     const push = (chunk) => {
-      out += String(chunk)
-      if (out.length > 20000) out = out.slice(-20000)
+      const buf = Buffer.isBuffer(chunk) ? chunk : Buffer.from(String(chunk), 'utf8')
+      chunks.push(buf)
+      size += buf.length
+      // 只留最后 64 KB，免得长日志把内存和卡片撑爆
+      while (size > 65536 && chunks.length > 1) size -= chunks.shift().length
     }
     child.stdout && child.stdout.on('data', push)
     child.stderr && child.stderr.on('data', push)
-    child.on('error', (error) => resolve({ code: -1, out: out + String((error && error.message) || error) }))
-    child.on('close', (code) => resolve({ code, out }))
+    child.on('error', (error) =>
+      resolve({ code: -1, out: decodeOutput(Buffer.concat(chunks)) + String((error && error.message) || error) }),
+    )
+    child.on('close', (code) => resolve({ code, out: decodeOutput(Buffer.concat(chunks)) }))
   })
 }
 
+// 更新失败时给人的提示：命令找不到就明说，别把一行乱码甩到卡片上
+function updateErrorText(result) {
+  const raw = (result.out || '').trim()
+  if (!raw) {
+    return `自动更新没跑起来（dsh 退出码 ${result.code}）：本机找不到可用的 dsh 命令，请在命令行手动执行 dsh plugin add ${PKG}@latest，然后重启 DSH`
+  }
+  const tail = raw.slice(-1200)
+  if (/not recognized|不是内部或外部命令|无法将.{0,12}项识别|command not found|ENOENT/i.test(raw)) {
+    return `${tail}\n\n提示：PATH 里没有 dsh 命令，请在命令行手动执行 dsh plugin add ${PKG}@latest，然后重启 DSH`
+  }
+  return tail
+}
+
+// 有些机器没把 `dsh` 命令放进 PATH（桌面版就是），这时退回 DSH 自带运行时里的
+// node + pnpm 直接装：<DSH_HOME>\dsh-runtimes\dsh-primary-runtime\dependencies\{node,pnpm}
+function runtimeTools(cfg) {
+  const busDir = (cfg && cfg.busDir) || ''
+  const home = busDir ? path.dirname(busDir) : path.join(os.homedir(), '.dsh')
+  const deps = path.join(home, 'dsh-runtimes', 'dsh-primary-runtime', 'dependencies')
+  return {
+    node: path.join(deps, 'node', 'bin', 'node.exe'),
+    pnpm: path.join(deps, 'pnpm', 'bin', 'pnpm.cjs'),
+    ok:
+      fs.existsSync(path.join(deps, 'node', 'bin', 'node.exe')) &&
+      fs.existsSync(path.join(deps, 'pnpm', 'bin', 'pnpm.cjs')),
+  }
+}
+
+function looksMissingCommand(result) {
+  return /not recognized|不是内部或外部命令|无法将.{0,12}项识别|command not found|ENOENT|is not recognized/i.test(
+    result.out || '',
+  )
+}
+
+async function updatePlugin(term, info) {
+  const target = `${PKG}@latest`
+  const direct = await run('dsh', ['plugin', '--profile', info.name, 'add', target], info.dir)
+  if (direct.code === 0) return { ok: true, via: 'dsh', out: direct.out }
+  const miss = looksMissingCommand(direct) || direct.out.trim() === ''
+  if (!miss) return { ok: false, via: 'dsh', out: direct.out }
+  const tools = runtimeTools(term.cfg)
+  if (!tools.ok) return { ok: false, via: 'none', out: updateErrorText(direct) }
+  const fallback = await run(tools.node, [tools.pnpm, 'add', target], info.dir, { shell: false })
+  return { ok: fallback.code === 0, via: 'pnpm', out: fallback.out || updateErrorText(fallback) }
+}
+
 function statusOf(term) {
   const cfg = term.cfg || {}
   const info = profileInfo(cfg.busDir)
@@ -315,15 +386,17 @@ export function registerWeb(ctx, term, log) {
                 })
                 return
               }
-              const result = await run('dsh', ['plugin', '--profile', info.name, 'add', `${PKG}@latest`], info.dir)
+              const result = await updatePlugin(term, info)
               json(res, 200, {
-                ok: result.code === 0,
+                ok: result.ok,
                 mode: 'registry',
-                needRestart: result.code === 0,
-                message:
-                  result.code === 0
-                    ? '已更新，重启 DSH 后生效'
-                    : (result.out || `dsh 退出码 ${result.code}`).slice(-1200),
+                via: result.via,
+                needRestart: result.ok,
+                message: result.ok
+                  ? `已更新${result.via === 'pnpm' ? '（用 DSH 自带 pnpm）' : ''}，重启 DSH 后生效`
+                  : result.via === 'none'
+                    ? result.out
+                    : (result.out || '').slice(-1200) || `更新失败（退出码不明）`,
               })
             },
           }),
@@ -345,3 +418,6 @@ export function registerWeb(ctx, term, log) {
     if (typeof log === 'function') log(`web 路由注册失败：${(error && error.message) || error}`)
   }
 }
+
+// 只给探针用：把内部小工具导出来，宿主运行时不依赖这些导出
+export { decodeOutput, runtimeTools, looksMissingCommand, updateErrorText }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-crossterm",
-  "version": "0.3.35",
+  "version": "0.3.37",
   "description": "DSH 跨终端互联：同一账号下的多个 DSH 终端/进程互发邮件与文件（主题内联、正文落盘，收件方自己读）",
   "type": "module",
   "main": "./lib/index.js",