lobstakit-cloud 1.3.8 → 1.3.9

package/lib/gateway.js

@@ -40,40 +40,56 @@ function isSystemdAvailable() {
   return _systemdAvailable;
 }
 
-// PM2 fallback for non-systemd environments
-const PM2_NAME = 'openclaw-gateway';
-function pm2Start() {
+// Detached-spawn fallback for non-systemd/container environments (no PM2 needed)
+const { spawn } = require('child_process');
+const GATEWAY_PID_FILE = path.join(os.homedir(), '.openclaw', 'gateway.pid');
+const GATEWAY_LOG_FILE = path.join(os.homedir(), '.openclaw', 'gateway-spawn.log');
+
+function spawnedStart() {
   try {
-    // Stop any existing instance first
-    try { execSync(`pm2 delete ${PM2_NAME} 2>/dev/null`, { encoding: 'utf8', timeout: 10000 }); } catch {}
-    execSync(`pm2 start openclaw --name ${PM2_NAME} -- gateway`, { encoding: 'utf8', timeout: 30000 });
-    execSync('pm2 save', { encoding: 'utf8', timeout: 10000 });
+    // Kill any previously spawned gateway
+    spawnedStop();
+    // Resolve openclaw binary
+    let bin = 'openclaw';
+    try { bin = execSync('which openclaw', { encoding: 'utf8', timeout: 3000 }).trim(); } catch {}
+    const logFd = require('fs').openSync(GATEWAY_LOG_FILE, 'a');
+    const child = spawn(bin, ['gateway'], {
+      detached: true,
+      stdio: ['ignore', logFd, logFd],
+      env: { ...process.env },
+    });
+    child.unref();
+    fs.writeFileSync(GATEWAY_PID_FILE, String(child.pid));
+    console.log(`[gateway] Spawned gateway PID ${child.pid} (no-systemd mode)`);
     return { success: true };
   } catch (err) {
     return { success: false, error: err.message };
   }
 }
-function pm2Stop() {
+function spawnedStop() {
   try {
-    execSync(`pm2 stop ${PM2_NAME}`, { encoding: 'utf8', timeout: 10000 });
+    if (!fs.existsSync(GATEWAY_PID_FILE)) return { success: true };
+    const pid = parseInt(fs.readFileSync(GATEWAY_PID_FILE, 'utf8').trim(), 10);
+    if (pid) {
+      try { process.kill(pid, 'SIGTERM'); } catch {}
+    }
+    fs.unlinkSync(GATEWAY_PID_FILE);
     return { success: true };
   } catch (err) {
     return { success: false, error: err.message };
   }
 }
-function pm2Restart() {
-  try {
-    try { execSync(`pm2 restart ${PM2_NAME}`, { encoding: 'utf8', timeout: 15000 }); }
-    catch { pm2Start(); } // restart fails if not running — start fresh
-    return { success: true };
-  } catch (err) {
-    return { success: false, error: err.message };
-  }
+function spawnedRestart() {
+  spawnedStop();
+  return spawnedStart();
 }
-function pm2IsRunning() {
+function spawnedIsRunning() {
   try {
-    const out = execSync(`pm2 list 2>/dev/null`, { encoding: 'utf8', timeout: 5000 });
-    return out.includes(PM2_NAME) && out.includes('online');
+    if (!fs.existsSync(GATEWAY_PID_FILE)) return false;
+    const pid = parseInt(fs.readFileSync(GATEWAY_PID_FILE, 'utf8').trim(), 10);
+    if (!pid) return false;
+    process.kill(pid, 0); // throws if process doesn't exist
+    return true;
   } catch { return false; }
 }
 
@@ -168,7 +184,7 @@ function pingGateway(token) {
 function isGatewayRunning() {
   // Primary: systemctl --user (accurate for user services) OR PM2 in container envs
   if (!isSystemdAvailable()) {
-    if (pm2IsRunning()) return true;
+    if (spawnedIsRunning()) return true;
     // Fall through to HTTP check
   } else {
     try {
@@ -247,7 +263,7 @@ function startGateway() {
   ensureUserSession();
   if (!isSystemdAvailable()) {
     console.log('[gateway] systemd unavailable — using PM2 fallback');
-    const result = pm2Start();
+    const result = spawnedStart();
     if (result.success) setTimeout(() => syncGatewayToken(), 4000);
     return result;
   }
@@ -272,7 +288,7 @@ function startGateway() {
 function stopGateway() {
   if (!isSystemdAvailable()) {
     console.log('[gateway] systemd unavailable — using PM2 fallback');
-    return pm2Stop();
+    return spawnedStop();
   }
   try {
     execSync(`systemctl --user stop ${SERVICE_NAME}`, { encoding: 'utf8', timeout: 15000, env: userEnv() });
@@ -288,7 +304,7 @@ function restartGateway() {
   ensureUserSession();
   if (!isSystemdAvailable()) {
     console.log('[gateway] systemd unavailable — using PM2 fallback');
-    const result = pm2Restart();
+    const result = spawnedRestart();
     if (result.success) setTimeout(() => syncGatewayToken(), 4000);
     return result;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lobstakit-cloud",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "LobstaKit Cloud — Setup wizard and management for LobstaCloud gateways",
   "main": "server.js",
   "bin": {