incyclist-devices 1.4.37 → 1.4.40

package/lib/DeviceSupport.d.ts

@@ -11,6 +11,7 @@ import { CyclingModeProperyType } from './CyclingMode';
 import BleInterface from './ble/ble-interface';
 import BleHrmDevice from './ble/hrm';
 import BleCyclingPowerDevice from './ble/pwr';
+import BleFitnessMachineDevice from './ble/fm';
 declare const Protocols: {
     SimulatorProtocol: typeof SimulatorProtocol;
     DaumClassicProtocol: typeof DaumClassicProtocol;
@@ -18,4 +19,4 @@ declare const Protocols: {
     KettlerRacerProtocol: typeof KettlerRacerProtocol;
     BleProtocol: typeof BleProtocol;
 };
-export { DeviceProtocolBase, DeviceProtocol, DeviceRegistry, INTERFACE, DeviceAdapter as Device, Protocols, AntScanner, BleProtocol, CyclingModeProperyType, BleInterface, BleHrmDevice, BleCyclingPowerDevice };
+export { DeviceProtocolBase, DeviceProtocol, DeviceRegistry, INTERFACE, DeviceAdapter as Device, Protocols, AntScanner, BleProtocol, CyclingModeProperyType, BleInterface, BleHrmDevice, BleCyclingPowerDevice, BleFitnessMachineDevice };

package/lib/DeviceSupport.js

@@ -33,6 +33,8 @@ const hrm_1 = __importDefault(require("./ble/hrm"));
 exports.BleHrmDevice = hrm_1.default;
 const pwr_1 = __importDefault(require("./ble/pwr"));
 exports.BleCyclingPowerDevice = pwr_1.default;
+const fm_1 = __importDefault(require("./ble/fm"));
+exports.BleFitnessMachineDevice = fm_1.default;
 const Protocols = {
     SimulatorProtocol: Simulator_1.default,
     DaumClassicProtocol: DaumClassicProtocol_1.default,

package/lib/ble/ble-device.d.ts

@@ -1,11 +1,6 @@
 /// <reference types="node" />
 import { EventLogger } from "gd-eventlog";
 import { BleInterfaceClass, BleDeviceClass, BlePeripheral, BleDeviceProps, ConnectProps } from "./ble";
-interface ConnectState {
-    isConnecting: boolean;
-    isConnected: boolean;
-    isDisconnecting: boolean;
-}
 interface BleDeviceConstructProps extends BleDeviceProps {
     log?: boolean;
     logger?: EventLogger;
@@ -19,13 +14,13 @@ export declare abstract class BleDevice extends BleDeviceClass {
     peripheral?: BlePeripheral;
     characteristics: any[];
     state?: string;
-    connectState: ConnectState;
     logger?: EventLogger;
     constructor(props?: BleDeviceConstructProps);
     logEvent(event: any): void;
     setInterface(ble: BleInterfaceClass): void;
     private cleanupListeners;
     private onDisconnect;
+    waitForConnectFinished(timeout: any): Promise<unknown>;
     connect(props?: ConnectProps): Promise<boolean>;
     disconnect(): Promise<boolean>;
     abstract getProfile(): string;

package/lib/ble/ble-device.js

@@ -11,11 +11,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const ble_1 = require("./ble");
+const CONNECT_WAIT_TIMEOUT = 10000;
 class BleDevice extends ble_1.BleDeviceClass {
     constructor(props) {
         super();
         this.characteristics = [];
-        this.connectState = { isConnecting: false, isConnected: false, isDisconnecting: false };
         this.id = props.id;
         this.address = props.address;
         this.name = props.name;
@@ -43,7 +43,7 @@ class BleDevice extends ble_1.BleDeviceClass {
             this.logger.logEvent(event);
         }
         if (process.env.BLE_DEBUG) {
-            console.log(event);
+            console.log('~~~BLE:', event);
         }
     }
     setInterface(ble) {
@@ -55,9 +55,9 @@ class BleDevice extends ble_1.BleDeviceClass {
         }
         else {
             this.characteristics.forEach(c => {
+                c.unsubscribe();
                 c.removeAllListeners('data');
             });
-            this.characteristics = [];
         }
     }
     onDisconnect() {
@@ -67,6 +67,27 @@ class BleDevice extends ble_1.BleDeviceClass {
         }
         this.emit('disconnected');
     }
+    waitForConnectFinished(timeout) {
+        const waitStart = Date.now();
+        const waitTimeout = waitStart + timeout;
+        return new Promise((resolve, reject) => {
+            const waitIv = setInterval(() => {
+                try {
+                    if (this.connectState.isConnecting && Date.now() > waitTimeout) {
+                        clearInterval(waitIv);
+                        return reject(new Error('connection already in progress'));
+                    }
+                    if (!this.connectState.isConnecting) {
+                        clearInterval(waitIv);
+                        return resolve(true);
+                    }
+                }
+                catch (err) {
+                    console.log('~~~ error', err);
+                }
+            }, 100);
+        });
+    }
     connect(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const connectPeripheral = (peripheral) => __awaiter(this, void 0, void 0, function* () {
@@ -80,30 +101,36 @@ class BleDevice extends ble_1.BleDeviceClass {
                         this.logEvent({ message: 'cannot connect', error: err.message || err });
                     }
                 }
-                this.connectState.isConnecting = false;
-                this.connectState.isConnected = true;
-                this.state = "connected";
-                this.emit('connected');
-                this.cleanupListeners();
-                this.ble.addConnectedDevice(this);
-                this.peripheral.once('disconnect', () => { this.onDisconnect(); });
                 try {
+                    this.cleanupListeners();
                     if (!connected) {
-                        const { characteristics } = yield peripheral.discoverSomeServicesAndCharacteristicsAsync(this.services || [], []);
+                        this.logEvent({ message: 'connect: discover characteristics start' });
+                        const res = yield peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
+                        const { characteristics } = res;
+                        this.logEvent({ message: 'connect: discover characteristics result',
+                            result: characteristics.map(c => ({ uuid: ble_1.uuid(c.uuid), properties: c.properties.join(','), service: ble_1.uuid(c._serviceUuid) }))
+                        });
                         this.characteristics = characteristics;
                     }
                     else {
                         this.characteristics = connected.characteristics;
                     }
+                    this.connectState.isConnecting = false;
+                    this.connectState.isConnected = true;
+                    this.state = "connected";
+                    this.emit('connected');
+                    this.ble.addConnectedDevice(this);
+                    this.peripheral.once('disconnect', () => { this.onDisconnect(); });
                     this.characteristics.forEach(c => {
                         if (c.properties.find(p => p === 'notify')) {
                             c.on('data', (data, _isNotification) => {
                                 this.onData(ble_1.uuid(c.uuid), data);
                             });
                             if (!connected) {
+                                this.logEvent({ message: 'subscribe', device: this.name, address: this.address, service: c._serviceUuid, characteristic: c.uuid });
                                 c.subscribe((err) => {
                                     if (err)
-                                        this.logEvent({ message: 'cannot subscribe', error: err.message || err });
+                                        this.logEvent({ message: 'cannot subscribe', device: this.name, address: this.address, service: c._serviceUuid, characteristic: c.uuid, error: err.message || err });
                                 });
                             }
                         }
@@ -111,9 +138,25 @@ class BleDevice extends ble_1.BleDeviceClass {
                 }
                 catch (err) {
                     this.logEvent({ message: 'cannot connect', error: err.message || err });
+                    this.connectState.isConnecting = false;
+                    this.connectState.isConnected = false;
                 }
             });
             try {
+                if (this.connectState.isConnecting) {
+                    yield this.waitForConnectFinished(CONNECT_WAIT_TIMEOUT);
+                }
+                if (this.connectState.isConnected) {
+                    this.characteristics.forEach(c => {
+                        if (c.properties.find(p => p === 'notify')) {
+                            c.on('data', (data, _isNotification) => {
+                                this.onData(ble_1.uuid(c.uuid), data);
+                            });
+                        }
+                    });
+                    return true;
+                }
+                this.connectState.isConnecting = true;
                 if (this.peripheral) {
                     const { id, address, advertisement } = this.peripheral;
                     const name = advertisement === null || advertisement === void 0 ? void 0 : advertisement.localName;
@@ -124,8 +167,8 @@ class BleDevice extends ble_1.BleDeviceClass {
                 }
                 else {
                     const { id, name, address } = this;
+                    let error;
                     if (this.address || this.id || this.name) {
-                        this.connectState.isConnecting = true;
                         this.logEvent({ message: 'connect requested', mode: 'device', device: { id, name, address } });
                         try {
                             if (this.ble.isScanning()) {
@@ -140,9 +183,11 @@ class BleDevice extends ble_1.BleDeviceClass {
                             }
                         }
                         catch (err) {
+                            console.log('~~~ error', err);
+                            error = err;
                         }
                     }
-                    this.logEvent({ message: 'connect result: failure', mode: 'device', device: { id, name, address } });
+                    this.logEvent({ message: 'connect result: failure', mode: 'device', device: { id, name, address }, error: error.message, stack: error.stack });
                     this.connectState.isConnecting = false;
                     this.connectState.isConnected = false;
                     return false;

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

@@ -3,6 +3,8 @@ import { EventLogger } from 'gd-eventlog';
 import { BleInterfaceClass, ConnectProps, ScanProps, BleDeviceClass, BlePeripheral, BleBinding } from './ble';
 export interface ScanState {
     isScanning: boolean;
+    isConnecting: boolean;
+    isBackgroundScan: boolean;
     timeout?: NodeJS.Timeout;
 }
 export interface ConnectState {
@@ -26,6 +28,7 @@ export default class BleInterface extends BleInterfaceClass {
     connectState: ConnectState;
     devices: BleDeviceInfo[];
     logger: EventLogger;
+    deviceCache: any[];
     static deviceClasses: BleDeviceClassInfo[];
     static _instance: BleInterface;
     static getInstance(props?: {
@@ -48,7 +51,10 @@ export default class BleInterface extends BleInterfaceClass {
     getDevicesFromServices(deviceTypes: (typeof BleDeviceClass)[], services: string | string[]): (typeof BleDeviceClass)[];
     getServicesFromDeviceTypes(deviceTypes: (typeof BleDeviceClass)[]): string[];
     getServicesFromDevice(device: BleDeviceClass): string[];
+    waitForConnectFinished(timeout: any): Promise<unknown>;
     connectDevice(requested: BleDeviceClass, timeout?: number): Promise<BleDeviceClass>;
+    waitForScanFinished(timeout: any): Promise<unknown>;
+    addPeripheralToCache(peripheral: BlePeripheral): void;
     scan(props: ScanProps): Promise<BleDeviceClass[]>;
     stopScan(): Promise<boolean>;
     isScanning(): boolean;

package/lib/ble/ble-interface.js

@@ -12,12 +12,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const utils_1 = require("../utils");
 const ble_1 = require("./ble");
+const CONNECT_TIMEOUT = 5000;
 class BleInterface extends ble_1.BleInterfaceClass {
     constructor(props = {}) {
         super(props);
-        this.scanState = { isScanning: false, timeout: undefined };
+        this.scanState = { isScanning: false, isConnecting: false, timeout: undefined, isBackgroundScan: false };
         this.connectState = { isConnecting: false, isConnected: false, isInitSuccess: false };
         this.devices = [];
+        this.deviceCache = [];
         if (props.logger)
             this.logger = props.logger;
         else if (props.log) {
@@ -51,7 +53,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
             this.logger.logEvent(event);
         }
         if (process.env.BLE_DEBUG) {
-            console.log(event);
+            console.log('~~BLE:', event);
         }
     }
     onStateChange(state) {
@@ -67,11 +69,21 @@ class BleInterface extends ble_1.BleInterfaceClass {
     }
     connect(props = {}) {
         const timeout = props.timeout || 2000;
+        const runBackgroundScan = () => {
+            this.scanState.isBackgroundScan = true;
+            this.scan({ timeout: 5000, isBackgroundScan: true })
+                .then(() => {
+                this.scanState.isBackgroundScan = false;
+            })
+                .catch(() => {
+                this.scanState.isBackgroundScan = false;
+            });
+        };
         return new Promise((resolve, reject) => {
             if (this.connectState.isConnected) {
                 return resolve(true);
             }
-            this.logEvent({ message: 'connect request' });
+            this.logEvent({ message: 'connect request', });
             if (!this.getBinding())
                 return Promise.reject(new Error('no binding defined'));
             this.connectState.timeout = setTimeout(() => {
@@ -114,7 +126,9 @@ class BleInterface extends ble_1.BleInterfaceClass {
                     this.connectState.isConnected = true;
                     this.connectState.isConnecting = false;
                     this.logEvent({ message: 'connect result: success' });
-                    return resolve(true);
+                    resolve(true);
+                    runBackgroundScan();
+                    return;
                 }
                 else {
                     this.getBinding().once('error', (err) => {
@@ -133,6 +147,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                             this.connectState.isConnected = true;
                             this.connectState.isConnecting = false;
                             this.logEvent({ message: 'connect result: success' });
+                            runBackgroundScan();
                             return resolve(true);
                         }
                         else {
@@ -229,16 +244,37 @@ class BleInterface extends ble_1.BleInterfaceClass {
         });
         return services;
     }
-    connectDevice(requested, timeout = 2000) {
+    waitForConnectFinished(timeout) {
+        const waitStart = Date.now();
+        const waitTimeout = waitStart + timeout;
+        return new Promise((resolve, reject) => {
+            const waitIv = setInterval(() => {
+                if (this.scanState.isConnecting && Date.now() > waitTimeout) {
+                    clearInterval(waitIv);
+                    return reject(new Error('Connecting already in progress'));
+                }
+                if (!this.scanState.isConnecting) {
+                    clearInterval(waitIv);
+                    return resolve(true);
+                }
+            }, 100);
+        });
+    }
+    connectDevice(requested, timeout = CONNECT_TIMEOUT) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { id, name, address } = requested;
-            this.logEvent({ message: 'connectDevice', id, name, address });
+            const { id, name, address, getProfile } = requested;
+            const profile = getProfile && typeof (getProfile) === 'function' ? getProfile() : undefined;
+            this.logEvent({ message: 'connectDevice', id, name, address, profile, isbusy: this.scanState.isConnecting });
+            if (this.scanState.isConnecting) {
+                yield this.waitForConnectFinished(10000);
+            }
+            this.scanState.isConnecting = true;
             let devices = [];
             let retry = false;
             let retryCount = 0;
             do {
                 if (retryCount > 0) {
-                    this.logEvent({ message: 'retry connect device', retryCount });
+                    this.logEvent({ message: 'retry connect device', id, name, address, profile, retryCount });
                 }
                 try {
                     devices = yield this.scan({ timeout, device: requested });
@@ -249,28 +285,66 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 }
                 catch (err) {
                     if (err.message === 'scanning already in progress') {
-                        this.logEvent({ message: 'scan busy' });
                         yield utils_1.sleep(1000);
                         retryCount++;
                         retry = retryCount < 5;
                         continue;
                     }
+                    this.scanState.isConnecting = false;
                     throw err;
                 }
             } while (devices.length === 0 && retry);
-            if (devices.length === 0)
+            if (devices.length === 0) {
+                this.logEvent({ message: 'connectDevice failure', id, name, address, profile, error: 'device not found' });
+                this.scanState.isConnecting = false;
                 throw new Error('device not found');
+            }
             if (devices[0]) {
+                this.logEvent({ message: 'connectDevice connecting', id, name, address, profile });
                 const connected = yield devices[0].connect();
+                this.scanState.isConnecting = false;
                 if (connected) {
+                    this.logEvent({ message: 'connectDevice success', id, name, address, profile });
                     return devices[0];
                 }
                 else {
+                    this.logEvent({ message: 'connectDevice failure', id, name, address, profile });
                     throw new Error('connect failed');
                 }
             }
         });
     }
+    waitForScanFinished(timeout) {
+        const waitStart = Date.now();
+        const waitTimeout = waitStart + timeout;
+        return new Promise((resolve, reject) => {
+            const waitIv = setInterval(() => {
+                if (this.scanState.isScanning && Date.now() > waitTimeout) {
+                    clearInterval(waitIv);
+                    return reject(new Error('scanning already in progress'));
+                }
+                if (!this.scanState.isScanning) {
+                    clearInterval(waitIv);
+                    return resolve(true);
+                }
+            }, 100);
+        });
+    }
+    addPeripheralToCache(peripheral) {
+        try {
+            this.logEvent({ message: 'adding device to cache', device: { address: peripheral.address, name: peripheral.advertisement ? peripheral.advertisement.localName : '' } });
+            const existing = this.deviceCache.find(p => p.address === peripheral.address);
+            if (!existing)
+                this.deviceCache.push(peripheral);
+            else {
+                if (peripheral.advertisement && peripheral.advertisement.localName !== '' && existing.advertisement && existing.advertisement.localName === '')
+                    existing.advertisement.localName = peripheral.advertisement.localName;
+            }
+        }
+        catch (err) {
+            console.log('~~~ error', err);
+        }
+    }
     scan(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const { timeout = 5000, deviceTypes = [], device } = props;
@@ -282,99 +356,175 @@ class BleInterface extends ble_1.BleInterfaceClass {
             if (!this.isConnected()) {
                 yield this.connect();
             }
+            this.logEvent({ message: 'scan()', props, scanState: this.scanState, cache: this.deviceCache.map(p => ({ name: p.advertisement ? p.advertisement.localName : '', address: p.address })) });
+            if (!props.isBackgroundScan && this.scanState.isBackgroundScan) {
+                yield this.stopScan();
+                this.scanState.isBackgroundScan = false;
+            }
             const detectedPeripherals = {};
+            let opStr;
             if (scanForDevice) {
+                opStr = 'search device';
                 const { id, address, name } = device;
                 this.logEvent({ message: 'search device request', device: { id, address, name }, deviceTypes });
             }
-            else
+            else {
+                opStr = 'scan';
                 this.logEvent({ message: 'scan start', services });
-            return new Promise((resolve, reject) => {
-                if (this.scanState.isScanning) {
-                    this.logEvent({ message: 'scan result: already scanning' });
-                    return reject(new Error('scanning already in progress'));
+            }
+            if (this.scanState.isScanning) {
+                try {
+                    yield this.waitForScanFinished(timeout);
                 }
+                catch (err) {
+                    this.logEvent({ message: `${opStr} result: already scanning` });
+                    return Promise.reject(err);
+                }
+            }
+            return new Promise((resolve, reject) => {
                 this.scanState.isScanning = true;
                 if (scanForDevice && device instanceof ble_1.BleDeviceClass) {
-                    const existing = this.devices.find(i => i.device.address === device.address && i.isConnected);
-                    if (existing) {
-                        device.peripheral = existing.device.peripheral;
-                        this.logEvent({ message: 'scan: device already connected', device: device.name, address: device.address });
-                        return resolve([device]);
+                    if (this.devices && this.devices.length > 0) {
+                        const connectedDevices = this.devices.map(i => ({ name: i.device.name, address: i.device.address, isConnected: i.isConnected, connectState: i.device.getConnectState() }));
+                        const { name, address } = device;
+                        this.logEvent({ message: `${opStr}: check if already registered`, device: { name, address }, connectedDevices });
+                        const existing = this.devices.find(i => (i.device.address === device.address || i.device.name === device.name));
+                        if (existing) {
+                            const d = device;
+                            const linkedDevice = existing.device;
+                            d.peripheral = existing.device.peripheral;
+                            if (d.setInterface && typeof (d.setInterface) === 'function')
+                                d.setInterface(this);
+                            setTimeout(() => {
+                                let connectState = linkedDevice.getConnectState();
+                                this.logEvent({ message: `${opStr}: device already registered`, device: device.name, address: device.address, connectState });
+                                if (connectState.isConnecting) {
+                                    const waitStart = Date.now();
+                                    const waitTimeout = waitStart + timeout;
+                                    const waitIv = setInterval(() => {
+                                        try {
+                                            connectState = linkedDevice.getConnectState();
+                                            if (connectState.isConnecting && Date.now() > waitTimeout) {
+                                                clearInterval(waitIv);
+                                                this.scanState.isScanning = false;
+                                                return resolve([]);
+                                            }
+                                            if (!connectState.isConnecting) {
+                                                clearInterval(waitIv);
+                                                this.scanState.isScanning = false;
+                                                return resolve([device]);
+                                            }
+                                        }
+                                        catch (err) {
+                                            console.log('~~~ error', err);
+                                        }
+                                    }, 100);
+                                }
+                                else if (connectState.isConnected) {
+                                    this.scanState.isScanning = false;
+                                    resolve([device]);
+                                }
+                                else {
+                                    this.scanState.isScanning = false;
+                                    resolve([]);
+                                }
+                            }, 100);
+                        }
                     }
                 }
-                bleBinding.startScanning([], true, (err) => {
-                    if (err) {
-                        this.logEvent({ message: 'scan result: error', error: err.message });
-                        this.scanState.isScanning = false;
-                        return reject(err);
-                    }
-                    bleBinding.on('discover', (peripheral) => {
-                        if (!peripheral || !peripheral.advertisement)
-                            return;
-                        if (!detectedPeripherals[peripheral.id]) {
-                            if (process.env.BLE_DEBUG)
-                                console.log('discovered', peripheral);
-                            detectedPeripherals[peripheral.id] = peripheral;
-                            let DeviceClasses;
-                            if (scanForDevice && (!deviceTypes || deviceTypes.length === 0)) {
-                                const classes = BleInterface.deviceClasses.map(c => c.Class);
-                                DeviceClasses = this.getDevicesFromServices(classes, peripheral.advertisement.serviceUuids);
+                const onPeripheralFound = (peripheral, fromCache = false) => {
+                    if (fromCache)
+                        this.logEvent({ message: 'adding from Cache', peripheral: peripheral.address });
+                    if (!peripheral || !peripheral.advertisement)
+                        return;
+                    if (!detectedPeripherals[peripheral.id]) {
+                        if (process.env.BLE_DEBUG)
+                            console.log('discovered', peripheral);
+                        detectedPeripherals[peripheral.id] = peripheral;
+                        this.addPeripheralToCache(peripheral);
+                        let DeviceClasses;
+                        if (scanForDevice && (!deviceTypes || deviceTypes.length === 0)) {
+                            const classes = BleInterface.deviceClasses.map(c => c.Class);
+                            DeviceClasses = this.getDevicesFromServices(classes, peripheral.advertisement.serviceUuids);
+                        }
+                        else {
+                            DeviceClasses = this.getDevicesFromServices(deviceTypes, peripheral.advertisement.serviceUuids);
+                        }
+                        DeviceClasses.forEach(DeviceClass => {
+                            let cntFound = 0;
+                            if (!DeviceClass)
+                                return;
+                            if (scanForDevice && cntFound > 0)
+                                return;
+                            const C = DeviceClass;
+                            const d = new C({ peripheral });
+                            if (device && device.getProfile && device.getProfile() !== d.getProfile())
+                                return;
+                            d.setInterface(this);
+                            if (scanForDevice) {
+                                if ((device.id && device.id !== '' && d.id === device.id) ||
+                                    (device.address && device.address !== '' && d.address === device.address) ||
+                                    (device.name && device.name !== '' && d.name === device.name))
+                                    cntFound++;
                             }
-                            else {
-                                DeviceClasses = this.getDevicesFromServices(deviceTypes, peripheral.advertisement.serviceUuids);
+                            else
+                                cntFound++;
+                            const existing = this.devices.find(i => i.device.id === d.id && i.device.getProfile() === d.getProfile());
+                            if (!scanForDevice && cntFound > 0 && !existing) {
+                                this.logEvent({ message: `${opStr}: device found`, device: d.name, address: d.address, services: d.services.join(',') });
+                                this.devices.push({ device: d, isConnected: false });
+                                this.emit('device', d);
                             }
-                            let cntFound = 0;
-                            DeviceClasses.forEach(DeviceClass => {
-                                if (!DeviceClass)
+                            if (scanForDevice && cntFound > 0) {
+                                if (fromCache) {
+                                    resolve([d]);
                                     return;
-                                if (scanForDevice && cntFound > 0)
-                                    return;
-                                const C = DeviceClass;
-                                const d = new C({ peripheral });
-                                if (device.getProfile && device.getProfile() !== d.getProfile())
-                                    return;
-                                d.setInterface(this);
-                                if (scanForDevice) {
-                                    if ((device.id && device.id !== '' && d.id === device.id) ||
-                                        (device.address && device.address !== '' && d.address === device.address) ||
-                                        (device.name && device.name !== '' && d.name === device.name))
-                                        cntFound++;
                                 }
-                                else
-                                    cntFound++;
-                                const existing = this.devices.find(i => i.device.id === d.id && i.device.getProfile() === d.getProfile());
-                                if (cntFound > 0 && !existing) {
-                                    this.logEvent({ message: 'scan: device found', device: d.name, address: d.address, services: d.services.join(',') });
-                                    this.devices.push({ device: d, isConnected: false });
-                                    this.emit('device', d);
-                                }
-                                if (scanForDevice && cntFound > 0) {
-                                    if (this.scanState.timeout) {
-                                        clearTimeout(this.scanState.timeout);
-                                        this.scanState.timeout = null;
-                                        bleBinding.stopScanning(() => {
-                                            this.getBinding().removeAllListeners('discover');
-                                            this.scanState.isScanning = false;
-                                            resolve([d]);
-                                        });
-                                    }
-                                    else {
+                                if (this.scanState.timeout) {
+                                    clearTimeout(this.scanState.timeout);
+                                    this.scanState.timeout = null;
+                                    this.logEvent({ message: `${opStr}: stop scanning`, requested: scanForDevice ? { name: device.name, address: device.address } : undefined, });
+                                    bleBinding.stopScanning(() => {
+                                        this.getBinding().removeAllListeners('discover');
+                                        this.scanState.isScanning = false;
                                         resolve([d]);
-                                    }
+                                    });
                                 }
-                            });
-                        }
-                        else {
-                        }
+                                else {
+                                    resolve([d]);
+                                }
+                            }
+                        });
+                    }
+                    else {
+                    }
+                };
+                this.logEvent({ message: `${opStr}: start scanning`, requested: scanForDevice ? { name: device.name, address: device.address } : undefined, timeout });
+                this.deviceCache.forEach(peripheral => {
+                    onPeripheralFound(peripheral, true);
+                });
+                bleBinding.startScanning([], true, (err) => {
+                    if (err) {
+                        this.logEvent({ message: `${opStr} result: error`, requested: scanForDevice ? { name: device.name, address: device.address } : undefined, error: err.message });
+                        this.scanState.isScanning = false;
+                        return reject(err);
+                    }
+                    bleBinding.on('discover', (p) => {
+                        console.log('~~~ discovered:', p.address, p.advertisement ? p.advertisement.localName : '');
+                        onPeripheralFound(p);
                     });
                 });
                 this.scanState.timeout = setTimeout(() => {
                     this.scanState.timeout = null;
-                    this.logEvent({ message: 'scan result: devices found', devices: this.devices.map(i => i.device.name + (!i.device.name || i.device.name === '') ? `addr=${i.device.address}` : '') });
+                    this.logEvent({ message: `${opStr} result: devices found`, requested: scanForDevice ? { name: device.name, address: device.address } : undefined, devices: this.devices.map(i => i.device.name + (!i.device.name || i.device.name === '') ? `addr=${i.device.address}` : '') });
                     this.getBinding().removeAllListeners('discover');
+                    this.logEvent({ message: `${opStr}: stop scanning`, requested: scanForDevice ? { name: device.name, address: device.address } : undefined, });
                     bleBinding.stopScanning(() => {
                         this.scanState.isScanning = false;
+                        if (scanForDevice) {
+                            reject(new Error('device not found'));
+                            return;
+                        }
                         resolve(this.devices.map(i => i.device));
                     });
                 }, timeout);

package/lib/ble/ble.d.ts

@@ -8,12 +8,20 @@ export interface BleDeviceIdentifier {
     address?: string;
     name?: string;
 }
+export interface ConnectState {
+    isConnecting: boolean;
+    isConnected: boolean;
+    isDisconnecting: boolean;
+}
 export declare abstract class BleDeviceClass extends EventEmitter {
     static services: string[];
     id?: string;
     address?: string;
     name?: string;
     peripheral?: BlePeripheral;
+    connectState: ConnectState;
+    getConnectState(): ConnectState;
+    isConnected(): boolean;
     abstract getProfile(): string;
     abstract getServiceUUids(): string[];
     abstract connect(props?: ConnectProps): Promise<boolean>;
@@ -29,6 +37,7 @@ export declare type ScanProps = {
     timeout?: number;
     deviceTypes?: (typeof BleDeviceClass)[];
     device?: BleDeviceClass;
+    isBackgroundScan?: boolean;
 };
 export declare class BleBindingWrapper {
     protected binding: BleBinding;

package/lib/ble/ble.js

@@ -5,6 +5,16 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const events_1 = __importDefault(require("events"));
 class BleDeviceClass extends events_1.default {
+    constructor() {
+        super(...arguments);
+        this.connectState = { isConnecting: false, isConnected: false, isDisconnecting: false };
+    }
+    getConnectState() {
+        return this.connectState;
+    }
+    isConnected() {
+        return this.connectState.isConnected;
+    }
 }
 exports.BleDeviceClass = BleDeviceClass;
 BleDeviceClass.services = [];

package/lib/ble/fm.d.ts

@@ -0,0 +1,78 @@
+/// <reference types="node" />
+import { BleDevice } from './ble-device';
+import BleInterface from './ble-interface';
+import BleProtocol from './incyclist-protocol';
+import { BleDeviceClass } from './ble';
+import DeviceAdapter, { DeviceData } from '../Device';
+import { DeviceProtocol } from '../DeviceProtocol';
+import { EventLogger } from 'gd-eventlog';
+import CyclingMode from '../CyclingMode';
+import { IncyclistBikeData } from '../CyclingMode';
+declare type PowerData = {
+    instantaneousPower?: number;
+    balance?: number;
+    accTorque?: number;
+    time: number;
+    rpm: number;
+    raw?: string;
+};
+declare type IndoorBikeData = {
+    speed?: number;
+    averageSpeed?: number;
+    cadence?: number;
+    averageCadence?: number;
+    totalDistance?: number;
+    resistanceLevel?: number;
+    instantaneousPower?: number;
+    averagePower?: number;
+    expendedEnergy?: number;
+    heartrate?: number;
+    metabolicEquivalent?: number;
+    time?: number;
+    remainingTime?: number;
+    raw?: string;
+};
+export default class BleFitnessMachineDevice extends BleDevice {
+    static services: string[];
+    static characteristics: string[];
+    data: IndoorBikeData;
+    constructor(props?: any);
+    getProfile(): string;
+    getServiceUUids(): string[];
+    parseIndoorBikeData(_data: Uint8Array): IndoorBikeData;
+    onData(characteristic: string, data: Buffer): void;
+    write(characteristic: any, data: any): Promise<boolean>;
+    read(characteristic: any): Promise<Buffer>;
+    reset(): void;
+}
+export declare class FmAdapter extends DeviceAdapter {
+    device: BleFitnessMachineDevice;
+    ignore: boolean;
+    ble: BleInterface;
+    protocol: DeviceProtocol;
+    paused: boolean;
+    logger: EventLogger;
+    mode: CyclingMode;
+    distanceInternal: number;
+    prevDataTS: number;
+    constructor(device: BleDeviceClass, protocol: BleProtocol);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    getProfile(): string;
+    getName(): string;
+    getDisplayName(): string;
+    getCyclingMode(): CyclingMode;
+    getDefaultCyclingMode(): CyclingMode;
+    getPort(): string;
+    setIgnoreBike(ignore: any): void;
+    setIgnorePower(ignore: any): void;
+    onDeviceData(deviceData: PowerData): void;
+    mapData(deviceData: IndoorBikeData): IncyclistBikeData;
+    transformData(bikeData: IncyclistBikeData): DeviceData;
+    start(props?: any): Promise<any>;
+    stop(): Promise<boolean>;
+    pause(): Promise<boolean>;
+    resume(): Promise<boolean>;
+}
+export {};

package/lib/ble/fm.js

@@ -0,0 +1,248 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ble_device_1 = require("./ble-device");
+const ble_interface_1 = __importDefault(require("./ble-interface"));
+const Device_1 = __importDefault(require("../Device"));
+const gd_eventlog_1 = require("gd-eventlog");
+const power_meter_1 = __importDefault(require("../modes/power-meter"));
+const bit = (nr) => (1 << nr);
+const IndoorBikeDataFlag = {
+    MoreData: bit(0),
+    AverageSpeedPresent: bit(1),
+    InstantaneousCadence: bit(2),
+    AverageCadencePresent: bit(3),
+    TotalDistancePresent: bit(4),
+    ResistanceLevelPresent: bit(5),
+    InstantaneousPowerPresent: bit(6),
+    AveragePowerPresent: bit(7),
+    ExpendedEnergyPresent: bit(8),
+    HeartRatePresent: bit(9),
+    MetabolicEquivalentPresent: bit(10),
+    ElapsedTimePresent: bit(11),
+    RemainingTimePresent: bit(12)
+};
+class BleFitnessMachineDevice extends ble_device_1.BleDevice {
+    constructor(props) {
+        super(props);
+        this.data = {};
+    }
+    getProfile() {
+        return 'Smart Trainer';
+    }
+    getServiceUUids() {
+        return BleFitnessMachineDevice.services;
+    }
+    parseIndoorBikeData(_data) {
+        const data = Buffer.from(_data);
+        const flags = data.readUInt16LE(0);
+        let offset = 2;
+        if ((flags & IndoorBikeDataFlag.MoreData) === 0) {
+            this.data.speed = data.readUInt16LE(offset) / 100;
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.AverageSpeedPresent) {
+            this.data.averageSpeed = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.InstantaneousCadence) {
+            this.data.cadence = data.readUInt16LE(offset) / 2;
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.AverageCadencePresent) {
+            this.data.averageCadence = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.TotalDistancePresent) {
+            this.data.totalDistance = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.ResistanceLevelPresent) {
+            this.data.resistanceLevel = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.InstantaneousPowerPresent) {
+            this.data.instantaneousPower = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.AveragePowerPresent) {
+            this.data.averagePower = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.ExpendedEnergyPresent) {
+            this.data.expendedEnergy = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.HeartRatePresent) {
+            this.data.heartrate = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.MetabolicEquivalentPresent) {
+            this.data.metabolicEquivalent = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.ElapsedTimePresent) {
+            this.data.time = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        if (flags & IndoorBikeDataFlag.RemainingTimePresent) {
+            this.data.remainingTime = data.readUInt16LE(offset);
+            offset += 2;
+        }
+        return Object.assign(Object.assign({}, this.data), { raw: data.toString('hex') });
+    }
+    onData(characteristic, data) {
+        console.log(characteristic.toLocaleLowerCase(), data);
+        if (characteristic.toLocaleLowerCase() === '2ad2') {
+            const res = this.parseIndoorBikeData(data);
+            this.emit('data', res);
+        }
+    }
+    write(characteristic, data) {
+        console.log('write', characteristic, data);
+        return Promise.resolve(true);
+    }
+    read(characteristic) {
+        console.log('read', characteristic);
+        return Promise.resolve(Buffer.from([]));
+    }
+    reset() {
+        this.data = {};
+    }
+}
+exports.default = BleFitnessMachineDevice;
+BleFitnessMachineDevice.services = ['1826'];
+BleFitnessMachineDevice.characteristics = ['2acc', '2ad2', '2ad6', '2ad8', '2ad9', '2ada'];
+ble_interface_1.default.register('BleFitnessMachineDevice', 'fm', BleFitnessMachineDevice, BleFitnessMachineDevice.services);
+class FmAdapter extends Device_1.default {
+    constructor(device, protocol) {
+        super(protocol);
+        this.ignore = false;
+        this.paused = false;
+        this.distanceInternal = 0;
+        this.device = device;
+        this.ble = protocol.ble;
+        this.mode = this.getDefaultCyclingMode();
+        this.logger = new gd_eventlog_1.EventLogger('BLE-FM');
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getProfile() {
+        return 'Power Meter';
+    }
+    getName() {
+        return `${this.device.name}`;
+    }
+    getDisplayName() {
+        return this.getName();
+    }
+    getCyclingMode() {
+        if (!this.mode)
+            this.mode = this.getDefaultCyclingMode();
+        return this.mode;
+    }
+    getDefaultCyclingMode() {
+        return new power_meter_1.default(this);
+    }
+    getPort() {
+        return 'ble';
+    }
+    setIgnoreBike(ignore) {
+        this.ignore = ignore;
+    }
+    setIgnorePower(ignore) {
+        this.ignore = ignore;
+    }
+    onDeviceData(deviceData) {
+        if (this.prevDataTS && Date.now() - this.prevDataTS < 1000)
+            return;
+        this.prevDataTS = Date.now();
+        this.logger.logEvent({ message: 'onDeviceData', data: deviceData });
+        let incyclistData = this.mapData(deviceData);
+        incyclistData = this.getCyclingMode().updateData(incyclistData);
+        const data = this.transformData(incyclistData);
+        if (this.onDataFn && !this.ignore && !this.paused)
+            this.onDataFn(data);
+    }
+    mapData(deviceData) {
+        const data = {
+            isPedalling: false,
+            power: 0,
+            pedalRpm: undefined,
+            speed: 0,
+            heartrate: 0,
+            distanceInternal: 0,
+            slope: undefined,
+            time: undefined
+        };
+        data.power = (deviceData.instantaneousPower !== undefined ? deviceData.instantaneousPower : data.power);
+        data.pedalRpm = (deviceData.cadence !== undefined ? deviceData.cadence : data.pedalRpm);
+        data.time = (deviceData.time !== undefined ? deviceData.time : data.time);
+        data.isPedalling = data.pedalRpm > 0 || (data.pedalRpm === undefined && data.power > 0);
+        return data;
+    }
+    transformData(bikeData) {
+        if (this.ignore) {
+            return {};
+        }
+        if (bikeData === undefined)
+            return;
+        let distance = 0;
+        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
+            distance = Math.round(bikeData.distanceInternal - this.distanceInternal);
+        }
+        if (bikeData.distanceInternal !== undefined)
+            this.distanceInternal = bikeData.distanceInternal;
+        let data = {
+            speed: bikeData.speed,
+            slope: bikeData.slope,
+            power: bikeData.power !== undefined ? Math.round(bikeData.power) : undefined,
+            cadence: bikeData.pedalRpm !== undefined ? Math.round(bikeData.pedalRpm) : undefined,
+            distance,
+            timestamp: Date.now()
+        };
+        return data;
+    }
+    start(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
+            try {
+                const bleDevice = yield this.ble.connectDevice(this.device);
+                if (bleDevice) {
+                    this.device = bleDevice;
+                    bleDevice.on('data', (data) => {
+                        this.onDeviceData(data);
+                    });
+                    return true;
+                }
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'start result: error', error: err.message, profile: this.getProfile() });
+                throw new Error(`could not start device, reason:${err.message}`);
+            }
+        });
+    }
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'stop requested', profile: this.getProfile() });
+            this.distanceInternal = 0;
+            this.device.reset();
+            return this.device.disconnect();
+        });
+    }
+    pause() { this.paused = true; return Promise.resolve(true); }
+    resume() { this.paused = false; return Promise.resolve(true); }
+}
+exports.FmAdapter = FmAdapter;

package/lib/ble/hrm.js

@@ -99,7 +99,7 @@ class HrmAdapter extends Device_1.default {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'start requested', props });
+            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
             try {
                 const bleDevice = yield this.ble.connectDevice(this.device);
                 if (bleDevice) {
@@ -112,13 +112,14 @@ class HrmAdapter extends Device_1.default {
                 }
             }
             catch (err) {
-                this.logger.logEvent({ message: 'start result: error', error: err.message });
+                this.logger.logEvent({ message: 'start result: error', error: err.message, profile: this.getProfile() });
                 throw new Error(`could not start device, reason:${err.message}`);
             }
         });
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'stop requested', profile: this.getProfile() });
             return this.device.disconnect();
         });
     }

package/lib/ble/incyclist-protocol.js

@@ -24,9 +24,10 @@ const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
 const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
 const ble_1 = require("./ble");
 const ble_interface_1 = __importDefault(require("./ble-interface"));
+const fm_1 = __importStar(require("./fm"));
 const hrm_1 = __importStar(require("./hrm"));
 const pwr_1 = __importStar(require("./pwr"));
-const supportedDeviceTypes = [hrm_1.default, pwr_1.default];
+const supportedDeviceTypes = [hrm_1.default, pwr_1.default, fm_1.default];
 class BleProtocol extends DeviceProtocol_1.default {
     constructor(binding) {
         super();
@@ -58,6 +59,10 @@ class BleProtocol extends DeviceProtocol_1.default {
             case 'hr':
             case 'heartrate monitor':
                 return new hrm_1.HrmAdapter(fromDevice ? bleDevice : new hrm_1.default(props()), this);
+            case 'fm':
+            case 'smart trainer':
+            case 'fitness machine':
+                return new fm_1.FmAdapter(fromDevice ? bleDevice : new fm_1.default(props()), this);
             case 'cp':
             case 'power meter':
                 return new pwr_1.PwrAdapter(fromDevice ? bleDevice : new pwr_1.default(props()), this);

package/lib/ble/pwr.d.ts

@@ -54,6 +54,7 @@ export declare class PwrAdapter extends DeviceAdapter {
     logger: EventLogger;
     mode: CyclingMode;
     distanceInternal: number;
+    prevDataTS: number;
     constructor(device: BleDeviceClass, protocol: BleProtocol);
     isBike(): boolean;
     isHrm(): boolean;

package/lib/ble/pwr.js

@@ -30,7 +30,7 @@ class BleCyclingPowerDevice extends ble_device_1.BleDevice {
         this.prevCrankData = undefined;
     }
     getProfile() {
-        return 'cp';
+        return 'Power Meter';
     }
     getServiceUUids() {
         return BleCyclingPowerDevice.services;
@@ -166,6 +166,9 @@ class PwrAdapter extends Device_1.default {
         this.ignore = ignore;
     }
     onDeviceData(deviceData) {
+        if (this.prevDataTS && Date.now() - this.prevDataTS < 1000)
+            return;
+        this.prevDataTS = Date.now();
         this.logger.logEvent({ message: 'onDeviceData', data: deviceData });
         let incyclistData = this.mapData(deviceData);
         incyclistData = this.getCyclingMode().updateData(incyclistData);
@@ -214,7 +217,7 @@ class PwrAdapter extends Device_1.default {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'start requested', props });
+            this.logger.logEvent({ message: 'start requested', profile: this.getProfile(), props });
             try {
                 const bleDevice = yield this.ble.connectDevice(this.device);
                 if (bleDevice) {
@@ -226,13 +229,14 @@ class PwrAdapter extends Device_1.default {
                 }
             }
             catch (err) {
-                this.logger.logEvent({ message: 'start result: error', error: err.message });
+                this.logger.logEvent({ message: 'start result: error', error: err.message, profile: this.getProfile() });
                 throw new Error(`could not start device, reason:${err.message}`);
             }
         });
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'stop requested', profile: this.getProfile() });
             this.distanceInternal = 0;
             this.device.reset();
             return this.device.disconnect();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.37",
+  "version": "1.4.40",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",