Fix device removal on failed refresh

StefanNienhuis · Oct 13, 2022 · 2d84c43 · 2d84c43
1 parent ccc366e
commit 2d84c43
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/plugin/package-lock.json b/plugin/package-lock.json
diff --git a/plugin/package.json b/plugin/package.json
@@ -1,7 +1,7 @@
 {
     "name": "homebridge-bold",
     "displayName": "Homebridge Bold",
-    "version": "2.1.4",
+    "version": "2.1.5",
     "description": "HomeKit support for the Bold Smart Locks.",
     "main": "build/index.js",
     "engines": {

diff --git a/plugin/src/bold.ts b/plugin/src/bold.ts
@@ -81,9 +81,7 @@ export class BoldAPI {
         let response = await this.request('GET', '/v1/effective-device-permissions');
 
         if (!response.success) {
-            this.log.error(`Error ${response.error.code ? `(${response.error.code}) ` : ''}while getting devices: ${response.error.message}`);
-
-            return [];
+            throw new Error(`Error ${response.error.code ? `(${response.error.code}) ` : ''}while getting devices: ${response.error.message}`);
         }
 
         if (Array.isArray(response.data)) {
@@ -94,8 +92,7 @@ export class BoldAPI {
 
             return supportedDevices;
         } else {
-            this.log.error(`Unknown reponse while getting devices: ${response.data}`);
-            return [];
+            throw new Error('Unknown reponse while getting devices: ${response.data}');
         }
     }
 

diff --git a/plugin/src/index.ts b/plugin/src/index.ts
@@ -166,7 +166,19 @@ class BoldPlatform implements DynamicPlatformPlugin {
     // Bold API
 
     async updateDevices() {
-        let devices = await this.bold.getDevices();
+        let devices: Device[];
+
+        try {
+            devices = await this.bold.getDevices();
+        } catch (error) {
+            if (this.accessories.length == 0) {
+                this.log.error('Unable to get devices. Check your authentication details.');
+            } else {
+                this.log.warn('Unable to refresh devices. Preserving cached accessories, which might be incorrect. Check your authentication details.');
+            }
+
+            return;
+        }
 
         // Add devices
         let addDevices = devices.filter((device) => !this.accessories.find((accessory) => accessory.context.device.id == device.id));