@riddix/hamh 2.1.0-alpha.820 → 2.1.0-alpha.822

package/dist/backend/cli.js

@@ -132611,6 +132611,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     disableLockPin: config11.disableLockPin,
                     lockUsercodeService: config11.lockUsercodeService,
                     lockUsercodeSlot: config11.lockUsercodeSlot,
+                    lockPinMinLength: config11.lockPinMinLength,
+                    lockPinMaxLength: config11.lockPinMaxLength,
                     powerEntity: config11.powerEntity,
                     energyEntity: config11.energyEntity,
                     suctionLevelEntity: config11.suctionLevelEntity,
@@ -132764,6 +132766,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   disableLockPin: config11.disableLockPin,
                   lockUsercodeService: config11.lockUsercodeService,
                   lockUsercodeSlot: config11.lockUsercodeSlot,
+                  lockPinMinLength: config11.lockPinMinLength,
+                  lockPinMaxLength: config11.lockPinMaxLength,
                   powerEntity: config11.powerEntity,
                   energyEntity: config11.energyEntity,
                   suctionLevelEntity: config11.suctionLevelEntity,
@@ -133608,6 +133612,8 @@ function entityMappingApi(mappingStorage) {
       disableLockPin: body.disableLockPin,
       lockUsercodeService: body.lockUsercodeService,
       lockUsercodeSlot: body.lockUsercodeSlot,
+      lockPinMinLength: body.lockPinMinLength,
+      lockPinMaxLength: body.lockPinMaxLength,
       powerEntity: body.powerEntity,
       energyEntity: body.energyEntity,
       suctionLevelEntity: body.suctionLevelEntity,
@@ -134100,6 +134106,8 @@ function configToProfileEntry(config11) {
     disableLockPin: config11.disableLockPin,
     lockUsercodeService: config11.lockUsercodeService,
     lockUsercodeSlot: config11.lockUsercodeSlot,
+    lockPinMinLength: config11.lockPinMinLength,
+    lockPinMaxLength: config11.lockPinMaxLength,
     powerEntity: config11.powerEntity,
     energyEntity: config11.energyEntity,
     suctionLevelEntity: config11.suctionLevelEntity,
@@ -134231,6 +134239,8 @@ function mappingProfileApi(mappingStorage) {
           disableLockPin: entry.disableLockPin,
           lockUsercodeService: entry.lockUsercodeService,
           lockUsercodeSlot: entry.lockUsercodeSlot,
+          lockPinMinLength: entry.lockPinMinLength,
+          lockPinMaxLength: entry.lockPinMaxLength,
           powerEntity: entry.powerEntity,
           energyEntity: entry.energyEntity,
           suctionLevelEntity: entry.suctionLevelEntity,
@@ -138403,6 +138413,10 @@ var EntityMappingStorage = class extends Service {
       this.mappings.set(request.bridgeId, bridgeMap);
     }
     const roomEntities = request.roomEntities?.filter((e) => e?.trim()) || [];
+    const pinLengths = sanitizePinLengths(
+      request.lockPinMinLength,
+      request.lockPinMaxLength
+    );
     const config11 = {
       entityId: request.entityId,
       matterDeviceType: request.matterDeviceType,
@@ -138422,6 +138436,8 @@ var EntityMappingStorage = class extends Service {
       disableLockPin: request.disableLockPin || void 0,
       lockUsercodeService: request.lockUsercodeService?.trim() || void 0,
       lockUsercodeSlot: sanitizeUsercodeSlot(request.lockUsercodeSlot),
+      lockPinMinLength: pinLengths.min,
+      lockPinMaxLength: pinLengths.max,
       powerEntity: request.powerEntity?.trim() || void 0,
       energyEntity: request.energyEntity?.trim() || void 0,
       pressureEntity: request.pressureEntity?.trim() || void 0,
@@ -138451,7 +138467,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.lockUsercodeService && config11.lockUsercodeSlot === 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.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)) {
       bridgeMap.delete(request.entityId);
     } else {
       bridgeMap.set(request.entityId, config11);
@@ -138491,6 +138507,24 @@ function sanitizeUsercodeSlot(value) {
   }
   return n;
 }
+function sanitizePinLength(value) {
+  if (value === void 0 || value === null || value === "") {
+    return void 0;
+  }
+  const n = typeof value === "string" ? Number(value) : value;
+  if (typeof n !== "number" || !Number.isInteger(n) || n < 1 || n > 20) {
+    return void 0;
+  }
+  return n;
+}
+function sanitizePinLengths(min, max) {
+  const lo = sanitizePinLength(min);
+  const hi = sanitizePinLength(max);
+  if ((lo ?? 4) > (hi ?? 8)) {
+    return { min: void 0, max: void 0 };
+  }
+  return { min: lo, max: hi };
+}
 function sanitizeDebounceMs(value) {
   if (value === void 0 || value === null || value === "") {
     return void 0;
@@ -161777,6 +161811,20 @@ function getCoverDebounce(endpoint) {
   }
   return st;
 }
+function clearPendingLift(st) {
+  if (st.liftTimer) {
+    clearTimeout(st.liftTimer);
+    st.liftTimer = null;
+  }
+  st.pendingLift = null;
+}
+function clearPendingTilt(st) {
+  if (st.tiltTimer) {
+    clearTimeout(st.tiltTimer);
+    st.tiltTimer = null;
+  }
+  st.pendingTilt = null;
+}
 var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedBase6 {
   // Written and read within one synchronous command (upOrOpen fires lift then
   // tilt on the same instance), so these stay as instance fields (#246).
@@ -161802,14 +161850,8 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
   async [Symbol.asyncDispose]() {
     const st = coverDebounce.get(this.endpoint);
     if (st) {
-      if (st.liftTimer) {
-        clearTimeout(st.liftTimer);
-      }
-      if (st.tiltTimer) {
-        clearTimeout(st.tiltTimer);
-      }
-      st.pendingLift = null;
-      st.pendingTilt = null;
+      clearPendingLift(st);
+      clearPendingTilt(st);
       coverDebounce.delete(this.endpoint);
     }
     await super[Symbol.asyncDispose]();
@@ -161974,16 +162016,21 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     }
   }
   handleStopMovement() {
+    const st = getCoverDebounce(this.endpoint);
+    clearPendingLift(st);
+    clearPendingTilt(st);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     homeAssistant.callAction(this.state.config.stopCover(void 0, this.agent));
   }
   handleLiftOpen() {
+    clearPendingLift(getCoverDebounce(this.endpoint));
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.openCoverLift(void 0, this.agent);
     logger216.info(`handleLiftOpen: calling action=${action.action}`);
     homeAssistant.callAction(action);
   }
   handleLiftClose() {
+    clearPendingLift(getCoverDebounce(this.endpoint));
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const action = this.state.config.closeCoverLift(void 0, this.agent);
     logger216.info(`handleLiftClose: calling action=${action.action}`);
@@ -162029,12 +162076,18 @@ var WindowCoveringServerBase = class _WindowCoveringServerBase extends FeaturedB
     }, debounceMs);
   }
   handleTiltOpen() {
+    const st = getCoverDebounce(this.endpoint);
+    clearPendingTilt(st);
+    if (st.pendingLift?.action.action.includes("tilt")) clearPendingLift(st);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     homeAssistant.callAction(
       this.state.config.openCoverTilt(void 0, this.agent)
     );
   }
   handleTiltClose() {
+    const st = getCoverDebounce(this.endpoint);
+    clearPendingTilt(st);
+    if (st.pendingLift?.action.action.includes("tilt")) clearPendingLift(st);
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     homeAssistant.callAction(
       this.state.config.closeCoverTilt(void 0, this.agent)
@@ -164405,6 +164458,24 @@ function usercodePassthroughFrom(homeAssistant) {
     callAction: (action) => homeAssistant.callAction(action)
   };
 }
+var DEFAULT_MIN_PIN_LENGTH = 4;
+var DEFAULT_MAX_PIN_LENGTH = 8;
+var PIN_LENGTH_SPEC_MIN = 1;
+var PIN_LENGTH_SPEC_MAX = 20;
+function clampPinLength(value) {
+  if (value === void 0 || !Number.isInteger(value) || value < PIN_LENGTH_SPEC_MIN || value > PIN_LENGTH_SPEC_MAX) {
+    return void 0;
+  }
+  return value;
+}
+function effectivePinCodeLengths(homeAssistant) {
+  const min = clampPinLength(homeAssistant.state.mapping?.lockPinMinLength) ?? DEFAULT_MIN_PIN_LENGTH;
+  const max = clampPinLength(homeAssistant.state.mapping?.lockPinMaxLength) ?? DEFAULT_MAX_PIN_LENGTH;
+  if (min > max) {
+    return { min: DEFAULT_MIN_PIN_LENGTH, max: DEFAULT_MAX_PIN_LENGTH };
+  }
+  return { min, max };
+}
 function asFabricIndex(value) {
   return value === void 0 || value === 0 ? null : FabricIndex3(value);
 }
@@ -164663,6 +164734,7 @@ var LockServerWithPinBase = class extends PinCredentialBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const isPinDisabledByMapping = homeAssistant.state.mapping?.disableLockPin === true;
     const hasPinConfigured = !isPinDisabledByMapping && hasStoredCredentialHelper(this.env, homeAssistant.entityId);
+    const pinLengths = effectivePinCodeLengths(homeAssistant);
     applyPatchState(this.state, {
       lockState: this.state.config.getLockState(entity.state, this.agent),
       lockType: DoorLock3.LockType.DeadBolt,
@@ -164682,8 +164754,8 @@ var LockServerWithPinBase = class extends PinCredentialBase {
       numberOfPinUsersSupported: 1,
       numberOfTotalUsersSupported: 1,
       numberOfCredentialsSupportedPerUser: 1,
-      maxPinCodeLength: 8,
-      minPinCodeLength: 4,
+      maxPinCodeLength: pinLengths.max,
+      minPinCodeLength: pinLengths.min,
       requirePinForRemoteOperation: hasPinConfigured
     });
   }
@@ -164836,6 +164908,7 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
     const isPinDisabledByMapping = homeAssistant.state.mapping?.disableLockPin === true;
     const hasPinConfigured = !isPinDisabledByMapping && hasStoredCredentialHelper(this.env, homeAssistant.entityId);
+    const pinLengths = effectivePinCodeLengths(homeAssistant);
     applyPatchState(this.state, {
       lockState: this.state.config.getLockState(entity.state, this.agent),
       lockType: DoorLock3.LockType.DeadBolt,
@@ -164855,8 +164928,8 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
       numberOfPinUsersSupported: 1,
       numberOfTotalUsersSupported: 1,
       numberOfCredentialsSupportedPerUser: 1,
-      maxPinCodeLength: 8,
-      minPinCodeLength: 4,
+      maxPinCodeLength: pinLengths.max,
+      minPinCodeLength: pinLengths.min,
       requirePinForRemoteOperation: hasPinConfigured
     });
   }