hybrid 1.2.6 → 1.2.7

package/dist/index.cjs

@@ -120,8 +120,24 @@ function generateXMTPToolsToken(payload) {
 var BG_STARTED = Symbol("BG_STARTED");
 var BG_STATE = Symbol("BG_STATE");
 var BG_STOP = Symbol("BG_STOP");
-function sleep(ms) {
-  return new Promise((r) => setTimeout(r, ms));
+function sleep(ms, signal) {
+  return new Promise((resolve, reject) => {
+    if (signal?.aborted) {
+      reject(new Error("AbortError"));
+      return;
+    }
+    const timeout = setTimeout(resolve, ms);
+    if (signal) {
+      signal.addEventListener(
+        "abort",
+        () => {
+          clearTimeout(timeout);
+          reject(new Error("AbortError"));
+        },
+        { once: true }
+      );
+    }
+  });
 }
 function createBackgroundMessageProcessor(opts) {
   if (!opts?.agent || !opts?.xmtpClient) {
@@ -294,10 +310,18 @@ function createBackgroundMessageProcessor(opts) {
             );
           }
         }
-        await sleep(nextDelay);
+        try {
+          await sleep(nextDelay, signal);
+        } catch (error) {
+          if (error instanceof Error && error.name === "AbortError") {
+            break;
+          }
+          throw error;
+        }
       }
       try {
         if (state.listenerRunning) {
+          console.log("[XMTP Background] Stopping message listener...");
           await listener.stop();
         }
       } catch (error) {
@@ -392,11 +416,51 @@ async function listen({
   app.notFound((c) => {
     return c.json({ error: "Not found" }, 404);
   });
-  (0, import_node_server.serve)({
-    fetch: app.fetch,
-    port: Number.parseInt(port || "8454")
+  const httpPort = Number.parseInt(port || "8454");
+  const shutdown = async () => {
+    console.log("Waiting for graceful termination...");
+    try {
+      stopBackground();
+    } catch (error) {
+      console.error("Error stopping background processor:", error);
+    }
+    await new Promise((resolve) => setTimeout(resolve, 1e3));
+  };
+  process.once("SIGINT", async () => {
+    await shutdown();
+    process.exit(0);
+  });
+  process.once("SIGTERM", async () => {
+    await shutdown();
+    process.exit(0);
+  });
+  process.on("uncaughtException", async (error) => {
+    console.error("Uncaught exception:", error);
+    await shutdown();
+    process.exit(1);
   });
-  console.log(`\u2705 XMTP Tools HTTP Server running`);
+  process.on("unhandledRejection", async (reason) => {
+    console.error("Unhandled rejection:", reason);
+    await shutdown();
+    process.exit(1);
+  });
+  try {
+    (0, import_node_server.serve)({
+      fetch: app.fetch,
+      port: httpPort
+    });
+    console.log(`\u2705 XMTP Tools HTTP Server running on port ${httpPort}`);
+  } catch (error) {
+    if (error.code === "EADDRINUSE") {
+      console.error(
+        `\u274C Port ${httpPort} is already in use. Please stop the existing server or use a different port.`
+      );
+      process.exit(1);
+    } else {
+      console.error("Server error:", error);
+      process.exit(1);
+    }
+  }
 }
 
 // src/core/plugin.ts