@yeaft/webchat-agent 0.1.15 → 0.1.16

package/cli.js

@@ -3,10 +3,11 @@
  * CLI entry point for @yeaft/webchat-agent
  * Parses command-line arguments and starts the agent or runs subcommands
  */
-import { execSync } from 'child_process';
-import { readFileSync } from 'fs';
+import { execSync, spawn } from 'child_process';
+import { readFileSync, writeFileSync, mkdirSync } from 'fs';
 import { dirname, join } from 'path';
 import { fileURLToPath } from 'url';
+import { platform, homedir } from 'os';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const pkg = JSON.parse(readFileSync(join(__dirname, 'package.json'), 'utf-8'));
@@ -136,16 +137,86 @@ function upgrade() {
   console.log('Checking for updates...');
 
   try {
-    const res = execSync(`npm view ${pkg.name} version`, { encoding: 'utf-8' }).trim();
-    if (res === pkg.version) {
+    const latest = execSync(`npm view ${pkg.name} version`, { encoding: 'utf-8' }).trim();
+    if (latest === pkg.version) {
       console.log('Already up to date.');
       return;
     }
-    console.log(`Upgrading to ${res}...`);
-    execSync(`npm install -g ${pkg.name}@latest`, { stdio: 'inherit' });
-    console.log(`Successfully upgraded to ${res}`);
+    console.log(`Upgrading to ${latest}...`);
+
+    if (platform() === 'win32') {
+      // On Windows, the current process locks its own files. npm cannot overwrite
+      // them while this process is running. Spawn a detached bat script that waits
+      // for us to exit, then runs npm install, then optionally restarts the service.
+      upgradeWindows(latest);
+    } else {
+      execSync(`npm install -g ${pkg.name}@latest`, { stdio: 'inherit' });
+      console.log(`Successfully upgraded to ${latest}`);
+    }
   } catch (e) {
     console.error('Upgrade failed:', e.message);
     process.exit(1);
   }
 }
+
+function upgradeWindows(latestVersion) {
+  const configDir = join(process.env.APPDATA || join(homedir(), 'AppData', 'Roaming'), 'yeaft-agent');
+  mkdirSync(configDir, { recursive: true });
+  const logDir = join(configDir, 'logs');
+  mkdirSync(logDir, { recursive: true });
+  const batPath = join(configDir, 'upgrade-cli.bat');
+  const logPath = join(logDir, 'upgrade.log');
+  const pid = process.pid;
+  const pkgSpec = `${pkg.name}@${latestVersion}`;
+
+  const batLines = [
+    '@echo off',
+    'setlocal',
+    `set PID=${pid}`,
+    `set PKG=${pkgSpec}`,
+    `set LOGFILE=${logPath}`,
+    `set MAX_WAIT=30`,
+    `set COUNT=0`,
+    '',
+    ':: Change to temp dir to avoid EBUSY on cwd',
+    'cd /d "%TEMP%"',
+    '',
+    'echo [Upgrade] Started at %date% %time% > "%LOGFILE%"',
+    'echo [Upgrade] Waiting for CLI process (PID %PID%) to exit... >> "%LOGFILE%"',
+    '',
+    ':WAIT_LOOP',
+    'tasklist /FI "PID eq %PID%" 2>NUL | find /I "%PID%" >NUL',
+    'if errorlevel 1 goto PID_EXITED',
+    'set /A COUNT+=1',
+    'if %COUNT% GEQ %MAX_WAIT% (',
+    '  echo [Upgrade] Timeout waiting for PID %PID% to exit >> "%LOGFILE%"',
+    '  goto PID_EXITED',
+    ')',
+    'ping -n 3 127.0.0.1 >NUL',
+    'goto WAIT_LOOP',
+    ':PID_EXITED',
+    '',
+    'echo [Upgrade] Process exited, running npm install -g %PKG%... >> "%LOGFILE%"',
+    'call npm install -g %PKG% >> "%LOGFILE%" 2>&1',
+    'if not "%errorlevel%"=="0" (',
+    '  echo [Upgrade] npm install failed with exit code %errorlevel% >> "%LOGFILE%"',
+    '  goto END',
+    ')',
+    'echo [Upgrade] Successfully upgraded. >> "%LOGFILE%"',
+    '',
+    ':END',
+    `del /F /Q "${batPath}" 2>NUL`,
+  ];
+
+  writeFileSync(batPath, batLines.join('\r\n'));
+  const child = spawn('cmd.exe', ['/c', batPath], {
+    detached: true,
+    stdio: 'ignore',
+    windowsHide: true,
+  });
+  child.unref();
+  console.log(`Upgrade script spawned. This process will exit now.`);
+  console.log(`The upgrade will proceed after this process exits.`);
+  console.log(`Check upgrade log: ${logPath}`);
+  process.exit(0);
+}

package/connection/upgrade-worker-template.js

@@ -15,6 +15,22 @@ function log(msg) {
   try { fs.appendFileSync(LOGFILE, line + '\n'); } catch {}
 }
 
+// Retry a file operation with exponential backoff (Windows file lock workaround)
+function retryOp(fn, label, maxRetries = 5) {
+  for (let i = 0; i <= maxRetries; i++) {
+    try {
+      return fn();
+    } catch (err) {
+      const isLockErr = err.code === 'EBUSY' || err.code === 'EPERM' || err.code === 'EACCES';
+      if (!isLockErr || i === maxRetries) throw err;
+      const delay = Math.min(1000 * Math.pow(2, i), 10000);
+      log(`${label}: ${err.code}, retrying in ${delay}ms (${i + 1}/${maxRetries})...`);
+      const end = Date.now() + delay;
+      while (Date.now() < end) { /* busy-wait in sync context */ }
+    }
+  }
+}
+
 function parseTar(buf) {
   const files = [];
   let offset = 0;
@@ -46,9 +62,9 @@ function rmDirContents(dir, keep) {
     const stat = fs.statSync(full, { throwIfNoEntry: false });
     if (!stat) continue;
     if (stat.isDirectory()) {
-      fs.rmSync(full, { recursive: true, force: true });
+      retryOp(() => fs.rmSync(full, { recursive: true, force: true }), 'rmdir ' + entry);
     } else {
-      fs.unlinkSync(full);
+      retryOp(() => fs.unlinkSync(full), 'unlink ' + entry);
     }
   }
 }
@@ -77,7 +93,7 @@ try {
   for (const f of files) {
     const dest = path.join(TARGET, f.path);
     fs.mkdirSync(path.dirname(dest), { recursive: true });
-    fs.writeFileSync(dest, f.data);
+    retryOp(() => fs.writeFileSync(dest, f.data), 'write ' + f.path);
   }
   log('Copied ' + files.length + ' files to target');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yeaft/webchat-agent",
-  "version": "0.1.15",
+  "version": "0.1.16",
   "description": "Remote agent for Yeaft WebChat — connects worker machines to the central server",
   "main": "index.js",
   "type": "module",