dsh-tg-bridge 1.3.4 → 1.3.5

package/bridge-kick.mjs

@@ -8,7 +8,7 @@
 //
 // Exit codes: 0 = nothing to do or started, 2 = start failed.
 
-import { spawnSync } from 'node:child_process';
+import { spawn, spawnSync } from 'node:child_process';
 import { appendFileSync, existsSync, readFileSync, openSync, closeSync, unlinkSync, writeFileSync } from 'node:fs';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
@@ -21,25 +21,48 @@ const KICK_LOG = join(DIR, 'kick.log');
 
 // Shared with setup.mjs: a restart holds this lock, so a tick that lands in the
 // middle of one must not start a second poller.
+//
+// A live holder used to disable supervision forever: the old code started the
+// bridge with spawnSync(), which blocks until the child EXITS — for a long-lived
+// bridge the tick never returned, kept this lock for hours, and every later tick
+// logged "restart in progress" and skipped (2026-10-24: supervisor dead from
+// 18:57 while the bridge lived). Two fixes: spawn() + unref() below, and
+// LOCK_MAX_AGE_MS here so even a genuinely wedged holder cannot wedge the guard.
 const LOCK = join(DIR, 'restart.lock');
+const LOCK_MAX_AGE_MS = 180_000;
+
 function acquireLock(owner) {
   for (let attempt = 0; attempt < 2; attempt += 1) {
     try {
       const fd = openSync(LOCK, 'wx');
       writeFileSync(fd, JSON.stringify({ pid: process.pid, owner, ts: Date.now() }));
       closeSync(fd);
-      const release = () => { try { unlinkSync(LOCK); } catch {} };
+      // Remove only our own lock: after a stale-lock takeover the file belongs
+      // to the new holder, and a late exit must not steal it.
+      const release = () => {
+        try {
+          if (Number(JSON.parse(readFileSync(LOCK, 'utf8')).pid) === process.pid) unlinkSync(LOCK);
+        } catch {}
+      };
       process.on('exit', release);
       return release;
     } catch (error) {
       if (error.code !== 'EEXIST') return null;
       let held = 0;
-      try { held = Number(JSON.parse(readFileSync(LOCK, 'utf8')).pid) || 0; } catch {}
+      let heldTs = 0;
+      try {
+        const info = JSON.parse(readFileSync(LOCK, 'utf8'));
+        held = Number(info.pid) || 0;
+        heldTs = Number(info.ts) || 0;
+      } catch {}
+      const age = heldTs ? Date.now() - heldTs : Number.POSITIVE_INFINITY;
       let alive = false;
       if (held) {
         try { process.kill(held, 0); alive = true; } catch (e) { alive = e.code === 'EPERM'; }
       }
-      if (alive) return null;
+      // Age wins over liveness: a holder that has not finished a restart in
+      // LOCK_MAX_AGE_MS is wedged, not busy.
+      if (alive && age < LOCK_MAX_AGE_MS) return null;
       try { unlinkSync(LOCK); } catch {}
     }
   }
@@ -93,25 +116,37 @@ function main() {
   const restartPending = existsSync(marker);
 
   const filePid = pidFromFile();
+  // Cheap path first: a live pid file is authoritative for a healthy bridge, so
+  // the minute tick costs one kill(0) instead of a PowerShell process scan.
+  if (filePid && alive(filePid)) {
+    if (restartPending) log(`marker present but pid ${filePid} alive`);
+    return 0;
+  }
+  // Only when the pid file is stale or missing: scan for a bridge that started
+  // without writing one.
   const live = bridgePids();
-  if (live.length > 0 || (filePid && alive(filePid))) {
-    if (restartPending && live.length === 0) log(`marker present but pid ${filePid} alive`);
+  if (live.length > 0) {
+    log(`pid file stale (${filePid || 'missing'}), bridge ${live.join(',')} alive — not starting`);
     return 0;
   }
 
   log(restartPending ? 'marker present and no bridge: starting' : 'no bridge: starting');
-  const child = spawnSync(process.execPath, ['--dns-result-order=ipv4first', BRIDGE], {
-    cwd: DIR,
-    detached: true,
-    stdio: 'ignore',
-    windowsHide: true,
-  });
-  if (child.error) {
-    log(`start failed: ${child.error.message}`);
+  // spawn(), NOT spawnSync(): spawnSync waits for the child to exit, and this
+  // child is meant to outlive the tick.
+  let child;
+  try {
+    child = spawn(process.execPath, ['--dns-result-order=ipv4first', BRIDGE], {
+      cwd: DIR,
+      detached: true,
+      stdio: 'ignore',
+      windowsHide: true,
+    });
+  } catch (error) {
+    log(`start failed: ${error.message}`);
     return 2;
   }
-  try { readFileSync; } catch {}
-  log('start issued');
+  child.unref();
+  log(`start issued pid=${child.pid ?? '?'}`);
   return 0;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-tg-bridge",
-  "version": "1.3.4",
+  "version": "1.3.5",
   "description": "Telegram bridge for DeepSeek Harness: text, voice, photos and project-per-topic sessions without opening the desktop app",
   "type": "module",
   "main": "bridge.mjs",

package/setup.mjs

@@ -286,11 +286,30 @@ async function main() {
   if (recentConflict) fail('a stale poller still owns getUpdates (409 in the last 90s) — kill it, then re-run setup');
   else ok('no 409 conflicts in the last 90s');
 
+  // 4. Scheduled task: point it at the GUARDED HIDDEN launcher (wscript + bridge-kick).
+  //    Two reasons it must be the guarded supervisor and not a direct node.exe start:
+  //    (a) a console action on an Interactive-logon task pops a window at every logon
+  //        and repetition — wscript with window style 0 never shows one;
+  //    (b) starting bridge.mjs directly here races the one-minute tick: both see "no
+  //        bridge" and both start a poller (409 getUpdates Conflict). Going through
+  //        bridge-kick.mjs means every start happens under restart.lock after a check.
+  const vbsPath = join(BRIDGE_DIR, 'bridge-kick-hidden.vbs');
+  writeFileSync(
+    vbsPath,
+    [
+      "' hidden launcher: DSH bridge supervisor tick (no console window)",
+      'Set sh = CreateObject("WScript.Shell")',
+      `sh.CurrentDirectory = "${BRIDGE_DIR}"`,
+      `rc = sh.Run("""${NODE}"" ""${join(BRIDGE_DIR, 'bridge-kick.mjs')}""", 0, True)`,
+      'WScript.Quit rc',
+      '',
+    ].join('\r\n'),
+  );
   const task = run('powershell', [
     '-NoProfile', '-NonInteractive', '-Command',
-    `$a = New-ScheduledTaskAction -Execute '${NODE}' -Argument '"--dns-result-order=ipv4first" "${BRIDGE}"' -WorkingDirectory '${BRIDGE_DIR}'; Set-ScheduledTask -TaskName 'DSH-TG-Bridge' -Action $a | Out-Null; 'ok'`,
+    `$a = New-ScheduledTaskAction -Execute 'C:\\Windows\\System32\\wscript.exe' -Argument '//B //Nologo "${vbsPath}"'; Set-ScheduledTask -TaskName 'DSH-TG-Bridge' -Action $a | Out-Null; 'ok'`,
   ]);
-  if ((task.stdout || '').includes('ok')) ok('scheduled task DSH-TG-Bridge now uses the same flags');
+  if ((task.stdout || '').includes('ok')) ok('scheduled task DSH-TG-Bridge now runs the guarded hidden supervisor');
   else warn(`scheduled task not updated: ${(task.stderr || '').trim().slice(0, 160)}`);
 
   // 5. Bot menu.