openclaw-abacusai-auth 1.2.6 → 1.2.8

package/index.ts

@@ -570,6 +570,17 @@ async function handleProxyRequest(req: IncomingMessage, res: ServerResponse) {
 
 async function handleProxyRequestInner(req: IncomingMessage, res: ServerResponse) {
   const path = req.url ?? "/";
+
+  if (path === "/__kill") {
+    console.log("[abacusai] Received /__kill command, stopping zombie proxy...");
+    sendJsonResponse(res, 200, { success: true });
+    // Execute stop proxy asynchronously after sending response
+    setTimeout(() => {
+      stopProxy().catch(() => process.exit(0));
+    }, 100);
+    return;
+  }
+
   const target = `${ROUTELLM_BASE}${path}`;
   const headers: Record<string, string> = {
     Authorization: `Bearer ${proxyApiKey}`,
@@ -703,33 +714,50 @@ function startProxy(apiKey: string): Promise<void> {
       });
     });
 
-    // Try fixed port first, then retry with port+1, +2, etc.
-    const tryListen = (port: number, attempt: number) => {
+    let killAttempts = 0;
+    const tryListen = (port: number) => {
       proxyServer!.listen(port, PROXY_HOST, () => {
         proxyPort = port;
         console.log(`[abacusai] proxy listening on http://${PROXY_HOST}:${proxyPort}`);
         resolve();
       });
       proxyServer!.once("error", (err: NodeJS.ErrnoException) => {
-        if (err.code === "EADDRINUSE" && attempt < 10) {
-          console.log(`[abacusai] port ${port} in use, trying ${port + 1}...`);
+        if (err.code === "EADDRINUSE") {
+          console.log(`[abacusai] port ${port} in use. Attempting to kill zombie proxy...`);
+          killAttempts++;
+          if (killAttempts > 5) {
+            console.error("[abacusai] Could not kill zombie proxy after multiple attempts.");
+            reject(new Error("EADDRINUSE on port 18862 and cannot kill zombie proxy."));
+            return;
+          }
           proxyServer!.removeAllListeners("error");
-          proxyServer!.close(() => {
+
+          // Try to kill the zombie proxy by sending it the /__kill command
+          const { request } = require("node:http");
+          const req = request(`http://${PROXY_HOST}:${port}/__kill`, { method: 'GET' }, (res: IncomingMessage) => {
+            res.resume();
+          });
+          req.on('error', () => { }); // Ignore network errors
+          req.end();
+
+          console.log(`[abacusai] Waiting 1s for port ${port} to free up...`);
+          setTimeout(() => {
+            // Create fresh proxyServer to avoid closed state issues
             proxyServer = createServer((req, res) => {
               handleProxyRequest(req, res).catch((e) => {
                 console.error("[abacusai] proxy error:", e);
                 sendJsonResponse(res, 500, { error: { message: String(e) } });
               });
             });
-            tryListen(port + 1, attempt + 1);
-          });
+            tryListen(port);
+          }, 1000);
         } else {
           reject(err);
         }
       });
     };
 
-    tryListen(PROXY_PORT_DEFAULT, 0);
+    tryListen(PROXY_PORT_DEFAULT);
   });
 }
 
@@ -814,7 +842,7 @@ function buildModelDefinition(modelId: string) {
  * but the config still stores the port from when `openclaw models auth login`
  * was first run.
  */
-function updateBaseUrlInConfig(): void {
+function updateBaseUrlInConfig(pluginApi: any): void {
   if (!proxyPort) return;
   const newBaseUrl = `http://${PROXY_HOST}:${proxyPort}`;
   try {
@@ -823,24 +851,30 @@ function updateBaseUrlInConfig(): void {
       process.env.CLAWDBOT_STATE_DIR ||
       join(homedir(), ".openclaw");
     const configPath = join(stateDir, "openclaw.json");
-    if (!existsSync(configPath)) return;
-
-    let raw = readFileSync(configPath, "utf-8");
-    // Strip UTF-8 BOM if present
-    if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
-    const config = JSON.parse(raw);
-    const currentUrl = config?.models?.providers?.abacusai?.baseUrl;
 
-    if (currentUrl === newBaseUrl) {
-      // Already up to date
-      return;
+    // 1. Update in-memory OpenClaw config if available (so it works immediately and saves correctly)
+    let inMemoryUpdated = false;
+    if (pluginApi?.config?.models?.providers?.abacusai) {
+      if (pluginApi.config.models.providers.abacusai.baseUrl !== newBaseUrl) {
+        pluginApi.config.models.providers.abacusai.baseUrl = newBaseUrl;
+        inMemoryUpdated = true;
+      }
     }
 
-    // Update the baseUrl
-    if (config.models?.providers?.abacusai) {
-      config.models.providers.abacusai.baseUrl = newBaseUrl;
-      writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
-      console.log(`[abacusai] Updated config baseUrl: ${currentUrl} → ${newBaseUrl}`);
+    // 2. Fallback to writing the disk file directly if needed
+    if (existsSync(configPath)) {
+      let raw = readFileSync(configPath, "utf-8");
+      if (raw.charCodeAt(0) === 0xFEFF) raw = raw.slice(1);
+      const config = JSON.parse(raw);
+      const currentUrl = config?.models?.providers?.abacusai?.baseUrl;
+
+      if (currentUrl !== newBaseUrl && config.models?.providers?.abacusai) {
+        config.models.providers.abacusai.baseUrl = newBaseUrl;
+        writeFileSync(configPath, JSON.stringify(config, null, 2) + "\n", "utf-8");
+        console.log(`[abacusai] Updated config baseUrl on disk: ${currentUrl} → ${newBaseUrl}`);
+      } else if (inMemoryUpdated) {
+        console.log(`[abacusai] Updated in-memory baseUrl to ${newBaseUrl}`);
+      }
     }
   } catch (err) {
     console.error("[abacusai] Failed to update baseUrl in config:", err);
@@ -913,7 +947,7 @@ const abacusaiPlugin = {
           // Update baseUrl in config to match the new proxy port
           // (The proxy gets a new random port each time the gateway starts,
           // but the config still has the port from when auth was first run)
-          updateBaseUrlInConfig();
+          updateBaseUrlInConfig(pluginApi);
         })
         .catch((err) => {
           console.error("[abacusai] Failed to auto-start proxy:", err);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openclaw-abacusai-auth",
-  "version": "1.2.6",
+  "version": "1.2.8",
   "description": "OpenClaw AbacusAI provider plugin - Third-party plugin for AbacusAI RouteLLM integration",
   "type": "module",
   "main": "index.ts",