incyclist-devices 2.0.0-beta.1 → 2.0.1

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

@@ -1,5 +1,4 @@
 import { BleCharacteristic, BlePeripheral, IBlePeripheralConnector } from './types';
-import BleInterface from "./ble-interface";
 export type ConnectorState = {
     isConnected: boolean;
     isConnecting: boolean;
@@ -16,7 +15,7 @@ export default class BlePeripheralConnector implements IBlePeripheralConnector {
     private peripheral;
     private logger?;
     private emitter;
-    constructor(ble: BleInterface, peripheral: BlePeripheral);
+    constructor(peripheral: BlePeripheral);
     logEvent(event: any): void;
     connect(): Promise<void>;
     reconnect(): Promise<void>;
@@ -25,8 +24,11 @@ export default class BlePeripheralConnector implements IBlePeripheralConnector {
     isSubscribed(characteristicUuid: string): boolean;
     subscribeAll(callback: (characteristicUuid: string, data: any) => void): Promise<string[]>;
     subscribe(characteristicUuid: string, timeout?: number): Promise<boolean>;
+    unsubscribeAll(): void;
+    unubscribe(c: BleCharacteristic): void;
     onData(characteristicUuid: string, data: any): void;
     on(characteristicUuid: string, callback: (characteristicUuid: string, data: any) => void): void;
+    once(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;

package/lib/ble/ble-peripheral.js

@@ -12,12 +12,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const ble_interface_1 = __importDefault(require("./ble-interface"));
 const gd_eventlog_1 = require("gd-eventlog");
 const events_1 = __importDefault(require("events"));
 const utils_1 = require("./utils");
 class BlePeripheralConnector {
-    constructor(ble, peripheral) {
-        this.ble = ble;
+    constructor(peripheral) {
+        this.ble = ble_interface_1.default.getInstance();
         this.peripheral = peripheral;
         this.emitter = new events_1.default();
         if (!this.peripheral || !this.ble)
@@ -39,15 +40,15 @@ class BlePeripheralConnector {
         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.logEvent({ message: 'connect peripheral', peripheral: this.peripheral.address, state: this.state, peripheralState: this.peripheral.state });
             this.state.isConnecting = true;
             try {
-                this.peripheral.on('connect', () => { });
                 this.peripheral.on('disconnect', () => { this.onDisconnect(); });
                 if (!this.state.isConnected || (this.peripheral && this.peripheral.state !== 'connected')) {
                     yield this.peripheral.connectAsync();
                 }
                 this.state.isConnected = this.peripheral.state === 'connected';
+                return;
             }
             catch (err) {
                 this.logEvent({ message: 'Error', fn: 'connect()', error: err.message });
@@ -66,6 +67,8 @@ class BlePeripheralConnector {
         this.logEvent({ message: 'onDisconnected', peripheral: this.peripheral.address, state: this.state });
         this.state.isConnected = false;
         this.state.isConnecting = false;
+        this.state.isInitialized = false;
+        this.state.isInitializing = false;
         this.emitter.emit('disconnect');
     }
     initialize(enforce = false) {
@@ -81,13 +84,22 @@ class BlePeripheralConnector {
             this.services = undefined;
             try {
                 const res = yield this.peripheral.discoverSomeServicesAndCharacteristicsAsync([], []);
-                this.characteristics = res.characteristics;
-                this.services = res.services;
+                if (this.state.isInitializing) {
+                    this.characteristics = res.characteristics;
+                    this.services = res.services.map(s => typeof (s) === 'string' ? s : s.uuid);
+                    this.state.isInitializing = false;
+                    this.state.isInitialized = this.characteristics !== undefined && this.services !== undefined;
+                    this.logEvent({ message: 'initialize done', peripheral: this.peripheral.address, state: this.state });
+                }
+                else {
+                    this.logEvent({ message: 'initialize interrupted', peripheral: this.peripheral.address });
+                }
             }
             catch (err) {
+                this.logEvent({ message: 'error', fn: 'initialize', error: err.message, stack: err.stack });
+                this.state.isInitializing = false;
+                this.state.isInitialized = false;
             }
-            this.state.isInitializing = false;
-            this.state.isInitialized = this.characteristics !== undefined && this.services !== undefined;
         });
     }
     isSubscribed(characteristicUuid) {
@@ -170,6 +182,21 @@ class BlePeripheralConnector {
             }
         });
     }
+    unsubscribeAll() {
+        var _a;
+        (_a = this.characteristics) === null || _a === void 0 ? void 0 : _a.forEach(c => {
+            const isNotify = c.properties.find(p => p === 'notify');
+            if (isNotify) {
+                this.unubscribe(c);
+            }
+        });
+        this.state.isSubscribing = false;
+        this.state.subscribed = [];
+    }
+    unubscribe(c) {
+        c.unsubscribe(undefined);
+        c.removeAllListeners();
+    }
     onData(characteristicUuid, data) {
         this.emitter.emit((0, utils_1.uuid)(characteristicUuid), characteristicUuid, data);
     }
@@ -177,6 +204,10 @@ class BlePeripheralConnector {
         if (callback)
             this.emitter.on((0, utils_1.uuid)(characteristicUuid), callback);
     }
+    once(characteristicUuid, callback) {
+        if (callback)
+            this.emitter.once((0, utils_1.uuid)(characteristicUuid), callback);
+    }
     off(characteristicUuid, callback) {
         if (callback)
             this.emitter.off((0, utils_1.uuid)(characteristicUuid), callback);

package/lib/ble/consts.d.ts

@@ -8,6 +8,7 @@ export declare const INDOOR_BIKE_DATA = "2ad2";
 export declare const CSP = "1818";
 export declare const CSP_MEASUREMENT = "2a63";
 export declare const CSP_FEATURE = "2a65";
+export declare const HR_MEASUREMENT = "2a37";
 export declare const CSC = "1816";
 export declare const CSC_MEASUREMENT = "2a5b";
 export declare const WAHOO_ADVANCED_TRAINER_CP = "a026e005";

package/lib/ble/consts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ELITE_TRAINER_SVC = exports.WAHOO_ADVANCED_TRAINER_CP_FULL = exports.WAHOO_ADVANCED_FTMS = exports.WAHOO_ADVANCED_TRAINER_CP = exports.CSC_MEASUREMENT = exports.CSC = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = void 0;
+exports.ELITE_TRAINER_SVC = exports.WAHOO_ADVANCED_TRAINER_CP_FULL = exports.WAHOO_ADVANCED_FTMS = exports.WAHOO_ADVANCED_TRAINER_CP = exports.CSC_MEASUREMENT = exports.CSC = exports.HR_MEASUREMENT = exports.CSP_FEATURE = exports.CSP_MEASUREMENT = exports.CSP = exports.INDOOR_BIKE_DATA = exports.FTMS_STATUS = exports.FTMS_CP = exports.FTMS = exports.TACX_FE_C_TX = exports.TACX_FE_C_RX = exports.TACX_FE_C_BLE = void 0;
 exports.TACX_FE_C_BLE = '6e40fec1';
 exports.TACX_FE_C_RX = '6e40fec2';
 exports.TACX_FE_C_TX = '6e40fec3';
@@ -11,6 +11,7 @@ exports.INDOOR_BIKE_DATA = '2ad2';
 exports.CSP = '1818';
 exports.CSP_MEASUREMENT = '2a63';
 exports.CSP_FEATURE = '2a65';
+exports.HR_MEASUREMENT = '2a37';
 exports.CSC = '1816';
 exports.CSC_MEASUREMENT = '2a5b';
 exports.WAHOO_ADVANCED_TRAINER_CP = 'a026e005';

package/lib/ble/cp/adapter.d.ts

@@ -1,6 +1,6 @@
 import CyclingMode from '../../modes/cycling-mode';
 import { IncyclistBikeData } from '../../modes/cycling-mode';
-import { BleControllableAdapter } from '../adapter';
+import { BleControllableAdapter } from '../base/adapter';
 import { DeviceProperties } from '../../types/device';
 import { PowerData } from './types';
 import { DeviceData } from '../../types/data';
@@ -15,7 +15,6 @@ export default class PwrAdapter extends BleControllableAdapter {
     getDisplayName(): string;
     getDefaultCyclingMode(): CyclingMode;
     getSupportedCyclingModes(): any[];
-    onDeviceData(deviceData: PowerData): void;
     mapData(deviceData: PowerData): IncyclistBikeData;
     transformData(bikeData: IncyclistBikeData): DeviceData;
     sendUpdate(request: any): Promise<void>;

package/lib/ble/cp/adapter.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
 const power_meter_1 = __importDefault(require("../../modes/power-meter"));
 const comm_1 = __importDefault(require("./comm"));
-const adapter_1 = require("../adapter");
+const adapter_1 = require("../base/adapter");
 const capabilities_1 = require("../../types/capabilities");
 class PwrAdapter extends adapter_1.BleControllableAdapter {
     constructor(settings, props) {
@@ -25,7 +25,7 @@ class PwrAdapter extends adapter_1.BleControllableAdapter {
         const { id, address, name } = settings;
         const logger = this.logger;
         const ble = this.ble;
-        this.device = new comm_1.default({ id, address, name, ble, logger });
+        this.device = new comm_1.default({ id, address, name, logger });
         this.capabilities = [
             capabilities_1.IncyclistCapability.Power, capabilities_1.IncyclistCapability.Cadence, capabilities_1.IncyclistCapability.Speed
         ];
@@ -53,19 +53,6 @@ class PwrAdapter extends adapter_1.BleControllableAdapter {
     getSupportedCyclingModes() {
         return [power_meter_1.default];
     }
-    onDeviceData(deviceData) {
-        super.onDeviceData(deviceData);
-        if (!this.started || this.paused || !this.onDataFn)
-            return;
-        if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
-            this.logger.logEvent({ message: 'onDeviceData', data: deviceData });
-            let incyclistData = this.mapData(deviceData);
-            incyclistData = this.getCyclingMode().updateData(incyclistData);
-            this.data = this.transformData(incyclistData);
-            this.onDataFn(this.data);
-            this.lastUpdate = Date.now();
-        }
-    }
     mapData(deviceData) {
         const data = {
             isPedalling: false,

package/lib/ble/cp/comm.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="node" />
-import { BleComms } from '../ble-comms';
 import { CrankData, PowerData } from './types';
+import { BleComms } from '../base/comms';
+import { LegacyProfile } from '../../antv2/types';
+import { BleProtocol, IBlePeripheralConnector } from '../types';
 export default class BleCyclingPowerDevice extends BleComms {
+    static protocol: BleProtocol;
     static services: string[];
     static characteristics: string[];
     static detectionPriority: number;
@@ -13,11 +16,11 @@ export default class BleCyclingPowerDevice extends BleComms {
     time: number;
     currentCrankData: CrankData;
     prevCrankData: CrankData;
-    constructor(props?: any);
-    isMatching(characteristics: string[]): boolean;
-    init(): Promise<boolean>;
-    getProfile(): string;
+    static isMatching(characteristics: string[]): boolean;
+    getProfile(): LegacyProfile;
+    getProtocol(): BleProtocol;
     getServiceUUids(): string[];
+    subscribeAll(conn?: IBlePeripheralConnector): Promise<void>;
     parseCrankData(crankData: any): {
         rpm: number;
         time: any;

package/lib/ble/cp/comm.js

@@ -1,20 +1,11 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const ble_comms_1 = require("../ble-comms");
 const consts_1 = require("../consts");
 const utils_1 = require("../utils");
-class BleCyclingPowerDevice extends ble_comms_1.BleComms {
-    constructor(props) {
-        super(props);
+const comms_1 = require("../base/comms");
+class BleCyclingPowerDevice extends comms_1.BleComms {
+    constructor() {
+        super(...arguments);
         this.instantaneousPower = undefined;
         this.balance = undefined;
         this.accTorque = undefined;
@@ -24,32 +15,25 @@ class BleCyclingPowerDevice extends ble_comms_1.BleComms {
         this.currentCrankData = undefined;
         this.prevCrankData = undefined;
     }
-    isMatching(characteristics) {
+    static isMatching(characteristics) {
         if (!characteristics)
             return false;
         const hasCPMeasurement = characteristics.find(c => c === consts_1.CSP_MEASUREMENT) !== undefined;
         const hasCPFeature = characteristics.find(c => c === consts_1.CSP_FEATURE) !== undefined;
         return hasCPMeasurement && hasCPFeature;
     }
-    init() {
-        const _super = Object.create(null, {
-            init: { get: () => super.init }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield _super.init.call(this);
-            }
-            catch (err) {
-                return Promise.resolve(false);
-            }
-        });
-    }
     getProfile() {
         return 'Power Meter';
     }
+    getProtocol() {
+        return BleCyclingPowerDevice.protocol;
+    }
     getServiceUUids() {
         return BleCyclingPowerDevice.services;
     }
+    subscribeAll(conn) {
+        return this.subscribeMultiple([consts_1.CSP_MEASUREMENT], conn);
+    }
     parseCrankData(crankData) {
         if (!this.prevCrankData)
             this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
@@ -135,6 +119,7 @@ class BleCyclingPowerDevice extends ble_comms_1.BleComms {
     }
 }
 exports.default = BleCyclingPowerDevice;
+BleCyclingPowerDevice.protocol = 'cp';
 BleCyclingPowerDevice.services = [consts_1.CSP];
 BleCyclingPowerDevice.characteristics = [consts_1.CSP_MEASUREMENT, consts_1.CSP_FEATURE, '2a5d', '2a3c'];
 BleCyclingPowerDevice.detectionPriority = 1;

package/lib/ble/elite/adapter.d.ts

@@ -1,4 +1,4 @@
-import BleAdapter, { BleControllableAdapter } from '../adapter';
+import BleAdapter, { BleControllableAdapter } from '../base/adapter';
 import CyclingMode, { IncyclistBikeData } from '../../modes/cycling-mode';
 import { PowerData } from '../cp';
 import { DeviceProperties } from '../../types/device';
@@ -12,7 +12,6 @@ export default class BleEliteAdapter extends BleControllableAdapter {
     getName(): string;
     getDefaultCyclingMode(): CyclingMode;
     getSupportedCyclingModes(): any[];
-    onDeviceData(deviceData: PowerData): void;
     mapData(deviceData: PowerData): IncyclistBikeData;
     transformData(bikeData: IncyclistBikeData): DeviceData;
     start(props?: any): Promise<any>;

package/lib/ble/elite/adapter.js

@@ -13,7 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const gd_eventlog_1 = require("gd-eventlog");
-const adapter_1 = require("../adapter");
+const adapter_1 = require("../base/adapter");
 const comms_1 = __importDefault(require("./comms"));
 const power_meter_1 = __importDefault(require("../../modes/power-meter"));
 const capabilities_1 = require("../../types/capabilities");
@@ -48,19 +48,6 @@ class BleEliteAdapter extends adapter_1.BleControllableAdapter {
     getSupportedCyclingModes() {
         return [power_meter_1.default];
     }
-    onDeviceData(deviceData) {
-        super.onDeviceData(deviceData);
-        if (!this.started || this.paused || !this.onDataFn)
-            return;
-        this.logger.logEvent({ message: 'onDeviceData', data: deviceData });
-        if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
-            let incyclistData = this.mapData(deviceData);
-            incyclistData = this.getCyclingMode().updateData(incyclistData);
-            const data = this.transformData(incyclistData);
-            this.onDataFn(data);
-            this.lastUpdate = Date.now();
-        }
-    }
     mapData(deviceData) {
         const data = {
             isPedalling: false,
@@ -99,12 +86,18 @@ class BleEliteAdapter extends adapter_1.BleControllableAdapter {
     }
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'csp: start requested', profile: this.getProfile(), props });
+            if (this.ble.isScanning()) {
+                this.logger.logEvent({ message: 'stop previous scan', isScanning: this.ble.isScanning() });
+                yield this.ble.stopScan();
+            }
+            const connected = yield this.connect();
+            if (!connected)
+                throw new Error(`could not start device, reason:could not connect`);
+            const comms = this.device;
+            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) => {
+                if (comms) {
+                    comms.on('data', (data) => {
                         this.onDeviceData(data);
                     });
                     return true;

package/lib/ble/elite/comms.d.ts

@@ -1,7 +1,10 @@
 /// <reference types="node" />
-import { BleComms } from "../ble-comms";
+import { LegacyProfile } from "../../antv2/types";
+import { BleComms } from "../base/comms";
 import { CrankData, PowerData } from "../cp";
+import { BleProtocol, IBlePeripheralConnector } from "../types";
 export default class BleEliteDevice extends BleComms {
+    static protocol: BleProtocol;
     static services: string[];
     static characteristics: string[];
     static detectionPriority: number;
@@ -14,9 +17,9 @@ export default class BleEliteDevice extends BleComms {
     currentCrankData: CrankData;
     prevCrankData: CrankData;
     constructor(props?: any);
-    isMatching(characteristics: string[]): boolean;
-    init(): Promise<boolean>;
-    getProfile(): string;
+    static isMatching(characteristics: string[]): boolean;
+    getProfile(): LegacyProfile;
+    getProtocol(): BleProtocol;
     getServiceUUids(): string[];
     parseCrankData(crankData: any): {
         rpm: number;
@@ -24,5 +27,6 @@ export default class BleEliteDevice extends BleComms {
     };
     parsePower(_data: Uint8Array): PowerData;
     onData(characteristic: string, data: Buffer): boolean;
+    subscribeAll(conn?: IBlePeripheralConnector): Promise<void>;
     reset(): void;
 }

package/lib/ble/elite/comms.js

@@ -1,18 +1,10 @@
 "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());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const ble_comms_1 = require("../ble-comms");
+const _1 = require(".");
+const comms_1 = require("../base/comms");
 const consts_1 = require("../consts");
 const utils_1 = require("../utils");
-class BleEliteDevice extends ble_comms_1.BleComms {
+class BleEliteDevice extends comms_1.BleComms {
     constructor(props) {
         super(props);
         this.instantaneousPower = undefined;
@@ -24,29 +16,19 @@ class BleEliteDevice extends ble_comms_1.BleComms {
         this.currentCrankData = undefined;
         this.prevCrankData = undefined;
     }
-    isMatching(characteristics) {
+    static isMatching(characteristics) {
         if (!characteristics)
             return false;
         const hasCPMeasurement = characteristics.find(c => c === consts_1.CSP_MEASUREMENT) !== undefined;
         const hasCPFeature = characteristics.find(c => c === consts_1.CSP_FEATURE) !== undefined;
         return hasCPMeasurement && hasCPFeature;
     }
-    init() {
-        const _super = Object.create(null, {
-            init: { get: () => super.init }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield _super.init.call(this);
-            }
-            catch (err) {
-                return Promise.resolve(false);
-            }
-        });
-    }
     getProfile() {
         return 'Power Meter';
     }
+    getProtocol() {
+        return _1.BleEliteComms.protocol;
+    }
     getServiceUUids() {
         return BleEliteDevice.services;
     }
@@ -122,6 +104,10 @@ class BleEliteDevice extends ble_comms_1.BleComms {
         }
         return true;
     }
+    subscribeAll(conn) {
+        const characteristics = [consts_1.CSP_MEASUREMENT];
+        return this.subscribeMultiple(characteristics, conn);
+    }
     reset() {
         this.instantaneousPower = undefined;
         this.balance = undefined;
@@ -134,6 +120,7 @@ class BleEliteDevice extends ble_comms_1.BleComms {
     }
 }
 exports.default = BleEliteDevice;
+BleEliteDevice.protocol = 'elite';
 BleEliteDevice.services = [consts_1.ELITE_TRAINER_SVC];
 BleEliteDevice.characteristics = [consts_1.CSP_MEASUREMENT, consts_1.CSP_FEATURE, '2a5d', '2a3c'];
 BleEliteDevice.detectionPriority = 10;

package/lib/ble/fm/adapter.d.ts

@@ -1,4 +1,4 @@
-import BleAdapter, { BleControllableAdapter } from '../adapter';
+import BleAdapter, { BleControllableAdapter } from '../base/adapter';
 import CyclingMode, { IncyclistBikeData } from '../../modes/cycling-mode';
 import { DeviceProperties } from '../../types/device';
 import { IndoorBikeData } from './types';
@@ -6,6 +6,7 @@ import { DeviceData } from '../../types/data';
 import { BleDeviceSettings, BleStartProperties } from '../types';
 export default class BleFmAdapter extends BleControllableAdapter {
     distanceInternal: number;
+    connectPromise: Promise<boolean>;
     constructor(settings: BleDeviceSettings, props?: DeviceProperties);
     isSame(device: BleAdapter): boolean;
     getProfile(): string;
@@ -13,9 +14,9 @@ export default class BleFmAdapter extends BleControllableAdapter {
     getDisplayName(): string;
     getSupportedCyclingModes(): Array<any>;
     getDefaultCyclingMode(): CyclingMode;
-    onDeviceData(deviceData: IndoorBikeData): void;
     mapData(deviceData: IndoorBikeData): IncyclistBikeData;
     transformData(bikeData: IncyclistBikeData): DeviceData;
     start(props?: BleStartProperties): Promise<any>;
     sendUpdate(request: any): Promise<void>;
+    setCyclingMode(mode: string | CyclingMode, settings?: any): void;
 }