lobstakit-cloud 1.3.0 → 1.3.2

package/lib/gateway.js

@@ -1,12 +1,15 @@
 /**
  * LobstaKit Cloud — Gateway Manager
- * 
+ *
  * Controls the openclaw-gateway systemd service.
  */
 
 const { execSync } = require('child_process');
+const fs = require('fs');
 
 const SERVICE_NAME = 'openclaw-gateway';
+const DROP_IN_DIR = `/etc/systemd/system/${SERVICE_NAME}.service.d`;
+const DROP_IN_FILE = `${DROP_IN_DIR}/dbus-env.conf`;
 
 /**
  * Check if the gateway service is currently running.
@@ -23,10 +26,102 @@ function isGatewayRunning() {
   }
 }
 
+/**
+ * Ensure D-Bus user session is available and inject env vars into the
+ * openclaw-gateway systemd service unit via a drop-in override.
+ *
+ * Root cause of "systemctl --user unavailable: Failed to connect to bus:
+ * No medium found": OpenClaw calls `systemctl --user` internally on startup.
+ * On headless VPS, no D-Bus user session exists. Even if LobstaKit sets up
+ * D-Bus in its own process, the gateway runs as a *separate* system service
+ * and never inherits those env vars.
+ *
+ * Fix: write a systemd drop-in that bakes XDG_RUNTIME_DIR and
+ * DBUS_SESSION_BUS_ADDRESS into the service unit so every restart picks
+ * them up automatically — no manual intervention required.
+ */
+function ensureUserSession() {
+  try {
+    const uid = execSync('id -u', { encoding: 'utf8', timeout: 3000 }).trim();
+    const username = execSync('id -un', { encoding: 'utf8', timeout: 3000 }).trim();
+    const runtimeDir = `/run/user/${uid}`;
+    const busSocket = `${runtimeDir}/bus`;
+    const busAddress = `unix:path=${busSocket}`;
+
+    // 1. Enable lingering so user units survive without an active login
+    execSync(`loginctl enable-linger ${username} 2>/dev/null || true`, {
+      encoding: 'utf8',
+      timeout: 5000
+    });
+
+    // 2. Ensure runtime dir exists with correct permissions
+    execSync(`mkdir -p ${runtimeDir} && chmod 700 ${runtimeDir} && chown ${uid}:${uid} ${runtimeDir} 2>/dev/null || true`, {
+      encoding: 'utf8',
+      timeout: 3000
+    });
+
+    // 3. Start dbus-daemon if socket not already present
+    let dbusRunning = false;
+    try {
+      execSync(`test -S ${busSocket}`, { encoding: 'utf8', timeout: 2000 });
+      dbusRunning = true;
+    } catch { /* socket not there yet */ }
+
+    if (!dbusRunning) {
+      try {
+        execSync(
+          `dbus-daemon --session --address=${busAddress} --fork --nopidfile`,
+          {
+            encoding: 'utf8',
+            timeout: 5000,
+            env: { ...process.env, XDG_RUNTIME_DIR: runtimeDir }
+          }
+        );
+        // Wait up to 2s for socket to appear
+        for (let i = 0; i < 10; i++) {
+          try {
+            execSync(`test -S ${busSocket}`, { encoding: 'utf8', timeout: 500 });
+            dbusRunning = true;
+            break;
+          } catch {
+            execSync('sleep 0.2', { timeout: 500 });
+          }
+        }
+      } catch (e) {
+        console.warn('[gateway] dbus-daemon unavailable:', e.message);
+        // dbus-daemon may not be installed — XDG_RUNTIME_DIR alone may be enough
+      }
+    }
+
+    // 4. Write systemd drop-in so the service unit inherits these env vars
+    //    on every start/restart, not just when LobstaKit happens to call this.
+    const lines = [
+      '# Auto-generated by LobstaKit — do not edit manually',
+      '[Service]',
+      `Environment="XDG_RUNTIME_DIR=${runtimeDir}"`,
+    ];
+    if (dbusRunning) {
+      lines.push(`Environment="DBUS_SESSION_BUS_ADDRESS=${busAddress}"`);
+    }
+    const dropInContent = lines.join('\n') + '\n';
+
+    execSync(`mkdir -p ${DROP_IN_DIR}`, { encoding: 'utf8', timeout: 3000 });
+    fs.writeFileSync(DROP_IN_FILE, dropInContent, 'utf8');
+
+    // 5. Reload systemd so it picks up the new drop-in
+    execSync('systemctl daemon-reload', { encoding: 'utf8', timeout: 10000 });
+
+    console.log(`[gateway] Session ready — runtimeDir=${runtimeDir} dbus=${dbusRunning} drop-in written`);
+  } catch (err) {
+    console.warn('[gateway] ensureUserSession warning:', err.message);
+  }
+}
+
 /**
  * Start the gateway service.
  */
 function startGateway() {
+  ensureUserSession();
   try {
     execSync(`systemctl start ${SERVICE_NAME}`, {
       encoding: 'utf8',
@@ -61,8 +156,8 @@ function stopGateway() {
  * Restart the gateway service (enables it first if not already enabled).
  */
 function restartGateway() {
+  ensureUserSession();
   try {
-    // Ensure service is enabled (cloud-init doesn't enable it — LobstaKit does after setup)
     execSync(`systemctl enable ${SERVICE_NAME}`, {
       encoding: 'utf8',
       timeout: 10000

package/package.json

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