@holin-work/holin-cli 1.0.0 → 1.1.1

package/bin/holin-cli.js

@@ -1,33 +1,45 @@
 #!/usr/bin/env node
 /**
- * holin-cli — Accio cli-login authorization tool
+ * holin-cli — Accio cli-login authorization + local MCP proxy
  *
- * Usage (invoked by Accio platform):
- *   HOLIN_API_KEY=holin_xxx holin-cli auth login
- *
- * On success: writes credentials to ~/.config/holin-auth/credentials.json, exits 0
- * On failure: prints error to stderr, exits 1
+ * Usage:
+ *   HOLIN_API_KEY=holin_xxx holin-cli auth login   # authorize + auto-start proxy
+ *   holin-cli auth logout                          # clear credentials + stop proxy
+ *   holin-cli auth status                          # check auth status
+ *   holin-cli proxy start                          # start proxy in foreground
+ *   holin-cli proxy stop                           # stop background proxy
+ *   holin-cli proxy status                         # check proxy status
  */
 
-import { existsSync, mkdirSync, writeFileSync, readFileSync } from "fs";
+import { existsSync, mkdirSync, writeFileSync, readFileSync, unlinkSync, openSync, appendFileSync } from "fs";
 import { homedir } from "os";
 import { join } from "path";
+import http from "http";
+import https from "https";
+import { spawn } from "child_process";
 
 // ── Constants ────────────────────────────────────────────────────────────────
 
-const MCP_URL = "https://api.holin.work/icbu/mcp";
+const UPSTREAM_URL = "https://api.holin.work/icbu/mcp";
+const PROXY_HOST = "127.0.0.1";
+const PROXY_PORT = 18787;
 
-const CREDENTIALS_FILE = join(
+const CONFIG_DIR = join(
   process.env.XDG_CONFIG_HOME || join(homedir(), ".config"),
-  "holin-auth",
-  "credentials.json"
+  "holin-auth"
 );
+const CREDENTIALS_FILE = join(CONFIG_DIR, "credentials.json");
+const PID_FILE = join(CONFIG_DIR, "proxy.pid");
+const LOG_FILE = join(CONFIG_DIR, "proxy.log");
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
+function ensureConfigDir() {
+  if (!existsSync(CONFIG_DIR)) mkdirSync(CONFIG_DIR, { recursive: true });
+}
+
 function writeCredentials(data) {
-  const dir = join(CREDENTIALS_FILE, "..");
-  if (!existsSync(dir)) mkdirSync(dir, { recursive: true });
+  ensureConfigDir();
   writeFileSync(CREDENTIALS_FILE, JSON.stringify(data, null, 2), "utf-8");
 }
 
@@ -39,16 +51,49 @@ function readCredentials() {
   }
 }
 
+function writePidFile(pid) {
+  ensureConfigDir();
+  writeFileSync(PID_FILE, String(pid), "utf-8");
+}
+
+function readPidFile() {
+  try {
+    return parseInt(readFileSync(PID_FILE, "utf-8").trim(), 10);
+  } catch {
+    return null;
+  }
+}
+
+function isProxyRunning() {
+  const pid = readPidFile();
+  if (!pid) return false;
+  try {
+    process.kill(pid, 0); // signal 0 just checks if process exists
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function log(msg) {
+  const line = `[${new Date().toISOString()}] ${msg}\n`;
+  try {
+    ensureConfigDir();
+    appendFileSync(LOG_FILE, line);
+  } catch {
+    console.error(line.trim());
+  }
+}
+
 /**
  * Verify API key by calling holin_ping via MCP.
- * Returns parsed ping result or throws on failure.
  */
 async function pingVerify(apiKey) {
-  const res = await fetch(MCP_URL, {
+  const res = await fetch(UPSTREAM_URL, {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      "Accept": "application/json, text/event-stream",
+      Accept: "application/json, text/event-stream",
       "X-API-Key": apiKey,
     },
     body: JSON.stringify({
@@ -60,12 +105,9 @@ async function pingVerify(apiKey) {
     signal: AbortSignal.timeout(10000),
   });
 
-  if (!res.ok) {
-    throw new Error(`MCP server responded ${res.status}`);
-  }
+  if (!res.ok) throw new Error(`MCP server responded ${res.status}`);
 
   const raw = await res.text();
-  // Parse SSE: find "data: {...}" line
   for (const line of raw.split("\n")) {
     const trimmed = line.trim();
     if (trimmed.startsWith("data:")) {
@@ -77,6 +119,95 @@ async function pingVerify(apiKey) {
   throw new Error("Unexpected response format from MCP server");
 }
 
+// ── Proxy Server ─────────────────────────────────────────────────────────────
+
+function createProxyServer() {
+  const server = http.createServer((req, res) => {
+    // Health check endpoint
+    if (req.method === "GET" && req.url === "/health") {
+      const creds = readCredentials();
+      const body = JSON.stringify({
+        status: "ok",
+        authenticated: !!(creds && creds.api_key),
+        customer: creds?.customer_name || null,
+        plan: creds?.plan || null,
+        upstream: UPSTREAM_URL,
+        pid: process.pid,
+      });
+      res.writeHead(200, {
+        "Content-Type": "application/json",
+        "Content-Length": Buffer.byteLength(body),
+      });
+      res.end(body);
+      return;
+    }
+
+    // Read credentials on every request (hot-reload support)
+    const creds = readCredentials();
+    if (!creds?.api_key) {
+      const body = JSON.stringify({ error: "not_authenticated", message: "Run 'holin-cli auth login' first." });
+      res.writeHead(401, {
+        "Content-Type": "application/json",
+        "Content-Length": Buffer.byteLength(body),
+      });
+      res.end(body);
+      return;
+    }
+
+    // Build upstream request
+    // MCP streamable-http has a single endpoint; forward directly to upstream path.
+    // Accio requests http://127.0.0.1:18787/mcp → upstream https://api.holin.work/icbu/mcp
+    const upstreamUrl = new URL(UPSTREAM_URL);
+    const options = {
+      hostname: upstreamUrl.hostname,
+      port: upstreamUrl.port || 443,
+      path: upstreamUrl.pathname,
+      method: req.method,
+      headers: {
+        ...req.headers,
+        host: upstreamUrl.hostname,
+        "X-API-Key": creds.api_key,
+      },
+    };
+
+    const proxyReq = https.request(options, (proxyRes) => {
+      // Forward response headers (strip content-length for chunked SSE)
+      const headers = { ...proxyRes.headers };
+      delete headers["content-length"];
+      delete headers["transfer-encoding"];
+
+      res.writeHead(proxyRes.statusCode || 502, headers);
+      proxyRes.pipe(res);
+    });
+
+    proxyReq.on("error", (err) => {
+      log(`[proxy] upstream error: ${err.message}`);
+      if (!res.headersSent) {
+        const body = JSON.stringify({ error: "upstream_error", message: err.message });
+        res.writeHead(502, {
+          "Content-Type": "application/json",
+          "Content-Length": Buffer.byteLength(body),
+        });
+        res.end(body);
+      } else {
+        res.end();
+      }
+    });
+
+    proxyReq.on("timeout", () => {
+      proxyReq.destroy();
+      if (!res.headersSent) {
+        res.writeHead(504, { "Content-Type": "application/json" });
+        res.end(JSON.stringify({ error: "gateway_timeout" }));
+      }
+    });
+
+    req.pipe(proxyReq);
+  });
+
+  return server;
+}
+
 // ── Commands ─────────────────────────────────────────────────────────────────
 
 async function cmdAuthLogin() {
@@ -113,9 +244,16 @@ async function cmdAuthLogin() {
   };
 
   writeCredentials(creds);
-  console.log(
-    `[holin-cli] Connected: ${creds.customer_name || creds.customer_id} (${creds.plan})`
-  );
+  console.log(`[holin-cli] Connected: ${creds.customer_name || creds.customer_id} (${creds.plan})`);
+
+  // Auto-start proxy in background (detached)
+  try {
+    startProxyDaemon();
+    console.log("[holin-cli] Local proxy started at http://127.0.0.1:18787/mcp");
+  } catch (err) {
+    console.error(`[holin-cli] Warning: Failed to start local proxy — ${err.message}`);
+    console.error("[holin-cli] You can start it manually with: holin-cli proxy start");
+  }
 }
 
 function cmdAuthLogout() {
@@ -125,6 +263,10 @@ function cmdAuthLogout() {
   } else {
     console.log("[holin-cli] No credentials found.");
   }
+  // Stop proxy if running
+  if (isProxyRunning()) {
+    cmdProxyStop();
+  }
 }
 
 function cmdAuthStatus() {
@@ -133,12 +275,117 @@ function cmdAuthStatus() {
     console.log("[holin-cli] Status: not connected.");
     process.exit(1);
   }
+  const proxyRunning = isProxyRunning();
   console.log(
     `[holin-cli] Status: connected as ${creds.customer_name || creds.customer_id} (${creds.plan})`
   );
+  console.log(`[holin-cli] Proxy: ${proxyRunning ? "running" : "stopped"} (http://127.0.0.1:18787/mcp)`);
+}
+
+function cmdProxyStart() {
+  const isDaemon = process.argv.includes("--daemon");
+
+  if (isProxyRunning()) {
+    console.log(`[holin-cli] Proxy already running (pid ${readPidFile()}).`);
+    if (!isDaemon) process.exit(0);
+    return;
+  }
+
+  const server = createProxyServer();
+
+  server.on("error", (err) => {
+    if (err.code === "EADDRINUSE") {
+      console.error(`[holin-cli] Error: Port ${PROXY_PORT} already in use.`);
+      process.exit(1);
+    }
+    console.error(`[holin-cli] Proxy error: ${err.message}`);
+    process.exit(1);
+  });
+
+  server.listen(PROXY_PORT, PROXY_HOST, () => {
+    writePidFile(process.pid);
+    const msg = `[holin-cli] Proxy listening on http://${PROXY_HOST}:${PROXY_PORT}/mcp (pid ${process.pid})`;
+    if (isDaemon) {
+      // Daemon mode: write to log file, don't print to stdout
+      ensureConfigDir();
+      appendFileSync(LOG_FILE, `[${new Date().toISOString()}] ${msg}\n`);
+    } else {
+      console.log(msg);
+      console.log(`[holin-cli] Upstream: ${UPSTREAM_URL}`);
+      console.log(`[holin-cli] Health check: http://${PROXY_HOST}:${PROXY_PORT}/health`);
+      console.log("[holin-cli] Press Ctrl+C to stop.");
+    }
+  });
+
+  // Cleanup on exit
+  const cleanup = () => {
+    try {
+      if (existsSync(PID_FILE)) unlinkSync(PID_FILE);
+    } catch {}
+    process.exit(0);
+  };
+  process.on("SIGINT", cleanup);
+  process.on("SIGTERM", cleanup);
+}
+
+function startProxyDaemon() {
+  if (isProxyRunning()) return;
+
+  ensureConfigDir();
+  const logFd = openSync(LOG_FILE, "a");
+
+  const child = spawn(process.execPath, [process.argv[1], "proxy", "start", "--daemon"], {
+    detached: true,
+    stdio: ["ignore", logFd, logFd],
+  });
+
+  child.unref();
+  // Give it a moment to start and write pid file
+  setTimeout(() => {
+    if (!isProxyRunning()) {
+      console.error("[holin-cli] Warning: Proxy failed to start. Check log:", LOG_FILE);
+    }
+  }, 1000);
+}
+
+function cmdProxyStop() {
+  const pid = readPidFile();
+  if (!pid) {
+    console.log("[holin-cli] Proxy is not running (no pid file).");
+    return;
+  }
+
+  try {
+    process.kill(pid, "SIGTERM");
+    console.log(`[holin-cli] Proxy stopped (pid ${pid}).`);
+  } catch (err) {
+    if (err.code === "ESRCH") {
+      console.log("[holin-cli] Proxy process not found (stale pid file), cleaning up.");
+    } else {
+      console.error(`[holin-cli] Error stopping proxy: ${err.message}`);
+    }
+  }
+
+  try {
+    if (existsSync(PID_FILE)) unlinkSync(PID_FILE);
+  } catch {}
+}
+
+function cmdProxyStatus() {
+  const running = isProxyRunning();
+  const pid = readPidFile();
+  const creds = readCredentials();
+
+  console.log(`[holin-cli] Proxy: ${running ? "running" : "stopped"}`);
+  if (running && pid) console.log(`[holin-cli] PID: ${pid}`);
+  console.log(`[holin-cli] Address: http://${PROXY_HOST}:${PROXY_PORT}/mcp`);
+  console.log(`[holin-cli] Upstream: ${UPSTREAM_URL}`);
+  console.log(`[holin-cli] Authenticated: ${creds?.api_key ? "yes" : "no"}`);
+  if (creds?.customer_name) console.log(`[holin-cli] Customer: ${creds.customer_name} (${creds.plan})`);
+  console.log(`[holin-cli] Log file: ${LOG_FILE}`);
 }
 
-// ── Entrypoint ────────────────────────────────────────────────────────────────
+// ── Entrypoint ───────────────────────────────────────────────────────────────
 
 const [, , cmd, sub] = process.argv;
 
@@ -151,10 +398,19 @@ if (cmd === "auth" && sub === "login") {
   cmdAuthLogout();
 } else if (cmd === "auth" && sub === "status") {
   cmdAuthStatus();
+} else if (cmd === "proxy" && sub === "start") {
+  cmdProxyStart();
+} else if (cmd === "proxy" && sub === "stop") {
+  cmdProxyStop();
+} else if (cmd === "proxy" && sub === "status") {
+  cmdProxyStatus();
 } else {
   console.log("Usage:");
-  console.log("  holin-cli auth login    — authorize with HOLIN_API_KEY env var");
-  console.log("  holin-cli auth logout   — clear stored credentials");
-  console.log("  holin-cli auth status   — check current auth status");
+  console.log("  holin-cli auth login     — authorize with HOLIN_API_KEY env var + auto-start proxy");
+  console.log("  holin-cli auth logout    — clear credentials + stop proxy");
+  console.log("  holin-cli auth status    — check auth and proxy status");
+  console.log("  holin-cli proxy start    — start proxy in foreground");
+  console.log("  holin-cli proxy stop     — stop background proxy");
+  console.log("  holin-cli proxy status   — check proxy status");
   process.exit(1);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@holin-work/holin-cli",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Holin CLI — Accio plugin authorization tool for ICBU batch listing",
   "type": "module",
   "bin": {