From 9614ad61e838b9fba0162406b96c54cd2bbd2b9a Mon Sep 17 00:00:00 2001
From: Johann Richard <189003+johannrichard@users.noreply.github.com>
Date: Thu, 12 Nov 2020 14:31:47 +0100
Subject: [PATCH] feat(accessories): streamline push naming

---
 src/dingzAccessory.ts         |  2 +-
 src/myStromButtonAccessory.ts |  2 +-
 src/platform.ts               |  6 +++---
 src/util/dingzEventBus.ts     | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/dingzAccessory.ts b/src/dingzAccessory.ts
index 8915e5b..4bef049 100644
--- a/src/dingzAccessory.ts
+++ b/src/dingzAccessory.ts
@@ -486,7 +486,7 @@ export class DingzDaAccessory extends EventEmitter {
     this.services.push(this.addButtonService('dingz Button 4', '4'));
 
     this.platform.eb.on(
-      DingzEvent.BTN_PRESS,
+      DingzEvent.ACTION,
       (mac, action: ButtonAction, button: ButtonId | '5') => {
         if (mac === this.device.mac && button) {
           this.platform.log.debug(
diff --git a/src/myStromButtonAccessory.ts b/src/myStromButtonAccessory.ts
index 43a41e1..89cc10f 100644
--- a/src/myStromButtonAccessory.ts
+++ b/src/myStromButtonAccessory.ts
@@ -124,7 +124,7 @@ export class MyStromButtonAccessory {
       .getCharacteristic(this.platform.Characteristic.ChargingState)
       .on(CharacteristicEventTypes.GET, this.getChargingState.bind(this));
 
-    this.platform.eb.on(DingzEvent.BTN_PRESS, (mac, action, battery) => {
+    this.platform.eb.on(DingzEvent.ACTION, (mac, action, battery) => {
       if (mac === this.device.mac) {
         this.buttonState = action ?? ButtonAction.SINGLE_PRESS;
         this.batteryLevel = battery;
diff --git a/src/platform.ts b/src/platform.ts
index 25edc9f..f9a9e8a 100644
--- a/src/platform.ts
+++ b/src/platform.ts
@@ -896,7 +896,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
             request.connection.remoteAddress,
           );
           this.eb.emit(
-            DingzEvent.BTN_PRESS,
+            DingzEvent.ACTION,
             mac,
             action as ButtonAction,
             button as ButtonId,
@@ -905,7 +905,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
           if (action) {
             this.log.warn('-> Simple Button action');
             this.eb.emit(
-              DingzEvent.BTN_PRESS,
+              DingzEvent.ACTION,
               mac,
               action as ButtonAction,
               battery as number,
@@ -913,7 +913,7 @@ export class DingzDaHomebridgePlatform implements DynamicPlatformPlugin {
           } else {
             this.log.warn('-> Button Heartbeat');
             this.eb.emit(
-              DingzEvent.BTN_PRESS,
+              DingzEvent.ACTION,
               mac,
               action as ButtonAction,
               battery,
diff --git a/src/util/dingzEventBus.ts b/src/util/dingzEventBus.ts
index 148470c..bd61803 100644
--- a/src/util/dingzEventBus.ts
+++ b/src/util/dingzEventBus.ts
@@ -6,17 +6,17 @@ import { ButtonId } from './dingzTypes';
 // EVENT TYPES
 export const enum DingzEvent {
   UPDATE_INFO = 'updateDingzInfo',
-  BTN_PRESS = 'buttonPress',
+  ACTION = 'deviceAction',
   STATE_UPDATE = 'stateUpdate',
 }
 
 export declare interface DingzEventBus {
   on(
-    event: DingzEvent.BTN_PRESS,
+    event: DingzEvent.ACTION,
     listener: (mac: string, action: ButtonAction, battery: number) => void,
   ): this;
   on(
-    event: DingzEvent.BTN_PRESS,
+    event: DingzEvent.ACTION,
     listener: (mac: string, action: ButtonAction, button: ButtonId) => void,
   ): this;
   on(
@@ -26,13 +26,13 @@ export declare interface DingzEventBus {
   on(event: DingzEvent.STATE_UPDATE, listener: () => void): this;
 
   emit(
-    event: DingzEvent.BTN_PRESS,
+    event: DingzEvent.ACTION,
     mac: string,
     action: ButtonAction,
     battery: number,
   ): boolean;
   emit(
-    event: DingzEvent.BTN_PRESS,
+    event: DingzEvent.ACTION,
     mac: string,
     action: ButtonAction,
     button: ButtonId,