@riddix/hamh 2.1.0-alpha.579 → 2.1.0-alpha.581

package/dist/backend/cli.js

@@ -172127,11 +172127,17 @@ var FeaturedBase7 = SwitchServer.with(
   "MomentarySwitchMultiPress"
 );
 var GenericSwitchServerBase = class extends FeaturedBase7 {
+  inLongPress = false;
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
     const entityId = homeAssistant.entityId;
-    logger180.debug(`[${entityId}] GenericSwitch initialized`);
+    const attrs = homeAssistant.entity.state.attributes;
+    const maxPress = this.detectMultiPressMax(attrs.event_types ?? []);
+    this.state.multiPressMax = maxPress;
+    logger180.debug(
+      `[${entityId}] GenericSwitch initialized (multiPressMax: ${maxPress})`
+    );
     this.reactTo(homeAssistant.onChange, this.handleEventChange);
   }
   handleEventChange() {
@@ -172148,6 +172154,7 @@ var GenericSwitchServerBase = class extends FeaturedBase7 {
   triggerPress(eventType) {
     const lower = eventType.toLowerCase();
     if (this.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);
@@ -172155,8 +172162,14 @@ var GenericSwitchServerBase = class extends FeaturedBase7 {
       return;
     }
     if (this.isLongRelease(lower)) {
-      this.events.longRelease?.emit({ previousPosition: 1 }, this.context);
+      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);
       this.fireBridgeEvent(eventType, 1);
       return;
     }
@@ -172166,19 +172179,14 @@ var GenericSwitchServerBase = class extends FeaturedBase7 {
     const pressCount = this.getPressCount(lower);
     this.state.currentPosition = 1;
     this.events.initialPress?.emit({ newPosition: 1 }, this.context);
-    setTimeout(
-      this.callback(() => {
-        this.events.shortRelease?.emit({ previousPosition: 1 }, this.context);
-        this.state.currentPosition = 0;
-        this.events.multiPressComplete?.emit(
-          {
-            previousPosition: 0,
-            totalNumberOfPressesCounted: pressCount
-          },
-          this.context
-        );
-      }),
-      100
+    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);
   }
@@ -172197,6 +172205,14 @@ var GenericSwitchServerBase = class extends FeaturedBase7 {
   isLongRelease(lower) {
     return lower.includes("long") && lower.includes("release");
   }
+  detectMultiPressMax(eventTypes) {
+    let max = 1;
+    for (const et of eventTypes) {
+      const count = this.getPressCount(et.toLowerCase());
+      if (count > max) max = count;
+    }
+    return max;
+  }
   getPressCount(lower) {
     if (lower.includes("triple") || lower.includes("3_press") || lower.includes("three")) {
       return 3;
@@ -179122,6 +179138,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   lastState;
   pendingMappedChange = false;
   flushUpdate;
+  eventUpdateChain = Promise.resolve();
   async delete() {
     this.flushUpdate.clear();
     await super.delete();
@@ -179142,6 +179159,12 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
       `State update received for ${this.entityId}: state=${state.state}`
     );
     this.lastState = state;
+    if (this.entityId.startsWith("event.")) {
+      this.eventUpdateChain = this.eventUpdateChain.then(
+        () => this.flushPendingUpdate(state)
+      );
+      return;
+    }
     this.flushUpdate(state);
   }
   async flushPendingUpdate(state) {