@leiyi-works/dsh-cloud-sync 0.1.11 → 0.2.0

package/client.js

@@ -21,8 +21,6 @@ window.__ModuleLoader__.load({
       '.csyCard{display:flex;align-items:center;gap:14px;border:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.22));border-radius:12px;padding:16px}',
       '.csyBig{appearance:none;cursor:pointer;border:none;border-radius:10px;padding:12px 26px;font-size:15px;font-weight:600;line-height:20px;background:var(--dsw-alias-state-business-primary,#3f7fd4);color:#fff}',
       '.csyBig:disabled{opacity:.55;cursor:default}',
-      '.csySmall{appearance:none;cursor:pointer;border:1px solid var(--dsw-alias-border-l1,rgba(127,127,127,.35));border-radius:10px;padding:10px 14px;font-size:13px;background:transparent;color:inherit}',
-      '.csySmall:disabled{opacity:.55;cursor:default}',
       '.csyCardText{display:flex;flex-direction:column;gap:3px;min-width:0}',
       '.csyCardMain{font-size:14px;font-weight:600}',
       '.csyNote{font-size:12px;color:var(--dsw-alias-label-secondary);word-break:break-all}',
@@ -61,11 +59,6 @@ window.__ModuleLoader__.load({
       hint: '把聊天记录、工作区/定时任务、插件清单与本地插件源码、钥则、凭据增量推到自己的云服务器；换机时从设置里点这个面板就能拉回。',
       syncNow: '立即同步',
       syncing: '同步中…',
-      testConn: '测试连接',
-      restore: '从云端恢复',
-      connOk: '连接正常',
-      connFail: '连接失败',
-      restoreConfirm: '从云端恢复会覆盖本机较旧的同名文件（覆盖前自动备份）。继续？',
       alreadyRunning: '已在同步中，稍候会自动刷新',
       unconfigured: '未配置服务器：在 profile 的 cordis.patch.yml 里填 host，或在 keyrule-secrets/ssh.json 里写连接信息',
       permanent: '环境不可用，已停止自动重试',
@@ -92,11 +85,6 @@ window.__ModuleLoader__.load({
       hint: 'Push chat history, plugins, rules and credentials to your cloud server; open this panel on another machine to restore.',
       syncNow: 'Sync now',
       syncing: 'Syncing…',
-      testConn: 'Test connection',
-      restore: 'Restore from cloud',
-      connOk: 'Connection OK',
-      connFail: 'Connection failed',
-      restoreConfirm: 'Restoring overwrites older local files with cloud versions (backed up first). Continue?',
       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',
@@ -202,44 +190,8 @@ window.__ModuleLoader__.load({
         return () => window.clearInterval(timer)
       }, [running, refresh])
 
-      /** 测一次 SSH 连接（服务器、耗时、错误）。 */
-      const testConnection = async () => {
+      const syncNow = async () => {
         setStarting(true)
-        setError(null)
-        setNotice(null)
-        try {
-          const payload = await post('connect-test', {})
-          const conn = payload?.connection ?? {}
-          if (conn.ok === true) setNotice(`${t('connOk')}${conn.ms === undefined ? '' : ` · ${Math.round(Number(conn.ms))} ms`}`)
-          else setError(`${t('connFail')}${conn.error === undefined ? '' : `：${conn.error}`}`)
-        } catch (failure) {
-          setError(failure instanceof Error ? failure.message : String(failure))
-        } finally {
-          setStarting(false)
-        }
-      }
-
-      /** 从云端恢复（需要确认）。 */
-      const restoreNow = async () => {
-        const confirmed = typeof window !== 'undefined' && typeof window.confirm === 'function'
-          ? window.confirm(t('restoreConfirm'))
-          : true
-        if (!confirmed) return
-        setStarting(true)
-        setError(null)
-        setNotice(null)
-        try {
-          const payload = await post('pull', {})
-          if (payload?.alreadyRunning === true) setNotice(t('alreadyRunning'))
-          await refresh()
-        } catch (failure) {
-          setError(failure instanceof Error ? failure.message : String(failure))
-        } finally {
-          setStarting(false)
-        }
-      }
-
-      const syncNow = async () => {        setStarting(true)
         setError(null)
         setNotice(null)
         try {
@@ -286,8 +238,6 @@ window.__ModuleLoader__.load({
         h('div', { className: 'csyCard' },
           h('button', { type: 'button', className: 'csyBig', disabled: busy, onClick: () => { void syncNow() } },
             busy ? t('syncing') : t('syncNow')),
-          h('button', { type: 'button', className: 'csySmall', disabled: busy, onClick: () => { void testConnection() } }, t('testConn')),
-          h('button', { type: 'button', className: 'csySmall', disabled: busy, onClick: () => { void restoreNow() } }, t('restore')),
           h('div', { className: 'csyCardText' },
             h('span', { className: error !== null ? 'csyCardMain csyErr' : notice !== null ? 'csyCardMain csyNote' : 'csyCardMain' }, resultText),
             percent === undefined ? null : h('div', { className: 'csyBar' }, h('div', { className: 'csyBarFill', style: { width: `${percent}%` } })))),

package/index.js

@@ -74,6 +74,8 @@ export const Config = z.object({
     .description('传输停滞判定（毫秒）：连续这么久没有数据就断开重试'),
   deviceMode: z.boolean().default(DEFAULTS.deviceMode)
     .description('设备模式：默认每天一次、不带附件/插件源码、不自动整份恢复（手机端建议开）'),
+  bidirectional: z.boolean().default(DEFAULTS.bidirectional)
+    .description('双向同步：每次同步先把其它机器的新改动拉下来，再推送本机改动（多机使用建议开）'),
   remoteRoot: z.string().default(DEFAULTS.remoteRoot).description('服务器上的备份根目录'),
   machineId: z.string().default('').description('这台机器的槽位名，留空 = 主机名'),
   localPluginRoot: z.string().default(DEFAULTS.localPluginRoot)
@@ -209,9 +211,32 @@ function createRunner(config) {
     }
     current = (async () => {
       try {
+        // 双向收敛：先把「其它机器」比本机新的文件拉下来，再推自己的
+        let merged = null
+        if (kind === 'push' && config.bidirectional !== false && options.pullOthers !== false) {
+          try {
+            const selfMachine = config.machineId !== '' ? config.machineId : defaultMachineId()
+            const listing = await listMachines(config)
+            const others = listing.machines.filter((item) => item.id !== selfMachine && item.manifestBytes > 0)
+            if (others.length > 0) {
+              merged = { machines: [], restored: 0 }
+              for (const other of others) {
+                const got = await pull({ config, log: lines, from: other.id })
+                const restored = Number(got?.restored) || 0
+                merged.machines.push(other.id)
+                merged.restored += restored
+                lines(`已合并 ${other.id} 的改动：${restored} 个文件`)
+              }
+            }
+          } catch (error) {
+            merged = null
+            lines(`合并其它机器失败（继续推送本机改动）：${error instanceof Error ? error.message : String(error)}`)
+          }
+        }
         const result = kind === 'push'
           ? await push({ config, log: lines, onProgress, auto: options.auto === true })
           : await pull({ config, log: lines, onProgress, from: options.from, force: options.force === true })
+        if (merged !== null && kind === 'push') result.mergedFromOthers = merged
         job.result = clean(result)
         job.phase = 'done'
         const next = {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "@leiyi-works/dsh-cloud-sync",
-  "version": "0.1.11",
+  "version": "0.2.0",
   "type": "module",
   "title": "云端同步",
-  "description": "云端同步：工作区状态（登记/归档/置顶）恢复时取并集、面板加测试连接与从云端恢复、subprocess/shell 包装、设备模式。",
+  "description": "云端同步：双向收敛（同步=先拉其它机器新改动再推本机）、subprocess 可移植执行层（手机可跑）、设备模式、dropbear 兼容、永久错误停止重试。",
   "license": "MIT",
   "author": "leiyi-works",
   "keywords": [

package/sync.js

@@ -44,6 +44,7 @@ export const DEFAULTS = {
   commandTimeoutMs: 60000,
   stallMs: 120000,
   deviceMode: false,
+  bidirectional: true,
   remoteRoot: '/opt/dsh-sync',
   connectionFile: '',
   machineId: '',
@@ -114,6 +115,7 @@ export function normalizeConfig(raw) {
     commandTimeoutMs: number('commandTimeoutMs', 240000, 1000),
     stallMs: number('stallMs', 300000, 5000),
     deviceMode: device,
+    bidirectional: flag(pick('bidirectional'), DEFAULTS.bidirectional),
     connectionFile: text(pick('connectionFile'), DEFAULTS.connectionFile),
     remoteRoot: text(pick('remoteRoot'), DEFAULTS.remoteRoot).replace(/\/+$/, '') || DEFAULTS.remoteRoot,
     machineId: sanitizeMachineId(text(pick('machineId'), '')),
@@ -1524,7 +1526,6 @@ export async function pull(options) {
   const wanted = []
   let skippedRecent = 0
   let skippedDeleted = 0
-  let needWorkspaceMerge = false
   for (const rel of remoteEntries) {
     if (!isSafeRel(rel)) {
       log(`忽略非法路径：${rel}`)
@@ -1549,12 +1550,6 @@ export async function pull(options) {
       wanted.push({ rel, mtimeMs: remoteMtime })
       continue
     }
-    if (rel === 'dsh/storages/workspace.json' && options.force !== true) {
-      // 状态集合文件（工作区/登记/归档/置顶）：总是取回云端版本用于合并，不按 mtime 跳过
-      needWorkspaceMerge = true
-      wanted.push({ rel, mtimeMs: remoteMtime })
-      continue
-    }
     if (remoteMtime <= local.mtimeMs + 2000) continue
     if (options.force !== true && now - local.mtimeMs < 5 * 60 * 1000) {
       skippedRecent += 1
@@ -1661,15 +1656,6 @@ export async function pull(options) {
     }
   }
 
-  if (needWorkspaceMerge) {
-    const current = path.join(dshRoot, 'storages', 'workspace.json')
-    const backup = path.join(backupDir, 'dsh', 'storages', 'workspace.json')
-    if (fs.existsSync(current) && fs.existsSync(backup)) {
-      const added = mergeWorkspaceState(current, backup, log)
-      log(`工作区状态取并集（登记/归档/置顶）：已与云端合并${added > 0 ? `，新增 ${added} 条会话登记` : ''}；重启 DSH 后左侧列表才显示`)
-    }
-  }
-
   log(`恢复完成：${restored} 个文件，${skipped} 个找不到落点而被跳过`)
   await rewriteProfileLinks(localProfileDir, pluginTargets, log)
 
@@ -1689,63 +1675,6 @@ export async function pull(options) {
   return { ok: true, from, restored, bytes, skipped, plugins: pluginTargets.size, skippedRecent, skippedDeleted, removed: applied.removed.length }
 }
 
-/**
- * `storages/workspace.json` 是「状态集合」文件（工作区列表 / 会话登记 / 归档 / 置顶）。
- * 两台机各改一半时，按 mtime 整文件覆盖只能留一份 → 这里改成取并集，
- * 避免「另一台登记的会话和归档状态没跟过来」。
- * @param {string} currentPath 刚恢复成云端版本的文件
- * @param {string} backupPath  覆盖前本机版本（.cloud-sync/backup/<时间戳>/ 下）
- * @returns {number} 新增的会话登记条数
- */
-export function mergeWorkspaceState(currentPath, backupPath) {
-  const readJson = (file) => {
-    try {
-      return JSON.parse(fs.readFileSync(file, 'utf8').replace(/^\uFEFF/, ''))
-    } catch {
-      return null
-    }
-  }
-  const mine = readJson(backupPath)
-  const theirs = readJson(currentPath)
-  if (mine === null || theirs === null) return 0
-  const unionList = (a, b) => {
-    const out = Array.isArray(a) ? [...a] : []
-    for (const item of Array.isArray(b) ? b : []) if (!out.includes(item)) out.push(item)
-    return out
-  }
-  const merged = { ...theirs }
-  if (mine.unit !== undefined && theirs.unit === undefined) merged.unit = mine.unit
-  const gTheirs = theirs.global !== null && typeof theirs.global === 'object' ? theirs.global : {}
-  const gMine = mine.global !== null && typeof mine.global === 'object' ? mine.global : {}
-  merged.global = { ...gMine, ...gTheirs }
-  for (const key of ['workspaceIds', 'archivedSessionIds', 'pinnedSessionIds']) {
-    if (Array.isArray(gMine[key]) || Array.isArray(gTheirs[key])) {
-      merged.global[key] = unionList(gTheirs[key], gMine[key])
-    }
-  }
-  const tTheirs = theirs.tables !== null && typeof theirs.tables === 'object' ? theirs.tables : {}
-  const tMine = mine.tables !== null && typeof mine.tables === 'object' ? mine.tables : {}
-  const wTheirs = tTheirs.workspaces !== null && typeof tTheirs.workspaces === 'object' ? tTheirs.workspaces : {}
-  const wMine = tMine.workspaces !== null && typeof tMine.workspaces === 'object' ? tMine.workspaces : {}
-  const workspaces = {}
-  let added = 0
-  for (const id of new Set([...Object.keys(wMine), ...Object.keys(wTheirs)])) {
-    const a = wMine[id] !== null && typeof wMine[id] === 'object' ? wMine[id] : {}
-    const b = wTheirs[id] !== null && typeof wTheirs[id] === 'object' ? wTheirs[id] : {}
-    const before = Array.isArray(b.sessionIds) ? b.sessionIds.length : 0
-    const sessionIds = unionList(b.sessionIds, a.sessionIds)
-    added += Math.max(0, sessionIds.length - before)
-    workspaces[id] = { ...a, ...b, sessionIds }
-  }
-  merged.tables = { ...tMine, ...tTheirs, workspaces }
-  try {
-    fs.writeFileSync(currentPath, JSON.stringify(merged, null, 2) + '\n', 'utf8')
-  } catch {
-    return 0
-  }
-  return added
-}
-
 function timestamp() {
   const now = new Date()
   const pad = (value) => String(value).padStart(2, '0')