@yeaft/webchat-agent 0.0.8 → 0.0.10

package/package.json

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

package/service.js

@@ -392,13 +392,16 @@ function winInstall(config) {
   if (config.agentSecret) envLines.push(`set "AGENT_SECRET=${config.agentSecret}"`);
   if (config.workDir) envLines.push(`set "WORK_DIR=${config.workDir}"`);
 
-  // Create a batch file that sets env vars and starts node
-  const batContent = `@echo off\r\n${envLines.join('\r\n')}\r\n"${nodePath}" "${cliPath}"\r\n`;
+  // Create a batch file that sets env vars and starts node (with log redirection)
+  mkdirSync(logDir, { recursive: true });
+  const logFile = join(logDir, 'out.log');
+  const cliDir = dirname(cliPath);
+  const batContent = `@echo off\r\ncd /d "${cliDir}"\r\n${envLines.join('\r\n')}\r\n"${nodePath}" "${cliPath}" >> "${logFile}" 2>&1\r\n`;
   const batPath = getWinBatPath();
   writeFileSync(batPath, batContent);
 
   // Create VBS wrapper to run hidden (no console window)
-  const vbsContent = `Set WshShell = CreateObject("WScript.Shell")\r\nWshShell.Run """${batPath}""", 0, False\r\n`;
+  const vbsContent = `Set WshShell = CreateObject("WScript.Shell")\r\nWshShell.CurrentDirectory = "${cliDir}"\r\nWshShell.Run """${batPath}""", 0, False\r\n`;
   const vbsPath = getWinWrapperPath();
   writeFileSync(vbsPath, vbsContent);
 
@@ -431,12 +434,17 @@ function winInstall(config) {
 
   // Also start it now
   if (usedStartupFolder) {
-    spawn('wscript.exe', [vbsPath], { detached: true, stdio: 'ignore' }).unref();
+    execSync(`wscript.exe "${vbsPath}"`, { stdio: 'pipe' });
   } else {
     execSync(`schtasks /run /tn "${WIN_TASK_NAME}"`, { stdio: 'pipe' });
   }
 
   console.log('Service installed and started.');
+  console.log(`  Bat:  ${batPath}`);
+  console.log(`  VBS:  ${vbsPath}`);
+  console.log(`  Log:  ${logFile}`);
+  console.log(`  Node: ${nodePath}`);
+  console.log(`  CLI:  ${cliPath}`);
   console.log(`\nManage with:`);
   console.log(`  yeaft-agent status`);
   console.log(`  yeaft-agent logs`);
@@ -466,7 +474,7 @@ function winStart() {
     // No schtasks — try direct launch via VBS
     const vbsPath = getWinWrapperPath();
     if (existsSync(vbsPath)) {
-      spawn('wscript.exe', [vbsPath], { detached: true, stdio: 'ignore' }).unref();
+      execSync(`wscript.exe "${vbsPath}"`, { stdio: 'pipe' });
       console.log('Service started.');
     } else {
       console.error('Service not installed. Run "yeaft-agent install" first.');
@@ -476,13 +484,14 @@ function winStart() {
 }
 
 function winStop() {
-  // Find and kill the node process running cli.js
+  // Find and kill the node process running our cli.js
   try {
     const output = execSync('wmic process where "name=\'node.exe\'" get processid,commandline /format:csv', {
       encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe']
     });
+    const cliPath = getCliPath();
     for (const line of output.split('\n')) {
-      if (line.includes('cli.js') && line.includes(SERVICE_NAME)) {
+      if (line.includes('cli.js') && (line.includes(SERVICE_NAME) || line.includes('webchat-agent'))) {
         const pid = line.trim().split(',').pop();
         if (pid && /^\d+$/.test(pid)) {
           execSync(`taskkill /pid ${pid} /f`, { stdio: 'pipe' });