dsh-wechat-remote 1.7.0 → 1.7.1

package/assets/release.json

@@ -1,13 +1,13 @@
 {
-  "version": "1.7.0",
+  "version": "1.7.1",
   "catalog": {
     "schemaVersion": 1,
-    "revision": "installer-1.7.0",
-    "issuedAt": 1788963160754,
-    "expiresAt": 1791382360754,
+    "revision": "installer-1.7.1",
+    "issuedAt": 1788979000679,
+    "expiresAt": 1791398200679,
     "releases": [
       {
-        "version": "1.7.0",
+        "version": "1.7.1",
         "channel": "stable",
         "dsh": [
           "0.1.1-rc.2",
@@ -22,9 +22,9 @@
           "x64"
         ],
         "asset": {
-          "url": "https://github.com/martinbear1/dsh-wechat-remote/releases/download/v1.7.0/harness-remote-dsh-wechat-remote-1.7.0.tgz",
-          "sha256": "594f42f1b959c5579b82df458932fc6dfa276abe88b6e94e789cbf639335f98d",
-          "bytes": 9524528
+          "url": "https://github.com/martinbear1/dsh-wechat-remote/releases/download/v1.7.1/harness-remote-dsh-wechat-remote-1.7.1.tgz",
+          "sha256": "5274a6d5beb513124a6d1a916ddd6df7d3e236a7a970e48515d902fa4d8c94d0",
+          "bytes": 9526754
         }
       }
     ],

package/bin/native-control.mjs

@@ -53,3 +53,18 @@ export async function waitForJson(filename, accept, timeout = 20000) {
   }
   throw new Error('DSH 没有完成安装握手；原插件未替换。请确认 DSH WebUI 正在运行且允许原生插件热加载。')
 }
+
+/** One bounded native handshake, including a possible offline host start.
+ * A listening WebUI is not proof that the asynchronous profile reload finished.
+ * Keep the same control entry/token while waiting; never restart a live host. */
+export async function waitForInstallControl(filename, {
+  accept, ensureRunning, onWaiting = () => {}, timeoutMs = 60000, initialWaitMs = 5000,
+}) {
+  const deadline = Date.now() + timeoutMs
+  try { return await waitForJson(filename, accept, Math.min(initialWaitMs, timeoutMs)) }
+  catch {
+    onWaiting()
+    if (Date.now() < deadline) await ensureRunning()
+    return await waitForJson(filename, accept, Math.max(0, deadline - Date.now()))
+  }
+}

package/bin/setup.mjs

@@ -6,7 +6,7 @@ import net from 'node:net'
 import { spawn } from 'node:child_process'
 import { randomBytes, createHash } from 'node:crypto'
 import { fileURLToPath } from 'node:url'
-import { attachControl, waitForJson } from './native-control.mjs'
+import { attachControl, waitForJson, waitForInstallControl } from './native-control.mjs'
 import { resolveInstallRuntime, verifyInstallRuntime } from '../lib/install-runtime.js'
 import { validateCatalog, releaseMatches, compareVersions } from '../lib/update-policy.js'
 import { boundedFetch, downloadRelease, auditArchive } from '../lib/update-download.js'
@@ -89,14 +89,27 @@ export async function install({ profileName = 'web', cli = findDsh(), assetsRoot
     fs.copyFileSync(path.join(root, 'lib/install-control.js'), helper)
     writePrivateJsonAtomic(path.join(directory, 'package.json'), { type: 'module' })
     remove = attachControl(profile, helper, { directory, token, pnpm: runtime.cli })
-    try { ref = await waitForJson(path.join(directory, 'control-ready.json'), v => Number.isInteger(v.pid), 5000) }
-    catch {
-      if (launched || await portBusy(Number(process.env.DSH_PORT || 3080))) throw new Error('当前 DSH 尚未完成安装握手，未替换插件。')
-      const log = fs.openSync(path.join(directory, 'startup.log'), 'a', 0o600)
-      launched = spawn(process.execPath, [cli, 'web', '--profile', profileName, '--no-open'], {
-        cwd: process.cwd(), env: process.env, detached: true, windowsHide: true, stdio: ['ignore', log, log] })
-      fs.closeSync(log); launched.on('error', () => {}); launched.unref()
-      ref = await waitForJson(path.join(directory, 'control-ready.json'), v => v.pid === launched.pid, 20000)
+    const handshakeStarted = Date.now()
+    try {
+      ref = await waitForInstallControl(path.join(directory, 'control-ready.json'), {
+        accept: v => Number.isInteger(v.pid) && v.pid > 0 && (!launched || v.pid === launched.pid),
+        onWaiting: () => console.log('正在等待 DSH 完成安装准备，请勿重复执行命令…'),
+        ensureRunning: async () => {
+          if (launched || await portBusy(Number(process.env.DSH_PORT || 3080))) return
+          const log = fs.openSync(path.join(directory, 'startup.log'), 'a', 0o600)
+          launched = spawn(process.execPath, [cli, 'web', '--profile', profileName, '--no-open'], {
+            cwd: process.cwd(), env: process.env, detached: true, windowsHide: true, stdio: ['ignore', log, log] })
+          fs.closeSync(log); launched.on('error', () => {}); launched.unref()
+        },
+      })
+      writePrivateJsonAtomic(path.join(directory, 'handshake.json'), {
+        state: 'ready', elapsedMs: Date.now() - handshakeStarted, startedHost: Boolean(launched),
+      })
+    } catch {
+      writePrivateJsonAtomic(path.join(directory, 'handshake.json'), {
+        state: 'timeout', elapsedMs: Date.now() - handshakeStarted, startedHost: Boolean(launched),
+      })
+      throw new Error('DSH 安装准备超时，原插件未替换。本机安装记录：' + path.join(directory, 'handshake.json'))
     }
     job = { controlOrigin: ref.origin, statusToken: token }
     const host = await control(job, 'describe')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-wechat-remote",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "private": false,
   "description": "Agent远程管理助手：DSH 微信连接插件的一键安装与升级",
   "type": "module",