@riddix/hamh 2.1.0-alpha.797 → 2.1.0-alpha.799

package/dist/backend/cli.js

@@ -124292,6 +124292,9 @@ var init_clusters = __esm({
 function classifyController(vendorId3) {
   return controllerByVendorId[vendorId3];
 }
+function alexaPairingPortProblem(vendorId3, port) {
+  return classifyController(vendorId3) === "alexa" && port !== 5540;
+}
 function computeControllerWarnings(controllers, exposed) {
   const seen = /* @__PURE__ */ new Set();
   const warnings = [];
@@ -148999,6 +149002,9 @@ var Bridge = class {
   sessionAddedHandler;
   // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
   sessionDeletedHandler;
+  // Warns when Alexa pairs on a non-5540 port, the fabric rolls back later (#401).
+  // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
+  fabricAddedHandler;
   get id() {
     return this.dataProvider.id;
   }
@@ -149168,6 +149174,7 @@ var Bridge = class {
         });
       }
       this.wireSessionDiagnostics();
+      this.wireFabricWarnings();
       this.startSessionRotation();
       logMemoryUsage(this.log, "bridge running");
       diagnosticEventBus.emit("bridge_started", `Bridge started`, {
@@ -149193,6 +149200,7 @@ ${e?.toString()}`);
   }
   async runStop(code, reason) {
     this.unwireSessionDiagnostics();
+    this.unwireFabricWarnings();
     this.stopAutoForceSync();
     await this.closeActiveSessions();
     await this.endpointManager.stopPlugins();
@@ -149530,6 +149538,35 @@ ${e?.toString()}`);
     this.stopSessionRotation();
     this.sessionStartedAt.clear();
   }
+  // Warn at the fabric-added event when Alexa pairs on a non-5540 port. Alexa
+  // completes AddNOC but never CASEs, so the fabric rolls back on failsafe
+  // expiry ~20s later and the committed-fabric warning path never sees it (#401).
+  wireFabricWarnings() {
+    this.unwireFabricWarnings();
+    try {
+      const fabrics = this.server.env.get(FabricManager);
+      this.fabricAddedHandler = (fabric) => {
+        const port = this.dataProvider.port;
+        if (alexaPairingPortProblem(fabric.rootVendorId, port)) {
+          this.log.warn(
+            `Fabric added by Amazon Alexa (vendor ${fabric.rootVendorId}) on port ${port}. Alexa only completes pairing on port 5540, this attempt will roll back about 20s after AddNOC. Recreate the bridge on port 5540 (#401)`
+          );
+        }
+      };
+      fabrics.events.added.on(this.fabricAddedHandler);
+    } catch {
+    }
+  }
+  unwireFabricWarnings() {
+    try {
+      const fabrics = this.server.env.get(FabricManager);
+      if (this.fabricAddedHandler) {
+        fabrics.events.added.off(this.fabricAddedHandler);
+      }
+    } catch {
+    }
+    this.fabricAddedHandler = void 0;
+  }
   stopAutoForceSync() {
     if (this.autoForceSyncTimer) {
       clearInterval(this.autoForceSyncTimer);
@@ -150858,9 +150895,8 @@ var LevelControlServerBase = class extends FeaturedBase4 {
     const config11 = this.state.config;
     const minLevel = 1;
     const maxLevel = 254;
-    const levelRange = maxLevel - minLevel;
     const currentLevelPercent = config11.getValuePercent(state, this.agent);
-    let currentLevel = currentLevelPercent != null ? Math.round(currentLevelPercent * levelRange + minLevel) : null;
+    let currentLevel = currentLevelPercent != null ? Math.round(currentLevelPercent * maxLevel) : null;
     if (currentLevel != null) {
       currentLevel = Math.min(Math.max(minLevel, currentLevel), maxLevel);
     }
@@ -150913,8 +150949,7 @@ var LevelControlServerBase = class extends FeaturedBase4 {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const config11 = this.state.config;
     const entityId = homeAssistant.entity.entity_id;
-    const levelRange = this.maxLevel - this.minLevel;
-    const levelPercent = (level - this.minLevel) / levelRange;
+    const levelPercent = level / this.maxLevel;
     const { featureFlags } = this.env.get(BridgeDataProvider);
     if (featureFlags?.alexaPreserveBrightnessOnTurnOn === true) {
       const lastTurnOn = lastTurnOnTimestamps.get(entityId);
@@ -165313,6 +165348,9 @@ var ServerModeBridge = class {
   sessionAddedHandler;
   // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
   sessionDeletedHandler;
+  // Warns when Alexa pairs on a non-5540 port, the fabric rolls back later (#401).
+  // biome-ignore lint/suspicious/noExplicitAny: matter.js internal types
+  fabricAddedHandler;
   get id() {
     return this.dataProvider.id;
   }
@@ -165438,6 +165476,7 @@ var ServerModeBridge = class {
         });
       }
       this.wireSessionDiagnostics();
+      this.wireFabricWarnings();
       this.startSessionRotation();
       this.scheduleWarmStart();
       logMemoryUsage(this.log, "server mode bridge running");
@@ -165456,6 +165495,7 @@ ${e?.toString()}`);
   async stop(code = BridgeStatus.Stopped, reason = "Manually stopped") {
     this.stopSessionRotation();
     this.unwireSessionDiagnostics();
+    this.unwireFabricWarnings();
     this.cancelWarmStart();
     this.stopAutoForceSync();
     await this.closeActiveSessions();
@@ -165794,6 +165834,35 @@ ${e?.toString()}`);
     this.staleSessionTimers.clear();
     this.sessionStartedAt.clear();
   }
+  // Warn at the fabric-added event when Alexa pairs on a non-5540 port. Alexa
+  // completes AddNOC but never CASEs, so the fabric rolls back on failsafe
+  // expiry ~20s later and the committed-fabric warning path never sees it (#401).
+  wireFabricWarnings() {
+    this.unwireFabricWarnings();
+    try {
+      const fabrics = this.server.env.get(FabricManager);
+      this.fabricAddedHandler = (fabric) => {
+        const port = this.dataProvider.port;
+        if (alexaPairingPortProblem(fabric.rootVendorId, port)) {
+          this.log.warn(
+            `Fabric added by Amazon Alexa (vendor ${fabric.rootVendorId}) on port ${port}. Alexa only completes pairing on port 5540, this attempt will roll back about 20s after AddNOC. Recreate the bridge on port 5540 (#401)`
+          );
+        }
+      };
+      fabrics.events.added.on(this.fabricAddedHandler);
+    } catch {
+    }
+  }
+  unwireFabricWarnings() {
+    try {
+      const fabrics = this.server.env.get(FabricManager);
+      if (this.fabricAddedHandler) {
+        fabrics.events.added.off(this.fabricAddedHandler);
+      }
+    } catch {
+    }
+    this.fabricAddedHandler = void 0;
+  }
   // Start the periodic age-based session rotation (#287).
   startSessionRotation() {
     this.stopSessionRotation();