incyclist-devices 2.3.39 → 2.3.41

package/lib/antv2/base/interface.d.ts

@@ -2,7 +2,7 @@ import EventEmitter from "events";
 import { EventLogger } from "gd-eventlog";
 import { Channel, IAntDevice, IChannel, ISensor } from "incyclist-ant-plus";
 import { AntDeviceSettings, AntScanProps, AntInterfaceProps } from "../types";
-import { IncyclistInterface } from "../../types";
+import { DeviceSettings, IncyclistInterface } from "../../types";
 import AntDeviceBinding from "./binding";
 type ChannelUsage = 'scan' | 'sensor';
 interface ChannelInfo {
@@ -52,5 +52,6 @@ export default class AntInterface extends EventEmitter implements IncyclistInter
     private blockChannel;
     private unblockChannel;
     stopSensor(sensor: ISensor): Promise<boolean>;
+    addKnownDevice(_settings: DeviceSettings): void;
 }
 export {};

package/lib/antv2/base/interface.js

@@ -412,6 +412,8 @@ class AntInterface extends events_1.default {
             }
         });
     }
+    addKnownDevice(_settings) {
+    }
 }
 AntInterface._instance = undefined;
 AntInterface.INTERFACE_NAME = 'ant';

package/lib/ble/base/interface.d.ts

@@ -94,6 +94,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected find(service: BlePeripheralAnnouncement): Announcement;
     protected getAll(): Announcement[];
     setDebug(enabled: boolean): void;
+    addKnownDevice(_settings: BleDeviceSettings): void;
     protected connectBle(): Promise<boolean>;
     protected waitForBleConnected(): Promise<boolean>;
     protected onError(err: Error): void;

package/lib/ble/base/interface.js

@@ -583,6 +583,8 @@ class BleInterface extends events_1.default {
     setDebug(enabled) {
         this.debug = enabled;
     }
+    addKnownDevice(_settings) {
+    }
     connectBle() {
         return __awaiter(this, void 0, void 0, function* () {
             this.currentBleState = this.getBinding().state;

package/lib/ble/types.d.ts

@@ -72,6 +72,7 @@ export interface BleDeviceSettings extends DeviceSettings {
     profile?: string;
     address?: string;
     name?: string;
+    services?: string;
 }
 export interface BleDeviceProperties extends DeviceProperties {
     wheelDiameter?: number;

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

@@ -11,6 +11,7 @@ import { InterfaceFactory } from "../../ble/base/types";
 interface Announcement {
     service: MulticastDnsAnnouncement;
     ts: number;
+    source?: string;
 }
 export default class DirectConnectInterface extends EventEmitter implements IBleInterface<MulticastDnsAnnouncement> {
     protected static _instance: DirectConnectInterface;
@@ -33,6 +34,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     createPeripheral(announcement: MulticastDnsAnnouncement): IBlePeripheral;
     createDeviceSetting(service: MulticastDnsAnnouncement): BleDeviceSettings;
     createPeripheralFromSettings(settings: DeviceSettings): IBlePeripheral;
+    addKnownDevice(settings: BleDeviceSettings): void;
     getLogger(): EventLogger;
     setLogger(logger: EventLogger): void;
     getName(): string;
@@ -66,6 +68,8 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     logError(err: Error, fn: string, args?: any): void;
     protected getProtocol(announcement: MulticastDnsAnnouncement): BleProtocol;
     protected getBestDeviceMatch(DeviceClasses: (typeof TBleSensor)[]): typeof TBleSensor;
+    protected createAnnouncementFromSettings(settings: BleDeviceSettings): MulticastDnsAnnouncement;
+    protected getServiceUUIDs(settings: BleDeviceSettings): string[];
     protected getAdapterFactory(): BleAdapterFactory<any>;
 }
 export declare class DirectConnectInterfaceFactory extends InterfaceFactory {

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

@@ -19,7 +19,10 @@ const task_1 = require("../../utils/task");
 const peripheral_1 = require("./peripheral");
 const ble_1 = require("../../ble");
 const types_1 = require("../../ble/base/types");
+const consts_1 = require("../../ble/consts");
+const consts_2 = require("../../ble/wahoo/consts");
 const DC_TYPE = 'wahoo-fitness-tnp';
+const DC_PORT = 36866;
 const DC_EXPIRATION_TIMEOUT = 10 * 1000 * 60;
 let instanceId = 0;
 class DirectConnectInterface extends events_1.default {
@@ -66,12 +69,16 @@ class DirectConnectInterface extends events_1.default {
         return peripheral_1.DirectConnectPeripheral.create(announcement);
     }
     createDeviceSetting(service) {
+        var _a, _b;
         try {
             const name = service.name;
             const protocol = this.getProtocol(service);
-            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol };
+            const address = service.address;
+            const services = (_b = (_a = service.serviceUUIDs) === null || _a === void 0 ? void 0 : _a.map(uuid => (0, ble_1.beautifyUUID)(uuid, false))) === null || _b === void 0 ? void 0 : _b.join(',');
+            console.log('# created device setting from announcement', name, service.serviceUUIDs, services);
+            return { interface: DirectConnectInterface.INTERFACE_NAME, name, protocol, address, services };
         }
-        catch (_a) {
+        catch (_c) {
             return null;
         }
     }
@@ -81,6 +88,12 @@ class DirectConnectInterface extends events_1.default {
             return null;
         return this.createPeripheral(info.service);
     }
+    addKnownDevice(settings) {
+        const announcement = this.createAnnouncementFromSettings(settings);
+        if (announcement) {
+            this.addService(announcement, 'known-device');
+        }
+    }
     getLogger() {
         return this.logger;
     }
@@ -236,6 +249,7 @@ class DirectConnectInterface extends events_1.default {
         const device = this.createDeviceSetting(service);
         if (!device)
             return;
+        console.log('# emitting device', device, service);
         this.emit('device', device, service);
     }
     buildDeviceSettings(matching = []) {
@@ -243,15 +257,22 @@ class DirectConnectInterface extends events_1.default {
     }
     addService(service, source) {
         var _a, _b;
+        console.log(`# DirectConnectInterface.addService from ${source}`, service.name, service.serviceUUIDs);
+        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);
+                }
             }
             else {
-                this.services.push({ ts: Date.now(), service });
+                this.services.push({ ts: Date.now(), service, source: src });
                 if (!((_a = service.serviceUUIDs) === null || _a === void 0 ? void 0 : _a.length))
                     return;
                 this.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
@@ -306,6 +327,42 @@ class DirectConnectInterface extends events_1.default {
         details.sort((a, b) => b.priority - a.priority);
         return details[0].class;
     }
+    createAnnouncementFromSettings(settings) {
+        if (settings.protocol && settings.address) {
+            const announcement = {
+                name: settings.name,
+                address: settings.address,
+                protocol: 'tcp',
+                port: DC_PORT,
+                type: DC_TYPE,
+                transport: 'wifi',
+                serviceUUIDs: this.getServiceUUIDs(settings),
+            };
+            console.log('# created announcement from settings', announcement);
+            return announcement;
+        }
+    }
+    getServiceUUIDs(settings) {
+        if (settings.services && settings.services.length > 0) {
+            return settings.services.split(',').map(s => s.trim());
+        }
+        switch (settings.protocol) {
+            case 'fm':
+                return ['1826'];
+            case 'hr':
+                return ['180d'];
+            case 'wahoo':
+                return [consts_1.CSP, consts_2.WAHOO_ADVANCED_FTMS];
+            case 'cp':
+                return [consts_1.CSP];
+            case 'csc':
+                return [consts_1.CSC];
+            case 'zwift-play':
+                return ['0000000119ca465186e5fa29dcdd09d1'];
+            default:
+                return [];
+        }
+    }
     getAdapterFactory() {
         return ble_1.BleAdapterFactory.getInstance('wifi');
     }

package/lib/serial/base/serial-interface.d.ts

@@ -2,7 +2,7 @@ import EventEmitter from "events";
 import { BindingInterface } from "@serialport/bindings-interface";
 import { SerialPortStream } from '@serialport/stream';
 import { SerialDeviceSettings, SerialScannerProps, PortMapping, SerialInterfaceProps } from "../types";
-import { IncyclistInterface } from "../../types";
+import { DeviceSettings, IncyclistInterface } from "../../types";
 import { EventLogger } from "gd-eventlog";
 export default class SerialInterface extends EventEmitter implements IncyclistInterface {
     ifaceName: string;
@@ -31,4 +31,5 @@ export default class SerialInterface extends EventEmitter implements IncyclistIn
     closePort(path: string): Promise<Boolean>;
     scan(props: SerialScannerProps): Promise<SerialDeviceSettings[]>;
     stopScan(): Promise<boolean>;
+    addKnownDevice(_settings: DeviceSettings): void;
 }

package/lib/serial/base/serial-interface.js

@@ -289,6 +289,8 @@ class SerialInterface extends events_1.default {
             return true;
         });
     }
+    addKnownDevice(_settings) {
+    }
 }
 SerialInterface._instances = [];
 exports.default = SerialInterface;

package/lib/types/interface.d.ts

@@ -15,4 +15,5 @@ export interface IncyclistInterface extends EventEmitter {
     isConnected(): boolean;
     scan(props: IncyclistScanProps): Promise<DeviceSettings[]>;
     stopScan(): Promise<boolean>;
+    addKnownDevice?(settings: DeviceSettings): void;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.39",
+  "version": "2.3.41",
   "dependencies": {
     "@protobuf-ts/runtime": "^2.11.1",
     "@serialport/bindings-interface": "^1.2.2",