@leiyi-works/dsh-cloud-sync 0.1.6 → 0.1.8

package/client.js

@@ -65,6 +65,7 @@ window.__ModuleLoader__.load({
       lastSync: '上次同步',
       cloudSize: '云端占用',
       autoPlan: '自动同步',
+      transport: '传输通道',
       files: '个文件',
       never: '还没有',
       running: '正在同步',
@@ -90,6 +91,7 @@ window.__ModuleLoader__.load({
       lastSync: 'Last sync',
       cloudSize: 'Cloud usage',
       autoPlan: 'Auto sync',
+      transport: 'Transport',
       files: 'files',
       never: 'never',
       running: 'syncing',
@@ -254,6 +256,12 @@ window.__ModuleLoader__.load({
               ? t('off')
               : status?.config?.dailySync === true ? t('daily') : `${status.config.intervalMinutes} ${t('minutes')}`),
             h('span', { className: 'csyNote' }, status?.schedule?.nextPushAt === undefined ? '' : `${t('nextAt')} ${when(status.schedule.nextPushAt)}`)),
+          h('div', { className: 'csyCell' },
+            h('span', { className: 'csyCellName' }, t('transport')),
+            h('span', { className: 'csyCellValue' }, status?.transport?.mode === 'subprocess' ? 'subprocess' : 'child_process'),
+            h('span', { className: 'csyNote' }, status?.transport === undefined
+              ? ''
+              : `${status.transport.sshOk === true ? 'ssh ✓' : 'ssh ✗'} · ${status.transport.identitySource === 'guest' ? 'key(guest)' : status.transport.identityFile === '' ? 'key(default)' : status.transport.identityOk === true ? 'key ✓' : 'key ✗'}`)),
 
         Array.isArray(job?.log) && job.log.length > 0
           ? h('pre', { className: 'csyLog' }, job.log.slice(-12).join('\n'))

package/exec.js

@@ -0,0 +1,117 @@
+import { spawn } from 'node:child_process'
+import { EventEmitter } from 'node:events'
+
+/**
+ * 命令执行层：优先走 DSH 的 `ctx.subprocess`（可移植层），
+ * 拿不到时退回 node:child_process。
+ *
+ * 为什么需要这一层：手机上（DSHM 鸿蒙外壳）应用沙箱不允许 Host 直接 fork/exec，
+ * `spawn('ssh')` 会 ENOENT；但 DSH 的 subprocess 服务可以被平台改派到自带的 guest 环境，
+ * 那里 ssh 可用。所以「能不能跑」取决于这里，而不是密钥或配置。
+ */
+
+let provider = null
+
+/** 由插件 apply() 调用，注入 ctx.subprocess（可能为 undefined）。 */
+export function setSubprocessProvider(value) {
+  provider = value ?? null
+}
+
+export function hasSubprocessProvider() {
+  return provider !== null
+}
+
+/** 当前执行通道：subprocess（DSH 可移植层）/ child_process（Node 原生）。 */
+export function transportMode() {
+  return provider === null ? 'child_process' : 'subprocess'
+}
+
+/** 在 provider 的执行世界里解析可执行文件路径；没有 provider 时原样返回。 */
+export async function resolveCommand(command) {
+  if (provider === null) return command
+  try {
+    const resolved = await provider.resolveExecutable(command)
+    return typeof resolved === 'string' && resolved !== '' ? resolved : command
+  } catch {
+    return command
+  }
+}
+
+/** 伪造一个「启动失败」的 child，行为与 EventEmitter 版子进程一致。 */
+function failedChild(error) {
+  const child = new EventEmitter()
+  child.stdin = new EventEmitter()
+  child.stdin.end = () => {}
+  child.stdin.write = () => true
+  child.stdout = new EventEmitter()
+  child.stderr = new EventEmitter()
+  child.kill = () => {}
+  setImmediate(() => {
+    child.emit('error', error instanceof Error ? error : new Error(String(error)))
+    child.emit('close', -1)
+  })
+  return child
+}
+
+/** 把 ctx.subprocess 的 handle 包成和 child_process 一样的接口。 */
+class ManagedChild extends EventEmitter {
+  constructor(handle) {
+    super()
+    this.handle = handle
+    this.stdin = handle.stdin ?? null
+    this.stdout = handle.stdout ?? null
+    this.stderr = handle.stderr ?? null
+    this.killed = false
+    this.exitCode = null
+    handle.done.then(
+      (outcome) => {
+        this.exitCode = outcome && outcome.exitCode !== undefined ? outcome.exitCode : -1
+        this.emit('close', this.exitCode)
+      },
+      (error) => {
+        this.emit('error', error instanceof Error ? error : new Error(String(error)))
+        this.emit('close', -1)
+      },
+    )
+    // stdin 写失败不该冒泡成未捕获异常
+    if (this.stdin && typeof this.stdin.on === 'function') this.stdin.on('error', () => {})
+  }
+
+  kill() {
+    if (this.killed) return
+    this.killed = true
+    try {
+      this.handle.terminate()
+    } catch { /* 已经不在了 */ }
+  }
+}
+
+/**
+ * 启动一个受管子进程。
+ * @param {string[]} argv 完整命令行（argv[0] 为可执行文件）
+ * @param {{ cwd?: string, env?: Record<string,string>, graceMs?: number }} options
+ */
+export function spawnManaged(argv, options = {}) {
+  const cwd = options.cwd ?? process.cwd()
+  const env = options.env ?? process.env
+  if (provider !== null) {
+    try {
+      const handle = provider.spawn({
+        argv,
+        cwd,
+        stdio: { stdin: 'pipe', stdout: 'pipe', stderr: 'pipe' },
+        graceMs: options.graceMs ?? 3000,
+        env,
+      })
+      return new ManagedChild(handle)
+    } catch (error) {
+      return failedChild(error)
+    }
+  }
+  return spawn(argv[0], argv.slice(1), {
+    windowsHide: true,
+    stdio: ['pipe', 'pipe', 'pipe'],
+    cwd,
+    env,
+  })
+}

package/index.js

@@ -31,6 +31,7 @@ import {
   readTombstones,
   defaultMachineId,
   isConfigured,
+  transportDiagnostics,
 } from './sync.js'
 import { setSubprocessProvider } from './exec.js'
 
@@ -347,6 +348,7 @@ async function buildStatus(config, runner) {
     },
     local: { ...local, deletedLocally },
     remote,
+    transport: await transportDiagnostics(config),
     schedule: {
       lastPushAt: lastPushAt || undefined,
       nextPushAt: config.autoSync ? nextPushAt : undefined,
@@ -394,7 +396,18 @@ function summarizeStatus(status) {
   const lastPush = status.last.push
   lines.push(`上次推送：${status.last.push !== undefined ? `${new Date(Number(status.schedule.lastPushAt) || 0).toLocaleString()}（上传 ${lastPush.uploaded} 个 / 删除 ${lastPush.deleted} 个）` : '还没有'}`)
   lines.push(`上次恢复：${status.last.pull !== undefined ? `${status.last.at}（${status.last.pull.restored} 个文件）` : '还没有'}`)
-  if (status.last.error !== undefined) lines.push(`上次失败：${status.last.error.kind} — ${status.last.error.message}`)
+  if (status.last.error !== undefined) lines.push(`上次失败：${status.last.error.kind} — ${status.last.error.message}${status.last.error.permanent === true ? '（环境不可用，已停止自动重试）' : ''}`)
+  const transport = status.transport
+  if (transport !== undefined) {
+    const sshText = transport.sshOk === true ? `ssh 可用（${transport.sshResolved}）` : `ssh 找不到（${transport.sshBinary}）`
+    const keyText = transport.identitySource === 'guest'
+      ? `私钥 ${transport.identityFile}（guest 路径，未校验）`
+      : transport.identityFile === ''
+        ? '私钥：用系统默认密钥'
+        : `私钥 ${transport.identityOk ? '存在' : '不存在'}（${transport.identityFile}）`
+    lines.push(`传输通道：${transport.mode === 'subprocess' ? 'DSH subprocess（可移植层）' : 'child_process（Node 原生）'}；${sshText}；${keyText}`)
+    if (transport.error !== '') lines.push(`传输诊断错误：${transport.error}`)
+  }
   if (status.config.autoSync) {
     lines.push(status.config.dailySync === true
       ? `自动同步：每天一次（${status.schedule.lastPushAt !== undefined && sameLocalDay(status.schedule.lastPushAt, Date.now()) ? `今天 ${new Date(status.schedule.lastPushAt).toLocaleTimeString()} 已同步` : '今天还没同步，下次检查时会补一轮'}；下次 ${new Date(status.schedule.nextPushAt).toLocaleString()}）`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leiyi-works/dsh-cloud-sync",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "type": "module",
   "title": "云端同步",
   "description": "云端同步：执行层走 DSH 可移植 subprocess（手机/沙箱也能跑）、ssh 兼容 dropbear、超时与停滞可配置、设备模式、永久错误停止重试；连接信息在 keyrule-secrets/ssh.json。",
@@ -23,6 +23,7 @@
   "files": [
     "index.js",
     "sync.js",
+    "exec.js",
     "client.js",
     "cordis.patch.yml",
     "locale/*.json",

package/sync.js

@@ -25,7 +25,7 @@ import fs from 'node:fs'
 import fsp from 'node:fs/promises'
 import path from 'node:path'
 import os from 'node:os'
-import { spawnManaged } from './exec.js'
+import { spawnManaged, transportMode, resolveCommand } from './exec.js'
 
 /* ── 配置 ───────────────────────────────────────────────────────────────── */
 
@@ -486,8 +486,7 @@ export function spawnSsh(config, remoteCommand) {
   return spawnManaged(argv)
 }
 
-/** 跑一条远程命令，收集输出；超时就杀掉，避免一个卡住的连接拖死整个任务。 */
-export async function runSsh(config, remoteCommand, options = {}) {
+/** 跑一条远程命令，收集输出；超时就杀掉，避免一个卡住的连接拖死整个任务。 */export async function runSsh(config, remoteCommand, options = {}) {
   const child = spawnSsh(config, remoteCommand)
   const out = []
   const err = []
@@ -509,6 +508,57 @@ export async function runSsh(config, remoteCommand, options = {}) {
   }
 }
 
+/**
+ * 传输诊断（面板/状态直接显示）：当前走哪条执行通道、ssh 能否找到、私钥在哪。
+ * 手机/沙箱环境跑不通时，先看这里就知道卡在哪一步。
+ */
+export async function transportDiagnostics(config) {
+  const mode = transportMode()
+  const binary = sshBinary(config)
+  const out = {
+    mode,
+    sshBinary: binary,
+    sshResolved: binary,
+    sshOk: false,
+    identityFile: '',
+    identityOk: true,
+    identitySource: 'default',
+    error: '',
+  }
+  try {
+    if (mode === 'subprocess') {
+      out.sshResolved = await resolveCommand(binary)
+      out.sshOk = true
+    } else {
+      out.sshResolved = binary
+      out.sshOk = path.isAbsolute(binary) ? fs.existsSync(binary) : true
+    }
+  } catch (error) {
+    out.error = error instanceof Error ? error.message : String(error)
+  }
+  try {
+    const guest = expandPath(config.identityFileGuest)
+    if (guest !== '') {
+      out.identityFile = guest
+      out.identitySource = 'guest'
+      out.identityOk = true
+    } else {
+      const host = expandPath(config.identityFile)
+      out.identityFile = host
+      if (host === '') {
+        out.identitySource = 'default'
+        out.identityOk = true
+      } else {
+        out.identitySource = 'host'
+        out.identityOk = fs.existsSync(host)
+      }
+    }
+  } catch (error) {
+    out.error = out.error || (error instanceof Error ? error.message : String(error))
+  }
+  return out
+}
+
 /* ── tar 流（自带实现） ─────────────────────────────────────────────────── */
 
 const BLOCK = 512