add more tracker connect checks to prevent dupes

JovannMC · Apr 24, 2024 · a687202 · a687202
1 parent 152b4f2
commit a687202
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/devices/haritorax-wireless.ts b/src/devices/haritorax-wireless.ts
@@ -1054,8 +1054,12 @@ function listenToDeviceEvents() {
     });
 
     bluetooth.on("connect", (peripheral) => {
-        haritora.emit("connect", peripheral.advertisement.localName);
-        log(`Connected to ${peripheral.advertisement.localName}`);
+        const trackerName = peripheral.advertisement.localName;
+        if (trackerName && !activeDevices.includes(trackerName)) {
+            activeDevices.push(trackerName);
+            haritora.emit("connect", trackerName);
+            log(`Connected to ${peripheral.advertisement.localName}`);
+        }
     });
 
     bluetooth.on("disconnect", (peripheral) => {

diff --git a/src/mode/bluetooth.ts b/src/mode/bluetooth.ts
@@ -89,7 +89,7 @@ export default class Bluetooth extends EventEmitter {
         if (
             localName &&
             localName.startsWith("HaritoraX") &&
-            !activeDevices.find((device) => device[1] === peripheral)
+            (!activeDevices.find((device) => device[1] === peripheral) || !activeDevices.find((device) => device[0] === localName))
         ) {
             log(`Found device: ${localName}`);
             if (localName.startsWith("HaritoraX-"))