@yeaft/webchat-agent 0.1.212 → 0.1.213

package/package.json

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

package/service/doctor.js

@@ -1,30 +1,16 @@
 /**
  * Service — doctor command
  * Diagnoses service configuration issues: checks paths, service status, version consistency.
+ *
+ * Reuses path and status functions from platform modules to avoid duplication.
  */
 import { execSync } from 'child_process';
 import { existsSync, readFileSync, statSync } from 'fs';
-import { join, dirname } from 'path';
 import { platform, homedir } from 'os';
-import { fileURLToPath } from 'url';
-import { SERVICE_NAME } from './config.js';
-
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-// ── Platform-specific service config paths ─────────────────────────────────
-
-function getMacPlistPath() {
-  return join(homedir(), 'Library', 'LaunchAgents', 'com.yeaft.agent.plist');
-}
-
-function getLinuxServicePath() {
-  return join(homedir(), '.config', 'systemd', 'user', `${SERVICE_NAME}.service`);
-}
-
-function getWindowsEcosystemPath() {
-  const appData = process.env.APPDATA || join(homedir(), 'AppData', 'Roaming');
-  return join(appData, SERVICE_NAME, 'ecosystem.config.cjs');
-}
+import { getNodePath } from './config.js';
+import { getLaunchdPlistPath, getMacServiceStatus } from './macos.js';
+import { getSystemdServicePath, getLinuxServiceStatus } from './linux.js';
+import { getEcosystemPath, getWinServiceStatus } from './windows.js';
 
 // ── Parse paths from service config files ──────────────────────────────────
 
@@ -107,78 +93,13 @@ function getCliVersion(nodePath, cliPath) {
 }
 
 function getCurrentNodePath() {
-  return process.execPath;
+  return getNodePath();
 }
 
 function getCurrentNodeVersion() {
   return process.version;
 }
 
-// ── Service status checks ──────────────────────────────────────────────────
-
-function getMacServiceStatus() {
-  try {
-    const output = execSync('launchctl list | grep com.yeaft.agent', {
-      encoding: 'utf-8',
-      stdio: ['pipe', 'pipe', 'pipe'],
-    });
-    if (output.trim()) {
-      const parts = output.trim().split(/\s+/);
-      const pid = parts[0];
-      if (pid !== '-') {
-        return { running: true, pid };
-      }
-      return { running: false, pid: null };
-    }
-    return { running: false, pid: null };
-  } catch {
-    return { running: false, pid: null };
-  }
-}
-
-function getLinuxServiceStatus() {
-  try {
-    const output = execSync(`systemctl --user is-active ${SERVICE_NAME}`, {
-      encoding: 'utf-8',
-      stdio: ['pipe', 'pipe', 'pipe'],
-    }).trim();
-    if (output === 'active') {
-      // Try to get PID
-      let pid = null;
-      try {
-        pid = execSync(`systemctl --user show ${SERVICE_NAME} --property=MainPID --value`, {
-          encoding: 'utf-8',
-          stdio: ['pipe', 'pipe', 'pipe'],
-        }).trim();
-        if (pid === '0') pid = null;
-      } catch {}
-      return { running: true, pid };
-    }
-    return { running: false, pid: null };
-  } catch {
-    return { running: false, pid: null };
-  }
-}
-
-function getWindowsServiceStatus() {
-  try {
-    const output = execSync('pm2 jlist', {
-      encoding: 'utf-8',
-      stdio: ['pipe', 'pipe', 'pipe'],
-    });
-    const apps = JSON.parse(output);
-    const app = Array.isArray(apps) && apps.find(a => a.name === 'yeaft-agent');
-    if (app) {
-      const running = app.pm2_env && app.pm2_env.status === 'online';
-      const pid = running ? app.pid : null;
-      return { running, pid: pid ? String(pid) : null };
-    }
-    return { running: false, pid: null };
-  } catch {
-    return { running: false, pid: null };
-  }
-}
-
 // ── Tilde shorthand for display ────────────────────────────────────────────
 
 function tildeify(filePath) {
@@ -201,17 +122,17 @@ export function doctor() {
 
   // 1. Determine platform and config path
   if (os === 'darwin') {
-    configPath = getMacPlistPath();
+    configPath = getLaunchdPlistPath();
     parsePaths = parseMacPaths;
     getServiceStatus = getMacServiceStatus;
   } else if (os === 'linux') {
-    configPath = getLinuxServicePath();
+    configPath = getSystemdServicePath();
     parsePaths = parseLinuxPaths;
     getServiceStatus = getLinuxServiceStatus;
   } else if (os === 'win32') {
-    configPath = getWindowsEcosystemPath();
+    configPath = getEcosystemPath();
     parsePaths = parseWindowsPaths;
-    getServiceStatus = getWindowsServiceStatus;
+    getServiceStatus = getWinServiceStatus;
   } else {
     console.log(`\u26a0\ufe0f  Unsupported platform: ${os}`);
     console.log(`   The doctor command supports macOS, Linux, and Windows.`);

package/service/linux.js

@@ -7,10 +7,9 @@ import { join, dirname } from 'path';
 import { homedir } from 'os';
 import { SERVICE_NAME, getLogDir, getNodePath, getCliPath } from './config.js';
 
+/** Pure path getter — no side effects (no directory creation). */
 export function getSystemdServicePath() {
-  const dir = join(homedir(), '.config', 'systemd', 'user');
-  mkdirSync(dir, { recursive: true });
-  return join(dir, `${SERVICE_NAME}.service`);
+  return join(homedir(), '.config', 'systemd', 'user', `${SERVICE_NAME}.service`);
 }
 
 function generateSystemdUnit(config) {
@@ -50,6 +49,8 @@ WantedBy=default.target
 
 export function linuxInstall(config) {
   const servicePath = getSystemdServicePath();
+  // Ensure systemd user directory exists before writing
+  mkdirSync(join(homedir(), '.config', 'systemd', 'user'), { recursive: true });
   writeFileSync(servicePath, generateSystemdUnit(config));
   execSync('systemctl --user daemon-reload');
   execSync(`systemctl --user enable ${SERVICE_NAME}`);
@@ -88,6 +89,33 @@ export function linuxRestart() {
   console.log('Service restarted.');
 }
 
+/**
+ * Query systemd for the current service status.
+ * Returns { running: boolean, pid: string|null }.
+ */
+export function getLinuxServiceStatus() {
+  try {
+    const output = execSync(`systemctl --user is-active ${SERVICE_NAME}`, {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    }).trim();
+    if (output === 'active') {
+      let pid = null;
+      try {
+        pid = execSync(`systemctl --user show ${SERVICE_NAME} --property=MainPID --value`, {
+          encoding: 'utf-8',
+          stdio: ['pipe', 'pipe', 'pipe'],
+        }).trim();
+        if (pid === '0') pid = null;
+      } catch {}
+      return { running: true, pid };
+    }
+    return { running: false, pid: null };
+  } catch {
+    return { running: false, pid: null };
+  }
+}
+
 export function linuxStatus() {
   try {
     execSync(`systemctl --user status ${SERVICE_NAME}`, { stdio: 'inherit' });

package/service/macos.js

@@ -7,10 +7,9 @@ import { join } from 'path';
 import { homedir } from 'os';
 import { getLogDir, getNodePath, getCliPath } from './config.js';
 
+/** Pure path getter — no side effects (no directory creation). */
 export function getLaunchdPlistPath() {
-  const dir = join(homedir(), 'Library', 'LaunchAgents');
-  mkdirSync(dir, { recursive: true });
-  return join(dir, 'com.yeaft.agent.plist');
+  return join(homedir(), 'Library', 'LaunchAgents', 'com.yeaft.agent.plist');
 }
 
 function generateLaunchdPlist(config) {
@@ -61,6 +60,8 @@ ${envDict.join('\n')}
 
 export function macInstall(config) {
   const plistPath = getLaunchdPlistPath();
+  // Ensure LaunchAgents directory exists before writing
+  mkdirSync(join(homedir(), 'Library', 'LaunchAgents'), { recursive: true });
   // Unload first if exists
   if (existsSync(plistPath)) {
     try { execSync(`launchctl unload ${plistPath} 2>/dev/null`); } catch {}
@@ -107,22 +108,38 @@ export function macRestart() {
   macStart();
 }
 
-export function macStatus() {
+/**
+ * Query launchd for the current service status.
+ * Returns { running: boolean, pid: string|null, exitCode: string|null }.
+ */
+export function getMacServiceStatus() {
   try {
-    const output = execSync(`launchctl list | grep com.yeaft.agent`, { encoding: 'utf-8' });
+    const output = execSync('launchctl list | grep com.yeaft.agent', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
     if (output.trim()) {
       const parts = output.trim().split(/\s+/);
       const pid = parts[0];
       const exitCode = parts[1];
       if (pid !== '-') {
-        console.log(`Service is running (PID: ${pid})`);
-      } else {
-        console.log(`Service is stopped (last exit code: ${exitCode})`);
+        return { running: true, pid, exitCode };
       }
-    } else {
-      console.log('Service is not installed.');
+      return { running: false, pid: null, exitCode };
     }
+    return { running: false, pid: null, exitCode: null };
   } catch {
+    return { running: false, pid: null, exitCode: null };
+  }
+}
+
+export function macStatus() {
+  const status = getMacServiceStatus();
+  if (status.running) {
+    console.log(`Service is running (PID: ${status.pid})`);
+  } else if (status.exitCode !== null) {
+    console.log(`Service is stopped (last exit code: ${status.exitCode})`);
+  } else {
     console.log('Service is not installed.');
   }
 }

package/service/windows.js

@@ -22,7 +22,7 @@ function ensurePm2() {
   }
 }
 
-function getEcosystemPath() {
+export function getEcosystemPath() {
   return join(getConfigDir(), 'ecosystem.config.cjs');
 }
 
@@ -156,6 +156,29 @@ export function winRestart() {
   }
 }
 
+/**
+ * Query pm2 for the current service status.
+ * Returns { running: boolean, pid: string|null }.
+ */
+export function getWinServiceStatus() {
+  try {
+    const output = execSync('pm2 jlist', {
+      encoding: 'utf-8',
+      stdio: ['pipe', 'pipe', 'pipe'],
+    });
+    const apps = JSON.parse(output);
+    const app = Array.isArray(apps) && apps.find(a => a.name === 'yeaft-agent');
+    if (app) {
+      const running = app.pm2_env && app.pm2_env.status === 'online';
+      const pid = running ? app.pid : null;
+      return { running, pid: pid ? String(pid) : null };
+    }
+    return { running: false, pid: null };
+  } catch {
+    return { running: false, pid: null };
+  }
+}
+
 export function winStatus() {
   try {
     execSync(`pm2 describe ${PM2_APP_NAME}`, { stdio: 'inherit' });