dsh-crossterm 0.3.36 → 0.3.38

package/README.md

@@ -244,6 +244,19 @@ dsh plugin --profile desktop remove dsh-crossterm
 
 > 插件、npm 包、B 机安装包**都不携带任何凭证**；换机器要各自配自己的。
 
+### 看有哪些机器连着（0.3.38）
+
+插件页卡片展开后有「云端设备」一行，也可以直接 `GET /crossterm/api/devices`：
+
+- 数据来自云端总线的 `presence/*.json`（每台机器 10 秒一次心跳），字段含名字、nodeId、版本、平台、会话数、入链；
+- 最后心跳 3 分钟内的算「在线」，其余显示「N 分钟前」；
+- 本机永远在列表里（标「（本机）」），取自本地 presence，不依赖云端往返；
+- 没配云盘的机器只显示「未连接云盘」，不会假装有别的设备。
+
+> 0.3.38 之前这里常常显示「云端还没有其他设备」：云端 `presence/` 里堆了 220 多个 `.tmp`
+> 残骸，而百度网盘列目录一页只给 200 条 —— 真实 json 被挤到了第二页。现在列目录会翻页，
+> 云端也不再上传 `.tmp`。
+
 ### 手动 / 自动注入开关（三层）
 
 | 层 | 开关 | 粒度 |

package/client/client.js

@@ -131,11 +131,37 @@ window.__ModuleLoader__.load({
 			);
 		}
 
+		function agoText(ts) {
+			if (!ts) return "未知";
+			const mins = Math.round((Date.now() - ts) / 60000);
+			if (mins <= 0) return "刚刚";
+			if (mins < 60) return mins + " 分钟前";
+			const hours = Math.round(mins / 60);
+			if (hours < 24) return hours + " 小时前";
+			return Math.round(hours / 24) + " 天前";
+		}
+
+		function devicesText(status, devices) {
+			if (!(status && status.cloud && status.cloud.configured)) return "未连接云盘";
+			if (!devices || devices.loading) return "读取中…";
+			if (!devices.ok) return devices.message || "读取失败";
+			const list = devices.devices || [];
+			if (!list.length) return "云端还没有其他设备";
+			return list
+				.map((d) => {
+					const label = (d.name || d.nodeId || "未知设备") + (d.nodeId === devices.me ? "（本机）" : "");
+					const state = d.online ? "在线" : agoText(d.updatedAt);
+					return label + " · " + state + (d.version ? " · v" + d.version : "");
+				})
+				.join("；");
+		}
+
 		function Card() {
 			const [open, setOpen] = React.useState(false);
 			const [status, setStatus] = React.useState(null);
 			const [busy, setBusy] = React.useState("");
 			const [msg, setMsg] = React.useState("");
+			const [devices, setDevices] = React.useState(null);
 
 			const load = React.useCallback(() => {
 				call("/crossterm/api/status")
@@ -150,6 +176,21 @@ window.__ModuleLoader__.load({
 				load();
 			}, [load]);
 
+			const loadDevices = React.useCallback(async () => {
+				setDevices({ loading: true, devices: [] });
+				try {
+					const data = await call("/crossterm/api/devices");
+					setDevices({ loading: false, ...(data || {}) });
+				} catch (error) {
+					setDevices({ loading: false, ok: false, devices: [], message: String((error && error.message) || error) });
+				}
+			}, []);
+
+			// 展开时自动读一次云端设备（收起不读，避免每次进页面都等网盘）
+			React.useEffect(() => {
+				if (open && !devices) void loadDevices();
+			}, [open, devices, loadDevices]);
+
 			const onCheck = async () => {
 				setBusy("check");
 				setMsg("正在检查更新…");
@@ -265,6 +306,12 @@ window.__ModuleLoader__.load({
 							label: "当前终端",
 							value: status ? `${status.node}（${status.nodeId}）· ${status.hostname}` : "",
 						}),
+						h(
+							"div",
+							{ style: S.grid },
+							h("div", { style: S.key }, "云端设备"),
+							h("div", { style: S.val }, devicesText(status, devices)),
+						),
 						h(
 							"div",
 							{ style: S.grid },
@@ -318,6 +365,7 @@ window.__ModuleLoader__.load({
 							{ style: S.actions },
 							h("button", { style: S.btn, onClick: onCheck, disabled: busy !== "" }, busy === "check" ? "检查中…" : "检查更新"),
 							h("button", { style: S.btnPrimary, onClick: onUpdate, disabled: busy !== "" }, busy === "update" ? "更新中…" : "更新"),
+							h("button", { style: S.btn, onClick: () => void loadDevices(), disabled: Boolean(devices && devices.loading) }, devices && devices.loading ? "读取中…" : "刷新设备"),
 						),
 						msg ? h("div", { style: S.msg }, msg) : null,
 					),

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.36'
+export const VERSION = '0.3.38'
 
 /** DSH 的家目录：与宿主其它状态（sessions / profiles）同一个根，多终端天然共享 */
 export function dshHome() {
@@ -203,8 +203,9 @@ export function formatBytes(n) {
 export async function writeJsonAtomic(file, value) {
   await fsp.mkdir(path.dirname(file), { recursive: true })
   const tmp = `${file}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`
-  await fsp.writeFile(tmp, JSON.stringify(value, null, 2), 'utf8')
-  await fsp.rename(tmp, file)
+  const data = JSON.stringify(value, null, 2)
+  await fsp.writeFile(tmp, data, 'utf8')
+  await renameWithRetry(tmp, file, data)
 }
 
 /** 原子写文本：同上，用于邮件正文 */
@@ -212,7 +213,53 @@ export async function writeFileAtomic(file, text) {
   await fsp.mkdir(path.dirname(file), { recursive: true })
   const tmp = `${file}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`
   await fsp.writeFile(tmp, text, 'utf8')
-  await fsp.rename(tmp, file)
+  await renameWithRetry(tmp, file, text)
+}
+
+// Windows 上目标文件被别的进程（读方、杀毒、同步盘）短暂占用时 rename 会 EPERM/EBUSY，
+// 以前就这么把 .tmp 漏在原地：presence/ 攒了两百多个。这里重试几次，最后退化成直接覆盖，
+// 无论成败都把 tmp 删掉，绝不留垃圾。
+async function renameWithRetry(tmp, file, data) {
+  for (let attempt = 0; attempt < 5; attempt++) {
+    try {
+      await fsp.rename(tmp, file)
+      return
+    } catch (error) {
+      const code = error && error.code
+      if (!['EPERM', 'EBUSY', 'EACCES', 'ENOENT'].includes(code)) throw error
+      await new Promise((resolve) => setTimeout(resolve, 15 * (attempt + 1)))
+    }
+  }
+  await fsp.writeFile(file, data, 'utf8')
+  await fsp.rm(tmp, { force: true }).catch(() => {})
+}
+
+/** 清掉总线目录里超过 maxAgeMs 的 .tmp 残骸（原子写的漏网之鱼） */
+export async function sweepTmp(root, maxAgeMs = 10 * 60 * 1000, dirs = ['presence', 'chains', 'links', 'inbox', 'mail']) {
+  const now = Date.now()
+  let removed = 0
+  for (const dir of dirs) {
+    const abs = path.join(root, dir)
+    let entries
+    try {
+      entries = await fsp.readdir(abs, { withFileTypes: true })
+    } catch {
+      continue
+    }
+    for (const entry of entries) {
+      if (!entry.isFile() || !entry.name.endsWith('.tmp')) continue
+      const target = path.join(abs, entry.name)
+      try {
+        const st = await fsp.stat(target)
+        if (now - st.mtimeMs < maxAgeMs) continue
+        await fsp.rm(target, { force: true })
+        removed += 1
+      } catch {
+        /* ignore */
+      }
+    }
+  }
+  return removed
 }
 
 export async function readJson(file) {
@@ -300,8 +347,14 @@ export class Bus {
     const file = this.mailFile(msg.id)
     fs.mkdirSync(path.dirname(file), { recursive: true })
     const tmp = `${file}.${process.pid}.${crypto.randomBytes(4).toString('hex')}.tmp`
-    fs.writeFileSync(tmp, `${head.join('\n')}\n${body}\n`, 'utf8')
-    fs.renameSync(tmp, file)
+    const text = `${head.join('\n')}\n${body}\n`
+    fs.writeFileSync(tmp, text, 'utf8')
+    try {
+      fs.renameSync(tmp, file)
+    } catch {
+      fs.writeFileSync(file, text, 'utf8')
+      try { fs.rmSync(tmp, { force: true }) } catch { /* ignore */ }
+    }
     return file
   }
 

package/lib/cloud/devices.js

@@ -0,0 +1,95 @@
+import fsp from 'node:fs/promises'
+import os from 'node:os'
+import path from 'node:path'
+
+const ONLINE_MS = 3 * 60 * 1000
+
+function trimRoot(root) {
+  return String(root || '').replace(/\/+$/, '')
+}
+
+function summarize(data, now) {
+  const updatedAt = Number(data.updatedAt) || 0
+  return {
+    nodeId: String(data.nodeId || ''),
+    name: String(data.name || data.hostname || data.nodeId || ''),
+    hostname: String(data.hostname || ''),
+    version: String(data.version || ''),
+    platform: String(data.platform || ''),
+    pid: Number(data.pid) || 0,
+    sessions: Array.isArray(data.sessions) ? data.sessions.length : 0,
+    chains: Array.isArray(data.chains)
+      ? [...new Set(data.chains.map((c) => (typeof c === 'string' ? c : c && c.code)).filter(Boolean))]
+      : [],
+    updatedAt,
+    lastSeen: updatedAt ? new Date(updatedAt).toISOString() : '',
+    online: updatedAt > 0 && now - updatedAt < ONLINE_MS,
+  }
+}
+
+/**
+ * 云端设备列表：读 <cloudRoot>/presence/*.json（翻页列目录，跳过 .tmp 残骸），
+ * 逐个下载解析出 nodeId/名字/版本/最后心跳。
+ * 注意 cfg.cloudRoot 本身就是总线根（形如 /dsh云盘/crossterm/bus），不再拼一层 bus。
+ */
+export async function listCloudDevices(pan, cloudRoot, opts = {}) {
+  const now = opts.now || Date.now()
+  const root = trimRoot(cloudRoot)
+  const dir = `${root}/presence`
+  const result = { ok: false, dir, devices: [], files: 0, tmpFiles: 0, error: '' }
+  if (!root) {
+    result.error = '还没配置云盘'
+    return result
+  }
+  let listing
+  try {
+    listing = await pan.lsAll(dir)
+  } catch (error) {
+    result.error = String((error && error.message) || error)
+    return result
+  }
+  if (!listing || listing.errno !== 0) {
+    // 4 = 目录不存在（还没同步过）
+    result.ok = true
+    result.error = listing && listing.errno === -9 ? '云端目录不存在' : ''
+    return result
+  }
+  const entries = listing.list || []
+  const jsonFiles = entries.filter((f) => f.isdir === 0 && f.server_filename.endsWith('.json'))
+  result.files = jsonFiles.length
+  result.tmpFiles = entries.filter((f) => f.isdir === 0 && f.server_filename.endsWith('.tmp')).length
+
+  const tmpDir = await fsp.mkdtemp(path.join(os.tmpdir(), 'ct-devices-'))
+  try {
+    const byId = new Map()
+    for (const entry of jsonFiles) {
+      const name = entry.server_filename
+      const nodeId = name.slice(0, -'.json'.length)
+      const local = path.join(tmpDir, name)
+      try {
+        await pan.get(`${dir}/${name}`, local)
+        const data = JSON.parse(await fsp.readFile(local, 'utf8'))
+        if (!data || !data.nodeId) continue
+        byId.set(data.nodeId, summarize(data, now))
+      } catch {
+        /* 单个坏文件不影响整体 */
+      }
+      if (byId.size >= 50) break
+    }
+    result.devices = [...byId.values()].sort((a, b) => b.updatedAt - a.updatedAt)
+    result.ok = true
+    return result
+  } finally {
+    await fsp.rm(tmpDir, { recursive: true, force: true }).catch(() => {})
+  }
+}
+
+/** 本地自己的 presence（不依赖云端，用来兜底显示"我"） */
+export async function localDevice(presenceDir, nodeId, now = Date.now()) {
+  try {
+    const raw = await fsp.readFile(path.join(presenceDir, `${nodeId}.json`), 'utf8')
+    return summarize(JSON.parse(raw), now)
+  } catch {
+    return undefined
+  }
+}

package/lib/cloud/pan.js

@@ -73,9 +73,27 @@ export function createPan({ appFile, authFile, log = () => {} }) {
     return api(`https://pan.baidu.com/rest/2.0/xpan/nas?method=uinfo&access_token=${encodeURIComponent(tok)}`)
   }
 
-  async function ls(dir = '/') {
+  async function lsPage(dir, start, limit) {
     await ensureToken()
-    return api(`https://pan.baidu.com/rest/2.0/xpan/file?method=list&access_token=${encodeURIComponent(tok)}&dir=${encodeURIComponent(dir)}&order=time&start=0&limit=200`)
+    return api(`https://pan.baidu.com/rest/2.0/xpan/file?method=list&access_token=${encodeURIComponent(tok)}&dir=${encodeURIComponent(dir)}&order=time&start=${start}&limit=${limit}`)
+  }
+
+  async function ls(dir = '/') {
+    return lsPage(dir, 0, 200)
+  }
+
+  // 一个目录超过 200 个文件时必须翻页，否则第 201 个之后永远看不见
+  // （presence/ 里被 .tmp 残骸占满时，真实 node json 就躲在第二页）。
+  async function lsAll(dir = '/', pageSize = 200) {
+    const all = []
+    for (let page = 0; page < 50; page += 1) {
+      const j = await lsPage(dir, page * pageSize, pageSize)
+      if (j.errno !== 0) return j
+      const list = j.list || []
+      all.push(...list)
+      if (list.length < pageSize) return { ...j, list: all, errno: 0 }
+    }
+    return { errno: 0, list: all }
   }
 
   async function put(localPath, remotePath) {
@@ -123,7 +141,7 @@ export function createPan({ appFile, authFile, log = () => {} }) {
     await ensureToken()
     const dir = path.posix.dirname(remotePath)
     const name = path.posix.basename(remotePath)
-    const list = await ls(dir)
+    const list = await lsAll(dir)
     if (list.errno !== 0) throw new Error('列目录失败：' + JSON.stringify(list))
     const hit = (list.list || []).find((f) => f.server_filename === name && f.isdir === 0)
     if (!hit) throw new Error('远端没有该文件：' + remotePath)
@@ -148,5 +166,5 @@ export function createPan({ appFile, authFile, log = () => {} }) {
     )
   }
 
-  return { uinfo, ls, put, get, rm, ensureToken }
+  return { uinfo, ls, lsAll, put, get, rm, ensureToken }
 }

package/lib/cloud/sync.js

@@ -44,6 +44,9 @@ export function createCloud(opts) {
             if (!r.includes('/')) continue
             if (EXCLUDE_TOP.has(r)) continue
           }
+          // 原子写的临时文件（xxx.json.<pid>.<hex>.tmp）绝不能当数据同步，
+          // 以前漏过滤，云端 presence/ 里攒了两百多个残骸。
+          if (e.name.endsWith('.tmp')) continue
           let st
           try { st = fs.statSync(path.join(root, r)) } catch { continue }
           out.push({
@@ -62,10 +65,11 @@ export function createCloud(opts) {
   async function walkCloud() {
     const out = new Map()
     async function rec(dir, rel) {
-      const j = await pan.ls(dir)
+      const j = await pan.lsAll(dir)
       if (j.errno !== 0) return
       for (const f of j.list || []) {
         if (EXCLUDE_DIRS.has(f.server_filename)) continue
+        if (f.server_filename.endsWith('.tmp')) continue
         const r = rel ? path.posix.join(rel, f.server_filename) : f.server_filename
         if (f.isdir === 1) { await rec(f.path, r); continue }
         out.set(r, { size: f.size, mtimeMs: (f.server_mtime || 0) * 1000, fs_id: f.fs_id })

package/lib/web.js

@@ -5,6 +5,8 @@ import os from 'node:os'
 import path from 'node:path'
 import { spawn } from 'node:child_process'
 import { VERSION, readConfig, writeConfig } from './bus.js'
+import { createPan } from './cloud/pan.js'
+import { listCloudDevices, localDevice } from './cloud/devices.js'
 import { runSetup } from './cloud/setup.js'
 
 const PKG = 'dsh-crossterm'
@@ -147,15 +149,16 @@ function decodeOutput(buffer) {
   return text.replace(/\u001b\[[0-9;?]*[A-Za-z]/g, '').replace(/\r/g, '\n')
 }
 
-function run(cmd, args, cwd) {
+function run(cmd, args, cwd, opts) {
   return new Promise((resolve) => {
     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) {
@@ -191,6 +194,39 @@ function updateErrorText(result) {
   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)
@@ -243,6 +279,43 @@ export function registerWeb(ctx, term, log) {
             handler: (req, res) => json(res, 200, statusOf(term)),
           }),
         )
+        disposers.push(
+          webCtx.webServer.register({
+            kind: 'exact',
+            path: '/crossterm/api/devices',
+            handler: async (req, res) => {
+              const cfg = term.cfg || {}
+              const info = statusOf(term)
+              if (!info.cloud.configured) {
+                json(res, 200, {
+                  ok: false,
+                  configured: false,
+                  devices: [],
+                  message: '这台机器还没连接云盘，看不到其他设备',
+                })
+                return
+              }
+              try {
+                const pan = createPan({
+                  appFile: cfg.baiduAppFile,
+                  authFile: cfg.baiduAuthFile,
+                  log: (m) => log('devices: ' + m),
+                })
+                const result = await listCloudDevices(pan, cfg.cloudRoot)
+                const me = await localDevice(path.join(cfg.busDir || '', 'presence'), info.nodeId || '')
+                if (me && !result.devices.some((d) => d.nodeId === me.nodeId)) result.devices.unshift(me)
+                json(res, 200, { ...result, configured: true, me: info.nodeId || '' })
+              } catch (error) {
+                json(res, 200, {
+                  ok: false,
+                  configured: true,
+                  devices: [],
+                  message: String((error && error.message) || error),
+                })
+              }
+            },
+          }),
+        )
         disposers.push(
           webCtx.webServer.register({
             kind: 'exact',
@@ -352,15 +425,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 后生效'
-                    : updateErrorText(result),
+                via: result.via,
+                needRestart: result.ok,
+                message: result.ok
+                  ? `已更新${result.via === 'pnpm' ? '（用 DSH 自带 pnpm）' : ''}，重启 DSH 后生效`
+                  : result.via === 'none'
+                    ? result.out
+                    : (result.out || '').slice(-1200) || `更新失败（退出码不明）`,
               })
             },
           }),
@@ -382,3 +457,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.36",
+  "version": "0.3.38",
   "description": "DSH 跨终端互联：同一账号下的多个 DSH 终端/进程互发邮件与文件（主题内联、正文落盘，收件方自己读）",
   "type": "module",
   "main": "./lib/index.js",