echoclaw-relay-agent 0.2.0 → 0.2.1

package/dist/main.js

@@ -62,7 +62,7 @@ async function computeSharedSecret(myPrivateKey, theirPublicKeyRaw) {
 var subtle2 = globalThis.crypto.subtle;
 var PROTOCOL_SALT = new TextEncoder().encode("echoclaw-relay-v1");
 var INFO_PREFIX = "echoclaw-e2e-";
-async function deriveSessionKey(sharedSecret, pairingCode2) {
+async function deriveSessionKey(sharedSecret, pairingCode2, extractable = false) {
   const hkdfKey = await subtle2.importKey(
     "raw",
     sharedSecret,
@@ -82,8 +82,7 @@ async function deriveSessionKey(sharedSecret, pairingCode2) {
     },
     hkdfKey,
     { name: "AES-GCM", length: 256 },
-    false,
-    // non-extractable
+    extractable,
     ["encrypt", "decrypt"]
   );
 }
@@ -113,10 +112,6 @@ async function decrypt(key, iv, ciphertext) {
 }
 
 // ../../packages/crypto/src/index.ts
-async function completeHandshake(myPrivateKey, theirPublicKey, pairingCode2) {
-  const shared = await computeSharedSecret(myPrivateKey, theirPublicKey);
-  return deriveSessionKey(shared, pairingCode2);
-}
 function toBase64(bytes) {
   let binary = "";
   for (let i = 0; i < bytes.length; i++) {
@@ -206,7 +201,6 @@ async function forwardToBridge(bridgeUrl, request) {
 // src/service/session.ts
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var import_crypto = require("crypto");
 var CONFIG_DIR = import_path.default.join(
   process.env.HOME || process.env.USERPROFILE || ".",
   ".echoclaw-relay"
@@ -217,13 +211,13 @@ function ensureDir() {
     import_fs.default.mkdirSync(CONFIG_DIR, { recursive: true, mode: 448 });
   }
 }
-async function saveSession(sessionId2, sessionKey2, relayUrl, bridgeUrl, pairingCode2) {
+async function saveSession(sessionId2, sharedSecret, relayUrl, bridgeUrl, pairingCode2) {
   ensureDir();
-  const rawKey = await import_crypto.webcrypto.subtle.exportKey("raw", sessionKey2);
-  const keyBase64 = Buffer.from(rawKey).toString("base64");
   const data = {
     sessionId: sessionId2,
-    sessionKeyBase64: keyBase64,
+    sessionKeyBase64: "",
+    // unused, kept for backwards compat
+    sharedSecretBase64: Buffer.from(sharedSecret).toString("base64"),
     relayUrl,
     bridgeUrl,
     pairingCode: pairingCode2,
@@ -240,15 +234,9 @@ async function loadSession() {
   try {
     const raw = import_fs.default.readFileSync(SESSION_FILE, "utf-8");
     const data = JSON.parse(raw);
-    if (!data.sessionId || !data.sessionKeyBase64) return null;
-    const keyBytes = Buffer.from(data.sessionKeyBase64, "base64");
-    const sessionKey2 = await import_crypto.webcrypto.subtle.importKey(
-      "raw",
-      keyBytes,
-      "AES-GCM",
-      true,
-      ["encrypt", "decrypt"]
-    );
+    if (!data.sessionId || !data.sharedSecretBase64) return null;
+    const sharedSecret = new Uint8Array(Buffer.from(data.sharedSecretBase64, "base64"));
+    const sessionKey2 = await deriveSessionKey(sharedSecret, data.pairingCode);
     console.log(`[session] Loaded saved session (ID: ${data.sessionId})`);
     return {
       sessionId: data.sessionId,
@@ -338,12 +326,10 @@ function connect() {
   reconnect.setState("connecting");
   const resumeId = sessionId || config.sessionId;
   const url = resumeId ? `${config.relayUrl}${config.relayUrl.includes("?") ? "&" : "?"}resume=${resumeId}` : config.relayUrl;
-  console.log(`[relay-agent] Connecting to ${url}...`);
   ws = new import_ws.default(url);
   ws.on("open", () => {
     reconnect.setState("connected");
     startHeartbeat();
-    console.log("[relay-agent] Connected to relay server");
     const registerMsg = {
       version: 1,
       session_id: sessionId ?? "",
@@ -371,7 +357,7 @@ function scheduleReconnect() {
   if (_stopped) return;
   reconnect.setState("disconnected");
   const delay = reconnect.nextDelay();
-  console.log(`[relay-agent] Reconnecting in ${delay}ms (attempt ${reconnect.attempt})...`);
+  console.log(`[relay-agent] Reconnecting in ${Math.round(delay / 1e3)}s (attempt ${reconnect.attempt})`);
   setTimeout(connect, delay);
 }
 async function handleMessage(raw) {
@@ -405,22 +391,22 @@ async function handleHello(msg) {
     if (msg.payload) {
       pairingCode = msg.payload;
       console.log("");
-      console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
-      console.log(`  \u2551  Pairing Code:  ${pairingCode.padEnd(24)}\u2551`);
-      console.log("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
+      console.log("  \u2554\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2557");
+      console.log("  \u2551                                              \u2551");
+      console.log(`  \u2551   Pairing Code:  ${pairingCode.padEnd(28)}\u2551`);
+      console.log("  \u2551                                              \u2551");
+      console.log("  \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u2550\u255D");
       console.log("");
-      console.log("  Enter this code in your EchoClaw desktop client to connect.");
+      console.log("  Enter this code in your EchoClaw desktop app.");
+      console.log("  Waiting for desktop to connect...");
       console.log("");
     }
   }
   if (msg.pubkey && msg.sender_role === "desktop") {
     console.log("[relay-agent] Received desktop public key, completing handshake...");
     const theirPubKey = fromBase64(msg.pubkey);
-    sessionKey = await completeHandshake(
-      keyPair.privateKey,
-      theirPubKey,
-      pairingCode ?? void 0
-    );
+    const sharedSecret = await computeSharedSecret(keyPair.privateKey, theirPubKey);
+    sessionKey = await deriveSessionKey(sharedSecret, pairingCode ?? void 0);
     sendRaw({
       version: 1,
       session_id: sessionId,
@@ -435,7 +421,7 @@ async function handleHello(msg) {
     try {
       await saveSession(
         sessionId,
-        sessionKey,
+        sharedSecret,
         config.relayUrl,
         config.bridgeUrl,
         pairingCode ?? void 0
@@ -504,29 +490,31 @@ var import_path2 = __toESM(require("path"));
 var import_child_process = require("child_process");
 var SERVICE_NAME = "me.echoclaw.relay-agent";
 var LABEL = "EchoClaw Relay Agent";
-function resolveNodeBin() {
-  const scriptPath = process.argv[1];
-  try {
-    const globalBin = (0, import_child_process.execSync)("npm root -g", { encoding: "utf-8" }).trim();
-    const globalAgent = import_path2.default.join(import_path2.default.dirname(globalBin), "bin", "echoclaw-relay-agent");
-    if (import_fs2.default.existsSync(globalAgent)) {
-      return globalAgent;
-    }
-  } catch {
+function getInstallDir() {
+  return import_path2.default.join(getConfigDir(), "bin");
+}
+function freezeRuntime() {
+  const installDir = getInstallDir();
+  if (!import_fs2.default.existsSync(installDir)) {
+    import_fs2.default.mkdirSync(installDir, { recursive: true, mode: 493 });
   }
-  if (scriptPath && import_fs2.default.existsSync(scriptPath)) {
-    return scriptPath;
+  const sourceScript = process.argv[1];
+  const destScript = import_path2.default.join(installDir, "agent.js");
+  if (sourceScript && import_fs2.default.existsSync(sourceScript)) {
+    import_fs2.default.copyFileSync(sourceScript, destScript);
+    import_fs2.default.chmodSync(destScript, 493);
+  } else {
+    throw new Error("Cannot locate the running agent script to install.");
   }
-  throw new Error(
-    "Cannot determine the installed path of echoclaw-relay-agent.\nPlease install globally first:\n\n  npm install -g echoclaw-relay-agent\n\nThen run: echoclaw-relay-agent --install"
-  );
-}
-function resolveNodePath() {
-  return process.execPath;
+  const nodePath = process.execPath;
+  const nodeInfoPath = import_path2.default.join(installDir, "node-path.txt");
+  import_fs2.default.writeFileSync(nodeInfoPath, nodePath, { mode: 420 });
+  console.log(`  Copied agent to: ${destScript}`);
+  console.log(`  Node runtime:    ${nodePath}`);
+  return { nodePath, agentScript: destScript };
 }
 function macosInstall() {
-  const agentBin = resolveNodeBin();
-  const nodePath = resolveNodePath();
+  const { nodePath, agentScript } = freezeRuntime();
   const logDir = getConfigDir();
   const plistDir = import_path2.default.join(process.env.HOME, "Library", "LaunchAgents");
   const plistPath = import_path2.default.join(plistDir, `${SERVICE_NAME}.plist`);
@@ -543,7 +531,7 @@ function macosInstall() {
   <key>ProgramArguments</key>
   <array>
     <string>${nodePath}</string>
-    <string>${agentBin}</string>
+    <string>${agentScript}</string>
   </array>
 
   <key>RunAtLoad</key>
@@ -574,7 +562,7 @@ function macosInstall() {
     (0, import_child_process.execSync)(`launchctl load "${plistPath}"`);
   } catch (err) {
     console.error(`[install] Failed to load LaunchAgent: ${err.message}`);
-    console.log(`[install] Plist written to ${plistPath} \u2014 you can load it manually:`);
+    console.log(`[install] Plist written to ${plistPath} \u2014 load manually:`);
     console.log(`  launchctl load "${plistPath}"`);
     return;
   }
@@ -603,6 +591,10 @@ function macosUninstall() {
   } catch {
   }
   import_fs2.default.unlinkSync(plistPath);
+  const installDir = getInstallDir();
+  if (import_fs2.default.existsSync(installDir)) {
+    import_fs2.default.rmSync(installDir, { recursive: true, force: true });
+  }
   console.log("");
   console.log("  \u2705 Uninstalled macOS LaunchAgent");
   console.log(`     Removed: ${plistPath}`);
@@ -631,8 +623,7 @@ function macosStatus() {
   }
 }
 function linuxInstall() {
-  const agentBin = resolveNodeBin();
-  const nodePath = resolveNodePath();
+  const { nodePath, agentScript } = freezeRuntime();
   const logDir = getConfigDir();
   const serviceDir = import_path2.default.join(
     process.env.HOME,
@@ -651,12 +642,13 @@ Wants=network-online.target
 
 [Service]
 Type=simple
-ExecStart=${nodePath} ${agentBin}
+ExecStart=${nodePath} ${agentScript}
 Restart=always
 RestartSec=10
 StandardOutput=append:${logDir}/stdout.log
 StandardError=append:${logDir}/stderr.log
 Environment=PATH=/usr/local/bin:/usr/bin:/bin
+Environment=HOME=${process.env.HOME}
 
 [Install]
 WantedBy=default.target
@@ -711,6 +703,10 @@ function linuxUninstall() {
     (0, import_child_process.execSync)("systemctl --user daemon-reload");
   } catch {
   }
+  const installDir = getInstallDir();
+  if (import_fs2.default.existsSync(installDir)) {
+    import_fs2.default.rmSync(installDir, { recursive: true, force: true });
+  }
   console.log("");
   console.log("  \u2705 Uninstalled systemd user service");
   console.log(`     Removed: ${servicePath}`);
@@ -741,8 +737,7 @@ function linuxStatus() {
   }
 }
 function windowsInstall() {
-  const agentBin = resolveNodeBin();
-  const nodePath = resolveNodePath();
+  const { nodePath, agentScript } = freezeRuntime();
   try {
     (0, import_child_process.execSync)(
       `schtasks /Delete /TN "${SERVICE_NAME}" /F 2>nul`,
@@ -752,7 +747,7 @@ function windowsInstall() {
   }
   try {
     (0, import_child_process.execSync)(
-      `schtasks /Create /TN "${SERVICE_NAME}" /TR "\\"${nodePath}\\" \\"${agentBin}\\"" /SC ONLOGON /RL HIGHEST /F`,
+      `schtasks /Create /TN "${SERVICE_NAME}" /TR "\\"${nodePath}\\" \\"${agentScript}\\"" /SC ONLOGON /RL HIGHEST /F`,
       { encoding: "utf-8" }
     );
     (0, import_child_process.execSync)(`schtasks /Run /TN "${SERVICE_NAME}"`, { encoding: "utf-8" });
@@ -772,12 +767,17 @@ function windowsInstall() {
 function windowsUninstall() {
   try {
     (0, import_child_process.execSync)(`schtasks /Delete /TN "${SERVICE_NAME}" /F`, { encoding: "utf-8" });
-    console.log("");
-    console.log("  \u2705 Uninstalled Windows Scheduled Task");
-    console.log("");
   } catch {
     console.log("[uninstall] No scheduled task found \u2014 nothing to remove.");
+    return;
   }
+  const installDir = getInstallDir();
+  if (import_fs2.default.existsSync(installDir)) {
+    import_fs2.default.rmSync(installDir, { recursive: true, force: true });
+  }
+  console.log("");
+  console.log("  \u2705 Uninstalled Windows Scheduled Task");
+  console.log("");
 }
 function windowsStatus() {
   try {
@@ -846,14 +846,70 @@ function serviceStatus() {
       break;
   }
 }
+function restartService() {
+  const platform = getPlatform();
+  switch (platform) {
+    case "macos": {
+      const plistPath = import_path2.default.join(
+        process.env.HOME,
+        "Library",
+        "LaunchAgents",
+        `${SERVICE_NAME}.plist`
+      );
+      try {
+        (0, import_child_process.execSync)(`launchctl unload "${plistPath}" 2>/dev/null || true`);
+        (0, import_child_process.execSync)(`launchctl load "${plistPath}"`);
+      } catch (err) {
+        console.error(`[restart] Failed: ${err.message}`);
+      }
+      break;
+    }
+    case "linux":
+      try {
+        (0, import_child_process.execSync)(`systemctl --user restart ${SERVICE_NAME}.service`);
+      } catch (err) {
+        console.error(`[restart] Failed: ${err.message}`);
+      }
+      break;
+    case "windows":
+      try {
+        (0, import_child_process.execSync)(`schtasks /End /TN "${SERVICE_NAME}" 2>nul`, { stdio: "pipe" });
+        (0, import_child_process.execSync)(`schtasks /Run /TN "${SERVICE_NAME}"`, { encoding: "utf-8" });
+      } catch (err) {
+        console.error(`[restart] Failed: ${err.message}`);
+      }
+      break;
+  }
+}
+function isServiceInstalled() {
+  const platform = getPlatform();
+  switch (platform) {
+    case "macos":
+      return import_fs2.default.existsSync(
+        import_path2.default.join(process.env.HOME, "Library", "LaunchAgents", `${SERVICE_NAME}.plist`)
+      );
+    case "linux":
+      return import_fs2.default.existsSync(
+        import_path2.default.join(process.env.HOME, ".config", "systemd", "user", `${SERVICE_NAME}.service`)
+      );
+    case "windows":
+      try {
+        (0, import_child_process.execSync)(`schtasks /Query /TN "${SERVICE_NAME}" 2>nul`, { stdio: "pipe" });
+        return true;
+      } catch {
+        return false;
+      }
+  }
+}
 
 // src/main.ts
-var VERSION = "0.2.0";
+var VERSION = "0.2.1";
 function parseArgs() {
   const args = process.argv.slice(2);
   const opts = {
     relayUrl: "wss://relay.echoclaw.me/agent/connect",
-    bridgeUrl: "http://localhost:8013"
+    bridgeUrl: ""
+    // auto-discover if not specified
   };
   for (let i = 0; i < args.length; i++) {
     const arg = args[i];
@@ -883,6 +939,9 @@ function parseArgs() {
       case "--status":
         opts.command = "status";
         break;
+      case "--restart":
+        opts.command = "restart";
+        break;
       case "--help":
       case "-h":
         printHelp();
@@ -916,9 +975,10 @@ function printHelp() {
                          (default: wss://relay.echoclaw.me/agent/connect)
 
     --bridge, -b <url>   Local OpenClaw bridge HTTP URL
-                         (default: http://localhost:8013)
+                         (default: auto-discover on port 18789, 8013)
 
     --install            Install as system service (auto-start on boot)
+    --restart            Restart the system service (repair connection)
     --uninstall          Remove system service and saved session
     --status             Show service and connection status
 
@@ -928,6 +988,7 @@ function printHelp() {
   EXAMPLES
     echoclaw-relay-agent --code ABC-1234              # Pair and connect
     echoclaw-relay-agent --code ABC-1234 --install    # Pair, connect, and install as service
+    echoclaw-relay-agent --restart                     # Restart service (repair)
     echoclaw-relay-agent --status                     # Check status
     echoclaw-relay-agent --uninstall                  # Remove service
 
@@ -936,6 +997,22 @@ function printHelp() {
     The relay server cannot read your messages \u2014 it only forwards ciphertext.
   `);
 }
+var BRIDGE_PORTS = [18789, 8013];
+async function discoverBridge() {
+  for (const port of BRIDGE_PORTS) {
+    const url = `http://localhost:${port}`;
+    try {
+      const res = await fetch(`${url}/health`, {
+        signal: AbortSignal.timeout(1500)
+      });
+      if (res.ok) {
+        return url;
+      }
+    } catch {
+    }
+  }
+  return null;
+}
 function handleInstall() {
   console.log("");
   console.log("  \u250C\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2510");
@@ -958,6 +1035,22 @@ function handleUninstall() {
   clearSession();
   console.log("  Session data cleared.");
 }
+function handleRestart() {
+  if (!hasSession()) {
+    console.error("  \u274C No saved session. Re-pair first:");
+    console.error("    echoclaw-relay-agent --code ABC-1234 --install");
+    process.exit(1);
+  }
+  if (!isServiceInstalled()) {
+    console.log("  Service not installed \u2014 installing now...");
+    installService();
+    return;
+  }
+  restartService();
+  console.log("");
+  console.log("  \u2705 Relay agent service restarted.");
+  console.log("");
+}
 function handleStatus() {
   console.log("");
   console.log(`  EchoClaw Relay Agent v${VERSION}`);
@@ -976,6 +1069,10 @@ async function main() {
     handleUninstall();
     return;
   }
+  if (opts.command === "restart") {
+    handleRestart();
+    return;
+  }
   if (opts.command === "status") {
     handleStatus();
     return;
@@ -989,25 +1086,36 @@ async function main() {
   console.log("  \u2502   Open Source \xB7 Apache License 2.0        \u2502");
   console.log("  \u2514\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2500\u2518");
   console.log("");
+  if (!opts.bridgeUrl) {
+    const discovered = await discoverBridge();
+    if (discovered) {
+      opts.bridgeUrl = discovered;
+      console.log(`  \u2705 Found OpenClaw bridge at ${discovered}`);
+    } else {
+      opts.bridgeUrl = `http://localhost:${BRIDGE_PORTS[0]}`;
+      console.warn(`  \u26A0\uFE0F  Cannot find OpenClaw bridge (tried ports ${BRIDGE_PORTS.join(", ")})`);
+      console.warn("     Will retry when messages arrive. Or specify: --bridge http://localhost:<port>");
+    }
+  } else {
+    try {
+      const healthRes = await fetch(`${opts.bridgeUrl}/health`, {
+        signal: AbortSignal.timeout(3e3)
+      });
+      if (healthRes.ok) {
+        console.log(`  \u2705 Bridge reachable at ${opts.bridgeUrl}`);
+      } else {
+        console.warn(`  \u26A0\uFE0F  Bridge returned HTTP ${healthRes.status} \u2014 starting anyway`);
+      }
+    } catch {
+      console.warn(`  \u26A0\uFE0F  Cannot reach ${opts.bridgeUrl} \u2014 will retry when messages arrive`);
+    }
+  }
   console.log(`  Relay:  ${opts.relayUrl}`);
   console.log(`  Bridge: ${opts.bridgeUrl}`);
   if (opts.code) {
     console.log(`  Code:   ${opts.code} (joining existing session)`);
   }
   console.log("");
-  try {
-    const healthRes = await fetch(`${opts.bridgeUrl}/health`, {
-      signal: AbortSignal.timeout(3e3)
-    });
-    if (healthRes.ok) {
-      console.log("  \u2705 Local bridge is reachable");
-    } else {
-      console.warn(`  \u26A0\uFE0F  Bridge returned HTTP ${healthRes.status} \u2014 starting anyway`);
-    }
-  } catch {
-    console.warn("  \u26A0\uFE0F  Cannot reach local bridge \u2014 will retry when messages arrive");
-  }
-  console.log("");
   let relayUrl = opts.relayUrl;
   if (opts.code) {
     const separator = relayUrl.includes("?") ? "&" : "?";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "echoclaw-relay-agent",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "EchoClaw Relay Agent — connects OpenClaw bridge to the EchoClaw Relay Server with E2E encryption",
   "main": "./dist/main.js",
   "bin": {