@riddix/hamh 2.1.0-alpha.815 → 2.1.0-alpha.816

package/dist/backend/cli.js

@@ -132609,6 +132609,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                     batteryEntity: config11.batteryEntity,
                     roomEntities: config11.roomEntities,
                     disableLockPin: config11.disableLockPin,
+                    lockUsercodeService: config11.lockUsercodeService,
+                    lockUsercodeSlot: config11.lockUsercodeSlot,
                     powerEntity: config11.powerEntity,
                     energyEntity: config11.energyEntity,
                     suctionLevelEntity: config11.suctionLevelEntity,
@@ -132760,6 +132762,8 @@ WARNING: ${includeIdentity ? "This backup contains sensitive Matter identity dat
                   batteryEntity: config11.batteryEntity,
                   roomEntities: config11.roomEntities,
                   disableLockPin: config11.disableLockPin,
+                  lockUsercodeService: config11.lockUsercodeService,
+                  lockUsercodeSlot: config11.lockUsercodeSlot,
                   powerEntity: config11.powerEntity,
                   energyEntity: config11.energyEntity,
                   suctionLevelEntity: config11.suctionLevelEntity,
@@ -133602,6 +133606,8 @@ function entityMappingApi(mappingStorage) {
       chargingStateEntity: body.chargingStateEntity,
       roomEntities: body.roomEntities,
       disableLockPin: body.disableLockPin,
+      lockUsercodeService: body.lockUsercodeService,
+      lockUsercodeSlot: body.lockUsercodeSlot,
       powerEntity: body.powerEntity,
       energyEntity: body.energyEntity,
       suctionLevelEntity: body.suctionLevelEntity,
@@ -134092,6 +134098,8 @@ function configToProfileEntry(config11) {
     batteryEntity: config11.batteryEntity,
     roomEntities: config11.roomEntities,
     disableLockPin: config11.disableLockPin,
+    lockUsercodeService: config11.lockUsercodeService,
+    lockUsercodeSlot: config11.lockUsercodeSlot,
     powerEntity: config11.powerEntity,
     energyEntity: config11.energyEntity,
     suctionLevelEntity: config11.suctionLevelEntity,
@@ -134221,6 +134229,8 @@ function mappingProfileApi(mappingStorage) {
           batteryEntity: entry.batteryEntity,
           roomEntities: entry.roomEntities,
           disableLockPin: entry.disableLockPin,
+          lockUsercodeService: entry.lockUsercodeService,
+          lockUsercodeSlot: entry.lockUsercodeSlot,
           powerEntity: entry.powerEntity,
           energyEntity: entry.energyEntity,
           suctionLevelEntity: entry.suctionLevelEntity,
@@ -138410,6 +138420,8 @@ var EntityMappingStorage = class extends Service {
       chargingStateEntity: request.chargingStateEntity?.trim() || void 0,
       roomEntities: roomEntities.length > 0 ? roomEntities : void 0,
       disableLockPin: request.disableLockPin || void 0,
+      lockUsercodeService: request.lockUsercodeService?.trim() || void 0,
+      lockUsercodeSlot: sanitizeUsercodeSlot(request.lockUsercodeSlot),
       powerEntity: request.powerEntity?.trim() || void 0,
       energyEntity: request.energyEntity?.trim() || void 0,
       pressureEntity: request.pressureEntity?.trim() || void 0,
@@ -138439,7 +138451,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.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.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);
@@ -138469,6 +138481,16 @@ function sanitizeVendorId(value) {
   }
   return n;
 }
+function sanitizeUsercodeSlot(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) {
+    return void 0;
+  }
+  return n;
+}
 function sanitizeDebounceMs(value) {
   if (value === void 0 || value === null || value === "") {
     return void 0;
@@ -164176,6 +164198,27 @@ function normalizeSupportedIndex(index) {
   }
   return null;
 }
+function buildUsercodeSetAction(service, slot, pin) {
+  const pinKey = service.split(".")[0] === "zha" ? "user_code" : "usercode";
+  return { action: service, data: { code_slot: slot, [pinKey]: pin } };
+}
+function buildUsercodeClearAction(service, slot) {
+  return {
+    action: service.replace(".set_", ".clear_"),
+    data: { code_slot: slot }
+  };
+}
+function usercodePassthroughFrom(homeAssistant) {
+  const service = homeAssistant.state.mapping?.lockUsercodeService?.trim();
+  if (!service) {
+    return void 0;
+  }
+  return {
+    service,
+    slot: homeAssistant.state.mapping?.lockUsercodeSlot ?? 1,
+    callAction: (action) => homeAssistant.callAction(action)
+  };
+}
 function asFabricIndex(value) {
   return value === void 0 || value === 0 ? null : FabricIndex3(value);
 }
@@ -164266,7 +164309,7 @@ function buildGetCredentialStatusResponse(env, entityId, request) {
     nextCredentialIndex: null
   };
 }
-async function applySetCredential(env, entityId, request, fabricIndex) {
+async function applySetCredential(env, entityId, request, fabricIndex, passthrough) {
   if (request.credential.credentialType !== DoorLock3.CredentialType.Pin || normalizeSupportedIndex(request.credential.credentialIndex) === null) {
     return {
       status: Status2.Failure,
@@ -164292,6 +164335,9 @@ async function applySetCredential(env, entityId, request, fabricIndex) {
       lastModifiedFabricIndex: fabricIndex,
       creatorFabricIndex: fabricIndex
     });
+    passthrough?.callAction(
+      buildUsercodeSetAction(passthrough.service, passthrough.slot, pinCode)
+    );
   }
   return {
     status: Status2.Success,
@@ -164311,15 +164357,35 @@ async function applySetUser(env, entityId, request, fabricIndex) {
     fabricIndex
   });
 }
-async function applyClearCredential(env, entityId, request) {
+async function applyClearCredential(env, entityId, request, passthrough) {
   if (request.credential === null) {
     const storage2 = env.get(LockCredentialStorage);
     await storage2.deleteCredential(entityId);
+    passthrough?.callAction(
+      buildUsercodeClearAction(passthrough.service, passthrough.slot)
+    );
     return;
   }
   if (request.credential.credentialType === DoorLock3.CredentialType.Pin && normalizeSupportedIndex(request.credential.credentialIndex) !== null) {
     const storage2 = env.get(LockCredentialStorage);
     await storage2.deleteCredential(entityId);
+    passthrough?.callAction(
+      buildUsercodeClearAction(passthrough.service, passthrough.slot)
+    );
+  }
+}
+async function applyClearUser(env, entityId, request, passthrough) {
+  const slot = normalizeSupportedIndex(request.userIndex);
+  if (slot === null && request.userIndex !== 65534) {
+    return;
+  }
+  const storage2 = env.get(LockCredentialStorage);
+  const hadCredential = storage2.hasCredential(entityId);
+  await storage2.deleteCredential(entityId);
+  if (hadCredential) {
+    passthrough?.callAction(
+      buildUsercodeClearAction(passthrough.service, passthrough.slot)
+    );
   }
 }
 var LockServerBase = class extends DoorLockServer {
@@ -164495,12 +164561,13 @@ var LockServerWithPinBase = class extends PinCredentialBase {
     );
   }
   async clearUser(request) {
-    const slot = normalizeSupportedIndex(request.userIndex);
-    if (slot !== null || request.userIndex === 65534) {
-      const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-      const storage2 = this.env.get(LockCredentialStorage);
-      await storage2.deleteCredential(homeAssistant.entityId);
-    }
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    await applyClearUser(
+      this.env,
+      homeAssistant.entityId,
+      request,
+      usercodePassthroughFrom(homeAssistant)
+    );
   }
   async setCredential(request) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
@@ -164508,7 +164575,8 @@ var LockServerWithPinBase = class extends PinCredentialBase {
       this.env,
       homeAssistant.entityId,
       request,
-      this.context.fabric
+      this.context.fabric,
+      usercodePassthroughFrom(homeAssistant)
     );
   }
   getCredentialStatus(request) {
@@ -164521,7 +164589,12 @@ var LockServerWithPinBase = class extends PinCredentialBase {
   }
   async clearCredential(request) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    await applyClearCredential(this.env, homeAssistant.entityId, request);
+    await applyClearCredential(
+      this.env,
+      homeAssistant.entityId,
+      request,
+      usercodePassthroughFrom(homeAssistant)
+    );
   }
 };
 ((LockServerWithPinBase2) => {
@@ -164691,12 +164764,13 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
     );
   }
   async clearUser(request) {
-    const slot = normalizeSupportedIndex(request.userIndex);
-    if (slot !== null || request.userIndex === 65534) {
-      const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-      const storage2 = this.env.get(LockCredentialStorage);
-      await storage2.deleteCredential(homeAssistant.entityId);
-    }
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    await applyClearUser(
+      this.env,
+      homeAssistant.entityId,
+      request,
+      usercodePassthroughFrom(homeAssistant)
+    );
   }
   async setCredential(request) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
@@ -164704,7 +164778,8 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
       this.env,
       homeAssistant.entityId,
       request,
-      this.context.fabric
+      this.context.fabric,
+      usercodePassthroughFrom(homeAssistant)
     );
   }
   getCredentialStatus(request) {
@@ -164717,7 +164792,12 @@ var LockServerWithPinAndUnboltBase = class extends PinCredentialUnboltBase {
   }
   async clearCredential(request) {
     const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    await applyClearCredential(this.env, homeAssistant.entityId, request);
+    await applyClearCredential(
+      this.env,
+      homeAssistant.entityId,
+      request,
+      usercodePassthroughFrom(homeAssistant)
+    );
   }
 };
 ((LockServerWithPinAndUnboltBase2) => {
@@ -170440,7 +170520,11 @@ init_esm();
 init_esm3();
 
 // src/plugins/builtin/camera/av-stream-server.ts
-var Base4 = CameraAvStreamManagementServer.with("Video", "Audio", "Snapshot");
+var Base4 = CameraAvStreamManagementServer.with(
+  "Video",
+  "Snapshot",
+  "ImageControl"
+);
 var CameraAvStreamServer = class extends Base4 {
   setStreamPriorities(request) {
     this.state.streamUsagePriorities = request.streamPriorities;
@@ -170472,28 +170556,6 @@ var CameraAvStreamServer = class extends Base4 {
       (s) => s.videoStreamId !== request.videoStreamId
     );
   }
-  audioStreamAllocate(request) {
-    const audioStreamId = this.state.nextAudioStreamId++;
-    this.state.allocatedAudioStreams = [
-      ...this.state.allocatedAudioStreams,
-      {
-        audioStreamId,
-        streamUsage: request.streamUsage,
-        audioCodec: request.audioCodec,
-        channelCount: request.channelCount,
-        sampleRate: request.sampleRate,
-        bitRate: request.bitRate,
-        bitDepth: request.bitDepth,
-        referenceCount: 1
-      }
-    ];
-    return { audioStreamId };
-  }
-  audioStreamDeallocate(request) {
-    this.state.allocatedAudioStreams = this.state.allocatedAudioStreams.filter(
-      (s) => s.audioStreamId !== request.audioStreamId
-    );
-  }
   snapshotStreamAllocate(request) {
     const snapshotStreamId = this.state.nextSnapshotStreamId++;
     this.state.allocatedSnapshotStreams = [
@@ -170531,7 +170593,6 @@ var CameraAvStreamServer = class extends Base4 {
     bridge;
     entityId;
     nextVideoStreamId = 1;
-    nextAudioStreamId = 1;
     nextSnapshotStreamId = 1;
   }
   CameraAvStreamServer2.State = State;
@@ -170611,7 +170672,12 @@ var CameraWebRtcProviderServer = class extends WebRtcTransportProviderServer {
 })(CameraWebRtcProviderServer || (CameraWebRtcProviderServer = {}));
 
 // src/plugins/builtin/camera/camera-endpoint.ts
-function createCameraEndpointType(bridge, entityId) {
+var defaultSensorParams = {
+  sensorWidth: 1920,
+  sensorHeight: 1080,
+  maxFps: 30
+};
+function createCameraEndpointType(bridge, entityId, sensor = defaultSensorParams) {
   return CameraDevice.with(
     CameraAvStreamServer,
     CameraWebRtcProviderServer
@@ -170628,14 +170694,54 @@ function createCameraEndpointType(bridge, entityId) {
       supportedStreamUsages: [StreamUsage.LiveView],
       streamUsagePriorities: [StreamUsage.LiveView],
       allocatedVideoStreams: [],
-      allocatedAudioStreams: [],
       allocatedSnapshotStreams: [],
       maxConcurrentEncoders: 1,
       maxEncodedPixelRate: 3840 * 2160 * 30,
-      maxNetworkBandwidth: 2e4,
+      maxNetworkBandwidth: 2e7,
+      // 20 Mbps, attribute is bits per second
       currentFrameRate: 0,
+      videoSensorParams: {
+        sensorWidth: sensor.sensorWidth,
+        sensorHeight: sensor.sensorHeight,
+        maxFps: sensor.maxFps
+      },
+      viewport: {
+        x1: 0,
+        y1: 0,
+        x2: sensor.sensorWidth,
+        y2: sensor.sensorHeight
+      },
+      minViewportResolution: { width: 64, height: 64 },
+      rateDistortionTradeOffPoints: [
+        {
+          codec: CameraAvStreamManagement3.VideoCodec.H264,
+          resolution: {
+            width: sensor.sensorWidth,
+            height: sensor.sensorHeight
+          },
+          minBitRate: 1e4
+        }
+      ],
+      maxContentBufferSize: 1048576,
+      // one snapshot jpeg in flight
+      // ImageControl attributes: matter.js 0.17.5 conformance forces the
+      // feature. Controllers can write these but the proxied HA media path
+      // never applies a transform.
+      imageRotation: 0,
+      imageFlipHorizontal: false,
+      imageFlipVertical: false,
+      snapshotCapabilities: [
+        {
+          resolution: {
+            width: sensor.sensorWidth,
+            height: sensor.sensorHeight
+          },
+          maxFrameRate: 1,
+          imageCodec: CameraAvStreamManagement3.ImageCodec.Jpeg,
+          requiresEncodedPixels: false
+        }
+      ],
       nextVideoStreamId: 1,
-      nextAudioStreamId: 1,
       nextSnapshotStreamId: 1
     }
   });
@@ -170848,6 +170954,27 @@ var CameraPlugin = class {
           title: "Camera entity ids (comma-separated)",
           description: "e.g. camera.front,camera.garage",
           required: true
+        },
+        sensorWidth: {
+          type: "number",
+          title: "Sensor width (px)",
+          description: "Video sensor width reported to controllers.",
+          default: defaultSensorParams.sensorWidth,
+          required: false
+        },
+        sensorHeight: {
+          type: "number",
+          title: "Sensor height (px)",
+          description: "Video sensor height reported to controllers.",
+          default: defaultSensorParams.sensorHeight,
+          required: false
+        },
+        maxFps: {
+          type: "number",
+          title: "Max frame rate (fps)",
+          description: "Maximum frame rate the sensor supports.",
+          default: defaultSensorParams.maxFps,
+          required: false
         }
       }
     };
@@ -170869,19 +170996,37 @@ var CameraPlugin = class {
       this.log.info("no camera entity ids configured");
       return;
     }
+    const sensor = this.sensorParams();
     this.bridge = new WebRtcBridge({ haUrl, haToken });
     for (const entityId of entityIds) {
       const id = entityId.replace(/\./g, "_");
       await context.registerDevice({
         id,
         name: entityId,
-        endpointType: createCameraEndpointType(this.bridge, entityId),
+        endpointType: createCameraEndpointType(this.bridge, entityId, sensor),
         clusters: []
       });
       this.deviceIds.push(id);
     }
     this.log.info(`Exposed ${this.deviceIds.length} camera(s)`);
   }
+  // Clamp the configured sensor to values the cluster accepts; a bad or missing
+  // entry falls back to the default for that field.
+  sensorParams() {
+    const dim = (n, fallback) => typeof n === "number" && Number.isFinite(n) ? Math.min(65535, Math.max(64, Math.floor(n))) : fallback;
+    const fps = (n, fallback) => typeof n === "number" && Number.isFinite(n) ? Math.min(65535, Math.max(1, Math.floor(n))) : fallback;
+    return {
+      sensorWidth: dim(
+        this.config.sensorWidth,
+        defaultSensorParams.sensorWidth
+      ),
+      sensorHeight: dim(
+        this.config.sensorHeight,
+        defaultSensorParams.sensorHeight
+      ),
+      maxFps: fps(this.config.maxFps, defaultSensorParams.maxFps)
+    };
+  }
   async teardown() {
     for (const id of this.deviceIds) {
       await this.context?.unregisterDevice(id).catch(() => {