@riddix/hamh 2.1.0-alpha.589 → 2.1.0-alpha.590

package/dist/backend/cli.js

@@ -172152,19 +172152,48 @@ function DishwasherEndpoint(homeAssistantEntity) {
 init_esm();
 init_home_assistant_entity_behavior();
 var logger180 = Logger.get("GenericSwitchServer");
-var FeaturedBase7 = SwitchServer.with(
+var SimpleBase = SwitchServer.with(
+  "MomentarySwitch",
+  "MomentarySwitchRelease",
+  "MomentarySwitchLongPress"
+);
+var FullBase = SwitchServer.with(
   "MomentarySwitch",
   "MomentarySwitchRelease",
   "MomentarySwitchLongPress",
   "MomentarySwitchMultiPress"
 );
-var GenericSwitchServerBase = class extends FeaturedBase7 {
+function isLongPress(lower) {
+  return lower.includes("long") && !lower.includes("release") || lower === "hold";
+}
+function isLongRelease(lower) {
+  return lower.includes("long") && lower.includes("release");
+}
+function getPressCount(lower) {
+  if (lower.includes("triple") || lower.includes("3_press") || lower.includes("three")) {
+    return 3;
+  }
+  if (lower.includes("double") || lower.includes("2_press") || lower.includes("two") || lower.includes("multi")) {
+    return 2;
+  }
+  return 1;
+}
+function fireBridgeEvent(agent, eventType, pressCount) {
+  const homeAssistant = agent.get(HomeAssistantEntityBehavior);
+  homeAssistant.fireEvent("hamh_action", {
+    action: "press",
+    event_type: eventType,
+    press_count: pressCount,
+    source: "matter_bridge"
+  });
+}
+var HaGenericSwitchServerBase = class extends SimpleBase {
   inLongPress = false;
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     const entityId = homeAssistant.entityId;
-    logger180.debug(`[${entityId}] GenericSwitch initialized`);
+    logger180.debug(`[${entityId}] GenericSwitch initialized (simple)`);
     this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
   handleEventChange() {
@@ -172180,74 +172209,111 @@ var GenericSwitchServerBase = class extends FeaturedBase7 {
   }
   triggerPress(eventType) {
     const lower = eventType.toLowerCase();
-    if (this.isLongPress(lower)) {
+    if (isLongPress(lower)) {
       this.inLongPress = true;
       this.state.currentPosition = 1;
-      this.events.initialPress?.emit({ newPosition: 1 }, this.context);
-      this.events.longPress?.emit({ newPosition: 1 }, this.context);
-      this.fireBridgeEvent(eventType, 1);
+      this.events.initialPress.emit({ newPosition: 1 }, this.context);
+      this.events.longPress.emit({ newPosition: 1 }, this.context);
+      fireBridgeEvent(this.agent, eventType, 1);
       return;
     }
-    if (this.isLongRelease(lower)) {
+    if (isLongRelease(lower)) {
       if (!this.inLongPress) {
         this.state.currentPosition = 1;
-        this.events.initialPress?.emit({ newPosition: 1 }, this.context);
-        this.events.longPress?.emit({ newPosition: 1 }, this.context);
+        this.events.initialPress.emit({ newPosition: 1 }, this.context);
+        this.events.longPress.emit({ newPosition: 1 }, this.context);
       }
       this.inLongPress = false;
       this.state.currentPosition = 0;
-      this.events.longRelease?.emit({ previousPosition: 1 }, this.context);
-      this.fireBridgeEvent(eventType, 1);
+      this.events.longRelease.emit({ previousPosition: 1 }, this.context);
+      fireBridgeEvent(this.agent, eventType, 1);
       return;
     }
     if (lower.includes("cont") && lower.includes("press")) {
       return;
     }
-    const pressCount = this.getPressCount(lower);
     this.state.currentPosition = 1;
-    this.events.initialPress?.emit({ newPosition: 1 }, this.context);
+    this.events.initialPress.emit({ newPosition: 1 }, this.context);
     this.state.currentPosition = 0;
-    this.events.shortRelease?.emit({ previousPosition: 1 }, this.context);
-    this.events.multiPressComplete?.emit(
-      {
-        previousPosition: 0,
-        totalNumberOfPressesCounted: pressCount
-      },
-      this.context
-    );
-    this.fireBridgeEvent(eventType, pressCount);
+    this.events.shortRelease.emit({ previousPosition: 1 }, this.context);
+    fireBridgeEvent(this.agent, eventType, 1);
   }
-  fireBridgeEvent(eventType, pressCount) {
-    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
-    homeAssistant.fireEvent("hamh_action", {
-      action: "press",
-      event_type: eventType,
-      press_count: pressCount,
-      source: "matter_bridge"
-    });
+};
+((HaGenericSwitchServerBase2) => {
+  class State extends SimpleBase.State {
   }
-  isLongPress(lower) {
-    return lower.includes("long") && !lower.includes("release") || lower === "hold";
+  HaGenericSwitchServerBase2.State = State;
+})(HaGenericSwitchServerBase || (HaGenericSwitchServerBase = {}));
+var HaGenericSwitchServerMultiBase = class extends FullBase {
+  inLongPress = false;
+  async initialize() {
+    await super.initialize();
+    const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
+    const entityId = homeAssistant.entityId;
+    logger180.debug(`[${entityId}] GenericSwitch initialized (multi)`);
+    this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
-  isLongRelease(lower) {
-    return lower.includes("long") && lower.includes("release");
+  handleEventChange() {
+    const homeAssistant = this.agent.get(HomeAssistantEntityBehavior);
+    const entity = homeAssistant.entity;
+    if (!entity?.state || !entity.state.attributes) return;
+    const attrs = entity.state.attributes;
+    const eventType = attrs.event_type;
+    if (!eventType) return;
+    const entityId = homeAssistant.entityId;
+    logger180.debug(`[${entityId}] Event fired: ${eventType}`);
+    this.triggerPress(eventType);
   }
-  getPressCount(lower) {
-    if (lower.includes("triple") || lower.includes("3_press") || lower.includes("three")) {
-      return 3;
+  triggerPress(eventType) {
+    const lower = eventType.toLowerCase();
+    if (isLongPress(lower)) {
+      this.inLongPress = true;
+      this.state.currentPosition = 1;
+      this.events.initialPress.emit({ newPosition: 1 }, this.context);
+      this.events.longPress.emit({ newPosition: 1 }, this.context);
+      fireBridgeEvent(this.agent, eventType, 1);
+      return;
+    }
+    if (isLongRelease(lower)) {
+      if (!this.inLongPress) {
+        this.state.currentPosition = 1;
+        this.events.initialPress.emit({ newPosition: 1 }, this.context);
+        this.events.longPress.emit({ newPosition: 1 }, this.context);
+      }
+      this.inLongPress = false;
+      this.state.currentPosition = 0;
+      this.events.longRelease.emit({ previousPosition: 1 }, this.context);
+      fireBridgeEvent(this.agent, eventType, 1);
+      return;
     }
-    if (lower.includes("double") || lower.includes("2_press") || lower.includes("two") || lower.includes("multi")) {
-      return 2;
+    if (lower.includes("cont") && lower.includes("press")) {
+      return;
     }
-    return 1;
+    const pressCount = getPressCount(lower);
+    this.state.currentPosition = 1;
+    this.events.initialPress.emit({ newPosition: 1 }, this.context);
+    this.state.currentPosition = 0;
+    this.events.shortRelease.emit({ previousPosition: 1 }, this.context);
+    this.events.multiPressComplete.emit(
+      {
+        previousPosition: 0,
+        totalNumberOfPressesCounted: pressCount
+      },
+      this.context
+    );
+    fireBridgeEvent(this.agent, eventType, pressCount);
   }
 };
-((GenericSwitchServerBase2) => {
-  class State extends FeaturedBase7.State {
+((HaGenericSwitchServerMultiBase2) => {
+  class State extends FullBase.State {
   }
-  GenericSwitchServerBase2.State = State;
-})(GenericSwitchServerBase || (GenericSwitchServerBase = {}));
-var HaGenericSwitchServer = GenericSwitchServerBase.set({
+  HaGenericSwitchServerMultiBase2.State = State;
+})(HaGenericSwitchServerMultiBase || (HaGenericSwitchServerMultiBase = {}));
+var HaGenericSwitchServerSimple = HaGenericSwitchServerBase.set({
+  numberOfPositions: 2,
+  currentPosition: 0
+});
+var HaGenericSwitchServer = HaGenericSwitchServerMultiBase.set({
   numberOfPositions: 2,
   currentPosition: 0,
   multiPressMax: 3
@@ -172255,12 +172321,18 @@ var HaGenericSwitchServer = GenericSwitchServerBase.set({
 
 // src/matter/endpoints/legacy/event/index.ts
 init_home_assistant_entity_behavior();
-var EventEndpointType = GenericSwitchDevice.with(
+var EventEndpointTypeMulti = GenericSwitchDevice.with(
   BasicInformationServer2,
   IdentifyServer2,
   HomeAssistantEntityBehavior,
   HaGenericSwitchServer
 );
+var EventEndpointTypeSimple = GenericSwitchDevice.with(
+  BasicInformationServer2,
+  IdentifyServer2,
+  HomeAssistantEntityBehavior,
+  HaGenericSwitchServerSimple
+);
 var multiPressPatterns = [
   [/triple|3_press|three/, 3],
   [/double|2_press|two|multi/, 2]
@@ -172278,9 +172350,14 @@ function detectMultiPressMax(eventTypes) {
 function EventDevice(homeAssistantEntity) {
   const attrs = homeAssistantEntity.entity.state.attributes;
   const multiPressMax = detectMultiPressMax(attrs.event_types ?? []);
-  return EventEndpointType.set({
-    homeAssistantEntity,
-    switch: { multiPressMax }
+  if (multiPressMax >= 2) {
+    return EventEndpointTypeMulti.set({
+      homeAssistantEntity,
+      switch: { multiPressMax }
+    });
+  }
+  return EventEndpointTypeSimple.set({
+    homeAssistantEntity
   });
 }
 
@@ -172524,8 +172601,8 @@ function consumePendingColorStaging(entityId) {
   pendingColorStaging.delete(entityId);
   return data;
 }
-var FeaturedBase8 = ColorControlServer.with("ColorTemperature", "HueSaturation");
-var ColorControlServerBase = class extends FeaturedBase8 {
+var FeaturedBase7 = ColorControlServer.with("ColorTemperature", "HueSaturation");
+var ColorControlServerBase = class extends FeaturedBase7 {
   pendingTransitionTime;
   async [Symbol.asyncDispose]() {
     const entityId = this.agent.get(HomeAssistantEntityBehavior).entityId;
@@ -172763,7 +172840,7 @@ var ColorControlServerBase = class extends FeaturedBase8 {
   }
 };
 ((ColorControlServerBase2) => {
-  class State extends FeaturedBase8.State {
+  class State extends FeaturedBase7.State {
     config;
   }
   ColorControlServerBase2.State = State;
@@ -173857,8 +173934,8 @@ var logger184 = Logger.get("SpeakerLevelControlServer");
 var optimisticLevelState2 = /* @__PURE__ */ new Map();
 var OPTIMISTIC_TIMEOUT_MS4 = 3e3;
 var OPTIMISTIC_TOLERANCE3 = 5;
-var FeaturedBase9 = LevelControlServer.with("OnOff");
-var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
+var FeaturedBase8 = LevelControlServer.with("OnOff");
+var SpeakerLevelControlServerBase = class extends FeaturedBase8 {
   async initialize() {
     if (this.state.currentLevel == null) {
       this.state.currentLevel = 0;
@@ -173958,7 +174035,7 @@ var SpeakerLevelControlServerBase = class extends FeaturedBase9 {
   }
 };
 ((SpeakerLevelControlServerBase2) => {
-  class State extends FeaturedBase9.State {
+  class State extends FeaturedBase8.State {
     config;
   }
   SpeakerLevelControlServerBase2.State = State;