@riddix/hamh 2.1.0-alpha.779 → 2.1.0-alpha.781

package/dist/backend/cli.js

@@ -131132,8 +131132,15 @@ var BridgeService = class _BridgeService extends Service {
   static MAX_RECOVERY_HISTORY = 20;
   static REACTIVE_DEBOUNCE_MS = 5e3;
   async initialize() {
-    for (const data of this.bridgeStorage.bridges) {
-      const normalized = this.normalizeBridgeData(data);
+    for (const data of [...this.bridgeStorage.bridges]) {
+      let normalized = this.normalizeBridgeData(data);
+      if (this.portUsed(normalized.port)) {
+        const freePort = this.getNextAvailablePort(normalized.port);
+        this.log.warn(
+          `Bridge ${normalized.name} port ${normalized.port} already in use, moved to ${freePort}`
+        );
+        normalized = { ...normalized, port: freePort };
+      }
       await this.bridgeStorage.add(normalized);
       await this.addBridge(normalized);
     }
@@ -165023,9 +165030,20 @@ var ServerModeBridge = class {
       const sessionManager = this.server.env.get(SessionManager);
       const sessions = [...sessionManager.sessions];
       let totalSubscriptions = 0;
+      const fabricMap = /* @__PURE__ */ new Map();
       const sessionList = sessions.map((s) => {
         const subCount = s.subscriptions.size;
         totalSubscriptions += subCount;
+        const fi = typeof s.fabric?.fabricIndex === "number" ? s.fabric.fabricIndex : null;
+        if (fi !== null) {
+          const existing = fabricMap.get(fi) ?? {
+            sessions: 0,
+            subscriptions: 0
+          };
+          existing.sessions++;
+          existing.subscriptions += subCount;
+          fabricMap.set(fi, existing);
+        }
         const nowMs = Date.now();
         const lastActiveMsAgo = typeof s.activeTimestamp === "number" && s.activeTimestamp > 0 ? nowMs - s.activeTimestamp : null;
         const lastAnyActivityMsAgo = typeof s.timestamp === "number" ? nowMs - s.timestamp : null;
@@ -165033,6 +165051,7 @@ var ServerModeBridge = class {
         return {
           id: s.id,
           peerNodeId: String(s.peerNodeId),
+          fabricIndex: fi,
           subscriptionCount: subCount,
           lastActiveMsAgo,
           lastAnyActivityMsAgo,
@@ -165040,16 +165059,23 @@ var ServerModeBridge = class {
           ageMsFromOpen: startedAt != null ? nowMs - startedAt : null
         };
       });
+      const fabrics = [...fabricMap.entries()].map(([fabricIndex, data]) => ({
+        fabricIndex,
+        sessions: data.sessions,
+        subscriptions: data.subscriptions
+      }));
       return {
         sessions: sessionList,
         totalSessions: sessions.length,
-        totalSubscriptions
+        totalSubscriptions,
+        fabrics
       };
     } catch {
       return {
         sessions: [],
         totalSessions: 0,
-        totalSubscriptions: 0
+        totalSubscriptions: 0,
+        fabrics: []
       };
     }
   }