@anusornneal/chat-relay 0.6.0 → 0.7.0

package/cli/config.mjs

@@ -1,113 +1,114 @@
-import fs from "node:fs";
-import os from "node:os";
-import path from "node:path";
-
-export function configDir() {
-  if (process.env.CHAT_RELAY_HOME) return path.resolve(process.env.CHAT_RELAY_HOME);
-  if (process.platform === "win32") {
-    const base = process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
-    return path.join(base, "chat-relay");
-  }
-  const base = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
-  return path.join(base, "chat-relay");
-}
-
-export function configPath() {
-  return path.join(configDir(), "config.json");
-}
-
-export function identityPath() {
-  return path.join(configDir(), "identity.json");
-}
-
-export function loadIdentity() {
-  const file = identityPath();
-  if (!fs.existsSync(file)) return null;
-  try {
-    return JSON.parse(fs.readFileSync(file, "utf8"));
-  } catch {
-    return null;
-  }
-}
-
-export function saveIdentity(identity) {
-  const dir = configDir();
-  fs.mkdirSync(dir, { recursive: true });
-  const file = identityPath();
-  fs.writeFileSync(file, JSON.stringify(identity, null, 2) + os.EOL, {
-    encoding: "utf8",
-    mode: 0o600,
-  });
-  try { fs.chmodSync(file, 0o600); } catch {}
-  return file;
-}
-
-function parseEnvFile(file) {
-  const result = {};
-  for (const raw of fs.readFileSync(file, "utf8").split(/\r?\n/)) {
-    const line = raw.trim();
-    if (!line || line.startsWith("#") || !line.includes("=")) continue;
-    const index = line.indexOf("=");
-    result[line.slice(0, index)] = line.slice(index + 1);
-  }
-  return result;
-}
-
-function migrateLegacyConfig() {
-  const legacyPath = path.resolve(".dev.vars");
-  if (!fs.existsSync(legacyPath)) return null;
-  const legacy = parseEnvFile(legacyPath);
-  if (!legacy.RELAY_URL || !legacy.CALLER_TOKEN || !legacy.AGENT_TOKEN) return null;
-
-  const config = {
-    relayUrl: legacy.RELAY_URL.replace(/\/$/, ""),
-    user: { id: "owner", name: "Owner", login: null },
-    userToken: legacy.CALLER_TOKEN,
-    agentId: legacy.AGENT_ID || "default",
-    agentName: legacy.AGENT_NAME || "Primary PC",
-    agentToken: legacy.AGENT_TOKEN,
-    allowedRoots: legacy.ALLOWED_ROOTS || defaultAllowedRoot(),
-    terminalEnabled: legacy.TERMINAL_ENABLED !== "0",
-    migratedAt: new Date().toISOString(),
-  };
-  saveConfig(config);
-  saveIdentity({
-    agentId: config.agentId,
-    createdAt: new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-  });
-  return config;
-}
-
-export function loadConfig() {
-  const file = configPath();
-  if (!fs.existsSync(file)) return migrateLegacyConfig();
-  try {
-    return JSON.parse(fs.readFileSync(file, "utf8"));
-  } catch {
-    throw new Error(`Invalid Chat Relay config: ${file}`);
-  }
-}
-
-export function saveConfig(config) {
-  const dir = configDir();
-  fs.mkdirSync(dir, { recursive: true });
-  const file = configPath();
-  fs.writeFileSync(file, JSON.stringify(config, null, 2) + os.EOL, {
-    encoding: "utf8",
-    mode: 0o600,
-  });
-  try { fs.chmodSync(file, 0o600); } catch {}
-  return file;
-}
-
-export function clearConfig() {
-  const file = configPath();
-  if (fs.existsSync(file)) fs.rmSync(file, { force: true });
-}
-
-export function defaultAllowedRoot() {
-  const projects = path.join(os.homedir(), "Projects");
-  if (fs.existsSync(projects)) return projects;
-  return os.homedir();
-}
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+export function configDir() {
+  if (process.env.CHAT_RELAY_HOME) return path.resolve(process.env.CHAT_RELAY_HOME);
+  if (process.platform === "win32") {
+    const base = process.env.LOCALAPPDATA || path.join(os.homedir(), "AppData", "Local");
+    return path.join(base, "chat-relay");
+  }
+  const base = process.env.XDG_CONFIG_HOME || path.join(os.homedir(), ".config");
+  return path.join(base, "chat-relay");
+}
+
+export function configPath() {
+  return path.join(configDir(), "config.json");
+}
+
+export function identityPath() {
+  return path.join(configDir(), "identity.json");
+}
+
+export function loadIdentity() {
+  const file = identityPath();
+  if (!fs.existsSync(file)) return null;
+  try {
+    return JSON.parse(fs.readFileSync(file, "utf8"));
+  } catch {
+    return null;
+  }
+}
+
+export function saveIdentity(identity) {
+  const dir = configDir();
+  fs.mkdirSync(dir, { recursive: true });
+  const file = identityPath();
+  fs.writeFileSync(file, JSON.stringify(identity, null, 2) + os.EOL, {
+    encoding: "utf8",
+    mode: 0o600,
+  });
+  try { fs.chmodSync(file, 0o600); } catch {}
+  return file;
+}
+
+function parseEnvFile(file) {
+  const result = {};
+  for (const raw of fs.readFileSync(file, "utf8").split(/\r?\n/)) {
+    const line = raw.trim();
+    if (!line || line.startsWith("#") || !line.includes("=")) continue;
+    const index = line.indexOf("=");
+    result[line.slice(0, index)] = line.slice(index + 1);
+  }
+  return result;
+}
+
+function migrateLegacyConfig() {
+  const legacyPath = path.resolve(".dev.vars");
+  if (!fs.existsSync(legacyPath)) return null;
+  const legacy = parseEnvFile(legacyPath);
+  if (!legacy.RELAY_URL || !legacy.CALLER_TOKEN || !legacy.AGENT_TOKEN) return null;
+
+  const config = {
+    relayUrl: legacy.RELAY_URL.replace(/\/$/, ""),
+    user: { id: "owner", name: "Owner", login: null },
+    userToken: legacy.CALLER_TOKEN,
+    agentId: legacy.AGENT_ID || "default",
+    agentName: legacy.AGENT_NAME || "Primary PC",
+    agentToken: legacy.AGENT_TOKEN,
+    allowedRoots: legacy.ALLOWED_ROOTS || defaultAllowedRoot(),
+    terminalEnabled: legacy.TERMINAL_ENABLED !== "0",
+    desktopEnabled: legacy.DESKTOP_ENABLED === "1",
+    migratedAt: new Date().toISOString(),
+  };
+  saveConfig(config);
+  saveIdentity({
+    agentId: config.agentId,
+    createdAt: new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+  });
+  return config;
+}
+
+export function loadConfig() {
+  const file = configPath();
+  if (!fs.existsSync(file)) return migrateLegacyConfig();
+  try {
+    return JSON.parse(fs.readFileSync(file, "utf8"));
+  } catch {
+    throw new Error(`Invalid Chat Relay config: ${file}`);
+  }
+}
+
+export function saveConfig(config) {
+  const dir = configDir();
+  fs.mkdirSync(dir, { recursive: true });
+  const file = configPath();
+  fs.writeFileSync(file, JSON.stringify(config, null, 2) + os.EOL, {
+    encoding: "utf8",
+    mode: 0o600,
+  });
+  try { fs.chmodSync(file, 0o600); } catch {}
+  return file;
+}
+
+export function clearConfig() {
+  const file = configPath();
+  if (fs.existsSync(file)) fs.rmSync(file, { force: true });
+}
+
+export function defaultAllowedRoot() {
+  const projects = path.join(os.homedir(), "Projects");
+  if (fs.existsSync(projects)) return projects;
+  return os.homedir();
+}

package/cli/device-login.mjs

@@ -1,168 +1,170 @@
-import { spawn } from "node:child_process";
-import { randomBytes } from "node:crypto";
-import os from "node:os";
-import {
-  defaultAllowedRoot,
-  loadConfig,
-  loadIdentity,
-  saveConfig,
-  saveIdentity,
-} from "./config.mjs";
-
-const DEFAULT_RELAY_URL = "https://chat-relay.anusorn-hank.workers.dev";
-
-function sanitizeAgentId(value) {
-  const normalized = value.toLowerCase().trim()
-    .replace(/[^a-z0-9_-]+/g, "-")
-    .replace(/^-+|-+$/g, "")
-    .slice(0, 54) || "machine";
-  return normalized;
-}
-
-function createAgentId(hostname) {
-  return `${sanitizeAgentId(hostname)}-${randomBytes(4).toString("hex")}`;
-}
-
-async function requestJson(url, options = {}, timeoutMs = 10_000) {
-  const controller = new AbortController();
-  const timer = setTimeout(() => controller.abort(), timeoutMs);
-  try {
-    const response = await fetch(url, {
-      ...options,
-      signal: controller.signal,
-      headers: {
-        accept: "application/json",
-        ...(options.body ? { "content-type": "application/json" } : {}),
-        ...(options.headers || {}),
-      },
-    });
-    const text = await response.text();
-    let data;
-    try { data = text ? JSON.parse(text) : {}; }
-    catch { data = { raw: text }; }
-    return { response, data };
-  } finally {
-    clearTimeout(timer);
-  }
-}
-
-function openBrowser(url) {
-  if (process.env.CHAT_RELAY_NO_BROWSER === "1") return false;
-  try {
-    if (process.platform === "win32") {
-      const child = spawn("cmd.exe", ["/c", "start", "", url], {
-        detached: true,
-        stdio: "ignore",
-        windowsHide: true,
-      });
-      child.unref();
-      return true;
-    }
-    if (process.platform === "darwin") {
-      const child = spawn("open", [url], { detached: true, stdio: "ignore" });
-      child.unref();
-      return true;
-    }
-    const child = spawn("xdg-open", [url], { detached: true, stdio: "ignore" });
-    child.unref();
-    return true;
-  } catch {
-    return false;
-  }
-}
-
-export async function login(options = {}) {
-  const existing = loadConfig() || {};
-  const relayUrl = String(options.relayUrl || existing.relayUrl || DEFAULT_RELAY_URL).replace(/\/$/, "");
-  const hostname = os.hostname();
-  const identity = loadIdentity() || {};
-  const requestedAgentId = options.agentId ||
-    existing.agentId ||
-    identity.agentId ||
-    createAgentId(hostname);
-  const agentName = options.agentName || existing.agentName || hostname;
-  const allowedRoots = options.allowedRoot || existing.allowedRoots || defaultAllowedRoot();
-
-  saveIdentity({
-    agentId: requestedAgentId,
-    createdAt: identity.createdAt || new Date().toISOString(),
-    updatedAt: new Date().toISOString(),
-  });
-
-  const { response, data } = await requestJson(`${relayUrl}/auth/device/start`, {
-    method: "POST",
-    body: JSON.stringify({ agentId: requestedAgentId, agentName }),
-  });
-  if (!response.ok) {
-    throw new Error(`Unable to start device login: ${data.error || response.status}`);
-  }
-
-  console.log("");
-  console.log("Chat Relay sign in");
-  console.log("------------------");
-  console.log(`Code: ${data.userCode}`);
-  console.log(`Open: ${data.verificationUriComplete}`);
-  console.log("");
-
-  const opened = options.noOpen ? false : openBrowser(data.verificationUriComplete);
-  console.log(opened ? "Browser opened. Waiting for authorization..." : "Open the URL above to continue.");
-
-  const deadline = Date.now() + Number(data.expiresIn || 600) * 1000;
-  const intervalMs = Math.max(Number(data.interval || 2), 1) * 1000;
-
-  while (Date.now() < deadline) {
-    await new Promise((resolve) => setTimeout(resolve, intervalMs));
-    const tokenResult = await requestJson(`${relayUrl}/auth/device/token`, {
-      method: "POST",
-      body: JSON.stringify({ deviceCode: data.deviceCode }),
-    });
-
-    if (tokenResult.response.status === 428 && tokenResult.data.error === "authorization_pending") {
-      continue;
-    }
-    if (!tokenResult.response.ok) {
-      throw new Error(`Device login failed: ${tokenResult.data.error || tokenResult.response.status}`);
-    }
-
-    const result = tokenResult.data;
-
-    if (existing.userToken && existing.relayUrl) {
-      const revoke = await requestJson(`${String(existing.relayUrl).replace(/\/$/, "")}/auth/session/revoke`, {
-        method: "POST",
-        headers: { authorization: `Bearer ${existing.userToken}` },
-      }).catch(() => null);
-      if (revoke && !revoke.response.ok && revoke.response.status !== 401) {
-        console.warn("Warning: previous Chat Relay session could not be revoked.");
-      }
-    }
-
-    saveIdentity({
-      agentId: result.agent.id,
-      createdAt: identity.createdAt || new Date().toISOString(),
-      updatedAt: new Date().toISOString(),
-    });
-
-    const config = {
-      relayUrl,
-      user: result.user,
-      userToken: result.userToken,
-      userTokenExpiresAt: result.userTokenExpiresAt,
-      agentId: result.agent.id,
-      agentName: result.agent.name,
-      agentToken: result.agentToken,
-      allowedRoots,
-      terminalEnabled: true,
-      loggedInAt: new Date().toISOString(),
-    };
-    const file = saveConfig(config);
-
-    console.log(`Signed in as ${result.user.name}.`);
-    console.log(`Registered ${result.agent.name} (${result.agent.id}).`);
-    console.log(`Saved credentials to ${file}`);
-    return config;
-  }
-
-  throw new Error("Device login expired. Run the login command again.");
-}
-
-export { DEFAULT_RELAY_URL, requestJson };
+import { spawn } from "node:child_process";
+import { randomBytes } from "node:crypto";
+import os from "node:os";
+import {
+  defaultAllowedRoot,
+  loadConfig,
+  loadIdentity,
+  saveConfig,
+  saveIdentity,
+} from "./config.mjs";
+
+const DEFAULT_RELAY_URL = "https://chat-relay.anusorn-hank.workers.dev";
+
+function sanitizeAgentId(value) {
+  const normalized = value.toLowerCase().trim()
+    .replace(/[^a-z0-9_-]+/g, "-")
+    .replace(/^-+|-+$/g, "")
+    .slice(0, 54) || "machine";
+  return normalized;
+}
+
+function createAgentId(hostname) {
+  return `${sanitizeAgentId(hostname)}-${randomBytes(4).toString("hex")}`;
+}
+
+async function requestJson(url, options = {}, timeoutMs = 10_000) {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  try {
+    const response = await fetch(url, {
+      ...options,
+      signal: controller.signal,
+      headers: {
+        accept: "application/json",
+        ...(options.body ? { "content-type": "application/json" } : {}),
+        ...(options.headers || {}),
+      },
+    });
+    const text = await response.text();
+    let data;
+    try { data = text ? JSON.parse(text) : {}; }
+    catch { data = { raw: text }; }
+    return { response, data };
+  } finally {
+    clearTimeout(timer);
+  }
+}
+
+function openBrowser(url) {
+  if (process.env.CHAT_RELAY_NO_BROWSER === "1") return false;
+  try {
+    if (process.platform === "win32") {
+      const child = spawn("cmd.exe", ["/c", "start", "", url], {
+        detached: true,
+        stdio: "ignore",
+        windowsHide: true,
+      });
+      child.unref();
+      return true;
+    }
+    if (process.platform === "darwin") {
+      const child = spawn("open", [url], { detached: true, stdio: "ignore" });
+      child.unref();
+      return true;
+    }
+    const child = spawn("xdg-open", [url], { detached: true, stdio: "ignore" });
+    child.unref();
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+export async function login(options = {}) {
+  const existing = loadConfig() || {};
+  const relayUrl = String(options.relayUrl || existing.relayUrl || DEFAULT_RELAY_URL).replace(/\/$/, "");
+  const hostname = os.hostname();
+  const identity = loadIdentity() || {};
+  const requestedAgentId = options.agentId ||
+    existing.agentId ||
+    identity.agentId ||
+    createAgentId(hostname);
+  const agentName = options.agentName || existing.agentName || hostname;
+  const allowedRoots = options.allowedRoot || existing.allowedRoots || defaultAllowedRoot();
+  const desktopEnabled = options.desktopEnabled ?? existing.desktopEnabled ?? false;
+
+  saveIdentity({
+    agentId: requestedAgentId,
+    createdAt: identity.createdAt || new Date().toISOString(),
+    updatedAt: new Date().toISOString(),
+  });
+
+  const { response, data } = await requestJson(`${relayUrl}/auth/device/start`, {
+    method: "POST",
+    body: JSON.stringify({ agentId: requestedAgentId, agentName }),
+  });
+  if (!response.ok) {
+    throw new Error(`Unable to start device login: ${data.error || response.status}`);
+  }
+
+  console.log("");
+  console.log("Chat Relay sign in");
+  console.log("------------------");
+  console.log(`Code: ${data.userCode}`);
+  console.log(`Open: ${data.verificationUriComplete}`);
+  console.log("");
+
+  const opened = options.noOpen ? false : openBrowser(data.verificationUriComplete);
+  console.log(opened ? "Browser opened. Waiting for authorization..." : "Open the URL above to continue.");
+
+  const deadline = Date.now() + Number(data.expiresIn || 600) * 1000;
+  const intervalMs = Math.max(Number(data.interval || 2), 1) * 1000;
+
+  while (Date.now() < deadline) {
+    await new Promise((resolve) => setTimeout(resolve, intervalMs));
+    const tokenResult = await requestJson(`${relayUrl}/auth/device/token`, {
+      method: "POST",
+      body: JSON.stringify({ deviceCode: data.deviceCode }),
+    });
+
+    if (tokenResult.response.status === 428 && tokenResult.data.error === "authorization_pending") {
+      continue;
+    }
+    if (!tokenResult.response.ok) {
+      throw new Error(`Device login failed: ${tokenResult.data.error || tokenResult.response.status}`);
+    }
+
+    const result = tokenResult.data;
+
+    if (existing.userToken && existing.relayUrl) {
+      const revoke = await requestJson(`${String(existing.relayUrl).replace(/\/$/, "")}/auth/session/revoke`, {
+        method: "POST",
+        headers: { authorization: `Bearer ${existing.userToken}` },
+      }).catch(() => null);
+      if (revoke && !revoke.response.ok && revoke.response.status !== 401) {
+        console.warn("Warning: previous Chat Relay session could not be revoked.");
+      }
+    }
+
+    saveIdentity({
+      agentId: result.agent.id,
+      createdAt: identity.createdAt || new Date().toISOString(),
+      updatedAt: new Date().toISOString(),
+    });
+
+    const config = {
+      relayUrl,
+      user: result.user,
+      userToken: result.userToken,
+      userTokenExpiresAt: result.userTokenExpiresAt,
+      agentId: result.agent.id,
+      agentName: result.agent.name,
+      agentToken: result.agentToken,
+      allowedRoots,
+      terminalEnabled: true,
+      desktopEnabled: Boolean(desktopEnabled),
+      loggedInAt: new Date().toISOString(),
+    };
+    const file = saveConfig(config);
+
+    console.log(`Signed in as ${result.user.name}.`);
+    console.log(`Registered ${result.agent.name} (${result.agent.id}).`);
+    console.log(`Saved credentials to ${file}`);
+    return config;
+  }
+
+  throw new Error("Device login expired. Run the login command again.");
+}
+
+export { DEFAULT_RELAY_URL, requestJson };