@leiyi-works/dsh-cloud-sync 0.1.7 → 0.1.9

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

@@ -21,6 +21,11 @@ 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
@@ -81,32 +86,56 @@ class ManagedChild extends EventEmitter {
   }
 }
 
+/** 平台 VM 桥只接管这些 shell 作为 argv[0]；其它程序需要包成 `shell -c 'exec …'`。 */
+const SHELLS = new Set(['bash', 'sh', 'ash', 'dash', 'zsh', 'ksh'])
+
+function baseName(value) {
+  return String(value).split(/[\\/]/).pop()
+}
+
+function quoteArg(value) {
+  return `'${String(value).replace(/'/g, `'\\''`)}'`
+}
+
+function spawnViaProvider(argv, options) {
+  const cwd = options.cwd ?? process.cwd()
+  const env = options.env ?? process.env
+  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)
+  }
+}
+
 /**
  * 启动一个受管子进程。
  * @param {string[]} argv 完整命令行（argv[0] 为可执行文件）
- * @param {{ cwd?: string, env?: Record<string,string>, graceMs?: number }} options
+ * @param {{ cwd?: string, env?: Record<string,string>, graceMs?: number, noWrap?: boolean }} 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)
+    // 手机侧（DSHM）的 subprocess 实现只把 shell 命令转进 guest；
+    // 直接 spawn('ssh') 会被 fail-open 回原生 spawn → ENOENT。
+    // 所以非 shell 的 argv 一律包成 `bash -c 'exec …'`，让它走 guest。
+    const head = baseName(argv[0])
+    if (options.noWrap !== true && !SHELLS.has(head)) {
+      const shell = process.env.DSH_CLOUD_SYNC_SHELL || 'bash'
+      const line = `exec ${argv.map(quoteArg).join(' ')}`
+      return spawnViaProvider([shell, '-c', line], options)
     }
+    return spawnViaProvider(argv, options)
   }
   return spawn(argv[0], argv.slice(1), {
     windowsHide: true,
     stdio: ['pipe', 'pipe', 'pipe'],
-    cwd,
-    env,
+    cwd: options.cwd ?? process.cwd(),
+    env: options.env ?? process.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,9 +1,9 @@
 {
   "name": "@leiyi-works/dsh-cloud-sync",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "type": "module",
   "title": "云端同步",
-  "description": "云端同步：执行层走 DSH 可移植 subprocess（手机/沙箱也能跑）、ssh 兼容 dropbear、超时与停滞可配置、设备模式、永久错误停止重试；连接信息在 keyrule-secrets/ssh.json。",
+  "description": "云端同步：subprocess 通道自动用 shell 包壳（HarmonyOS/DSHM 可跑）、设备模式默认值、dropbear 兼容、永久错误停止重试、传输诊断。",
   "license": "MIT",
   "author": "leiyi-works",
   "keywords": [

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'
 
 /* ── 配置 ───────────────────────────────────────────────────────────────── */
 
@@ -99,6 +99,10 @@ export function normalizeConfig(raw) {
   const bool = (key, deviceDefault) => (input[key] === undefined || input[key] === null
     ? (device ? deviceDefault : DEFAULTS[key])
     : flag(input[key], DEFAULTS[key]))
+  /** 数字项：显式配置优先；没配时用 deviceMode 的默认值。 */
+  const number = (key, deviceDefault, min) => (input[key] === undefined || input[key] === null
+    ? (device ? deviceDefault : DEFAULTS[key])
+    : num(input[key], DEFAULTS[key], min))
   const out = {
     host: text(pick('host'), DEFAULTS.host),
     port: num(pick('port'), DEFAULTS.port, 1),
@@ -106,9 +110,9 @@ export function normalizeConfig(raw) {
     identityFileGuest: text(pick('identityFileGuest'), DEFAULTS.identityFileGuest),
     sshBinary: text(pick('sshBinary'), DEFAULTS.sshBinary),
     sshCompat: text(pick('sshCompat'), DEFAULTS.sshCompat),
-    connectTimeoutMs: num(pick('connectTimeoutMs'), DEFAULTS.connectTimeoutMs, 1000),
-    commandTimeoutMs: num(pick('commandTimeoutMs'), DEFAULTS.commandTimeoutMs, 1000),
-    stallMs: num(pick('stallMs'), DEFAULTS.stallMs, 5000),
+    connectTimeoutMs: number('connectTimeoutMs', 60000, 1000),
+    commandTimeoutMs: number('commandTimeoutMs', 240000, 1000),
+    stallMs: number('stallMs', 300000, 5000),
     deviceMode: device,
     connectionFile: text(pick('connectionFile'), DEFAULTS.connectionFile),
     remoteRoot: text(pick('remoteRoot'), DEFAULTS.remoteRoot).replace(/\/+$/, '') || DEFAULTS.remoteRoot,
@@ -443,11 +447,26 @@ function sshBinary(config) {
  * 那样只会得到 Permission denied，看不出真实原因）。
  * `identityFileGuest` 非空时优先用它——那是 guest/VM 世界里的路径，宿主侧无法校验。
  */
+/** 宿主路径 → guest 路径（DSHM：应用 files 目录挂到 /mnt/share）。 */
+const GUEST_PREFIX_MAP = [['/data/storage/el2/base/haps/phone/files', '/mnt/share']]
+
+function toGuestPath(value) {
+  for (const [from, to] of GUEST_PREFIX_MAP) {
+    if (value.startsWith(from)) return to + value.slice(from.length)
+  }
+  return ''
+}
+
 function identityPath(config) {
   const guest = expandPath(config.identityFileGuest)
   if (guest !== '') return guest
   const raw = expandPath(config.identityFile)
   if (raw === '') return ''
+  // 设备模式：宿主路径能映射到 guest 时优先用映射后的（宿主存在 ≠ guest 存在）
+  if (config.deviceMode === true) {
+    const mapped = toGuestPath(raw)
+    if (mapped !== '') return mapped
+  }
   if (!fs.existsSync(raw)) {
     throw new Error(`私钥不存在：${raw}（检查 ssh.json / identityFile；手机端要填 guest 内可见的路径，可用 identityFileGuest）`)
   }
@@ -486,8 +505,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 +527,103 @@ export async function runSsh(config, remoteCommand, options = {}) {
   }
 }
 
+/** ssh 可用性探测（带 10 分钟缓存；手机上一次 spawn 就要好几秒）。 */
+let sshProbeCache = { key: '', at: 0, result: null }
+
+function probeSshVersion(binary, timeoutMs = 10000) {
+  return new Promise((resolve) => {
+    let settled = false
+    const chunks = []
+    const finish = (ok, text) => {
+      if (settled) return
+      settled = true
+      clearTimeout(timer)
+      resolve({ ok, text: String(text ?? '').trim().split(/\r?\n/)[0] ?? '' })
+    }
+    let child
+    try {
+      child = spawnManaged([binary, '-V'])
+    } catch (error) {
+      resolve({ ok: false, text: error instanceof Error ? error.message : String(error) })
+      return
+    }
+    const timer = setTimeout(() => {
+      try { child.kill() } catch { /* 已退出 */ }
+      finish(false, 'timeout')
+    }, timeoutMs)
+    if (typeof timer.unref === 'function') timer.unref()
+    if (child.stdout) child.stdout.on('data', (chunk) => chunks.push(chunk))
+    if (child.stderr) child.stderr.on('data', (chunk) => chunks.push(chunk))
+    child.on('error', (error) => finish(false, error instanceof Error ? error.message : String(error)))
+    child.on('close', (code) => {
+      const text = Buffer.concat(chunks).toString('utf8')
+      finish(/OpenSSH|dropbear|SSH/i.test(text) || code === 0, text !== '' ? text : `exit ${code}`)
+    })
+  })
+}
+
+/**
+ * 传输诊断（面板/状态直接显示）：当前走哪条执行通道、ssh 能否找到、私钥在哪。
+ * 手机/沙箱环境跑不通时，先看这里就知道卡在哪一步。
+ */
+export async function transportDiagnostics(config) {
+  const mode = transportMode()
+  const binary = sshBinary(config)
+  const out = {
+    mode,
+    sshBinary: binary,
+    sshResolved: binary,
+    sshOk: false,
+    sshVersion: '',
+    identityFile: '',
+    identityOk: true,
+    identitySource: 'default',
+    error: '',
+  }
+  try {
+    if (mode === 'subprocess') {
+      out.sshResolved = await resolveCommand(binary)
+      const now = Date.now()
+      const cached = sshProbeCache.result !== null && sshProbeCache.key === out.sshResolved && now - sshProbeCache.at < 10 * 60 * 1000
+      if (cached) {
+        out.sshOk = sshProbeCache.result.ok
+        out.sshVersion = sshProbeCache.result.text
+      } else {
+        const probed = await probeSshVersion(out.sshResolved, 10000)
+        sshProbeCache = { key: out.sshResolved, at: now, result: probed }
+        out.sshOk = probed.ok
+        out.sshVersion = probed.text
+      }
+    } 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