incyclist-devices 3.0.24 → 3.0.25

package/lib/cjs/ble/base/adapter.js

@@ -55,7 +55,7 @@ class BleAdapter extends adpater_js_1.default {
             const info = peripheral.getInfo();
             const settings = { ...this.settings };
             settings.id = settings.id ?? info.id;
-            settings.address = settings.address ?? info.address;
+            settings.address = info.address ?? settings.address;
             settings.name = settings.name ?? info.name;
             this.settings = settings;
         }
@@ -77,11 +77,13 @@ class BleAdapter extends adpater_js_1.default {
         if (as.profile || settings.profile) {
             return (as.protocol === settings.protocol && as.profile === settings.profile && as.name === settings.name);
         }
-        else {
-            return (as.protocol === settings.protocol && ((as.name && settings.name && as.name === settings.name) ||
-                (as.address && settings.address && as.address === settings.address) ||
-                (as.id && settings.id && as.id === settings.id)));
-        }
+        if (as.protocol !== settings.protocol)
+            return false;
+        if (as.id && settings.id)
+            return as.id === settings.id;
+        if (as.address && settings.address)
+            return as.address === settings.address;
+        return !!(as.name && settings.name && as.name === settings.name);
     }
     isSame(adapter) {
         return this.isEqual(adapter.getSettings());

package/lib/cjs/direct-connect/base/interface.js

@@ -72,14 +72,18 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
             const protocol = this.getProtocol(service);
             const address = service.address;
             const services = service.serviceUUIDs?.map(uuid => (0, index_js_1.beautifyUUID)(uuid, false))?.join(',');
-            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol, address, services };
+            const id = service.serialNo || undefined;
+            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol, address, services, ...(id ? { id } : {}) };
         }
         catch {
             return null;
         }
     }
     createPeripheralFromSettings(settings) {
-        const info = this.getAll().find(a => a.service.name === settings.name);
+        const bleSettings = settings;
+        const all = this.getAll();
+        const info = (bleSettings.address && all.find(a => a.service.name === settings.name && a.service.address === bleSettings.address))
+            ?? all.find(a => a.service.name === settings.name);
         if (!info?.service)
             return null;
         return this.createPeripheral(info.service);
@@ -247,35 +251,68 @@ class DirectConnectInterface extends node_events_1.EventEmitter {
         const src = source === 'known-device' ? 'known-device' : 'mdns';
         try {
             service.transport = this.getName();
-            const existing = this.find(service);
-            if (existing) {
-                const idx = this.services.indexOf(existing);
-                this.services[idx] = { ts: Date.now(), service };
-                if (src !== 'known-device' && existing.source === 'known-device') {
-                    this.services[idx].source = src;
-                    this.logEvent({ message: 'device re-announced', device: service.name, announcement: service, source });
-                    this.emitDevice(service);
-                }
+            const sameAddress = this.findByNameAndAddress(service.name, service.address);
+            if (sameAddress) {
+                this.refreshSameAddressEntry(sameAddress, service, src, source);
+                return;
+            }
+            const sameName = this.findAllByName(service.name);
+            if (src === 'known-device' && sameName.some(a => a.source !== 'known-device')) {
+                return;
+            }
+            if (sameName.length === 0) {
+                this.announceNewEntry(service, src, source, 'device announced');
+                return;
             }
-            else {
-                this.services.push({ ts: Date.now(), service, source: src });
-                if (!service.serviceUUIDs?.length)
-                    return;
-                this.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
-                this.emitDevice(service);
-                this.matching?.push(service.name);
+            const realEntries = sameName.filter(a => a.source !== 'known-device');
+            if (src !== 'known-device' && realEntries.length >= 1) {
+                this.announceNewEntry(service, src, source, 'device announced (name collision, distinct address)');
+                return;
             }
+            this.reannounceExistingEntry(sameName[0], service, src, source);
         }
         catch (err) {
             this.logError(err, 'addService');
         }
     }
-    find(service) {
-        return this.services.find(a => a.service.name === service.name && a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
+    refreshSameAddressEntry(sameAddress, service, src, source) {
+        const idx = this.services.indexOf(sameAddress);
+        const wasKnownDevicePlaceholder = sameAddress.source === 'known-device';
+        const nextSource = (wasKnownDevicePlaceholder && src !== 'known-device') ? src : sameAddress.source;
+        this.services[idx] = { ts: Date.now(), service, source: nextSource };
+        if (src !== 'known-device' && wasKnownDevicePlaceholder) {
+            this.logEvent({ message: 'device re-announced', device: service.name, announcement: service, source });
+            this.emitDevice(service);
+        }
+    }
+    announceNewEntry(service, src, source, message) {
+        this.services.push({ ts: Date.now(), service, source: src });
+        if (!service.serviceUUIDs?.length)
+            return;
+        this.logEvent({ message, device: service.name, announcement: service, source });
+        this.emitDevice(service);
+        this.matching?.push(service.name);
+    }
+    reannounceExistingEntry(existing, service, src, source) {
+        const idx = this.services.indexOf(existing);
+        this.services[idx] = { ts: Date.now(), service, source: src };
+        if (src !== 'known-device') {
+            this.logEvent({ message: 'device re-announced', device: service.name, announcement: service, source });
+            this.emitDevice(service);
+        }
+    }
+    findByNameAndAddress(name, address) {
+        return this.services.find(a => a.service.name === name && a.service.address === address && a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
+    }
+    findAllByName(name) {
+        return this.services.filter(a => a.service.name === name && a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
     }
     getAll() {
         return this.services.filter(a => a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
     }
+    hasNameCollision(name) {
+        return this.findAllByName(name).length > 1;
+    }
     setDebug(enabled) {
         this.debug = enabled;
     }

package/lib/esm/ble/base/adapter.js

@@ -50,7 +50,7 @@ export default class BleAdapter extends IncyclistDevice {
             const info = peripheral.getInfo();
             const settings = { ...this.settings };
             settings.id = settings.id ?? info.id;
-            settings.address = settings.address ?? info.address;
+            settings.address = info.address ?? settings.address;
             settings.name = settings.name ?? info.name;
             this.settings = settings;
         }
@@ -72,11 +72,13 @@ export default class BleAdapter extends IncyclistDevice {
         if (as.profile || settings.profile) {
             return (as.protocol === settings.protocol && as.profile === settings.profile && as.name === settings.name);
         }
-        else {
-            return (as.protocol === settings.protocol && ((as.name && settings.name && as.name === settings.name) ||
-                (as.address && settings.address && as.address === settings.address) ||
-                (as.id && settings.id && as.id === settings.id)));
-        }
+        if (as.protocol !== settings.protocol)
+            return false;
+        if (as.id && settings.id)
+            return as.id === settings.id;
+        if (as.address && settings.address)
+            return as.address === settings.address;
+        return !!(as.name && settings.name && as.name === settings.name);
     }
     isSame(adapter) {
         return this.isEqual(adapter.getSettings());

package/lib/esm/direct-connect/base/interface.js

@@ -69,14 +69,18 @@ export default class DirectConnectInterface extends EventEmitter {
             const protocol = this.getProtocol(service);
             const address = service.address;
             const services = service.serviceUUIDs?.map(uuid => beautifyUUID(uuid, false))?.join(',');
-            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol, address, services };
+            const id = service.serialNo || undefined;
+            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol, address, services, ...(id ? { id } : {}) };
         }
         catch {
             return null;
         }
     }
     createPeripheralFromSettings(settings) {
-        const info = this.getAll().find(a => a.service.name === settings.name);
+        const bleSettings = settings;
+        const all = this.getAll();
+        const info = (bleSettings.address && all.find(a => a.service.name === settings.name && a.service.address === bleSettings.address))
+            ?? all.find(a => a.service.name === settings.name);
         if (!info?.service)
             return null;
         return this.createPeripheral(info.service);
@@ -244,35 +248,68 @@ export default class DirectConnectInterface extends EventEmitter {
         const src = source === 'known-device' ? 'known-device' : 'mdns';
         try {
             service.transport = this.getName();
-            const existing = this.find(service);
-            if (existing) {
-                const idx = this.services.indexOf(existing);
-                this.services[idx] = { ts: Date.now(), service };
-                if (src !== 'known-device' && existing.source === 'known-device') {
-                    this.services[idx].source = src;
-                    this.logEvent({ message: 'device re-announced', device: service.name, announcement: service, source });
-                    this.emitDevice(service);
-                }
+            const sameAddress = this.findByNameAndAddress(service.name, service.address);
+            if (sameAddress) {
+                this.refreshSameAddressEntry(sameAddress, service, src, source);
+                return;
+            }
+            const sameName = this.findAllByName(service.name);
+            if (src === 'known-device' && sameName.some(a => a.source !== 'known-device')) {
+                return;
+            }
+            if (sameName.length === 0) {
+                this.announceNewEntry(service, src, source, 'device announced');
+                return;
             }
-            else {
-                this.services.push({ ts: Date.now(), service, source: src });
-                if (!service.serviceUUIDs?.length)
-                    return;
-                this.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
-                this.emitDevice(service);
-                this.matching?.push(service.name);
+            const realEntries = sameName.filter(a => a.source !== 'known-device');
+            if (src !== 'known-device' && realEntries.length >= 1) {
+                this.announceNewEntry(service, src, source, 'device announced (name collision, distinct address)');
+                return;
             }
+            this.reannounceExistingEntry(sameName[0], service, src, source);
         }
         catch (err) {
             this.logError(err, 'addService');
         }
     }
-    find(service) {
-        return this.services.find(a => a.service.name === service.name && a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
+    refreshSameAddressEntry(sameAddress, service, src, source) {
+        const idx = this.services.indexOf(sameAddress);
+        const wasKnownDevicePlaceholder = sameAddress.source === 'known-device';
+        const nextSource = (wasKnownDevicePlaceholder && src !== 'known-device') ? src : sameAddress.source;
+        this.services[idx] = { ts: Date.now(), service, source: nextSource };
+        if (src !== 'known-device' && wasKnownDevicePlaceholder) {
+            this.logEvent({ message: 'device re-announced', device: service.name, announcement: service, source });
+            this.emitDevice(service);
+        }
+    }
+    announceNewEntry(service, src, source, message) {
+        this.services.push({ ts: Date.now(), service, source: src });
+        if (!service.serviceUUIDs?.length)
+            return;
+        this.logEvent({ message, device: service.name, announcement: service, source });
+        this.emitDevice(service);
+        this.matching?.push(service.name);
+    }
+    reannounceExistingEntry(existing, service, src, source) {
+        const idx = this.services.indexOf(existing);
+        this.services[idx] = { ts: Date.now(), service, source: src };
+        if (src !== 'known-device') {
+            this.logEvent({ message: 'device re-announced', device: service.name, announcement: service, source });
+            this.emitDevice(service);
+        }
+    }
+    findByNameAndAddress(name, address) {
+        return this.services.find(a => a.service.name === name && a.service.address === address && a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
+    }
+    findAllByName(name) {
+        return this.services.filter(a => a.service.name === name && a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
     }
     getAll() {
         return this.services.filter(a => a.ts > Date.now() - DC_EXPIRATION_TIMEOUT);
     }
+    hasNameCollision(name) {
+        return this.findAllByName(name).length > 1;
+    }
     setDebug(enabled) {
         this.debug = enabled;
     }

package/lib/types/direct-connect/base/interface.d.ts

@@ -62,8 +62,13 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
         name: string;
     }[];
     protected addService(service: MulticastDnsAnnouncement, source?: string): void;
-    protected find(service: MulticastDnsAnnouncement): Announcement;
+    private refreshSameAddressEntry;
+    private announceNewEntry;
+    private reannounceExistingEntry;
+    protected findByNameAndAddress(name: string, address: string): Announcement;
+    protected findAllByName(name: string): Announcement[];
     protected getAll(): Announcement[];
+    hasNameCollision(name: string): boolean;
     setDebug(enabled: boolean): void;
     logEvent(event: any): void;
     logError(err: Error, fn: string, args?: any): void;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "incyclist-devices",
-    "version": "3.0.24",
+    "version": "3.0.25",
     "scripts": {
         "lint": "eslint . --ext .ts",
         "build": "npm run build:esm && npm run build:cjs",