om-memory-system 3.5.0 → 3.6.0-next.37

package/dist/services/web-server.js

@@ -36,7 +36,7 @@ function serveFetch(opts) {
             hostname: opts.hostname,
             fetch: opts.fetch,
         });
-        return { stop: () => bunHandle.stop() };
+        return Promise.resolve({ stop: () => bunHandle.stop() });
     }
     // Node path: wrap node:http around the fetch-style handler. The adapter
     // converts IncomingMessage → Web Request and Web Response → ServerResponse.
@@ -95,30 +95,34 @@ function serveFetch(opts) {
             }
         }
     });
-    // Surface EADDRINUSE synchronously so callers can detect the
-    // already-running-instance case the same way they do under Bun.
-    let listenError;
-    server.on("error", (err) => {
-        if (err.code === "EADDRINUSE") {
-            listenError = err;
-        }
-    });
-    // exclusive: false disables SO_EXCLUSIVEADDRUSE on Windows, allowing
-    // rebind after a crashed predecessor left orphaned sockets behind.
-    server.listen({ port: opts.port, host: opts.hostname, reuseAddr: true, exclusive: false });
     server.unref();
     server.timeout = NODE_HTTP_IDLE_TIMEOUT_MS;
     server.keepAliveTimeout = 10000;
     server.headersTimeout = 11000;
-    if (listenError) {
-        throw listenError;
-    }
-    return {
-        stop: () => {
-            server.closeAllConnections();
-            server.close();
-        },
-    };
+    // Node reports EADDRINUSE after listen() returns, so wait for the outcome.
+    // Callers then see a busy port the same way they do under Bun.
+    return new Promise((resolve, reject) => {
+        const onError = (error) => {
+            server.off("listening", onListening);
+            reject(error);
+        };
+        const onListening = () => {
+            server.off("error", onError);
+            // Keep a listener, so a later server error is logged instead of crashing the process.
+            server.on("error", (error) => log("Web server error", { error: String(error) }));
+            resolve({
+                stop: () => {
+                    server.closeAllConnections();
+                    server.close();
+                },
+            });
+        };
+        server.once("error", onError);
+        server.once("listening", onListening);
+        // exclusive: false disables SO_EXCLUSIVEADDRUSE on Windows, allowing
+        // rebind after a crashed predecessor left orphaned sockets behind.
+        server.listen({ port: opts.port, host: opts.hostname, reuseAddr: true, exclusive: false });
+    });
 }
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
@@ -192,7 +196,7 @@ export class WebServer {
             .catch(() => { });
         assertWebServerNetworkAuth(this.config.host, this.config.apiToken, this.config.auth?.isEnabled() ?? false);
         try {
-            this.server = serveFetch({
+            this.server = await serveFetch({
                 port: this.config.port,
                 hostname: this.config.host,
                 fetch: this.handleRequest.bind(this),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "om-memory-system",
-  "version": "3.5.0",
+  "version": "3.6.0-next.37",
   "description": "Opinionated modular memory system for coding agents (OpenCode + Pi)",
   "type": "module",
   "main": "dist/plugin.js",