@riddix/hamh 2.1.0-alpha.770 → 2.1.0-alpha.772

package/dist/backend/cli.js

@@ -125230,6 +125230,12 @@ var init_bridge_config_schema = __esm({
           minimum: 0,
           maximum: 5e3,
           default: 0
+        },
+        fastSessionRecovery: {
+          title: "Fast Session Recovery (Google offline workaround)",
+          description: "When a controller drops all subscriptions, clean up the dead session and re-announce after 5 seconds instead of 60. Opt-in for Google Home users whose devices go offline after a cancelled subscription (#386). It shortens the offline window but cannot stop the controller from rejecting the subscription. Default off.",
+          type: "boolean",
+          default: false
         }
       }
     };
@@ -126317,6 +126323,7 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     customServiceAreas: config11.customServiceAreas,
                     customFanSpeedTags: config11.customFanSpeedTags,
                     fanWindPresets: config11.fanWindPresets,
+                    fanRestoreSpeedOnPowerOn: config11.fanRestoreSpeedOnPowerOn,
                     composedEntities: config11.composedEntities
                   });
                   mappingsRestored++;
@@ -127303,6 +127310,7 @@ function entityMappingApi(mappingStorage) {
       customServiceAreas: body.customServiceAreas,
       customFanSpeedTags: body.customFanSpeedTags,
       fanWindPresets: body.fanWindPresets,
+      fanRestoreSpeedOnPowerOn: body.fanRestoreSpeedOnPowerOn,
       currentRoomEntity: body.currentRoomEntity,
       cleanedAreaEntity: body.cleanedAreaEntity,
       disableCustomAreaRoomModes: body.disableCustomAreaRoomModes,
@@ -127789,6 +127797,7 @@ function configToProfileEntry(config11) {
     customServiceAreas: config11.customServiceAreas,
     customFanSpeedTags: config11.customFanSpeedTags,
     fanWindPresets: config11.fanWindPresets,
+    fanRestoreSpeedOnPowerOn: config11.fanRestoreSpeedOnPowerOn,
     valetudoIdentifier: config11.valetudoIdentifier,
     coverSwapOpenClose: config11.coverSwapOpenClose,
     coverSliderDebounceMs: config11.coverSliderDebounceMs,
@@ -127917,6 +127926,7 @@ function mappingProfileApi(mappingStorage) {
           customServiceAreas: entry.customServiceAreas,
           customFanSpeedTags: entry.customFanSpeedTags,
           fanWindPresets: entry.fanWindPresets,
+          fanRestoreSpeedOnPowerOn: entry.fanRestoreSpeedOnPowerOn,
           valetudoIdentifier: entry.valetudoIdentifier,
           coverSwapOpenClose: entry.coverSwapOpenClose,
           coverSliderDebounceMs: entry.coverSliderDebounceMs,
@@ -132080,6 +132090,7 @@ var EntityMappingStorage = class extends Service {
       ) ?? void 0,
       customFanSpeedTags: request.customFanSpeedTags && Object.keys(request.customFanSpeedTags).length > 0 ? request.customFanSpeedTags : void 0,
       fanWindPresets: request.fanWindPresets && ((request.fanWindPresets.natural?.length ?? 0) > 0 || (request.fanWindPresets.sleep?.length ?? 0) > 0) ? request.fanWindPresets : void 0,
+      fanRestoreSpeedOnPowerOn: request.fanRestoreSpeedOnPowerOn || void 0,
       currentRoomEntity: request.currentRoomEntity?.trim() || void 0,
       cleanedAreaEntity: request.cleanedAreaEntity?.trim() || void 0,
       disableCustomAreaRoomModes: request.disableCustomAreaRoomModes || void 0,
@@ -132095,7 +132106,7 @@ var EntityMappingStorage = class extends Service {
       climateAutoMode: request.climateAutoMode || void 0,
       composedEntities: request.composedEntities?.filter((e) => e.entityId?.trim()) ?? 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.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !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.currentRoomEntity && !config11.cleanedAreaEntity && !config11.disableCustomAreaRoomModes && !config11.valetudoIdentifier && !config11.coverSwapOpenClose && !config11.coverExposeAsDimmableLight && !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.chargingStateEntity && !config11.roomEntities && !config11.disableLockPin && !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.coverSliderDebounceMs && !config11.updateThrottleMs && !config11.disableClimateOnOff && !config11.disableClimateFanControl && !config11.climateKeepModeOnIdle && !config11.climateExposeFan && !config11.climateAutoMode && (!config11.composedEntities || config11.composedEntities.length === 0)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -148857,6 +148868,10 @@ 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 Bridge = class {
   constructor(env, logger234, dataProvider, endpointManager) {
@@ -149171,12 +149186,15 @@ ${e?.toString()}`);
             `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_MS);
+            }, timeoutMs);
             this.log.info(
-              `Scheduled dead session cleanup in ${DEAD_SESSION_TIMEOUT_MS / 1e3}s`
+              `Scheduled dead session cleanup in ${timeoutMs / 1e3}s`
             );
           }
         } else if (totalSubs > 0 && this.deadSessionTimer) {
@@ -149192,7 +149210,7 @@ ${e?.toString()}`);
             setTimeout(() => {
               this.staleSessionTimers.delete(session.id);
               this.closeStaleSession(session.id);
-            }, DEAD_SESSION_TIMEOUT_MS)
+            }, deadSessionTimeoutMs(this.dataProvider.featureFlags))
           );
         } else if (session.subscriptions.size > 0 && this.staleSessionTimers.has(session.id)) {
           clearTimeout(this.staleSessionTimers.get(session.id));
@@ -149256,7 +149274,7 @@ ${e?.toString()}`);
       for (const s of [...sessionManager.sessions]) {
         if (s.id === sessionId && !s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
-            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+            `Closing stale session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s)`
           );
           s.initiateClose().catch(() => {
             return s.initiateForceClose({
@@ -149278,7 +149296,7 @@ ${e?.toString()}`);
       for (const s of sessions) {
         if (!s.isClosing && s.subscriptions.size === 0) {
           this.log.warn(
-            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${DEAD_SESSION_TIMEOUT_MS / 1e3}s)`
+            `Closing dead session ${s.id} (peer ${s.peerNodeId}, no subscriptions for ${deadSessionTimeoutMs(this.dataProvider.featureFlags) / 1e3}s)`
           );
           closes.push(
             s.initiateClose().catch(() => {
@@ -151101,6 +151119,11 @@ var FanControlServerBase = class extends FeaturedBase5 {
     if (!homeAssistant.isAvailable) {
       return;
     }
+    const restoreOnPowerOn = homeAssistant.state.mapping?.fanRestoreSpeedOnPowerOn === true;
+    const wasOff = this.agent.has(OnOffBehavior) && !this.agent.get(OnOffBehavior).state.onOff;
+    if (restoreOnPowerOn && wasOff && this.lastNonZeroPercent > 0 && percentage > 0) {
+      percentage = this.lastNonZeroPercent;
+    }
     const config11 = this.state.config;
     const supportsPercentage = config11.supportsPercentage(
       homeAssistant.entity.state,