@riddix/hamh 2.1.0-alpha.827 → 2.1.0-alpha.829

package/dist/backend/cli.js

@@ -132628,7 +132628,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     customFanSpeedTags: config11.customFanSpeedTags,
                     fanWindPresets: config11.fanWindPresets,
                     fanRestoreSpeedOnPowerOn: config11.fanRestoreSpeedOnPowerOn,
-                    composedEntities: config11.composedEntities
+                    composedEntities: config11.composedEntities,
+                    disableMomentaryFlip: config11.disableMomentaryFlip
                   });
                   mappingsRestored++;
                 }
@@ -132784,7 +132785,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   customServiceAreas: config11.customServiceAreas,
                   customFanSpeedTags: config11.customFanSpeedTags,
                   fanWindPresets: config11.fanWindPresets,
-                  composedEntities: config11.composedEntities
+                  composedEntities: config11.composedEntities,
+                  disableMomentaryFlip: config11.disableMomentaryFlip
                 });
                 mappingsRestored++;
               }
@@ -133641,7 +133643,8 @@ function entityMappingApi(mappingStorage) {
       climateKeepModeOnIdle: body.climateKeepModeOnIdle,
       climateExposeFan: body.climateExposeFan,
       climateAutoMode: body.climateAutoMode,
-      composedEntities: body.composedEntities
+      composedEntities: body.composedEntities,
+      disableMomentaryFlip: body.disableMomentaryFlip
     };
     const config11 = await mappingStorage.setMapping(request);
     res.status(200).json(config11);
@@ -134127,7 +134130,8 @@ function configToProfileEntry(config11) {
     disableClimateFanControl: config11.disableClimateFanControl,
     climateKeepModeOnIdle: config11.climateKeepModeOnIdle,
     climateExposeFan: config11.climateExposeFan,
-    climateAutoMode: config11.climateAutoMode
+    climateAutoMode: config11.climateAutoMode,
+    disableMomentaryFlip: config11.disableMomentaryFlip
   };
 }
 function mappingProfileApi(mappingStorage) {
@@ -134261,7 +134265,8 @@ function mappingProfileApi(mappingStorage) {
           disableClimateFanControl: entry.disableClimateFanControl,
           climateKeepModeOnIdle: entry.climateKeepModeOnIdle,
           climateExposeFan: entry.climateExposeFan,
-          climateAutoMode: entry.climateAutoMode
+          climateAutoMode: entry.climateAutoMode,
+          disableMomentaryFlip: entry.disableMomentaryFlip
         });
         applied++;
       } catch (e) {
@@ -138475,9 +138480,10 @@ var EntityMappingStorage = class extends Service {
       climateKeepModeOnIdle: request.climateKeepModeOnIdle || void 0,
       climateExposeFan: request.climateExposeFan || void 0,
       climateAutoMode: request.climateAutoMode || void 0,
-      composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0
+      composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? void 0,
+      disableMomentaryFlip: request.disableMomentaryFlip || void 0
     };
-    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0)) {
+    if (!config11.matterDeviceType && !config11.customName && !config11.customProductName && !config11.customVendorName && !config11.customSerialNumber && config11.customVendorId === void 0 && config11.disabled !== true && !config11.filterLifeEntity && !config11.cleaningModeEntity && !config11.temperatureEntity && !config11.humidityEntity && !config11.batteryEntity && !config11.disableBatteryMapping && !config11.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !config11.lockUsercodeService && config11.lockUsercodeSlot === void 0 && config11.lockPinMinLength === void 0 && config11.lockPinMaxLength === void 0 && !config11.powerEntity && !config11.energyEntity && !config11.pressureEntity && !config11.suctionLevelEntity && !config11.mopIntensityEntity && (!config11.customServiceAreas || config11.customServiceAreas.length === 0) && (!config11.customFanSpeedTags || Object.keys(config11.customFanSpeedTags).length === 0) && (!config11.fanWindPresets || (config11.fanWindPresets.natural?.length ?? 0) === 0 && (config11.fanWindPresets.sleep?.length ?? 0) === 0) && !config11.fanRestoreSpeedOnPowerOn && !config11.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !config11.selectExposeAsSwitch && !config11.selectSwitchOnOption && !config11.selectSwitchOffOption && !config11.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0) && !config11.disableMomentaryFlip) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -155969,6 +155975,11 @@ function parseSessionMaxAgeHours(raw) {
   if (n > max) return max;
   return n;
 }
+var DEAD_SESSION_TIMEOUT_MS = 6e4;
+var FAST_DEAD_SESSION_TIMEOUT_MS = 5e3;
+function deadSessionTimeoutMs(flags2) {
+  return flags2?.fastSessionRecovery ? FAST_DEAD_SESSION_TIMEOUT_MS : DEAD_SESSION_TIMEOUT_MS;
+}
 var STALE_SESSION_QUIET_WINDOW_MS = 5 * 60 * 1e3;
 function staleSessionQuietWindowMs(flags2) {
   return flags2?.fastSessionRecovery ? 0 : STALE_SESSION_QUIET_WINDOW_MS;
@@ -156003,11 +156014,6 @@ 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 FAST_DEAD_SESSION_TIMEOUT_MS = 5e3;
-function deadSessionTimeoutMs(flags2) {
-  return flags2?.fastSessionRecovery ? FAST_DEAD_SESSION_TIMEOUT_MS : DEAD_SESSION_TIMEOUT_MS;
-}
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS = 6e4;
 var Bridge = class {
@@ -158281,20 +158287,25 @@ var OnOffServerBase = class extends OnOffServer {
     }
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = turnOn ? turnOn(void 0, this.agent) : defaultOnOffAction(homeAssistant.entityId, true);
-    applyPatchState(this.state, { onOff: true });
+    const skipMomentaryFlip = turnOff === null && homeAssistant.state.mapping?.disableMomentaryFlip;
+    if (!skipMomentaryFlip) {
+      applyPatchState(this.state, { onOff: true });
+    }
     if (!action) {
       return;
     }
     logger207.info(`[${homeAssistant.entityId}] Turning ON -> ${action.action}`);
     notifyLightTurnedOn(homeAssistant.entityId);
-    const now = Date.now();
-    sweepOptimisticOnOff(now);
-    optimisticOnOffState.set(homeAssistant.entityId, {
-      expectedOnOff: true,
-      timestamp: now
-    });
+    if (!skipMomentaryFlip) {
+      const now = Date.now();
+      sweepOptimisticOnOff(now);
+      optimisticOnOffState.set(homeAssistant.entityId, {
+        expectedOnOff: true,
+        timestamp: now
+      });
+    }
     homeAssistant.callAction(action);
-    if (turnOff === null) {
+    if (turnOff === null && !skipMomentaryFlip) {
       setTimeout(this.callback(this.autoReset), 1e3);
     }
   }
@@ -161768,6 +161779,9 @@ var ButtonOnOffServerBase = class extends OnOffServer {
   on() {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     homeAssistant.callAction({ action: "button.press" });
+    if (homeAssistant.state.mapping?.disableMomentaryFlip) {
+      return;
+    }
     setTimeout(this.callback(this.resetToOff), 1e3);
   }
   off() {
@@ -172989,7 +173003,6 @@ init_esm7();
 import * as os10 from "node:os";
 init_diagnostic_event_bus();
 var AUTO_FORCE_SYNC_INTERVAL_MS2 = 9e4;
-var DEAD_SESSION_TIMEOUT_MS2 = 6e4;
 var SHUTDOWN_SESSION_CLOSE_TIMEOUT_MS2 = 2500;
 var MDNS_ADDRESS_CHECK_INTERVAL_MS2 = 6e4;
 function makeWarmStartState(state, now = (/* @__PURE__ */ new Date()).toISOString()) {
@@ -173272,17 +173285,34 @@ ${e?.toString()}`);
         this.log.debug(
           `Session ${session.id} (peer ${session.peerNodeId}): subscriptions=${session.subscriptions.size} | total: sessions=${sessions.length} subscriptions=${totalSubs}`
         );
+        diagnosticEventBus.emit(
+          "subscription_changed",
+          `Session ${session.id}: ${session.subscriptions.size} subs (total ${totalSubs})`,
+          {
+            bridgeId: this.data.id,
+            bridgeName: this.data.name,
+            details: {
+              sessionId: session.id,
+              sessionSubs: session.subscriptions.size,
+              totalSessions: sessions.length,
+              totalSubs
+            }
+          }
+        );
         if (totalSubs === 0 && sessions.length > 0) {
           this.log.warn(
             `All subscriptions lost, ${sessions.length} session(s) still active, waiting for controller to re-subscribe`
           );
           if (!this.deadSessionTimer) {
+            const timeoutMs = deadSessionTimeoutMs(
+              this.dataProvider.featureFlags
+            );
             this.deadSessionTimer = setTimeout(() => {
               this.deadSessionTimer = null;
               this.closeDeadSessions();
-            }, DEAD_SESSION_TIMEOUT_MS2);
+            }, timeoutMs);
             this.log.info(
-              `Scheduled dead session cleanup in ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s`
+              `Scheduled dead session cleanup in ${timeoutMs / 1e3}s`
             );
           }
         } else if (totalSubs > 0 && this.deadSessionTimer) {
@@ -173298,7 +173328,7 @@ ${e?.toString()}`);
             setTimeout(() => {
               this.staleSessionTimers.delete(session.id);
               this.closeStaleSession(session.id);
-            }, DEAD_SESSION_TIMEOUT_MS2)
+            }, deadSessionTimeoutMs(this.dataProvider.featureFlags))
           );
         } else if (session.subscriptions.size > 0 && this.staleSessionTimers.has(session.id)) {
           clearTimeout(this.staleSessionTimers.get(session.id));
@@ -173311,6 +173341,15 @@ ${e?.toString()}`);
         this.log.info(
           `Session opened: id=${newSession.id} peer=${newSession.peerNodeId}`
         );
+        diagnosticEventBus.emit(
+          "session_opened",
+          `Session ${newSession.id} opened (peer ${newSession.peerNodeId})`,
+          {
+            bridgeId: this.data.id,
+            bridgeName: this.data.name,
+            details: { sessionId: newSession.id }
+          }
+        );
         for (const s of [...sessionManager.sessions]) {
           if (s !== newSession && !s.isClosing && s.peerNodeId === newSession.peerNodeId && s.fabric?.fabricIndex === newSession.fabric?.fabricIndex && s.subscriptions.size === 0) {
             this.log.info(
@@ -173359,6 +173398,18 @@ ${e?.toString()}`);
         this.log.warn(
           `Session closed: id=${session.id} peer=${session.peerNodeId} | remaining sessions=${sessions.length}`
         );
+        diagnosticEventBus.emit(
+          "session_closed",
+          `Session ${session.id} closed (peer ${session.peerNodeId})`,
+          {
+            bridgeId: this.data.id,
+            bridgeName: this.data.name,
+            details: {
+              sessionId: session.id,
+              remainingSessions: sessions.length
+            }
+          }
+        );
       };
       sessionManager.sessions.added.on(this.sessionAddedHandler);
       sessionManager.sessions.deleted.on(this.sessionDeletedHandler);
@@ -173386,12 +173437,12 @@ ${e?.toString()}`);
             setTimeout(() => {
               this.staleSessionTimers.delete(sessionId);
               this.closeStaleSession(sessionId);
-            }, DEAD_SESSION_TIMEOUT_MS2)
+            }, deadSessionTimeoutMs(this.dataProvider.featureFlags))
           );
           break;
         }
         this.log.warn(
-          `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s, no traffic for ${idleSec}s)`
+          `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s, no traffic for ${idleSec}s)`
         );
         s.initiateClose().catch(() => {
           return s.initiateForceClose({
@@ -173426,7 +173477,7 @@ ${e?.toString()}`);
           continue;
         }
         this.log.warn(
-          `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS2 / 1e3}s, no traffic for ${idleSec}s)`
+          `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s, no traffic for ${idleSec}s)`
         );
         closes.push(
           s.initiateClose().catch(() => {
@@ -173440,7 +173491,7 @@ ${e?.toString()}`);
         this.deadSessionTimer = setTimeout(() => {
           this.deadSessionTimer = null;
           this.closeDeadSessions();
-        }, DEAD_SESSION_TIMEOUT_MS2);
+        }, deadSessionTimeoutMs(this.dataProvider.featureFlags));
       }
       if (closes.length > 0) {
         Promise.allSettled(closes).then(() => this.triggerMdnsReAnnounce());