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

package/client.js

@@ -61,6 +61,7 @@ window.__ModuleLoader__.load({
       syncing: '同步中…',
       alreadyRunning: '已在同步中，稍候会自动刷新',
       unconfigured: '未配置服务器：在 profile 的 cordis.patch.yml 里填 host，或在 keyrule-secrets/ssh.json 里写连接信息',
+      permanent: '环境不可用，已停止自动重试',
       lastSync: '上次同步',
       cloudSize: '云端占用',
       autoPlan: '自动同步',
@@ -85,6 +86,7 @@ window.__ModuleLoader__.load({
       syncing: 'Syncing…',
       alreadyRunning: 'A sync is already running — this panel will refresh automatically',
       unconfigured: 'No server configured: set host in the profile cordis.patch.yml, or put connection info in keyrule-secrets/ssh.json',
+      permanent: 'Environment unavailable — automatic retries stopped',
       lastSync: 'Last sync',
       cloudSize: 'Cloud usage',
       autoPlan: 'Auto sync',
@@ -221,7 +223,9 @@ window.__ModuleLoader__.load({
               ? `${t('running')}：${job.log?.slice(-1)[0] ?? ''}`
               : job?.phase === 'failed'
                 ? `${t('failed')}：${job.error ?? ''}`
-                : lastPushAt !== undefined
+                : status?.last?.error?.permanent === true
+                  ? `${t('permanent')}：${status.last.error.message ?? ''}`
+                  : lastPushAt !== undefined
                   ? `${when(lastPushAt)} · ${status?.last?.push?.uploaded ?? 0} ${t('files')}`
                   : t('never')
 

package/index.js

@@ -32,6 +32,14 @@ import {
   defaultMachineId,
   isConfigured,
 } from './sync.js'
+import { setSubprocessProvider } from './exec.js'
+
+/** 这些错误是「环境不具备」，重试多少次都没用：停止自动重试，交给 UI 提示。 */
+const PERMANENT_ERROR_RE = /ENOENT|EACCES|EPERM|not a function|私钥不存在|未配置服务器|Permission denied|no such identity|Cannot find module|spawn .* ENOENT/i
+
+function isPermanentError(message) {
+  return PERMANENT_ERROR_RE.test(String(message ?? ''))
+}
 
 export const name = 'dsh-cloud-sync'
 export const inject = ['tools', 'webServer']
@@ -51,6 +59,20 @@ export const Config = z.object({
     .description('私钥路径；留空则从 connectionFile 读取'),
   connectionFile: z.string().default(DEFAULTS.connectionFile)
     .description('连接信息 json（默认 <DSH_HOME>/keyrule-secrets/ssh.json，随钥则目录一起同步）'),
+  identityFileGuest: z.string().default(DEFAULTS.identityFileGuest)
+    .description('guest/VM 世界里的私钥路径（手机端用；填了就不校验宿主路径）'),
+  sshBinary: z.string().default(DEFAULTS.sshBinary)
+    .description('ssh 可执行文件（留空 = 自动找；手机端可填 guest 里的绝对路径）'),
+  sshCompat: z.string().default(DEFAULTS.sshCompat)
+    .description('ssh 兼容模式：openssh（默认）/ dropbear（精简参数、-y 接受主机密钥）'),
+  connectTimeoutMs: z.natural().default(DEFAULTS.connectTimeoutMs)
+    .description('建连超时（毫秒；手机端软件模拟 SSH 很慢，建议 60000 以上）'),
+  commandTimeoutMs: z.natural().default(DEFAULTS.commandTimeoutMs)
+    .description('单条远程命令超时（毫秒）'),
+  stallMs: z.natural().default(DEFAULTS.stallMs)
+    .description('传输停滞判定（毫秒）：连续这么久没有数据就断开重试'),
+  deviceMode: z.boolean().default(DEFAULTS.deviceMode)
+    .description('设备模式：默认每天一次、不带附件/插件源码、不自动整份恢复（手机端建议开）'),
   remoteRoot: z.string().default(DEFAULTS.remoteRoot).description('服务器上的备份根目录'),
   machineId: z.string().default('').description('这台机器的槽位名，留空 = 主机名'),
   localPluginRoot: z.string().default(DEFAULTS.localPluginRoot)
@@ -207,16 +229,17 @@ function createRunner(config) {
       } catch (error) {
         job.error = error instanceof Error ? error.message : String(error)
         job.phase = 'failed'
+        const permanent = isPermanentError(job.error)
         const next = {
           ...readState(),
           version: 1,
           lastKind: kind,
           lastAt: new Date().toISOString(),
-          lastError: { kind, message: job.error, at: new Date().toISOString() },
-          pendingRetryAt: Date.now() + 30 * 60 * 1000,
+          lastError: { kind, message: job.error, at: new Date().toISOString(), ...(permanent ? { permanent: true } : {}) },
+          ...(permanent ? {} : { pendingRetryAt: Date.now() + 30 * 60 * 1000 }),
         }
         writeState(next)
-        appendLog(`${kind} 失败：${job.error}`)
+        appendLog(`${kind} 失败${permanent ? '（环境不可用，已停止自动重试）' : ''}：${job.error}`)
         throw error
       } finally {
         job.finishedAt = Date.now()
@@ -391,6 +414,13 @@ function summarizeStatus(status) {
 
 export function apply(ctx, rawConfig) {
   const config = normalizeConfig(rawConfig)
+  // 命令执行层：优先用 DSH 的可移植 subprocess 服务（手机/沙箱环境里只有它能起进程）
+  try {
+    const subprocess = typeof ctx.get === 'function' ? ctx.get('subprocess') : undefined
+    setSubprocessProvider(subprocess)
+  } catch {
+    setSubprocessProvider(undefined)
+  }
   const runner = createRunner(config)
 
   /* 记「有没有会话在跑」：空闲暂停靠它判断 */
@@ -552,6 +582,8 @@ export function apply(ctx, rawConfig) {
     const tick = () => {
       if (!config.autoSync || runner.active()) return
       const state = readState()
+      // 永久性错误（环境不可用：没有 ssh、没有私钥、未配置服务器…）→ 不再自动重试，等用户手动处理
+      if (state.lastError !== undefined && state.lastError !== null && state.lastError.permanent === true) return
       const pendingAt = Number(state.pendingRetryAt) || 0
       if (pendingAt > Date.now()) return
       // 上一轮有「刚改过、留到下轮」的文件：到点就补一轮，不受间隔限制

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@leiyi-works/dsh-cloud-sync",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "title": "云端同步",
-  "description": "云端同步（不内置服务器地址：连接信息从 keyrule-secrets/ssh.json 或配置读取；黑名单制同步整个 ~/.dsh；跨机删除；每天一次）。",
+  "description": "云端同步：执行层走 DSH 可移植 subprocess（手机/沙箱也能跑）、ssh 兼容 dropbear、超时与停滞可配置、设备模式、永久错误停止重试；连接信息在 keyrule-secrets/ssh.json。",
   "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 { spawn } from 'node:child_process'
+import { spawnManaged } from './exec.js'
 
 /* ── 配置 ───────────────────────────────────────────────────────────────── */
 
@@ -37,10 +37,17 @@ export const DEFAULTS = {
   host: '',
   port: 22,
   identityFile: '',
+  identityFileGuest: '',
+  sshBinary: '',
+  sshCompat: 'openssh',
+  connectTimeoutMs: 15000,
+  commandTimeoutMs: 60000,
+  stallMs: 120000,
+  deviceMode: false,
   remoteRoot: '/opt/dsh-sync',
   connectionFile: '',
   machineId: '',
-  localPluginRoot: 'D:/DSH工作区',
+  localPluginRoot: '',
   intervalMinutes: 5,
   dailySync: false,
   autoSync: true,
@@ -86,25 +93,41 @@ export function normalizeConfig(raw) {
     return trimmed === '' ? fallback : trimmed
   }
   const flag = (value, fallback) => (typeof value === 'boolean' ? value : fallback)
+  // 设备模式（手机/嵌入式）：默认每天一次、不带附件和插件源码、不自动整份恢复
+  const device = flag(pick('deviceMode'), DEFAULTS.deviceMode)
+  /** 布尔项：显式配置优先；没配时用 deviceMode 的默认值；再退回普通默认值。 */
+  const bool = (key, deviceDefault) => (input[key] === undefined || input[key] === null
+    ? (device ? deviceDefault : DEFAULTS[key])
+    : flag(input[key], DEFAULTS[key]))
   const out = {
     host: text(pick('host'), DEFAULTS.host),
     port: num(pick('port'), DEFAULTS.port, 1),
     identityFile: text(pick('identityFile'), DEFAULTS.identityFile).replace(/\\/g, '/'),
+    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),
+    deviceMode: device,
     connectionFile: text(pick('connectionFile'), DEFAULTS.connectionFile),
     remoteRoot: text(pick('remoteRoot'), DEFAULTS.remoteRoot).replace(/\/+$/, '') || DEFAULTS.remoteRoot,
     machineId: sanitizeMachineId(text(pick('machineId'), '')),
-    localPluginRoot: text(pick('localPluginRoot'), DEFAULTS.localPluginRoot).replace(/\\/g, '/').replace(/\/+$/, ''),
+    localPluginRoot: text(
+      pick('localPluginRoot'),
+      process.platform === 'win32' ? 'D:/DSH工作区' : '',
+    ).replace(/\\/g, '/').replace(/\/+$/, ''),
     intervalMinutes: num(pick('intervalMinutes'), DEFAULTS.intervalMinutes, 1),
-    dailySync: flag(pick('dailySync'), DEFAULTS.dailySync),
+    dailySync: bool('dailySync', true),
     autoSync: flag(pick('autoSync'), DEFAULTS.autoSync),
     applyRemoteDeletes: flag(pick('applyRemoteDeletes'), DEFAULTS.applyRemoteDeletes),
     pauseWhenIdle: flag(pick('pauseWhenIdle'), DEFAULTS.pauseWhenIdle),
     idlePauseMinutes: num(pick('idlePauseMinutes'), DEFAULTS.idlePauseMinutes, 1),
-    restoreOnEmpty: flag(pick('restoreOnEmpty'), DEFAULTS.restoreOnEmpty),
-    includeAttachments: flag(pick('includeAttachments'), DEFAULTS.includeAttachments),
+    restoreOnEmpty: bool('restoreOnEmpty', false),
+    includeAttachments: bool('includeAttachments', false),
     includeCredentials: flag(pick('includeCredentials'), DEFAULTS.includeCredentials),
     includeKeyruleSecrets: flag(pick('includeKeyruleSecrets'), DEFAULTS.includeKeyruleSecrets),
-    includeLocalPlugins: flag(pick('includeLocalPlugins'), DEFAULTS.includeLocalPlugins),
+    includeLocalPlugins: bool('includeLocalPlugins', false),
     quietSeconds: num(pick('quietSeconds'), DEFAULTS.quietSeconds, 0),
     trashDays: num(pick('trashDays'), DEFAULTS.trashDays, 1),
     versionDays: num(pick('versionDays'), DEFAULTS.versionDays, 1),
@@ -141,7 +164,12 @@ export function sanitizeMachineId(value) {
 /** 当前机器名（默认用主机名；用户可在 Config 里覆盖）。 */
 export function defaultMachineId() {
   try {
-    return sanitizeMachineId(os.hostname()) || 'machine'
+    const host = sanitizeMachineId(os.hostname())
+    // 手机/容器里 hostname 常是 localhost 或空，多台设备会撞同一槽位 → 加平台后缀
+    if (host === '' || host === 'localhost' || host === '127-0-0-1') {
+      return sanitizeMachineId(`${host || 'device'}-${process.platform}`) || 'machine'
+    }
+    return host
   } catch {
     return 'machine'
   }
@@ -154,9 +182,16 @@ export function dshHome() {
     : path.join(os.homedir(), '.dsh')
 }
 
-/** 当前 profile 名。 */
+/** 当前 profile 名：环境变量 → profiles 下唯一子目录 → desktop。 */
 export function profileName() {
-  return process.env.DSH_PROFILE !== undefined && process.env.DSH_PROFILE !== '' ? process.env.DSH_PROFILE : 'desktop'
+  const fromEnv = process.env.DSH_PROFILE
+  if (typeof fromEnv === 'string' && fromEnv.trim() !== '') return fromEnv.trim()
+  try {
+    const root = path.join(dshHome(), 'profiles')
+    const entries = fs.readdirSync(root, { withFileTypes: true }).filter((item) => item.isDirectory())
+    if (entries.length === 1) return entries[0].name
+  } catch { /* 读不到就用默认 */ }
+  return 'desktop'
 }
 
 /** 当前 profile 目录。 */
@@ -377,13 +412,24 @@ export async function applyTombstones(options) {
 
 /* ── 命令执行 ───────────────────────────────────────────────────────────── */
 
-/** Windows 自带 OpenSSH 的绝对路径（PATH 里没有时兜底）。 */
-function sshBinary() {
+/** 展开 `~` 与 `%VAR%`（配置里写相对/环境变量路径时用）。 */
+export function expandPath(value) {
+  if (typeof value !== 'string' || value.trim() === '') return ''
+  let out = value.trim()
+  if (out === '~') out = os.homedir()
+  else if (out.startsWith('~/') || out.startsWith('~\\')) out = path.join(os.homedir(), out.slice(2))
+  out = out.replace(/%([A-Za-z_][A-Za-z0-9_]*)%/g, (all, name) => process.env[name] ?? all)
+  return out
+}
+
+/** ssh 可执行文件：配置优先 → 环境变量 → Windows 自带路径 → PATH 里的 ssh。 */
+function sshBinary(config) {
+  const configured = typeof config.sshBinary === 'string' ? expandPath(config.sshBinary) : ''
+  if (configured !== '') return configured
+  const fromEnv = typeof process.env.DSH_CLOUD_SYNC_SSH === 'string' ? process.env.DSH_CLOUD_SYNC_SSH : ''
+  if (fromEnv !== '') return fromEnv
   if (process.platform !== 'win32') return 'ssh'
-  const candidates = [
-    process.env.DSH_CLOUD_SYNC_SSH,
-    path.join(process.env.WINDIR ?? 'C:\\Windows', 'System32', 'OpenSSH', 'ssh.exe'),
-  ].filter((item) => typeof item === 'string' && item !== '')
+  const candidates = [path.join(process.env.WINDIR ?? 'C:\\Windows', 'System32', 'OpenSSH', 'ssh.exe')]
   for (const candidate of candidates) {
     try {
       if (fs.existsSync(candidate)) return candidate
@@ -392,26 +438,52 @@ function sshBinary() {
   return 'ssh'
 }
 
+/**
+ * 私钥路径：`~` 展开；显式配置了却不存在 → 明确报错（不要静默退化成默认密钥，
+ * 那样只会得到 Permission denied，看不出真实原因）。
+ * `identityFileGuest` 非空时优先用它——那是 guest/VM 世界里的路径，宿主侧无法校验。
+ */
+function identityPath(config) {
+  const guest = expandPath(config.identityFileGuest)
+  if (guest !== '') return guest
+  const raw = expandPath(config.identityFile)
+  if (raw === '') return ''
+  if (!fs.existsSync(raw)) {
+    throw new Error(`私钥不存在：${raw}（检查 ssh.json / identityFile；手机端要填 guest 内可见的路径，可用 identityFileGuest）`)
+  }
+  return raw
+}
+
 /** 远程命令里出现的字符串一律单引号包裹。 */
 export function shQuote(value) {
   return `'${String(value).replace(/'/g, `'\\''`)}'`
 }
 
-/** 拼出 ssh 的固定参数（不含目标与命令）。 */
+/**
+ * 拼出 ssh 的固定参数（不含目标与命令）。
+ * `sshCompat`：openssh（默认）/ dropbear（精简 -o，改用 -y 接受主机密钥）。
+ */
 function sshOptions(config) {
-  const args = ['-p', String(config.port), '-o', 'BatchMode=yes', '-o', 'ConnectTimeout=15', '-o', 'ServerAliveInterval=20', '-o', 'StrictHostKeyChecking=accept-new']
-  if (config.identityFile !== '' && fs.existsSync(config.identityFile)) args.push('-i', config.identityFile)
+  const args = ['-p', String(config.port)]
+  if (config.sshCompat === 'dropbear') {
+    args.push('-y')
+  } else {
+    args.push(
+      '-o', 'BatchMode=yes',
+      '-o', `ConnectTimeout=${Math.max(1, Math.round(config.connectTimeoutMs / 1000))}`,
+      '-o', 'ServerAliveInterval=20',
+      '-o', 'StrictHostKeyChecking=accept-new',
+    )
+  }
+  const identity = identityPath(config)
+  if (identity !== '') args.push('-i', identity)
   return args
 }
 
-/** 打开一条 ssh 通道，返回子进程（stdin/stdout 均为管道）。 */
+/** 打开一条 ssh 通道（stdin/stdout 均为管道，可流式传 tar）。 */
 export function spawnSsh(config, remoteCommand) {
-  const args = [...sshOptions(config), config.host, remoteCommand]
-  return spawnChild(sshBinary(), args)
-}
-
-function spawnChild(bin, args) {
-  return spawn(bin, args, { windowsHide: true, stdio: ['pipe', 'pipe', 'pipe'] })
+  const argv = [sshBinary(config), ...sshOptions(config), config.host, remoteCommand]
+  return spawnManaged(argv)
 }
 
 /** 跑一条远程命令，收集输出；超时就杀掉，避免一个卡住的连接拖死整个任务。 */
@@ -423,7 +495,7 @@ export async function runSsh(config, remoteCommand, options = {}) {
   child.stderr.on('data', (chunk) => err.push(chunk))
   if (options.stdin !== undefined) child.stdin.end(options.stdin)
   else child.stdin.end()
-  const timeoutMs = options.timeoutMs ?? 60000
+  const timeoutMs = options.timeoutMs ?? config.commandTimeoutMs ?? 60000
   const timer = setTimeout(() => child.kill(), timeoutMs)
   if (typeof timer.unref === 'function') timer.unref()
   const code = await new Promise((resolve, reject) => {
@@ -441,7 +513,7 @@ export async function runSsh(config, remoteCommand, options = {}) {
 
 const BLOCK = 512
 /** 传输卡死判定：连续这么久没收到/发出数据就杀掉 ssh，让任务失败重试而不是永远挂着。 */
-const STALL_MS = 120000
+const STALL_MS = 120000 // 兜底值；实际用 config.stallMs
 
 function octal(value, width) {
   const text = Math.max(0, Math.floor(value)).toString(8)
@@ -1109,7 +1181,7 @@ export async function push(options) {
       let lastActivity = Date.now()
       let stalled = false
       const stallTimer = setInterval(() => {
-        if (Date.now() - lastActivity > STALL_MS) {
+        if (Date.now() - lastActivity > config.stallMs) {
           stalled = true
           lastActivity = Date.now()
           child.kill()
@@ -1130,7 +1202,7 @@ export async function push(options) {
       }
       const result = await closed
       if (stalled) {
-        throw new Error(`上传 ${group} 时传输卡住（${Math.round(STALL_MS / 1000)} 秒没有进展），已断开；服务端只收到半截进入临时目录，不会污染现有备份，稍后重试即可`)
+        throw new Error(`上传 ${group} 时传输卡住（${Math.round(config.stallMs / 1000)} 秒没有进展），已断开；服务端只收到半截进入临时目录，不会污染现有备份，稍后重试即可`)
       }
       if (result.code !== 0) throw new Error(`上传 ${group} 失败（退出码 ${result.code}）：${String(result.stderr).trim()}`)
       uploaded += entries.length
@@ -1403,7 +1475,7 @@ export async function pull(options) {
     let stalled = false
     const reader = new ByteReader(child.stdout, () => { lastActivity = Date.now() })
     const stallTimer = setInterval(() => {
-      if (Date.now() - lastActivity > STALL_MS) {
+      if (Date.now() - lastActivity > config.stallMs) {
         stalled = true
         lastActivity = Date.now()
         child.kill()
@@ -1459,7 +1531,7 @@ export async function pull(options) {
       clearInterval(stallTimer)
       const result = await closed
       if (stalled) {
-        throw new Error(`恢复 ${group} 时传输卡住（${Math.round(STALL_MS / 1000)} 秒没有数据），已断开；云端数据没动，稍后重试即可`)
+        throw new Error(`恢复 ${group} 时传输卡住（${Math.round(config.stallMs / 1000)} 秒没有数据），已断开；云端数据没动，稍后重试即可`)
       }
       if (result.code !== 0) {
         log(`恢复 ${group} 时远端退出码 ${result.code}：${String(result.stderr).trim()}`)