@automagik/omni 2.260706.3 → 2.260706.4

package/dist/index.js

@@ -30805,6 +30805,7 @@ class NatsEventBus {
   subscriptionManager = new SubscriptionManager;
   connectionAttempts = 0;
   isClosing = false;
+  pendingReconnect = null;
   constructor(config2 = {}) {
     this.config = {
       url: config2.url ?? DEFAULTS.url,
@@ -30824,7 +30825,7 @@ class NatsEventBus {
       servers: this.config.url,
       name: this.config.serviceName,
       reconnect: true,
-      maxReconnectAttempts: this.config.reconnect.maxRetries,
+      maxReconnectAttempts: -1,
       reconnectTimeWait: this.config.reconnect.delayMs,
       waitOnFirstConnect: true
     };
@@ -30863,7 +30864,7 @@ class NatsEventBus {
     return this.publishInternal(type, payload, metadata);
   }
   async publishInternal(type, payload, metadata) {
-    this.ensureConnected();
+    await this.ensureConnected();
     const eventId = crypto.randomUUID();
     const timestamp = Date.now();
     const event = {
@@ -31049,32 +31050,67 @@ class NatsEventBus {
   getSubscriptionCount() {
     return this.subscriptionManager.size;
   }
-  ensureConnected() {
+  async ensureConnected() {
+    if (this.isConnected())
+      return;
+    if (this.isClosing) {
+      throw new Error("Not connected to NATS. Call connect() first.");
+    }
+    const reconnect = this.scheduleReconnect();
+    const winner = await Promise.race([
+      reconnect.then(() => "connected"),
+      this.sleep(ENSURE_CONNECTED_WAIT_MS).then(() => "timeout")
+    ]);
+    if (winner === "timeout" || !this.isConnected()) {
+      throw new Error("Not connected to NATS. Reconnect in progress.");
+    }
+  }
+  scheduleReconnect() {
+    if (!this.pendingReconnect) {
+      log4.warn("Connection lost, rebuilding", { url: this.config.url });
+      this.pendingReconnect = (async () => {
+        this.nc = null;
+        this.js = null;
+        this.jsm = null;
+        await this.connect();
+      })().finally(() => {
+        this.pendingReconnect = null;
+      });
+      this.pendingReconnect.catch(() => {});
+    }
+    return this.pendingReconnect;
+  }
+  assertConnected() {
     if (!this.isConnected()) {
       throw new Error("Not connected to NATS. Call connect() first.");
     }
   }
   requireJetStream() {
-    this.ensureConnected();
+    this.assertConnected();
     if (!this.js) {
       throw new Error("JetStream not initialized");
     }
     return this.js;
   }
   requireJetStreamManager() {
-    this.ensureConnected();
+    this.assertConnected();
     if (!this.jsm) {
       throw new Error("JetStreamManager not initialized");
     }
     return this.jsm;
   }
   setupConnectionHandlers() {
-    if (!this.nc)
+    const nc = this.nc;
+    if (!nc)
       return;
-    (async () => {
-      if (!this.nc)
+    nc.closed().then((err) => {
+      if (this.isClosing || this.nc !== nc)
         return;
-      for await (const status of this.nc.status()) {
+      log4.error("Connection closed unexpectedly", { error: err ? String(err) : "none" });
+      this.scheduleReconnect();
+    });
+    (async () => {
+      for await (const status of nc.status()) {
         switch (status.type) {
           case "disconnect":
             log4.warn("Disconnected from NATS");
@@ -31109,7 +31145,7 @@ async function connectEventBus(config2) {
   await bus.connect();
   return bus;
 }
-var import_api2, import_nats, log4, DEFAULTS;
+var import_api2, import_nats, log4, DEFAULTS, ENSURE_CONNECTED_WAIT_MS = 5000;
 var init_client = __esm(() => {
   init_logger();
   init_consumer();
@@ -125020,7 +125056,7 @@ import { fileURLToPath } from "url";
 // package.json
 var package_default = {
   name: "@automagik/omni",
-  version: "2.260706.3",
+  version: "2.260706.4",
   description: "LLM-optimized CLI for Omni",
   type: "module",
   bin: {

package/dist/server/index.js

@@ -22765,6 +22765,7 @@ class NatsEventBus {
   subscriptionManager = new SubscriptionManager;
   connectionAttempts = 0;
   isClosing = false;
+  pendingReconnect = null;
   constructor(config2 = {}) {
     this.config = {
       url: config2.url ?? DEFAULTS.url,
@@ -22784,7 +22785,7 @@ class NatsEventBus {
       servers: this.config.url,
       name: this.config.serviceName,
       reconnect: true,
-      maxReconnectAttempts: this.config.reconnect.maxRetries,
+      maxReconnectAttempts: -1,
       reconnectTimeWait: this.config.reconnect.delayMs,
       waitOnFirstConnect: true
     };
@@ -22823,7 +22824,7 @@ class NatsEventBus {
     return this.publishInternal(type, payload, metadata);
   }
   async publishInternal(type, payload, metadata) {
-    this.ensureConnected();
+    await this.ensureConnected();
     const eventId = crypto.randomUUID();
     const timestamp = Date.now();
     const event = {
@@ -23009,32 +23010,67 @@ class NatsEventBus {
   getSubscriptionCount() {
     return this.subscriptionManager.size;
   }
-  ensureConnected() {
+  async ensureConnected() {
+    if (this.isConnected())
+      return;
+    if (this.isClosing) {
+      throw new Error("Not connected to NATS. Call connect() first.");
+    }
+    const reconnect = this.scheduleReconnect();
+    const winner = await Promise.race([
+      reconnect.then(() => "connected"),
+      this.sleep(ENSURE_CONNECTED_WAIT_MS).then(() => "timeout")
+    ]);
+    if (winner === "timeout" || !this.isConnected()) {
+      throw new Error("Not connected to NATS. Reconnect in progress.");
+    }
+  }
+  scheduleReconnect() {
+    if (!this.pendingReconnect) {
+      log4.warn("Connection lost, rebuilding", { url: this.config.url });
+      this.pendingReconnect = (async () => {
+        this.nc = null;
+        this.js = null;
+        this.jsm = null;
+        await this.connect();
+      })().finally(() => {
+        this.pendingReconnect = null;
+      });
+      this.pendingReconnect.catch(() => {});
+    }
+    return this.pendingReconnect;
+  }
+  assertConnected() {
     if (!this.isConnected()) {
       throw new Error("Not connected to NATS. Call connect() first.");
     }
   }
   requireJetStream() {
-    this.ensureConnected();
+    this.assertConnected();
     if (!this.js) {
       throw new Error("JetStream not initialized");
     }
     return this.js;
   }
   requireJetStreamManager() {
-    this.ensureConnected();
+    this.assertConnected();
     if (!this.jsm) {
       throw new Error("JetStreamManager not initialized");
     }
     return this.jsm;
   }
   setupConnectionHandlers() {
-    if (!this.nc)
+    const nc = this.nc;
+    if (!nc)
       return;
-    (async () => {
-      if (!this.nc)
+    nc.closed().then((err) => {
+      if (this.isClosing || this.nc !== nc)
         return;
-      for await (const status of this.nc.status()) {
+      log4.error("Connection closed unexpectedly", { error: err ? String(err) : "none" });
+      this.scheduleReconnect();
+    });
+    (async () => {
+      for await (const status of nc.status()) {
         switch (status.type) {
           case "disconnect":
             log4.warn("Disconnected from NATS");
@@ -23066,7 +23102,7 @@ async function connectEventBus(config2) {
   await bus.connect();
   return bus;
 }
-var import_api2, import_nats, log4, DEFAULTS;
+var import_api2, import_nats, log4, DEFAULTS, ENSURE_CONNECTED_WAIT_MS = 5000;
 var init_client = __esm(() => {
   init_logger();
   init_consumer();
@@ -225845,7 +225881,7 @@ var init_sentry_scrub = __esm(() => {
 var require_package7 = __commonJS((exports, module) => {
   module.exports = {
     name: "@omni/api",
-    version: "2.260706.3",
+    version: "2.260706.4",
     type: "module",
     exports: {
       ".": {
@@ -344234,7 +344270,8 @@ var import__package2, VERSION6, startTime2, healthRoutes, getHealth = async (c)
   }
   let natsCheck;
   if (eventBus) {
-    natsCheck = { status: "ok", details: { connected: true } };
+    const connected = eventBus.isConnected();
+    natsCheck = connected ? { status: "ok", details: { connected: true } } : { status: "error", details: { connected: false }, error: "NATS connection is not established" };
   } else {
     natsCheck = { status: "ok", details: { connected: false, reason: "Not configured" } };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/omni",
-  "version": "2.260706.3",
+  "version": "2.260706.4",
   "description": "LLM-optimized CLI for Omni",
   "type": "module",
   "bin": {