@webmux/agent 0.1.0 → 0.1.2

package/dist/cli.js

@@ -1,7 +1,10 @@
 #!/usr/bin/env node
 
 // src/cli.ts
+import fs2 from "fs";
 import os2 from "os";
+import path2 from "path";
+import { execSync } from "child_process";
 import { Command } from "commander";
 
 // src/credentials.ts
@@ -165,9 +168,9 @@ function assertValidSessionName(name) {
 function parseSessionList(stdout) {
   return stdout.split("\n").map((line) => line.trim()).filter(Boolean).flatMap((line) => {
     const parts = line.split(FIELD_SEPARATOR);
-    const [name, windows, attachedClients, createdAt, lastActivityAt, path2] = parts;
+    const [name, windows, attachedClients, createdAt, lastActivityAt, path3] = parts;
     const currentCommand = parts[6] ?? "";
-    if (!name || !windows || !attachedClients || !createdAt || !lastActivityAt || !path2) {
+    if (!name || !windows || !attachedClients || !createdAt || !lastActivityAt || !path3) {
       return [];
     }
     return [
@@ -177,7 +180,7 @@ function parseSessionList(stdout) {
         attachedClients: Number(attachedClients),
         createdAt: Number(createdAt),
         lastActivityAt: Number(lastActivityAt),
-        path: path2,
+        path: path3,
         currentCommand
       }
     ];
@@ -251,6 +254,7 @@ async function createTerminalBridge(options) {
 
 // src/connection.ts
 var HEARTBEAT_INTERVAL_MS = 3e4;
+var SESSION_SYNC_INTERVAL_MS = 15e3;
 var INITIAL_RECONNECT_DELAY_MS = 1e3;
 var MAX_RECONNECT_DELAY_MS = 3e4;
 var AgentConnection = class {
@@ -260,6 +264,7 @@ var AgentConnection = class {
   tmux;
   ws = null;
   heartbeatTimer = null;
+  sessionSyncTimer = null;
   reconnectTimer = null;
   reconnectDelay = INITIAL_RECONNECT_DELAY_MS;
   bridges = /* @__PURE__ */ new Map();
@@ -281,6 +286,7 @@ var AgentConnection = class {
       this.reconnectTimer = null;
     }
     this.stopHeartbeat();
+    this.stopSessionSync();
     this.disposeAllBridges();
     if (this.ws) {
       this.ws.close(1e3, "agent shutting down");
@@ -320,6 +326,7 @@ var AgentConnection = class {
       case "auth-ok":
         console.log("[agent] Authenticated successfully");
         this.startHeartbeat();
+        this.startSessionSync();
         this.syncSessions();
         break;
       case "auth-fail":
@@ -347,10 +354,10 @@ var AgentConnection = class {
         this.handleTerminalResize(msg.browserId, msg.cols, msg.rows);
         break;
       case "session-create":
-        this.handleSessionCreate(msg.name);
+        this.handleSessionCreate(msg.requestId, msg.name);
         break;
       case "session-kill":
-        this.handleSessionKill(msg.name);
+        this.handleSessionKill(msg.requestId, msg.name);
         break;
       default:
         console.warn("[agent] Unknown message type:", msg.type);
@@ -360,9 +367,11 @@ var AgentConnection = class {
     try {
       const sessions = await this.tmux.listSessions();
       this.sendMessage({ type: "sessions-sync", sessions });
+      return sessions;
     } catch (err) {
       console.error("[agent] Failed to list sessions:", err);
       this.sendMessage({ type: "error", message: "Failed to list sessions" });
+      return [];
     }
   }
   async handleTerminalAttach(browserId, sessionName, cols, rows) {
@@ -383,10 +392,12 @@ var AgentConnection = class {
         onExit: (exitCode) => {
           this.bridges.delete(browserId);
           this.sendMessage({ type: "terminal-exit", browserId, exitCode });
+          void this.syncSessions();
         }
       });
       this.bridges.set(browserId, bridge);
       this.sendMessage({ type: "terminal-ready", browserId, sessionName });
+      await this.syncSessions();
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       console.error(`[agent] Failed to attach terminal for browser ${browserId}:`, message);
@@ -398,6 +409,7 @@ var AgentConnection = class {
     if (bridge) {
       bridge.dispose();
       this.bridges.delete(browserId);
+      void this.syncSessions();
     }
   }
   handleTerminalInput(browserId, data) {
@@ -412,24 +424,30 @@ var AgentConnection = class {
       bridge.resize(cols, rows);
     }
   }
-  async handleSessionCreate(name) {
+  async handleSessionCreate(requestId, name) {
     try {
       await this.tmux.createSession(name);
-      await this.syncSessions();
+      const sessions = await this.syncSessions();
+      const session = sessions.find((item) => item.name === name);
+      if (!session) {
+        throw new Error("Created session was not returned by tmux");
+      }
+      this.sendMessage({ type: "command-result", requestId, ok: true, session });
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       console.error(`[agent] Failed to create session "${name}":`, message);
-      this.sendMessage({ type: "error", message: `Failed to create session: ${message}` });
+      this.sendMessage({ type: "command-result", requestId, ok: false, error: message });
     }
   }
-  async handleSessionKill(name) {
+  async handleSessionKill(requestId, name) {
     try {
       await this.tmux.killSession(name);
       await this.syncSessions();
+      this.sendMessage({ type: "command-result", requestId, ok: true });
     } catch (err) {
       const message = err instanceof Error ? err.message : String(err);
       console.error(`[agent] Failed to kill session "${name}":`, message);
-      this.sendMessage({ type: "error", message: `Failed to kill session: ${message}` });
+      this.sendMessage({ type: "command-result", requestId, ok: false, error: message });
     }
   }
   sendMessage(msg) {
@@ -443,12 +461,24 @@ var AgentConnection = class {
       this.sendMessage({ type: "heartbeat" });
     }, HEARTBEAT_INTERVAL_MS);
   }
+  startSessionSync() {
+    this.stopSessionSync();
+    this.sessionSyncTimer = setInterval(() => {
+      void this.syncSessions();
+    }, SESSION_SYNC_INTERVAL_MS);
+  }
   stopHeartbeat() {
     if (this.heartbeatTimer) {
       clearInterval(this.heartbeatTimer);
       this.heartbeatTimer = null;
     }
   }
+  stopSessionSync() {
+    if (this.sessionSyncTimer) {
+      clearInterval(this.sessionSyncTimer);
+      this.sessionSyncTimer = null;
+    }
+  }
   disposeAllBridges() {
     for (const [browserId, bridge] of this.bridges) {
       bridge.dispose();
@@ -457,6 +487,7 @@ var AgentConnection = class {
   }
   onDisconnect() {
     this.stopHeartbeat();
+    this.stopSessionSync();
     this.disposeAllBridges();
     this.ws = null;
     if (this.stopped) {
@@ -477,6 +508,7 @@ function buildWsUrl(serverUrl) {
 }
 
 // src/cli.ts
+var SERVICE_NAME = "webmux-agent";
 var program = new Command();
 program.name("webmux-agent").description("Webmux agent \u2014 connects your machine to the webmux server").version("0.0.0");
 program.command("register").description("Register this agent with a webmux server").requiredOption("--server <url>", "Server URL (e.g. https://webmux.example.com)").requiredOption("--token <token>", "One-time registration token from the server").option("--name <name>", "Display name for this agent (defaults to hostname)").action(async (opts) => {
@@ -521,13 +553,16 @@ program.command("register").description("Register this agent with a webmux serve
   console.log(`[agent] Registration successful!`);
   console.log(`[agent] Agent ID: ${result.agentId}`);
   console.log(`[agent] Credentials saved to ${credentialsPath()}`);
-  console.log(`[agent] Run "webmux-agent start" to connect.`);
+  console.log(``);
+  console.log(`Next steps:`);
+  console.log(`  npx @webmux/agent start              # run once`);
+  console.log(`  npx @webmux/agent service install     # install as systemd service`);
 });
 program.command("start").description("Start the agent and connect to the server").action(() => {
   const creds = loadCredentials();
   if (!creds) {
     console.error(
-      `[agent] No credentials found at ${credentialsPath()}. Run "webmux-agent register" first.`
+      `[agent] No credentials found at ${credentialsPath()}. Run "npx @webmux/agent register" first.`
     );
     process.exit(1);
   }
@@ -536,7 +571,7 @@ program.command("start").description("Start the agent and connect to the server"
   console.log(`[agent] Agent ID: ${creds.agentId}`);
   const tmux = new TmuxClient({
     socketName: "webmux",
-    workspaceRoot: process.cwd()
+    workspaceRoot: os2.homedir()
   });
   const connection = new AgentConnection(
     creds.serverUrl,
@@ -563,5 +598,97 @@ program.command("status").description("Show agent status and credentials info").
   console.log(`Server URL:       ${creds.serverUrl}`);
   console.log(`Agent ID:         ${creds.agentId}`);
   console.log(`Credentials File: ${credentialsPath()}`);
+  try {
+    const result = execSync(`systemctl --user is-active ${SERVICE_NAME} 2>/dev/null`, { encoding: "utf-8" }).trim();
+    console.log(`Service:          ${result}`);
+  } catch {
+    console.log(`Service:          not installed`);
+  }
 });
+var service = program.command("service").description("Manage the systemd service");
+service.command("install").description("Install and start the agent as a systemd user service").action(() => {
+  const creds = loadCredentials();
+  if (!creds) {
+    console.error(`[agent] Not registered. Run "npx @webmux/agent register" first.`);
+    process.exit(1);
+  }
+  const npxPath = findBinary("npx");
+  if (!npxPath) {
+    console.error(`[agent] Cannot find npx. Make sure Node.js is installed.`);
+    process.exit(1);
+  }
+  const serviceDir = path2.join(os2.homedir(), ".config", "systemd", "user");
+  const servicePath = path2.join(serviceDir, `${SERVICE_NAME}.service`);
+  const unit = `[Unit]
+Description=Webmux Agent (${creds.name})
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=simple
+ExecStart=${npxPath} -y @webmux/agent start
+Restart=always
+RestartSec=5
+Environment=HOME=${os2.homedir()}
+Environment=PATH=${process.env.PATH}
+WorkingDirectory=${os2.homedir()}
+
+[Install]
+WantedBy=default.target
+`;
+  fs2.mkdirSync(serviceDir, { recursive: true });
+  fs2.writeFileSync(servicePath, unit);
+  console.log(`[agent] Service file created: ${servicePath}`);
+  try {
+    execSync("systemctl --user daemon-reload", { stdio: "inherit" });
+    execSync(`systemctl --user enable ${SERVICE_NAME}`, { stdio: "inherit" });
+    execSync(`systemctl --user start ${SERVICE_NAME}`, { stdio: "inherit" });
+    execSync(`loginctl enable-linger ${os2.userInfo().username}`, { stdio: "inherit" });
+    console.log(``);
+    console.log(`[agent] Service installed and started!`);
+    console.log(`[agent] It will auto-start on boot.`);
+    console.log(``);
+    console.log(`Useful commands:`);
+    console.log(`  systemctl --user status ${SERVICE_NAME}`);
+    console.log(`  journalctl --user -u ${SERVICE_NAME} -f`);
+    console.log(`  npx @webmux/agent service uninstall`);
+  } catch (err) {
+    const message = err instanceof Error ? err.message : String(err);
+    console.error(`[agent] Failed to enable service: ${message}`);
+    console.error(`[agent] Service file was written to ${servicePath}`);
+    console.error(`[agent] You can try manually: systemctl --user enable --now ${SERVICE_NAME}`);
+    process.exit(1);
+  }
+});
+service.command("uninstall").description("Stop and remove the systemd user service").action(() => {
+  const servicePath = path2.join(os2.homedir(), ".config", "systemd", "user", `${SERVICE_NAME}.service`);
+  try {
+    execSync(`systemctl --user stop ${SERVICE_NAME} 2>/dev/null`, { stdio: "inherit" });
+    execSync(`systemctl --user disable ${SERVICE_NAME} 2>/dev/null`, { stdio: "inherit" });
+  } catch {
+  }
+  if (fs2.existsSync(servicePath)) {
+    fs2.unlinkSync(servicePath);
+    console.log(`[agent] Service file removed: ${servicePath}`);
+  }
+  try {
+    execSync("systemctl --user daemon-reload", { stdio: "inherit" });
+  } catch {
+  }
+  console.log(`[agent] Service uninstalled.`);
+});
+service.command("status").description("Show systemd service status").action(() => {
+  try {
+    execSync(`systemctl --user status ${SERVICE_NAME}`, { stdio: "inherit" });
+  } catch {
+    console.log(`[agent] Service is not installed or not running.`);
+  }
+});
+function findBinary(name) {
+  try {
+    return execSync(`which ${name} 2>/dev/null`, { encoding: "utf-8" }).trim();
+  } catch {
+    return null;
+  }
+}
 program.parse();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webmux/agent",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "bin": {
     "webmux-agent": "./dist/cli.js"