openclaw-abacusai-auth 1.2.5 → 1.2.7

package/index.ts

@@ -270,6 +270,8 @@ async function validateApiKey(
 
 let proxyServer: ReturnType<typeof createServer> | null = null;
 let proxyApiKey = "";
+let activeProxyRequests = 0;
+let proxyShuttingDown = false;
 
 function readBody(req: IncomingMessage): Promise<Buffer> {
   return new Promise((resolve, reject) => {
@@ -554,6 +556,19 @@ function normalizeResponseToolCalls(json: Record<string, unknown>): Record<strin
 }
 
 async function handleProxyRequest(req: IncomingMessage, res: ServerResponse) {
+  if (proxyShuttingDown) {
+    sendJsonResponse(res, 503, { error: { message: "Proxy is shutting down", type: "service_unavailable" } });
+    return;
+  }
+  activeProxyRequests++;
+  try {
+    await handleProxyRequestInner(req, res);
+  } finally {
+    activeProxyRequests--;
+  }
+}
+
+async function handleProxyRequestInner(req: IncomingMessage, res: ServerResponse) {
   const path = req.url ?? "/";
   const target = `${ROUTELLM_BASE}${path}`;
   const headers: Record<string, string> = {
@@ -718,6 +733,48 @@ function startProxy(apiKey: string): Promise<void> {
   });
 }
 
+/**
+ * Gracefully stop the RouteLLM proxy server.
+ * 1. Stop accepting new connections
+ * 2. Wait for all in-flight requests to complete (up to 10s timeout)
+ * 3. Close the server and release the port
+ */
+function stopProxy(): Promise<void> {
+  return new Promise((resolve) => {
+    if (!proxyServer) {
+      resolve();
+      return;
+    }
+
+    proxyShuttingDown = true;
+    console.log(`[abacusai] Proxy shutting down (${activeProxyRequests} active requests)...`);
+
+    // Stop accepting new connections immediately
+    proxyServer.close(() => {
+      console.log("[abacusai] Proxy server closed, port released.");
+      proxyServer = null;
+      proxyShuttingDown = false;
+      activeProxyRequests = 0;
+      resolve();
+    });
+
+    // Force-close after 10s if requests don't drain
+    const forceTimeout = setTimeout(() => {
+      console.warn(`[abacusai] Force-closing proxy (${activeProxyRequests} requests still active after 10s).`);
+      proxyServer?.closeAllConnections?.();
+    }, 10_000);
+
+    // Poll for active requests to finish, resolve early if all done
+    const drainInterval = setInterval(() => {
+      if (activeProxyRequests <= 0) {
+        clearInterval(drainInterval);
+        clearTimeout(forceTimeout);
+        // server.close callback will resolve
+      }
+    }, 200);
+  });
+}
+
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -757,7 +814,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 {
@@ -766,24 +823,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);
@@ -818,11 +881,32 @@ const abacusaiPlugin = {
   register(api: unknown) {
     const pluginApi = api as {
       registerProvider: (config: unknown) => void;
+      registerHook?: (events: string | string[], handler: Function, opts?: { name?: string }) => void;
       config?: {
         models?: { providers?: { abacusai?: { compat?: { supportsStrictMode?: boolean } } } };
       };
     };
 
+    // ================================================================
+    // Register gateway_stop hook for graceful proxy shutdown
+    // ================================================================
+    if (typeof pluginApi.registerHook === "function") {
+      pluginApi.registerHook(
+        "gateway_stop",
+        async () => {
+          await stopProxy();
+        },
+        { name: "openclaw-abacusai-auth:gateway-stop" },
+      );
+    }
+
+    // Fallback: handle process signals if gateway_stop hook is unavailable
+    const shutdownHandler = () => {
+      stopProxy().then(() => process.exit(0));
+    };
+    process.once("SIGTERM", shutdownHandler);
+    process.once("SIGINT", shutdownHandler);
+
     // Use local proxy mode to handle schema cleaning internally
     // This is required because OpenClaw core may not support requiresCleanSchema yet
     // The proxy normalizes tool schemas before forwarding to RouteLLM
@@ -835,7 +919,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.5",
+  "version": "1.2.7",
   "description": "OpenClaw AbacusAI provider plugin - Third-party plugin for AbacusAI RouteLLM integration",
   "type": "module",
   "main": "index.ts",