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

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.10",
+  "version": "0.2.0",
   "type": "module",
   "title": "云端同步",
-  "description": "云端同步：subprocess 通道自动用 shell 包壳（HarmonyOS/DSHM 可跑）、设备模式默认值、dropbear 兼容、永久错误停止重试、传输诊断。",
+  "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'), '')),