fix(dingz): 🐛 further fixes for new callback-url scheme

- fixes new callback url scheme for FW v1.4.x fixes #511
johannrichard · Oct 24, 2022 · b7588ee · b7588ee
1 parent d218c53
commit b7588ee
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/dingzAccessory.ts b/src/dingzAccessory.ts
@@ -243,7 +243,13 @@ export class DingzAccessory extends DingzDaBaseAccessory {
             token: this.device.token,
             endpoints: endpoints,
           });
-        } else if (!callBackUrl?.url.includes(this.platform.getCallbackUrl())) {
+        } else if (
+          // FIXME: because of #511
+          (semver.lt(this.hw.fw_version, '1.4.0') &&
+            !callBackUrl?.url?.includes(this.platform.getCallbackUrl())) ||
+          (semver.gte(this.hw.fw_version, '1.4.0') &&
+            !callBackUrl?.generic?.includes(this.platform.getCallbackUrl()))
+        ) {
           this.log.warn('Update existing callback URL ->', callBackUrl);
 
           this.platform.setButtonCallbackUrl({

diff --git a/src/lib/commonTypes.ts b/src/lib/commonTypes.ts
@@ -65,6 +65,8 @@ export interface AccessoryTypes {
   [key: string]: AccessoryType;
 }
 
+// FIXME: Needed because of #511
 export interface AccessoryActionUrl {
-  url: string;
+  url?: string;
+  generic?: string;
 }
diff --git a/src/myStromPIRAccessory.ts b/src/myStromPIRAccessory.ts
@@ -155,7 +155,10 @@ export class MyStromPIRAccessory extends DingzDaBaseAccessory {
             token: this.device.token,
             endpoints: ['pir/generic'],
           });
-        } else if (!callBackUrl?.url.includes(this.platform.getCallbackUrl())) {
+        } else if (
+          // FIXME: Needed because of #511
+          !callBackUrl?.url?.includes(this.platform.getCallbackUrl())
+        ) {
           this.log.warn('Update existing callback URL ->', callBackUrl);
           // Set the callback URL (Override!)
           this.platform.setButtonCallbackUrl({