Add failsafe, logging to getAvailableDevices()

JovannMC · Jul 25, 2024 · 63c3a45 · 63c3a45
1 parent 28204b0
commit 63c3a45
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/HaritoraX.ts b/src/HaritoraX.ts
@@ -779,8 +779,11 @@ export default class HaritoraX extends EventEmitter {
         let com = new COM("wireless"); // variable doesn't matter, just need to initialize it to get the available devices
         let bluetooth = new Bluetooth();
 
+        console.log("Checking if any COM devices is available")
         if (await com.isDeviceAvailable()) {
+            log("COM devices available")
             const devices = await com.getAvailableDevices();
+            log(`Got COM devices: ${devices}`);
             // for each device, add the device name to the available devices
             devices.forEach((device) => {
                 if (device === "HaritoraX 1.0" || device === "HaritoraX 1.1" || device === "HaritoraX 1.1b") {
@@ -790,7 +793,9 @@ export default class HaritoraX extends EventEmitter {
                 }
             });
         }
+        log("Checking if Bluetooth & HaritoraX Wireless are available")
         if (await bluetooth.isDeviceAvailable()) {
+            log("Bluetooth & HaritoraX Wireless devices available")
             availableDevices.push("Bluetooth");
             availableDevices.push("HaritoraX Wireless");
         }

diff --git a/src/mode/bluetooth.ts b/src/mode/bluetooth.ts
@@ -86,6 +86,11 @@ export default class Bluetooth extends EventEmitter {
                     resolve(false);
                 }
             });
+
+            // Fail-safe if noble never initializes properly (no "stateChange" event fired)
+            setTimeout(() => {
+                resolve(false);
+            }, 3500);
         });
     }