@riddix/hamh 2.1.0-alpha.754 → 2.1.0-alpha.756

package/dist/backend/cli.js

@@ -124071,6 +124071,14 @@ function computeControllerWarnings(controllers, exposed) {
   }
   return warnings;
 }
+function controllerWarningsForFabrics(fabrics, exposed) {
+  const controllers = [
+    ...new Set(fabrics.map((f) => classifyController(f.rootVendorId)).filter((c) => c !== void 0))
+  ];
+  if (controllers.length === 0)
+    return [];
+  return computeControllerWarnings(controllers, exposed);
+}
 var controllerByVendorId, deviceTypeIdSupport, controllerLabels;
 var init_controller_compat = __esm({
   "../common/dist/controller-compat.js"() {
@@ -127121,12 +127129,7 @@ function healthApi(bridgeService, haClient, version2, startTime) {
       const fabrics = data.commissioning?.fabrics ?? [];
       const sessionInfo = b.getSessionInfo();
       const exposed = b.getExposedDeviceTypes();
-      const controllers = [
-        ...new Set(
-          fabrics.map((f) => classifyController(f.rootVendorId)).filter((c) => c !== void 0)
-        )
-      ];
-      const controllerWarnings = controllers.length > 0 ? computeControllerWarnings(controllers, exposed) : [];
+      const controllerWarnings = data.controllerWarnings ?? [];
       const entityDiagnostics = buildEntityDiagnostics(
         exposed,
         data.failedEntities ?? [],
@@ -128353,15 +128356,13 @@ function metricsApi(bridgeService, haClient, haRegistry, startTime) {
   router.get("/", (_, res) => {
     const memoryUsage = process.memoryUsage();
     const bridges = bridgeService.bridges;
-    const running = bridges.filter((b) => b.data.status === "running").length;
-    const stopped = bridges.filter((b) => b.data.status === "stopped").length;
-    const failed = bridges.filter((b) => b.data.status === "failed").length;
-    const totalDevices = bridges.reduce(
-      (sum, b) => sum + b.data.deviceCount,
-      0
-    );
-    const totalFabrics = bridges.reduce(
-      (sum, b) => sum + (b.data.commissioning?.fabrics?.length ?? 0),
+    const datas = bridges.map((b) => b.data);
+    const running = datas.filter((d) => d.status === "running").length;
+    const stopped = datas.filter((d) => d.status === "stopped").length;
+    const failed = datas.filter((d) => d.status === "failed").length;
+    const totalDevices = datas.reduce((sum, d) => sum + d.deviceCount, 0);
+    const totalFabrics = datas.reduce(
+      (sum, d) => sum + (d.commissioning?.fabrics?.length ?? 0),
       0
     );
     const metrics = {
@@ -128393,15 +128394,13 @@ function metricsApi(bridgeService, haClient, haRegistry, startTime) {
     const memoryUsage = process.memoryUsage();
     const bridges = bridgeService.bridges;
     const uptime2 = Math.floor((Date.now() - startTime) / 1e3);
-    const running = bridges.filter((b) => b.data.status === "running").length;
-    const stopped = bridges.filter((b) => b.data.status === "stopped").length;
-    const failed = bridges.filter((b) => b.data.status === "failed").length;
-    const totalDevices = bridges.reduce(
-      (sum, b) => sum + b.data.deviceCount,
-      0
-    );
-    const totalFabrics = bridges.reduce(
-      (sum, b) => sum + (b.data.commissioning?.fabrics?.length ?? 0),
+    const datas = bridges.map((b) => b.data);
+    const running = datas.filter((d) => d.status === "running").length;
+    const stopped = datas.filter((d) => d.status === "stopped").length;
+    const failed = datas.filter((d) => d.status === "failed").length;
+    const totalDevices = datas.reduce((sum, d) => sum + d.deviceCount, 0);
+    const totalFabrics = datas.reduce(
+      (sum, d) => sum + (d.commissioning?.fabrics?.length ?? 0),
       0
     );
     const lines = [
@@ -128459,8 +128458,9 @@ function metricsApi(bridgeService, haClient, haRegistry, startTime) {
       ""
     ];
     for (const bridge of bridges) {
-      const status3 = bridge.data.status === "running" ? 1 : 0;
-      const safeName = bridge.data.name.replace(/[^a-zA-Z0-9_]/g, "_");
+      const data = bridge.data;
+      const status3 = data.status === "running" ? 1 : 0;
+      const safeName = data.name.replace(/[^a-zA-Z0-9_]/g, "_");
       lines.push(
         `# HELP hamh_bridge_status Bridge status (1=running, 0=not running)`,
         `# TYPE hamh_bridge_status gauge`,
@@ -128468,7 +128468,7 @@ function metricsApi(bridgeService, haClient, haRegistry, startTime) {
         "",
         `# HELP hamh_bridge_devices Number of devices on bridge`,
         `# TYPE hamh_bridge_devices gauge`,
-        `hamh_bridge_devices{bridge_id="${bridge.id}",bridge_name="${safeName}"} ${bridge.data.deviceCount}`,
+        `hamh_bridge_devices{bridge_id="${bridge.id}",bridge_name="${safeName}"} ${data.deviceCount}`,
         ""
       );
     }
@@ -147233,6 +147233,7 @@ init_esm7();
 import crypto4 from "node:crypto";
 
 // src/services/bridges/bridge-data-provider.ts
+init_dist();
 init_service();
 import { values as values2 } from "lodash-es";
 var BridgeDataProvider = class extends Service {
@@ -147289,8 +147290,13 @@ var BridgeDataProvider = class extends Service {
   /**
    * @deprecated
    */
-  withMetadata(status3, serverNode, deviceCount, failedEntities = []) {
+  withMetadata(status3, serverNode, deviceCount, failedEntities = [], exposedDeviceTypes = []) {
     const commissioning = serverNode.state.commissioning;
+    const fabrics = commissioning ? values2(commissioning.fabrics) : [];
+    const controllerWarnings = controllerWarningsForFabrics(
+      fabrics,
+      exposedDeviceTypes
+    );
     return {
       id: this.id,
       name: this.name,
@@ -147311,7 +147317,7 @@ var BridgeDataProvider = class extends Service {
         discriminator: commissioning.discriminator,
         manualPairingCode: commissioning.pairingCodes.manualPairingCode,
         qrPairingCode: commissioning.pairingCodes.qrPairingCode,
-        fabrics: values2(commissioning.fabrics).map((fabric) => ({
+        fabrics: fabrics.map((fabric) => ({
           fabricIndex: fabric.fabricIndex,
           fabricId: Number(fabric.fabricId),
           nodeId: Number(fabric.nodeId),
@@ -147321,7 +147327,8 @@ var BridgeDataProvider = class extends Service {
         }))
       } : void 0,
       deviceCount,
-      failedEntities: failedEntities.length > 0 ? failedEntities : void 0
+      failedEntities: failedEntities.length > 0 ? failedEntities : void 0,
+      controllerWarnings: controllerWarnings.length > 0 ? controllerWarnings : void 0
     };
   }
 };
@@ -148436,6 +148443,7 @@ function seedExistingSessionStarts(startedAt, sessions, now = Date.now()) {
 // src/services/bridges/bridge.ts
 var AUTO_FORCE_SYNC_INTERVAL_MS = 9e4;
 var DEAD_SESSION_TIMEOUT_MS = 6e4;
+var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS = 2500;
 var Bridge = class {
   constructor(env, logger234, dataProvider, endpointManager) {
     this.dataProvider = dataProvider;
@@ -148499,7 +148507,8 @@ var Bridge = class {
       this.status,
       this.server,
       this.aggregator.parts.size,
-      this.endpointManager.failedEntities
+      this.endpointManager.failedEntities,
+      this.getExposedDeviceTypes()
     );
   }
   getSessionInfo() {
@@ -148685,6 +148694,7 @@ ${e?.toString()}`);
   async runStop(code, reason) {
     this.unwireSessionDiagnostics();
     this.stopAutoForceSync();
+    await this.closeActiveSessions();
     await this.endpointManager.stopPlugins();
     this.endpointManager.stopObserving();
     try {
@@ -148715,6 +148725,7 @@ ${e?.toString()}`);
     this.log.info(`Force sync: every ${AUTO_FORCE_SYNC_INTERVAL_MS / 1e3}s`);
   }
   wireSessionDiagnostics() {
+    this.unwireSessionDiagnostics();
     try {
       const sessionManager = this.server.env.get(SessionManager);
       seedExistingSessionStarts(this.sessionStartedAt, sessionManager.sessions);
@@ -148870,6 +148881,42 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  // Close every active session on shutdown so each controller is told to drop
+  // its CASE session instead of being left with a stale one. Mirrors the
+  // dead-session close, but covers all sessions and waits (capped) so the
+  // close actually reaches the peer before the server is canceled.
+  async closeActiveSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const closes = [];
+      for (const s of [...sessionManager.sessions]) {
+        if (s.isClosing) {
+          continue;
+        }
+        closes.push(
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose({
+              cause: new Error("graceful close failed, forcing")
+            });
+          })
+        );
+      }
+      if (closes.length === 0) {
+        return;
+      }
+      this.log.info(`Closing ${closes.length} active session(s) on shutdown`);
+      let timer;
+      const timeout = new Promise((resolve11) => {
+        timer = setTimeout(resolve11, SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS);
+      });
+      try {
+        await Promise.race([Promise.allSettled(closes), timeout]);
+      } finally {
+        clearTimeout(timer);
+      }
+    } catch {
+    }
+  }
   /**
    * Force a fresh mDNS operational advertisement after session cleanup.
    * matter.js DeviceAdvertiser only re-announces when a subscription is
@@ -164341,6 +164388,7 @@ init_dist();
 init_diagnostic_event_bus();
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
 var DEAD_SESSION_TIMEOUT_MS2 = 6e4;
+var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2 = 2500;
 function makeWarmStartState(state, now = (/* @__PURE__ */ new Date()).toISOString()) {
   return { ...state, last_updated: now };
 }
@@ -164387,7 +164435,8 @@ var ServerModeBridge = class {
       this.status,
       this.server,
       this.endpointManager.devices.length,
-      this.endpointManager.failedEntities
+      this.endpointManager.failedEntities,
+      this.getExposedDeviceTypes()
     );
   }
   /**
@@ -164504,6 +164553,7 @@ ${e?.toString()}`);
     this.unwireSessionDiagnostics();
     this.cancelWarmStart();
     this.stopAutoForceSync();
+    await this.closeActiveSessions();
     this.endpointManager.stopObserving();
     try {
       await this.server.cancel();
@@ -164573,6 +164623,7 @@ ${e?.toString()}`);
     this.log.info(`Force sync: every ${AUTO_FORCE_SYNC_INTERVAL_MS2 / 1e3}s`);
   }
   wireSessionDiagnostics() {
+    this.unwireSessionDiagnostics();
     try {
       const sessionManager = this.server.env.get(SessionManager);
       this.sessionDiagHandler = (session) => {
@@ -164693,6 +164744,42 @@ ${e?.toString()}`);
     } catch {
     }
   }
+  // Close every active session on shutdown so each controller is told to drop
+  // its CASE session instead of being left with a stale one. Mirrors the
+  // dead-session close, but covers all sessions and waits (capped) so the
+  // close actually reaches the peer before the server is canceled.
+  async closeActiveSessions() {
+    try {
+      const sessionManager = this.server.env.get(SessionManager);
+      const closes = [];
+      for (const s of [...sessionManager.sessions]) {
+        if (s.isClosing) {
+          continue;
+        }
+        closes.push(
+          s.initiateClose().catch(() => {
+            return s.initiateForceClose({
+              cause: new Error("graceful close failed, forcing")
+            });
+          })
+        );
+      }
+      if (closes.length === 0) {
+        return;
+      }
+      this.log.info(`Closing ${closes.length} active session(s) on shutdown`);
+      let timer;
+      const timeout = new Promise((resolve11) => {
+        timer = setTimeout(resolve11, SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2);
+      });
+      try {
+        await Promise.race([Promise.allSettled(closes), timeout]);
+      } finally {
+        clearTimeout(timer);
+      }
+    } catch {
+    }
+  }
   /**
    * Force a fresh mDNS operational advertisement after session cleanup.
    * matter.js DeviceAdvertiser only re-announces when a subscription is
@@ -165918,6 +166005,14 @@ async function startHandler(startOptions, webUiDist) {
     if (shuttingDown) return;
     shuttingDown = true;
     console.log(`Received ${signal}, shutting down gracefully...`);
+    try {
+      await Promise.race([
+        bridgeService.stopAll(),
+        new Promise((resolve11) => setTimeout(resolve11, 1e4))
+      ]);
+    } catch (e) {
+      console.warn("Stopping bridges during shutdown failed:", e);
+    }
     try {
       await Promise.race([
         backupService.createAutoBackup(),