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

package/dist/backend/cli.js

@@ -123872,6 +123872,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 +125056,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 +125078,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 +127992,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 +128067,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 +128101,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 +162070,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,