incyclist-devices 1.4.45 → 1.4.48

package/lib/ble/ble-interface.js

@@ -8,10 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 gd_eventlog_1 = require("gd-eventlog");
 const utils_1 = require("../utils");
 const ble_1 = require("./ble");
+const ble_peripheral_1 = __importDefault(require("./ble-peripheral"));
 const CONNECT_TIMEOUT = 5000;
 const DEFAULT_SCAN_TIMEOUT = 20000;
 const BACKGROUND_SCAN_TIMEOUT = 30000;
@@ -71,6 +75,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
     connect(props = {}) {
         const timeout = props.timeout || 2000;
         const runBackgroundScan = () => {
+            return;
             this.scanState.isBackgroundScan = true;
             this.scan({ timeout: BACKGROUND_SCAN_TIMEOUT, isBackgroundScan: true })
                 .then(() => {
@@ -267,7 +272,22 @@ class BleInterface extends ble_1.BleInterfaceClass {
         });
     }
     addPeripheralToCache(peripheral, props = {}) {
-        this.peripheralCache.push(Object.assign({ address: peripheral.address, ts: Date.now(), peripheral }, props));
+        const info = this.peripheralCache.find(i => i.address === peripheral.address);
+        const connector = info && info.connector ? info.connector : new ble_peripheral_1.default(this, peripheral);
+        this.peripheralCache.push(Object.assign({ address: peripheral.address, ts: Date.now(), peripheral, connector }, props));
+    }
+    getConnector(peripheral) {
+        const info = this.peripheralCache.find(i => i.address === peripheral.address);
+        if (!info) {
+            const connector = new ble_peripheral_1.default(this, peripheral);
+            this.peripheralCache.push({ address: peripheral.address, ts: Date.now(), peripheral, connector });
+            return connector;
+        }
+        return info.connector;
+    }
+    findPeripheral(peripheral) {
+        const info = this.peripheralCache.find(i => i.address === peripheral.address || peripheral.address === i.peripheral.address || peripheral.name === i.peripheral.name || peripheral.id === i.peripheral.id);
+        return info ? info.peripheral : undefined;
     }
     getCharacteristics(peripheral) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -280,28 +300,17 @@ class BleInterface extends ble_1.BleInterfaceClass {
                 this.addPeripheralToCache(peripheral);
                 chachedPeripheralInfo = this.peripheralCache.find(i => i.address === peripheral.address);
             }
+            const connector = chachedPeripheralInfo.connector;
             if (!chachedPeripheralInfo.characteristics) {
                 try {
                     chachedPeripheralInfo.state = { isConfigured: false, isLoading: true, isInterrupted: false };
-                    if (chachedPeripheralInfo.peripheral && chachedPeripheralInfo.peripheral.state !== 'connected') {
-                        yield peripheral.connectAsync();
-                        chachedPeripheralInfo.peripheral.state = peripheral.state;
-                    }
-                    else {
-                        peripheral.state = chachedPeripheralInfo.peripheral.state;
-                    }
-                    const res = yield peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
-                    if (!chachedPeripheralInfo.state.isInterrupted) {
-                        this.logEvent({ message: 'characteristic info (+):', info: res.characteristics.map(c => `${peripheral.address} ${c.uuid} ${c.properties}`) });
-                        chachedPeripheralInfo.characteristics = res.characteristics;
-                        chachedPeripheralInfo.state = { isConfigured: true, isLoading: false, isInterrupted: false };
-                        characteristics = res.characteristics;
-                    }
-                    else {
-                        this.logEvent({ message: 'characteristic info:', info: 'interrupted' });
-                        chachedPeripheralInfo.state = { isConfigured: false, isLoading: false, isInterrupted: false };
-                        throw new Error('interrupted');
-                    }
+                    yield connector.connect();
+                    peripheral.state = connector.getState();
+                    yield connector.initialize();
+                    characteristics = connector.getCharachteristics();
+                    this.logEvent({ message: 'characteristic info (+):', info: characteristics.map(c => `${peripheral.address} ${c.uuid} ${c.properties}`) });
+                    chachedPeripheralInfo.characteristics = characteristics;
+                    chachedPeripheralInfo.state = { isConfigured: true, isLoading: false, isInterrupted: false };
                 }
                 catch (err) {
                     console.log(err);
@@ -339,6 +348,9 @@ class BleInterface extends ble_1.BleInterfaceClass {
     createDevice(DeviceClass, peripheral, characteristics) {
         const C = DeviceClass;
         const device = new C({ peripheral });
+        const existingDevice = this.devices.find(i => i.device.id === device.id && i.device.getProfile() === device.getProfile());
+        if (existingDevice)
+            return existingDevice;
         device.setInterface(this);
         device.characteristics = characteristics;
         return device;
@@ -525,12 +537,13 @@ class BleInterface extends ble_1.BleInterfaceClass {
                     const characteristics = yield this.getCharacteristics(peripheral);
                     const DeviceClasses = this.getDeviceClasses(peripheral, { profile });
                     let cntFound = 0;
-                    DeviceClasses.forEach(DeviceClass => {
+                    DeviceClasses.forEach((DeviceClass) => __awaiter(this, void 0, void 0, function* () {
                         if (!DeviceClass)
                             return;
                         if (scanForDevice && cntFound > 0)
                             return;
                         const d = this.createDevice(DeviceClass, peripheral, characteristics);
+                        yield d.connect();
                         if (scanForDevice) {
                             if ((id && id !== '' && d.id === id) ||
                                 (address && address !== '' && d.address === address) ||
@@ -542,14 +555,14 @@ class BleInterface extends ble_1.BleInterfaceClass {
                         const existing = devicesProcessed.find(device => device.id === d.id && 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: peripheral.state === 'connected' });
+                            this.addDeviceToCache(d, peripheral.state === 'connected');
                             devicesProcessed.push(d);
                             this.emit('device', d);
                             return;
                         }
                         if (scanForDevice && cntFound > 0) {
                             this.logEvent({ message: `${opStr}: device found`, device: d.name, address: d.address, services: d.services.join(',') });
-                            this.devices.push({ device: d, isConnected: peripheral.state === 'connected' });
+                            this.addDeviceToCache(d, peripheral.state === 'connected');
                             devicesProcessed.push(d);
                             this.emit('device', d);
                             process.nextTick(() => {
@@ -565,7 +578,7 @@ class BleInterface extends ble_1.BleInterfaceClass {
                                 });
                             });
                         }
-                    });
+                    }));
                 });
                 this.logEvent({ message: `${opStr}: start scanning`, requested: scanForDevice ? { name, address, profile } : undefined, timeout });
                 this.peripheralCache.forEach(i => {
@@ -608,19 +621,30 @@ class BleInterface extends ble_1.BleInterfaceClass {
         return this.scanState.isScanning;
     }
     addConnectedDevice(device) {
-        const existigDevice = this.devices.find(i => i.device.id === device.id);
+        const existigDevice = this.devices.find(i => i.device.id === device.id && i.device.getProfile() === device.getProfile());
         if (existigDevice) {
             existigDevice.isConnected = true;
             return;
         }
         this.devices.push({ device, isConnected: true });
     }
+    addDeviceToCache(device, isConnected) {
+        const existigDevice = this.devices.find(i => i.device.id === device.id && i.device.getProfile() === device.getProfile());
+        if (existigDevice) {
+            return;
+        }
+        this.devices.push({ device, isConnected });
+    }
     findConnected(device) {
         const connected = this.devices.find(i => i.device.id === device.id && i.isConnected);
         if (connected)
             return connected.device;
         return undefined;
     }
+    findDeviceInCache(device) {
+        const existing = this.devices.find(i => (i.device.id === device.id || i.device.address === device.address || i.device.name === device.name) && i.device.getProfile() === device.profile);
+        return existing ? existing.device : undefined;
+    }
     removeConnectedDevice(device) {
         const existigDevice = this.devices.find(i => i.device.id === device.id);
         if (existigDevice) {

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

@@ -0,0 +1,34 @@
+import { BleCharacteristic, BlePeripheral } from "./ble";
+import BleInterface from "./ble-interface";
+export declare type ConnectorState = {
+    isConnected: boolean;
+    isConnecting: boolean;
+    isInitialized: boolean;
+    isInitializing: boolean;
+    isSubscribing: boolean;
+    subscribed?: string[];
+};
+export default class BlePeripheralConnector {
+    private state;
+    private services;
+    private characteristics;
+    private ble;
+    private peripheral;
+    private logger?;
+    private emitter;
+    constructor(ble: BleInterface, peripheral: BlePeripheral);
+    logEvent(event: any): void;
+    connect(): Promise<void>;
+    reconnect(): Promise<void>;
+    onDisconnect(): void;
+    initialize(enforce?: boolean): Promise<void>;
+    subscribeAll(callback: (characteristicUuid: string, data: any) => void): Promise<string[]>;
+    subscribe(characteristicUuid: string): Promise<boolean>;
+    onData(characteristicUuid: string, data: any): void;
+    on(characteristicUuid: string, callback: (characteristicUuid: string, data: any) => void): void;
+    off(characteristicUuid: string, callback: (characteristicUuid: string, data: any) => void): void;
+    removeAllListeners(characteristicUuid: string): void;
+    getState(): string;
+    getCharachteristics(): BleCharacteristic[];
+    getServices(): string[];
+}

package/lib/ble/ble-peripheral.js

@@ -0,0 +1,170 @@
+"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_1 = require("./ble");
+const gd_eventlog_1 = require("gd-eventlog");
+const events_1 = __importDefault(require("events"));
+class BlePeripheralConnector {
+    constructor(ble, peripheral) {
+        this.ble = ble;
+        this.peripheral = peripheral;
+        this.emitter = new events_1.default();
+        if (!this.peripheral || !this.ble)
+            throw new Error('Illegal Arguments');
+        this.state = { isConnected: false, isConnecting: false, isInitialized: false, isInitializing: false, isSubscribing: false };
+        this.services = undefined;
+        this.characteristics = undefined;
+        this.logger = new gd_eventlog_1.EventLogger('BLE');
+    }
+    logEvent(event) {
+        if (this.logger) {
+            this.logger.logEvent(event);
+        }
+        if (process.env.BLE_DEBUG) {
+            console.log('~~~BLE:', event);
+        }
+    }
+    connect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.state.isConnected)
+                return;
+            this.logEvent({ message: 'connect', peripheral: this.peripheral.address, state: this.state });
+            this.state.isConnecting = true;
+            try {
+                if (!this.state.isConnected || (this.peripheral && this.peripheral.state !== 'connected')) {
+                    yield this.peripheral.connectAsync();
+                    this.peripheral.once('disconnect', this.onDisconnect.bind(this));
+                }
+                this.state.isConnected = this.peripheral.state === 'connected';
+            }
+            catch (err) {
+                this.logEvent({ message: 'Error', fn: 'connect()', error: err.message });
+            }
+            this.state.isConnecting = false;
+        });
+    }
+    reconnect() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.connect();
+        });
+    }
+    onDisconnect() {
+        this.logEvent({ message: 'onDisconnected', peripheral: this.peripheral.address, state: this.state });
+        this.state.isConnected = false;
+        this.reconnect();
+    }
+    initialize(enforce = false) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.state.isInitialized && !enforce)
+                return;
+            this.logEvent({ message: 'initialize', peripheral: this.peripheral.address, state: this.state, enforce });
+            if (this.state.isInitialized && enforce) {
+                this.state.isInitialized = false;
+            }
+            this.state.isInitializing = true;
+            this.characteristics = undefined;
+            this.services = undefined;
+            try {
+                const res = yield this.peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
+                this.characteristics = res.characteristics;
+                this.services = res.services;
+            }
+            catch (err) {
+            }
+            this.state.isInitializing = false;
+            this.state.isInitialized = this.characteristics !== undefined && this.services !== undefined;
+        });
+    }
+    subscribeAll(callback) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cnt = this.characteristics.length;
+            this.state.isSubscribing = true;
+            const subscribed = [];
+            if (!this.state.subscribed)
+                this.state.subscribed = [];
+            for (let i = 0; i < cnt; i++) {
+                try {
+                    const c = this.characteristics[i];
+                    const isNotify = c.properties.find(p => p === 'notify');
+                    if (isNotify && subscribed.find(uuid => uuid === c.uuid) === undefined) {
+                        c.on('data', (data, _isNotification) => {
+                            this.onData((0, ble_1.uuid)(c.uuid), data);
+                        });
+                        if (callback)
+                            this.on((0, ble_1.uuid)(c.uuid), callback);
+                        this.logEvent({ message: 'subscribe', peripheral: this.peripheral.address, characteristic: c.uuid });
+                        if (this.state.subscribed.find(uuid => uuid === c.uuid) === undefined) {
+                            try {
+                                yield this.subscribe(c.uuid);
+                                subscribed.push(c.uuid);
+                                this.state.subscribed.push(c.uuid);
+                            }
+                            catch (err) {
+                                this.logEvent({ message: 'cannot subscribe', peripheral: this.peripheral.address, characteristic: c.uuid, error: err.message || err });
+                            }
+                        }
+                    }
+                }
+                catch (err) {
+                    console.log('~~~ error', err);
+                }
+            }
+            this.state.isSubscribing = false;
+            this.state.subscribed = subscribed;
+            return subscribed;
+        });
+    }
+    subscribe(characteristicUuid) {
+        return new Promise((resolve, reject) => {
+            const characteristic = this.characteristics.find(c => c.uuid === characteristicUuid || (0, ble_1.uuid)(c.uuid) === characteristicUuid);
+            if (!characteristic) {
+                reject(new Error('Characteristic not found'));
+                return;
+            }
+            characteristic.on('data', (data, _isNotification) => {
+                this.onData(characteristicUuid, data);
+            });
+            characteristic.subscribe((err) => {
+                if (err)
+                    reject(err);
+                else
+                    resolve(true);
+            });
+        });
+    }
+    onData(characteristicUuid, data) {
+        this.emitter.emit(characteristicUuid, characteristicUuid, data);
+    }
+    on(characteristicUuid, callback) {
+        if (callback)
+            this.emitter.on(characteristicUuid, callback);
+    }
+    off(characteristicUuid, callback) {
+        if (callback)
+            this.emitter.off(characteristicUuid, callback);
+    }
+    removeAllListeners(characteristicUuid) {
+        this.emitter.removeAllListeners(characteristicUuid);
+    }
+    getState() {
+        return this.peripheral.state;
+    }
+    getCharachteristics() {
+        return this.characteristics;
+    }
+    getServices() {
+        return this.services;
+    }
+}
+exports.default = BlePeripheralConnector;

package/lib/ble/ble-st-mode.d.ts

@@ -0,0 +1,24 @@
+import CyclingMode, { CyclingModeProperty, IncyclistBikeData, UpdateRequest } from "../CyclingMode";
+import PowerBasedCyclingModeBase from "../modes/power-base";
+import { FmAdapter } from "./fm";
+export declare type ERGEvent = {
+    rpmUpdated?: boolean;
+    gearUpdated?: boolean;
+    starting?: boolean;
+    tsStart?: number;
+};
+export default class ERGCyclingMode extends PowerBasedCyclingModeBase implements CyclingMode {
+    prevRequest: UpdateRequest;
+    hasBikeUpdate: boolean;
+    chain: number[];
+    cassette: number[];
+    event: ERGEvent;
+    constructor(adapter: FmAdapter, props?: any);
+    getName(): string;
+    getDescription(): string;
+    getProperties(): CyclingModeProperty[];
+    getProperty(name: string): CyclingModeProperty;
+    getBikeInitRequest(): UpdateRequest;
+    sendBikeUpdate(request: UpdateRequest): UpdateRequest;
+    updateData(bikeData: IncyclistBikeData): any;
+}

package/lib/ble/ble-st-mode.js

@@ -0,0 +1,148 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const CyclingMode_1 = require("../CyclingMode");
+const power_base_1 = __importDefault(require("../modes/power-base"));
+const config = {
+    name: "Smart Trainer",
+    description: "Calculates speed based on power and slope. Slope is set to the device",
+    properties: [
+        { key: 'bikeType', name: 'Bike Type', description: '', type: CyclingMode_1.CyclingModeProperyType.SingleSelect, options: ['Race', 'Mountain', 'Triathlon'], default: 'Race' },
+        { key: 'startPower', name: 'Starting Power', description: 'Initial power in Watts at start of training', type: CyclingMode_1.CyclingModeProperyType.Integer, default: 50, min: 25, max: 800 },
+    ]
+};
+class ERGCyclingMode extends power_base_1.default {
+    constructor(adapter, props) {
+        super(adapter, props);
+        this.hasBikeUpdate = false;
+        this.event = {};
+        this.initLogger('ERGMode');
+    }
+    getName() {
+        return config.name;
+    }
+    getDescription() {
+        return config.description;
+    }
+    getProperties() {
+        return config.properties;
+    }
+    getProperty(name) {
+        return config.properties.find(p => p.name === name);
+    }
+    getBikeInitRequest() {
+        const startPower = this.getSetting('startPower');
+        return { targetPower: startPower };
+    }
+    sendBikeUpdate(request) {
+        const getData = () => {
+            if (!this.data)
+                return {};
+            const { pedalRpm, slope, power, speed } = this.data;
+            return { pedalRpm, slope, power, speed };
+        };
+        this.logger.logEvent({ message: "processing update request", request, prev: this.prevRequest, data: getData(), event: this.event });
+        let newRequest = {};
+        try {
+            if (!request || request.reset || Object.keys(request).length === 0) {
+                this.prevRequest = {};
+                return request || {};
+            }
+            const prevData = this.data || {};
+            if (request.targetPower !== undefined) {
+                delete request.slope;
+                delete request.refresh;
+            }
+            if (this.event.starting && request.targetPower === undefined) {
+                newRequest.targetPower = this.getSetting('startPower');
+                if (this.event.tsStart && Date.now() - this.event.tsStart > 5000) {
+                    delete this.event.starting;
+                    delete this.event.tsStart;
+                }
+            }
+            if (request.refresh) {
+                delete request.refresh;
+                newRequest.targetPower = this.prevRequest.targetPower;
+            }
+            if (request.slope !== undefined) {
+                if (!this.data)
+                    this.data = {};
+                this.data.slope = request.slope;
+            }
+            if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
+                request.targetPower = request.maxPower;
+            }
+            if (request.targetPower !== undefined) {
+                newRequest.targetPower = request.targetPower;
+            }
+            delete request.slope;
+            if (request.maxPower !== undefined) {
+                if (newRequest.targetPower !== undefined && newRequest.targetPower > request.maxPower) {
+                    newRequest.targetPower = request.maxPower;
+                }
+                newRequest.maxPower = request.maxPower;
+            }
+            if (request.minPower !== undefined) {
+                if (newRequest.targetPower !== undefined && newRequest.targetPower < request.minPower) {
+                    newRequest.targetPower = request.minPower;
+                }
+                newRequest.minPower = request.minPower;
+            }
+            if (newRequest.targetPower !== undefined && prevData.power !== undefined && newRequest.targetPower === prevData.power) {
+                delete newRequest.targetPower;
+            }
+            this.prevRequest = JSON.parse(JSON.stringify(request));
+        }
+        catch (err) {
+            this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message || err, stack: err.stack });
+        }
+        return newRequest;
+    }
+    updateData(bikeData) {
+        const prevData = JSON.parse(JSON.stringify(this.data || {}));
+        const prevSpeed = prevData.speed;
+        const prevRequest = this.prevRequest || {};
+        const data = this.data || {};
+        const bikeType = this.getSetting('bikeType').toLowerCase();
+        delete this.event.rpmUpdated;
+        if (prevData === {} || prevData.speed === undefined || prevData.speed === 0) {
+            this.event.starting = true;
+            this.event.tsStart = Date.now();
+        }
+        try {
+            const rpm = bikeData.pedalRpm || 0;
+            let power = bikeData.power || 0;
+            const slope = (prevData.slope !== undefined ? prevData.slope : prevRequest.slope || 0);
+            const distanceInternal = prevData.distanceInternal || 0;
+            if (!bikeData.pedalRpm || bikeData.isPedalling === false) {
+                power = 0;
+            }
+            const m = this.getWeight();
+            const t = this.getTimeSinceLastUpdate();
+            const { speed, distance } = this.calculateSpeedAndDistance(power, slope, m, t, { bikeType });
+            data.speed = parseFloat(speed.toFixed(1));
+            data.power = Math.round(power);
+            data.distanceInternal = Math.round(distanceInternal + distance);
+            data.slope = slope;
+            data.pedalRpm = rpm;
+            if (data.time !== undefined && !(this.event.starting && !bikeData.pedalRpm))
+                data.time += t;
+            else
+                data.time = 0;
+            data.heartrate = bikeData.heartrate;
+            data.isPedalling = bikeData.isPedalling;
+            if (rpm && rpm !== prevData.pedalRpm) {
+                this.event.rpmUpdated = true;
+            }
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'updateData()', error: err.message || err });
+        }
+        this.logger.logEvent({ message: "updateData result", data, bikeData, prevRequest, prevSpeed });
+        this.data = data;
+        return data;
+    }
+}
+exports.default = ERGCyclingMode;

package/lib/ble/ble.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import EventEmitter from "events";
+import BlePeripheralConnector from "./ble-peripheral";
 export declare type ConnectProps = {
     timeout?: number;
 };
@@ -77,6 +78,12 @@ export declare abstract class BleInterfaceClass extends EventEmitter {
     abstract addConnectedDevice(device: BleDeviceClass): void;
     abstract removeConnectedDevice(device: BleDeviceClass): void;
     abstract findConnected(device: BleDeviceClass | BlePeripheral): BleDeviceClass;
+    abstract getConnector(peripheral: BlePeripheral): BlePeripheralConnector;
+    abstract findPeripheral(peripheral: BlePeripheral | {
+        id?: string;
+        address?: string;
+        name?: string;
+    }): BlePeripheral;
     getBinding(): BleBinding;
     setBinding(binding: BleBinding): void;
 }
@@ -89,6 +96,8 @@ export interface BlePeripheral extends EventEmitter, BleDeviceIdentifier {
     discoverSomeServicesAndCharacteristicsAsync(serviceUUIDs: string[], characteristicUUIDs: string[]): Promise<any>;
 }
 export interface BleCharacteristic extends EventEmitter {
+    uuid: string;
+    properties: string[];
     subscribe(callback: (err: Error) => void): void;
     read(callback: (err: Error, data: Buffer) => void): void;
     write(data: Buffer, withoutResponse: boolean, callback?: (err: Error) => void): void;

package/lib/ble/fm.d.ts

@@ -41,8 +41,11 @@ export default class BleFitnessMachineDevice extends BleDevice {
     static characteristics: string[];
     data: IndoorBikeData;
     features: IndoorBikeFeatures;
+    hasControl: boolean;
+    isCPSubscribed: boolean;
     constructor(props?: any);
     init(): Promise<boolean>;
+    onDisconnect(): void;
     getProfile(): string;
     getServiceUUids(): string[];
     isBike(): boolean;
@@ -52,7 +55,8 @@ export default class BleFitnessMachineDevice extends BleDevice {
     parseIndoorBikeData(_data: Uint8Array): IndoorBikeData;
     getFitnessMachineFeatures(): Promise<IndoorBikeFeatures>;
     onData(characteristic: string, data: Buffer): void;
-    write(characteristic: any, data: any): Promise<boolean>;
+    requestControl(): Promise<boolean>;
+    setTargetPower(power: number): Promise<void>;
     reset(): void;
 }
 export declare class FmAdapter extends DeviceAdapter {
@@ -69,6 +73,7 @@ export declare class FmAdapter extends DeviceAdapter {
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
+    isSame(device: DeviceAdapter): boolean;
     getProfile(): string;
     getName(): string;
     getDisplayName(): string;
@@ -82,6 +87,7 @@ export declare class FmAdapter extends DeviceAdapter {
     transformData(bikeData: IncyclistBikeData): DeviceData;
     start(props?: any): Promise<any>;
     stop(): Promise<boolean>;
+    sendUpdate(request: any): Promise<void>;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
 }