@holin-work/holin-cli 1.3.7 → 1.3.9

package/bin/holin-cli.js

@@ -34,6 +34,7 @@ const CONFIG_DIR = join(
 const CREDENTIALS_FILE = join(CONFIG_DIR, "credentials.json");
 const PID_FILE = join(CONFIG_DIR, "proxy.pid");
 const LOG_FILE = join(CONFIG_DIR, "proxy.log");
+const LOGIN_LOCK_FILE = join(CONFIG_DIR, "login.lock"); // written by auth login, read by proxy healthcheck
 
 // ── Helpers ──────────────────────────────────────────────────────────────────
 
@@ -267,10 +268,26 @@ function createProxyServer() {
       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);
+    // Build upstream request based on path
+    // /mcp → https://api.holin.work/icbu/mcp (MCP protocol)
+    // /api/* → https://api.holin.work/api/* (platform API, e.g. file upload)
+    const upstreamBase = "https://api.holin.work";
+    let upstreamPath;
+    let isMcpRequest = false;
+    if (req.url.startsWith("/mcp")) {
+      upstreamPath = "/icbu/mcp";
+      isMcpRequest = true;
+    } else if (req.url.startsWith("/api/")) {
+      upstreamPath = req.url;
+    } else {
+      // Unknown path
+      const body = JSON.stringify({ error: "not_found", message: `Unknown path: ${req.url}` });
+      res.writeHead(404, { "Content-Type": "application/json", "Content-Length": Buffer.byteLength(body) });
+      res.end(body);
+      return;
+    }
+
+    const upstreamUrl = new URL(upstreamBase);
     const bodyBuffer = Buffer.concat(chunks);
     const forwardHeaders = { ...req.headers };
     delete forwardHeaders["transfer-encoding"];
@@ -281,25 +298,28 @@ function createProxyServer() {
     const options = {
       hostname: upstreamUrl.hostname,
       port: upstreamUrl.port || 443,
-      path: upstreamUrl.pathname,
+      path: upstreamPath,
       method: req.method,
       headers: forwardHeaders,
     };
 
-    // Parse request body to determine MCP method
+    // Parse request body to determine MCP method (only for MCP requests)
     let mcpMethod = "";
-    try {
-      const parsed = JSON.parse(rawBody);
-      mcpMethod = parsed.method || "";
-    } catch { /* not JSON */ }
+    if (isMcpRequest) {
+      try {
+        const parsed = JSON.parse(rawBody);
+        mcpMethod = parsed.method || "";
+      } catch { /* not JSON */ }
+    }
 
-    // Non-streaming methods should return JSON, not SSE
+    // Non-streaming methods should return JSON, not SSE (only for MCP requests)
     // Accio expects JSON for initialize and tools/list
-    const shouldConvertToJson = mcpMethod === "initialize" || mcpMethod === "tools/list";
+    const shouldConvertToJson = isMcpRequest && (mcpMethod === "initialize" || mcpMethod === "tools/list");
 
     const proxyReq = https.request(options, (proxyRes) => {
       const elapsed = Date.now() - requestStart;
-      log(`[proxy] ← ${proxyRes.statusCode} ${elapsed}ms content-type=${proxyRes.headers["content-type"]} method=${mcpMethod}`);
+      const routeLabel = isMcpRequest ? `mcp/${mcpMethod || "unknown"}` : req.url;
+      log(`[proxy] ← ${proxyRes.statusCode} ${elapsed}ms content-type=${proxyRes.headers["content-type"]} route=${routeLabel}`);
 
       if (shouldConvertToJson && proxyRes.headers["content-type"]?.includes("text/event-stream")) {
         // Collect SSE response and convert to JSON
@@ -389,6 +409,14 @@ async function cmdAuthLogin() {
     process.exit(1);
   }
 
+  // Write login lock so the running proxy does not exit during re-auth credential gap.
+  ensureConfigDir();
+  writeFileSync(LOGIN_LOCK_FILE, String(process.pid), "utf-8");
+  const removeLock = () => { try { if (existsSync(LOGIN_LOCK_FILE)) unlinkSync(LOGIN_LOCK_FILE); } catch {} };
+  process.on("exit", removeLock);
+  process.on("SIGINT", () => { removeLock(); process.exit(1); });
+  process.on("SIGTERM", () => { removeLock(); process.exit(1); });
+
   console.log("[holin-cli] Verifying API Key...");
   let result;
   try {
@@ -431,6 +459,7 @@ async function cmdAuthLogin() {
     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");
   }
+  // Lock removed automatically via process.on("exit")
 }
 
 function cmdAuthLogout() {
@@ -529,12 +558,20 @@ function cmdProxyStart() {
       return;
     }
     // Check if credentials file still exists (user may have logged out / uninstalled)
-    // Use a 30s grace period to avoid false positives during re-auth (old creds cleared, new ones not yet written)
+    // Use a 30s grace period to avoid false positives during re-auth (old creds cleared, new ones not yet written).
+    // Skip the grace period countdown entirely while a login.lock file exists — auth login is in progress.
     const credsExist = existsSync(CREDENTIALS_FILE);
     const creds = credsExist ? readCredentials() : null;
     const hasValidKey = !!(creds?.api_key);
     if (!hasValidKey) {
-      if (!credsMissingSince) {
+      const loginInProgress = existsSync(LOGIN_LOCK_FILE);
+      if (loginInProgress) {
+        // auth login is actively running — reset timer, do not start grace period
+        if (credsMissingSince) {
+          log("[proxy] Login lock detected, resetting credentials grace period.");
+          credsMissingSince = null;
+        }
+      } else if (!credsMissingSince) {
         credsMissingSince = Date.now();
         log("[proxy] Credentials missing, starting 30s grace period...");
       } else if (Date.now() - credsMissingSince > 30000) {

package/package.json

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