fix(bluetooth): improve adapter stability

legovaer · Jan 10, 2021 · 27112a0 · 27112a0
1 parent 112441b
commit 27112a0
Show file tree

Hide file tree

Showing 6 changed files with 184 additions and 166 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -111,7 +111,7 @@
     "vuepress-plugin-sitemap": "^2.3.1"
   },
   "optionalDependencies": {
-    "@mkerix/noble": "1.9.2-10.1",
+    "@mkerix/noble": "1.9.2-10.2",
     "i2c-bus": "^5.1.0",
     "mdns": "^2.5.1",
     "onoff": "^6.0.0"

diff --git a/src/integrations/bluetooth-low-energy/bluetooth-low-energy.service.ts b/src/integrations/bluetooth-low-energy/bluetooth-low-energy.service.ts
@@ -487,19 +487,19 @@ export class BluetoothLowEnergyService
 
           this.handleAppDiscovery(tag.id, appId);
         } catch (e) {
-          if (e.message === 'timed out') {
+          if (e.message?.includes('already locked')) {
             this.logger.debug(
-              `Temporarily denylisting ${tag.id} from app discovery due to timeout`
+              `Unable to retrieve companion ID, retrying on next advertisement: ${e.message}`
+            );
+          } else {
+            this.logger.warn(
+              `Temporarily denylisting ${tag.id} from app discovery due to error: ${e.message}`
             );
             this.companionAppDenylist.add(tag.id);
             setTimeout(
               () => this.companionAppDenylist.delete(tag.id),
               3 * 60 * 1000
             );
-          } else {
-            this.logger.debug(
-              `Unable to retrieve companion ID, retrying on next advertisement: ${e.message}`
-            );
           }
 
           this.companionAppTags.delete(tag.id);