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

package/dist/backend/cli.js

@@ -172127,6 +172127,7 @@ var FeaturedBase7 = SwitchServer.with(
   "MomentarySwitchMultiPress"
 );
 var GenericSwitchServerBase = class extends FeaturedBase7 {
+  inLongPress = false;
   async initialize() {
     await super.initialize();
     const homeAssistant = await this.agent.load(HomeAssistantEntityBehavior);
@@ -172148,6 +172149,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 +172157,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 +172174,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);
   }
@@ -179122,6 +179125,7 @@ var LegacyEndpoint = class _LegacyEndpoint extends EntityEndpoint {
   lastState;
   pendingMappedChange = false;
   flushUpdate;
+  eventUpdateChain = Promise.resolve();
   async delete() {
     this.flushUpdate.clear();
     await super.delete();
@@ -179142,6 +179146,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) {