dsh-crossterm 0.3.37 → 0.3.39

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/index.js

@@ -36,6 +36,7 @@ import {
 import { deriveNameFromFile, findTranscript } from './names.js'
 import { createPan } from './cloud/pan.js'
 import { createCloud } from './cloud/sync.js'
+import { createCloudHome } from './cloud/home.js'
 import { runSetup } from './cloud/setup.js'
 import { registerWeb } from './web.js'
 
@@ -730,6 +731,69 @@ class CrossTerm {
     return { ok: true, sessionId, files: landed }
   }
 
+  // ── 云端中转站（0.3.39）────────────────────────────────────────────────
+
+  /** 按会话名（也接受短号/完整 id）找本终端里的会话 */
+  resolveByName(raw) {
+    const s = String(raw || '').trim()
+    if (!s) return ''
+    const lower = s.toLowerCase()
+    const list = this.sessions()
+    const exact = list.find((x) => [x.name, x.title, x.short, x.id].some((v) => String(v || '').trim().toLowerCase() === lower))
+    if (exact) return exact.id
+    const part = list.find((x) => [x.name, x.title].some((v) => String(v || '').trim().toLowerCase().includes(lower)))
+    if (part) return part.id
+    return this.resolveSessionId(s) || ''
+  }
+
+  /** 中转站投递：把云端收件箱里的一封信投进本机对应会话（按收件人会话名） */
+  async relayDeliver({ to, envelope = {}, files = [] }) {
+    const targets = (Array.isArray(to) ? to : String(to || '').split(/[,，;；\s]+/))
+      .map((s) => String(s || '').trim())
+      .filter(Boolean)
+    if (!targets.length) return { ok: false, reason: '信封里没有收件人（要填会话名）' }
+    const controller = this.sessionController()
+    if (!controller || typeof controller.prompt !== 'function') {
+      return { ok: false, reason: '本 Host 没有 sessionController.prompt，中转站只能留件' }
+    }
+    const from = envelope.from || {}
+    const lines = ['[云端中转站] 收到 1 封']
+    lines.push(`来自：${from.name || from.nodeId || '未知设备'}${from.nodeId ? ` (${from.nodeId})` : ''}`)
+    if (envelope.subject) lines.push(`主题：${envelope.subject}`)
+    if (envelope.text) lines.push('', String(envelope.text).trim())
+    const landed = files.filter((f) => f && f.local)
+    if (landed.length) {
+      lines.push('', '附件已保存到本机：')
+      for (const f of landed) lines.push(`- ${f.local}（${formatBytes(f.bytes || 0)}）`)
+    }
+    const bad = files.filter((f) => !f || !f.local)
+    if (bad.length) lines.push('', `（有 ${bad.length} 个附件没下载下来：${bad.map((f) => (f && f.name) || '未知').join('、')}）`)
+    lines.push('', `（这封信由云端中转站投递；收件人：${targets.join('、')}。回复用 term_send。）`)
+    const text = lines.join('\n')
+    const delivered = []
+    const failed = []
+    for (const target of targets) {
+      const sessionId = this.resolveByName(target)
+      if (!sessionId) { failed.push({ target, reason: '本机没有这个会话' }); continue }
+      try {
+        await this.promptSession(controller, { id: `relay-${Date.now()}-${shortId(sessionId)}` }, sessionId, text)
+        delivered.push(sessionId)
+        await this.note(`relay delivered -> ${this.labelOf(sessionId)}`)
+      } catch (e) {
+        failed.push({ target, reason: (e && e.message) || String(e) })
+      }
+    }
+    if (!delivered.length) return { ok: false, reason: `投递失败：${failed.map((f) => `${f.target}（${f.reason}）`).join('、')}` }
+    return { ok: true, sessionId: delivered[0], delivered, failed }
+  }
+
+  /** 给云端备份用的「会话短号 → 显示名」表 */
+  sessionNames() {
+    const out = {}
+    for (const s of this.sessions()) out[s.short] = { name: s.name || '', cwd: s.cwd || '' }
+    return out
+  }
+
   // ── 会话链（一串特征码链接多个会话）────────────────────────────────────
 
   async loadLinks() {
@@ -1161,10 +1225,42 @@ class CrossTerm {
     })
     this.cloud.start()
     void this.note(`cloud sync 启动 → ${this.cfg.cloudRoot}（${this.cfg.cloudIntervalMs}ms）`)
+    this.enableCloudHome(pan)
     return this.cloud
   }
 
+  /** 云端目录（账号/设备/共享收件箱）+ 中转站 + 会话备份，见 lib/cloud/home.js */
+  enableCloudHome(pan) {
+    if (this.home) return this.home
+    try {
+      this.home = createCloudHome({
+        cfg: this.cfg,
+        device: {
+          nodeId: this.nodeId,
+          name: this.cfg.name,
+          version: VERSION,
+          platform: process.platform,
+          sessions: this.sessions().length,
+        },
+        pan,
+        busDir: this.bus.root,
+        deliver: (opts) => this.relayDeliver(opts),
+        names: () => this.sessionNames(),
+        log: (m) => void this.note('cloud: ' + m),
+      })
+      this.home.start()
+    } catch (e) {
+      this.home = null
+      void this.warn('云端目录启动失败：' + ((e && e.message) || String(e)))
+    }
+    return this.home
+  }
+
   disableCloud() {
+    if (this.home) {
+      this.home.stop()
+      this.home = null
+    }
     if (!this.cloud) return false
     this.cloud.stop()
     this.cloud = null
@@ -1196,6 +1292,7 @@ class CrossTerm {
     if (this.timer) clearInterval(this.timer)
     this.timer = undefined
     if (this.cloud) { this.cloud.stop(); this.cloud = null }
+    if (this.home) { this.home.stop(); this.home = null }
     await this.bus.leave(this.nodeId).catch(() => {})
     await this.note('stopped')
   }
@@ -1617,14 +1714,33 @@ function buildTools(term, agent, part = 'all') {
 
   const cloud = defineTool({
     name: 'term_cloud',
-    description: '云总线同步：查看/开启/关闭本机总线与云端目录的镜像同步，或立刻同步一次；setup 可一键配置自己的云盘（弹出记事本填 AppKey/AppSecret → 浏览器授权 → 自动开启同步）。',
+    description: '云总线同步：查看/开启/关闭本机总线与云端目录的镜像同步，或立刻同步一次；setup 可一键配置自己的云盘（弹出记事本填 AppKey/AppSecret → 浏览器授权 → 自动开启同步）；home/layout/relay/backup 管理云端目录（账号/设备/共享收件箱/中转站/会话备份）。',
     parameters: {
-      action: { type: 'string', enum: ['status', 'start', 'stop', 'once', 'setup'], description: 'status=查看状态；start=开启（本进程内生效）；stop=关闭；once=立刻同步一次；setup=一键配置自己的云盘' },
+      action: { type: 'string', enum: ['status', 'start', 'stop', 'once', 'setup', 'home', 'layout', 'relay', 'backup'], description: 'status=查看状态；start=开启（本进程内生效）；stop=关闭；once=立刻同步一次；setup=一键配置自己的云盘；home=云端目录/中转站/备份概况；layout=重建云端目录；relay=立刻收一轮云端收件箱；backup=立刻备份一轮会话' },
       code: { type: 'string', description: '仅 setup 用：授权回调 URL 里的 code（浏览器没自动回调时手动粘贴）；不填则插件自己起本地回调等待' },
     },
     output: {
       schema: { type: 'json' },
       render: textRender((v) => {
+        if (v && v.home) {
+          const h = v.home
+          const lines = []
+          if (h.layout) {
+            lines.push(`云端账号：${h.layout.account}（角色 ${h.layout.role === 'admin' ? '管理员' : '成员'}，设备 ${h.layout.deviceId}）`)
+            const p = h.layout.paths || {}
+            lines.push(`设备目录：${p.deviceDir || '(未建)'}`)
+            lines.push(`我的收件箱：${p.inboxDir || '(未建)'}`)
+            lines.push(`会话备份：${p.sessionDir || '(未建)'}（${h.backup?.files || 0} 个会话，已备份 ${formatBytes(h.backup?.bytes || 0)}）`)
+          } else {
+            lines.push('云端目录：还没建好（可能没连云盘，或建目录失败）')
+          }
+          if (h.relay) lines.push(`中转站：已收 ${h.relay.processed || 0} 封，失败 ${h.relay.failed || 0} 封，每 ${Math.round((h.relay.intervalMs || 0) / 1000)} s 查一次`)
+          if (h.backup?.lastAt) lines.push(`上次备份：${new Date(h.backup.lastAt).toISOString()}（${h.backup.lastCount || 0} 个会话）`)
+          if (v.layout) lines.push(`目录动作：${v.layout.created?.length ? '新建 ' + v.layout.created.join('、') : '已存在'}`)
+          if (v.relay) lines.push(`本轮收信：拉取 ${v.relay.fetched || 0} 封，投递 ${v.relay.delivered || 0}，失败 ${v.relay.failed || 0}`)
+          if (v.backup) lines.push(`本轮备份：会话 ${v.backup.sessions?.uploaded || 0}，附件 ${v.backup.attachments?.uploaded || 0}，耗时 ${v.backup.ms || 0} ms`)
+          return lines.join('\n')
+        }
         if (v && v.setup) {
           const s = v.setup
           const lines = []
@@ -1666,6 +1782,24 @@ function buildTools(term, agent, part = 'all') {
           term.enableCloud()
           return { ok: true, status: term.cloud ? term.cloud.status() : undefined, setup: ret }
         }
+        else if (action === 'home' || action === 'layout' || action === 'relay' || action === 'backup') {
+          if (!term.cloud) term.enableCloud()
+          const h = term.home
+          if (!h) return { ok: false, detail: '云同步没开（先 action="start"，或在设置里开云同步）' }
+          if (action === 'layout') {
+            const layout = await h.getLayout(true)
+            return { ok: !!(layout && layout.paths), home: h.status(), layout }
+          }
+          if (action === 'relay') {
+            const relay = await h.relayNow()
+            return { ok: relay.ok !== false, relay, home: h.status() }
+          }
+          if (action === 'backup') {
+            const backup = await h.backupNow()
+            return { ok: backup.ok !== false, backup, home: h.status() }
+          }
+          return { ok: true, home: h.status() }
+        }
         else if (action === 'once') {
           const c = term.cloud || term.enableCloud()
           const result = await c.once()

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'
@@ -256,6 +258,8 @@ function statusOf(term) {
       provider,
     },
     chains,
+    // 云端目录（0.3.39）：账号/角色/设备目录/中转站/会话备份
+    home: term.home ? term.home.status() : null,
   }
 }
 
@@ -277,6 +281,107 @@ 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',
+            path: '/crossterm/api/home',
+            handler: async (req, res) => {
+              const cfg = term.cfg || {}
+              if (!statusOf(term).cloud.configured) {
+                json(res, 200, { ok: false, configured: false, message: '这台机器还没连接云盘：先「配置云盘」' })
+                return
+              }
+              try {
+                if (!term.home) term.enableCloud()
+                const home = term.home
+                if (!home) {
+                  json(res, 200, { ok: false, configured: true, message: '云端目录还没启动（云同步可能被关掉了）' })
+                  return
+                }
+                const url = String((req && req.url) || '')
+                const action = (() => {
+                  try { return String(new URL(url, 'http://x').searchParams.get('action') || '') } catch { return '' }
+                })()
+                if (action === 'layout') {
+                  const layout = await home.getLayout(true)
+                  log(`home: 云端目录 ${layout && layout.paths ? layout.paths.deviceDir : '未建好'}`)
+                  json(res, 200, { ok: !!(layout && layout.paths), home: home.status(), layout })
+                  return
+                }
+                if (action === 'relay') {
+                  const relay = await home.relayNow()
+                  json(res, 200, { ok: relay.ok !== false, relay, home: home.status() })
+                  return
+                }
+                if (action === 'backup') {
+                  const backup = await home.backupNow()
+                  json(res, 200, { ok: backup.ok !== false, backup, home: home.status() })
+                  return
+                }
+                json(res, 200, { ok: true, configured: true, home: home.status(), cloudRoot: cfg.cloudRoot || '' })
+              } catch (error) {
+                json(res, 200, { ok: false, configured: true, message: String((error && error.message) || error) })
+              }
+            },
+          }),
+        )
+        disposers.push(
+          webCtx.webServer.register({
+            kind: 'exact',
+            path: '/crossterm/api/backup',
+            handler: async (req, res) => {
+              try {
+                if (!term.home) term.enableCloud()
+                if (!term.home) {
+                  json(res, 200, { ok: false, message: '云端目录还没启动（先在卡片上打开云同步）' })
+                  return
+                }
+                const result = await term.home.backupNow()
+                log(`backup: 会话 ${result.sessions ? result.sessions.uploaded : 0}，附件 ${result.attachments ? result.attachments.uploaded : 0}`)
+                json(res, 200, { ok: result.ok !== false, backup: result, home: term.home.status() })
+              } catch (error) {
+                json(res, 200, { ok: false, message: String((error && error.message) || error) })
+              }
+            },
+          }),
+        )
         disposers.push(
           webCtx.webServer.register({
             kind: 'exact',

package/package.json

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