@riddix/hamh 2.1.0-alpha.759 → 2.1.0-alpha.761

package/README.md

@@ -524,6 +524,7 @@ Newest first.
 
 | Contributor | Contributions |
 |-------------|---------------|
+| [@qbattersby](https://github.com/qbattersby) | 🤖 **Code Contributor** - LevelControl transitionTime patch for matter.js 0.17, so Google Home can dim already-on lights ([#383](https://github.com/RiDDiX/home-assistant-matter-hub/pull/383)) |
 | [@Yllelder](https://github.com/Yllelder) | 🌐 **Translator** - Spanish translation ([#314](https://github.com/RiDDiX/home-assistant-matter-hub/pull/314)) |
 | [@MStankiewiczOfficial](https://github.com/MStankiewiczOfficial) | 🌐 **Translator** - Polish translation ([#288](https://github.com/RiDDiX/home-assistant-matter-hub/pull/288), [#329](https://github.com/RiDDiX/home-assistant-matter-hub/pull/329)) |
 | [@aetasoul](https://github.com/aetasoul) | 🤖 **Code Contributor** - Immediate force sync on startup to beat stale Alexa queues ([#282](https://github.com/RiDDiX/home-assistant-matter-hub/pull/282)) |

package/dist/backend/cli.js

@@ -7,8 +7,13 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
   if (typeof require !== "undefined") return require.apply(this, arguments);
   throw Error('Dynamic require of "' + x + '" is not supported');
 });
-var __esm = (fn, res) => function __init() {
-  return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+var __esm = (fn, res, err) => function __init() {
+  if (err) throw err[0];
+  try {
+    return fn && (res = (0, fn[__getOwnPropNames(fn)[0]])(fn = 0)), res;
+  } catch (e) {
+    throw err = [e], e;
+  }
 };
 var __export = (target, all) => {
   for (var name in all)
@@ -123872,6 +123877,7 @@ var init_home_assistant_filter = __esm({
       HomeAssistantMatcherType2["EntityCategory"] = "entity_category";
       HomeAssistantMatcherType2["DeviceName"] = "device_name";
       HomeAssistantMatcherType2["ProductName"] = "product_name";
+      HomeAssistantMatcherType2["Manufacturer"] = "manufacturer";
       HomeAssistantMatcherType2["DeviceClass"] = "device_class";
     })(HomeAssistantMatcherType || (HomeAssistantMatcherType = {}));
   }
@@ -125055,7 +125061,7 @@ var init_bridge_config_schema = __esm({
             {
               const: "any_field_regex",
               title: "any_field_regex",
-              description: "Regex tested against a single-line key=value haystack covering entity_id, domain, platform, area, entity_category, device_class, entity_labels, entity_label_names, device_labels, device_label_names, device_name, product_name. Use lookaheads for AND, alternation for OR. Example: '(?=.*domain=light)(?=.*area=living_room)|(?=.*domain=switch)(?=.*entity_labels=.*\\bvoice\\b)'."
+              description: "Regex tested against a single-line key=value haystack covering entity_id, domain, platform, area, entity_category, device_class, entity_labels, entity_label_names, device_labels, device_label_names, device_name, product_name, manufacturer. Use lookaheads for AND, alternation for OR. Example: '(?=.*domain=light)(?=.*area=living_room)|(?=.*domain=switch)(?=.*entity_labels=.*\\bvoice\\b)'."
             },
             {
               const: "area",
@@ -125077,6 +125083,11 @@ var init_bridge_config_schema = __esm({
               title: "product_name",
               description: "Match entities by their product/model name. Supports wildcards. Example: 'Hue*Bulb'."
             },
+            {
+              const: "manufacturer",
+              title: "manufacturer",
+              description: "Match entities by their device manufacturer. Supports wildcards. Handy for MQTT or other generic integrations. Example: '*Sonoff*'."
+            },
             {
               const: "device_class",
               title: "device_class",
@@ -127986,6 +127997,8 @@ function testMatcher(matcher, device, entity, entityState, labels) {
       return testDeviceName(matcher.value, device);
     case "product_name":
       return testProductName(matcher.value, device);
+    case "manufacturer":
+      return testManufacturer(matcher.value, device);
     case "device_class":
       return entityState?.attributes?.device_class === matcher.value;
   }
@@ -128059,7 +128072,8 @@ function buildEntityHaystack(entity, device, entityState, labels) {
     `device_labels=${deviceLabelSlugs.join(",")}`,
     `device_label_names=${deviceLabelNames.join(",")}`,
     `device_name=${deviceName}`,
-    `product_name=${productName}`
+    `product_name=${productName}`,
+    `manufacturer=${device?.manufacturer ?? device?.default_manufacturer ?? ""}`
   ].join(" ");
 }
 function testDeviceName(pattern2, device) {
@@ -128092,6 +128106,21 @@ function testProductName(pattern2, device) {
   }
   return lowerProductName.includes(lowerPattern);
 }
+function testManufacturer(pattern2, device) {
+  if (!device) {
+    return false;
+  }
+  const manufacturer = device.manufacturer ?? device.default_manufacturer;
+  if (!manufacturer) {
+    return false;
+  }
+  const lowerPattern = pattern2.toLowerCase();
+  const lowerManufacturer = manufacturer.toLowerCase();
+  if (lowerPattern.includes("*")) {
+    return patternToRegex(lowerPattern).test(lowerManufacturer);
+  }
+  return lowerManufacturer.includes(lowerPattern);
+}
 function resolveLabelValue(value, labels) {
   if (labels) {
     const match = labels.find(
@@ -162046,7 +162075,10 @@ var matterDeviceTypeFactories = {
   },
   dishwasher: DishwasherEndpoint,
   dimmable_plugin_unit: (ha) => DimmablePlugInUnitType.set({ homeAssistantEntity: ha }),
-  on_off_switch: SwitchDevice,
+  // Expose as On/Off Light (0x0100, an OnOff server) so controllers show a
+  // switch instead of a plug. Plain SwitchDevice is 0x010A (a plug), so the
+  // override had no effect before (#380).
+  on_off_switch: (ha) => OnOffLightType.set({ homeAssistantEntity: ha }),
   door_lock: LockDevice,
   window_covering: CoverDevice,
   thermostat: ClimateDevice,
@@ -166284,16 +166316,58 @@ init_nodejs();
 
 // src/matter/patches/patch-level-control-tlv.ts
 var logger233 = Logger.get("PatchLevelControlTlv");
+var optionalFieldModels = /* @__PURE__ */ new WeakSet();
+var fieldModelMandatoryGetterPatched = false;
 function patchLevelControlTlv() {
   let patched = 0;
+  const patchErrors = [];
+  const markOptional = (field2) => {
+    if (!field2) {
+      return false;
+    }
+    try {
+      if (typeof field2.patch === "function") {
+        field2.patch({ conformance: "O" });
+      }
+    } catch (error) {
+      patchErrors.push(formatPatchError("patch", error));
+    }
+    try {
+      field2.optional = true;
+    } catch (error) {
+      patchErrors.push(formatPatchError("optional", error));
+    }
+    try {
+      Object.defineProperty(field2, "mandatory", {
+        configurable: true,
+        value: false,
+        writable: true
+      });
+    } catch (error) {
+      patchErrors.push(formatPatchError("mandatory", error));
+    }
+    return field2.mandatory === false || forceOptionalViaPrototype(field2);
+  };
   const moveToLevelFields = LevelControl3.MoveToLevelRequest.fieldDefinitions;
-  if (moveToLevelFields?.transitionTime) {
-    moveToLevelFields.transitionTime.optional = true;
+  if (markOptional(moveToLevelFields?.transitionTime)) {
     patched++;
   }
   const stepFields = LevelControl3.StepRequest.fieldDefinitions;
-  if (stepFields?.transitionTime) {
-    stepFields.transitionTime.optional = true;
+  if (markOptional(stepFields?.transitionTime)) {
+    patched++;
+  }
+  const moveToLevelSchemaField = findTransitionTimeField(
+    LevelControl3.commands.moveToLevel.schema.children,
+    1
+  );
+  if (markOptional(moveToLevelSchemaField)) {
+    patched++;
+  }
+  const stepSchemaField = findTransitionTimeField(
+    LevelControl3.commands.step.schema.children,
+    2
+  );
+  if (markOptional(stepSchemaField)) {
     patched++;
   }
   if (patched > 0) {
@@ -166302,10 +166376,62 @@ function patchLevelControlTlv() {
     );
   } else {
     logger233.warn(
-      "Failed to patch LevelControl TLV schemas, field definitions not found. Google Home brightness adjustment may not work."
+      "Failed to patch LevelControl TLV schemas, field definitions not found. Google Home brightness adjustment may not work.",
+      {
+        moveToLevel: describeFields(
+          LevelControl3.commands.moveToLevel.schema.children
+        ),
+        patchErrors,
+        step: describeFields(
+          LevelControl3.commands.step.schema.children
+        )
+      }
     );
   }
 }
+function findTransitionTimeField(fields, fallbackIndex) {
+  return fields?.find(
+    (field2) => field2.name === "TransitionTime" || field2.propertyName === "transitionTime"
+  ) ?? fields?.[fallbackIndex];
+}
+function forceOptionalViaPrototype(field2) {
+  optionalFieldModels.add(field2);
+  if (!fieldModelMandatoryGetterPatched) {
+    let proto = Object.getPrototypeOf(field2);
+    while (proto) {
+      const descriptor = Object.getOwnPropertyDescriptor(proto, "mandatory");
+      if (descriptor?.get && descriptor.configurable) {
+        const original = descriptor.get;
+        Object.defineProperty(proto, "mandatory", {
+          configurable: true,
+          get() {
+            if (optionalFieldModels.has(this)) {
+              return false;
+            }
+            return original.call(this);
+          }
+        });
+        fieldModelMandatoryGetterPatched = true;
+        break;
+      }
+      proto = Object.getPrototypeOf(proto);
+    }
+  }
+  return field2.mandatory === false;
+}
+function describeFields(fields) {
+  return fields?.map((field2, index) => ({
+    hasPatch: typeof field2.patch === "function",
+    index,
+    mandatory: field2.mandatory,
+    name: field2.name,
+    optional: field2.optional,
+    propertyName: field2.propertyName
+  }));
+}
+function formatPatchError(action, error) {
+  return `${action}:${error instanceof Error ? error.message : String(error)}`;
+}
 
 // src/commands/start/start-handler.ts
 function extractErrorMessage(error) {