incyclist-devices 1.4.26 → 1.4.29

package/lib/ble/incyclist-protocol.js

@@ -0,0 +1,109 @@
+"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 __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
+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 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 hrm_1 = __importStar(require("./hrm"));
+const pwr_1 = __importStar(require("./pwr"));
+const supportedDeviceTypes = [hrm_1.default, pwr_1.default];
+class BleProtocol extends DeviceProtocol_1.default {
+    constructor(binding) {
+        super();
+        const b = binding || BleProtocol._defaultBinding;
+        this.logger = new gd_eventlog_1.EventLogger('BLE');
+        this.ble = ble_interface_1.default.getInstance({ binding: b, logger: this.logger });
+        BleProtocol._instances.push(this);
+    }
+    static setDefaultBinding(binding) {
+        BleProtocol._defaultBinding = binding;
+        BleProtocol._instances.forEach((p) => {
+            if (p.ble && !p.ble.getBinding()) {
+                p.ble.setBinding(binding);
+            }
+        });
+    }
+    setBinding(binding) {
+        if (this.ble)
+            this.ble.setBinding(binding);
+    }
+    createDevice(bleDevice) {
+        const fromDevice = bleDevice instanceof ble_1.BleDeviceClass;
+        const profile = bleDevice instanceof ble_1.BleDeviceClass ? bleDevice.getProfile() : bleDevice.profile;
+        const props = () => {
+            const { id, name, address } = bleDevice;
+            return { id, name, address };
+        };
+        switch (profile.toLocaleLowerCase()) {
+            case 'hr':
+            case 'heartrate monitor':
+                return new hrm_1.HrmAdapter(fromDevice ? bleDevice : new hrm_1.default(props()), this);
+            case 'cp':
+            case 'power meter':
+                return new pwr_1.PwrAdapter(fromDevice ? bleDevice : new pwr_1.default(props()), this);
+        }
+    }
+    getName() { return 'BLE'; }
+    getInterfaces() { return [DeviceProtocol_1.INTERFACE.BLE]; }
+    isBike() { return true; }
+    isHrm() { return true; }
+    isPower() { return true; }
+    add(settings) {
+        this.logger.logEvent({ message: 'adding device', settings });
+        const device = this.createDevice(settings);
+        return device;
+    }
+    scan(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.ble.on('device', (bleDevice) => {
+                    if (props && props.onDeviceFound) {
+                        const device = this.createDevice(bleDevice);
+                        props.onDeviceFound(device, this);
+                    }
+                });
+                this.logger.logEvent({ message: 'scan started' });
+                yield this.ble.scan({ deviceTypes: supportedDeviceTypes });
+                if (props && props.onScanFinished) {
+                    props.onScanFinished(props.id);
+                }
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'error', error: err.message });
+            }
+        });
+    }
+    stopScan() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.ble.stopScan();
+            return;
+        });
+    }
+    isScanning() {
+        return this.ble.isScanning();
+    }
+}
+exports.default = BleProtocol;
+BleProtocol._defaultBinding = undefined;
+BleProtocol._instances = [];
+DeviceRegistry_1.default.register(new BleProtocol());

package/lib/ble/pwr.d.ts

@@ -0,0 +1,77 @@
+/// <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?: Buffer;
+};
+declare type CrankData = {
+    revolutions?: number;
+    time?: number;
+    cntUpdateMissing?: number;
+};
+export default class BleCyclingPowerDevice extends BleDevice {
+    static services: string[];
+    static characteristics: string[];
+    instantaneousPower: number;
+    balance: number;
+    accTorque: number;
+    rpm: number;
+    timeOffset: number;
+    time: number;
+    currentCrankData: CrankData;
+    prevCrankData: CrankData;
+    constructor(props?: any);
+    getProfile(): string;
+    getServiceUUids(): string[];
+    parseCrankData(crankData: any): {
+        rpm: number;
+        time: any;
+    };
+    parsePower(data: Buffer): PowerData;
+    onData(characteristic: string, data: Buffer): void;
+    write(characteristic: any, data: any): Promise<boolean>;
+    read(characteristic: any): Promise<Buffer>;
+    reset(): void;
+}
+export declare class PwrAdapter extends DeviceAdapter {
+    device: BleCyclingPowerDevice;
+    ignore: boolean;
+    ble: BleInterface;
+    protocol: DeviceProtocol;
+    paused: boolean;
+    logger: EventLogger;
+    mode: CyclingMode;
+    distanceInternal: 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: PowerData): IncyclistBikeData;
+    transformData(bikeData: IncyclistBikeData): DeviceData;
+    start(props?: any): Promise<any>;
+    stop(): Promise<boolean>;
+    pause(): Promise<boolean>;
+    resume(): Promise<boolean>;
+}
+export {};

package/lib/ble/pwr.js

@@ -0,0 +1,243 @@
+"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"));
+class BleCyclingPowerDevice extends ble_device_1.BleDevice {
+    constructor(props) {
+        super(props);
+        this.instantaneousPower = undefined;
+        this.balance = undefined;
+        this.accTorque = undefined;
+        this.rpm = undefined;
+        this.timeOffset = 0;
+        this.time = undefined;
+        this.currentCrankData = undefined;
+        this.prevCrankData = undefined;
+    }
+    getProfile() {
+        return 'cp';
+    }
+    getServiceUUids() {
+        return BleCyclingPowerDevice.services;
+    }
+    parseCrankData(crankData) {
+        if (!this.prevCrankData)
+            this.prevCrankData = { revolutions: 0, time: 0, cntUpdateMissing: -1 };
+        const c = this.currentCrankData = crankData;
+        const p = this.prevCrankData;
+        let rpm = this.rpm;
+        let hasUpdate = c.time !== p.time;
+        if (hasUpdate) {
+            let time = c.time - p.time;
+            let revs = c.revolutions - p.revolutions;
+            if (c.time < p.time) {
+                time += 0x10000;
+                this.timeOffset += 0x10000;
+            }
+            if (c.revolutions < p.revolutions)
+                revs += 0x10000;
+            rpm = 1024 * 60 * revs / time;
+        }
+        else {
+            if (p.cntUpdateMissing < 0 || p.cntUpdateMissing > 2) {
+                rpm = 0;
+            }
+        }
+        const cntUpdateMissing = p.cntUpdateMissing;
+        this.prevCrankData = this.currentCrankData;
+        if (hasUpdate)
+            this.prevCrankData.cntUpdateMissing = 0;
+        else
+            this.prevCrankData.cntUpdateMissing = cntUpdateMissing + 1;
+        return { rpm, time: this.timeOffset + c.time };
+    }
+    parsePower(data) {
+        try {
+            let offset = 4;
+            const flags = data.readUInt16LE(0);
+            this.instantaneousPower = data.readUInt16LE(2);
+            if (flags & 0x1)
+                this.balance = data.readUInt8(offset++);
+            if (flags & 0x4) {
+                this.accTorque = data.readUInt16LE(offset);
+                offset += 2;
+            }
+            if (flags & 0x20) {
+                const crankData = {
+                    revolutions: data.readUInt16LE(offset),
+                    time: data.readUInt16LE(offset + 2)
+                };
+                const { rpm, time } = this.parseCrankData(crankData);
+                this.rpm = rpm;
+                this.time = time;
+                offset += 4;
+            }
+        }
+        catch (err) {
+        }
+        const { instantaneousPower, balance, accTorque, rpm, time } = this;
+        return { instantaneousPower, balance, accTorque, rpm, time, raw: data };
+    }
+    onData(characteristic, data) {
+        if (characteristic.toLocaleLowerCase() === '2a63') {
+            const res = this.parsePower(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.instantaneousPower = undefined;
+        this.balance = undefined;
+        this.accTorque = undefined;
+        this.rpm = undefined;
+        this.timeOffset = 0;
+        this.time = undefined;
+        this.currentCrankData = undefined;
+        this.prevCrankData = undefined;
+    }
+}
+exports.default = BleCyclingPowerDevice;
+BleCyclingPowerDevice.services = ['1818'];
+BleCyclingPowerDevice.characteristics = ['2a63', '2a65', '2a5d', '2a3c'];
+ble_interface_1.default.register('BleCyclingPowerDevice', 'cp', BleCyclingPowerDevice, BleCyclingPowerDevice.services);
+class PwrAdapter 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-CP');
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getProfile() {
+        return 'Power Meter';
+    }
+    getName() {
+        return `${this.device.name}`;
+    }
+    getDisplayName() {
+        const { name, instantaneousPower: power } = this.device;
+        const powerStr = power ? ` (${power})` : '';
+        return `${name}${powerStr}`;
+    }
+    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) {
+        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: 0,
+            speed: 0,
+            heartrate: 0,
+            distanceInternal: 0,
+            slope: undefined,
+            time: undefined
+        };
+        data.power = (deviceData.instantaneousPower !== undefined ? deviceData.instantaneousPower : data.power);
+        data.pedalRpm = (deviceData.rpm !== undefined ? deviceData.rpm : 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', 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 });
+                return false;
+            }
+        });
+    }
+    stop() {
+        return __awaiter(this, void 0, void 0, function* () {
+            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.PwrAdapter = PwrAdapter;

package/lib/calculations.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.solveCubic = exports.IllegalArgumentException = void 0;
 const g = 9.80665;
 const rho = 1.2041;
 const cwABike = {

package/lib/daum/DaumAdapter.d.ts

@@ -1,11 +1,11 @@
 import { EventLogger } from 'gd-eventlog';
 import CyclingMode, { IncyclistBikeData } from '../CyclingMode';
-import DeviceAdapterBase, { Bike, DeviceAdapter, DeviceData } from '../Device';
+import IncyclistDevice, { Bike, DeviceAdapter, DeviceData } from '../Device';
 import { User } from '../types/user';
 interface DaumAdapter {
     getCurrentBikeData(): Promise<any>;
 }
-export default class DaumAdapterBase extends DeviceAdapterBase implements DeviceAdapter, DaumAdapter, Bike {
+export default class DaumAdapterBase extends IncyclistDevice implements DeviceAdapter, DaumAdapter, Bike {
     bike: any;
     ignoreHrm: boolean;
     ignoreBike: boolean;

package/lib/daum/DaumAdapter.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -27,6 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -312,16 +300,16 @@ class DaumAdapterBase extends Device_1.default {
             return;
         let distance = 0;
         if (this.distanceInternal !== undefined && this.cyclingData.distanceInternal !== undefined) {
-            distance = (0, utils_1.intVal)(this.cyclingData.distanceInternal - this.distanceInternal);
+            distance = utils_1.intVal(this.cyclingData.distanceInternal - this.distanceInternal);
         }
         if (this.cyclingData.distanceInternal !== undefined)
             this.distanceInternal = this.cyclingData.distanceInternal;
         let data = {
-            speed: (0, utils_1.floatVal)(this.cyclingData.speed),
-            slope: (0, utils_1.floatVal)(this.cyclingData.slope),
-            power: (0, utils_1.intVal)(this.cyclingData.power),
-            cadence: (0, utils_1.intVal)(this.cyclingData.pedalRpm),
-            heartrate: (0, utils_1.intVal)(this.cyclingData.heartrate),
+            speed: utils_1.floatVal(this.cyclingData.speed),
+            slope: utils_1.floatVal(this.cyclingData.slope),
+            power: utils_1.intVal(this.cyclingData.power),
+            cadence: utils_1.intVal(this.cyclingData.pedalRpm),
+            heartrate: utils_1.intVal(this.cyclingData.heartrate),
             distance,
             timestamp: Date.now(),
             deviceTime: this.cyclingData.time,

package/lib/daum/SmartTrainerCyclingMode.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.direction = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const CyclingMode_1 = require("../CyclingMode");
 const calculations_1 = __importDefault(require("../calculations"));

package/lib/daum/classic/DaumClassicAdapter.js

@@ -86,7 +86,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             const { user } = props;
             this.initData();
             let startState = {};
-            return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
+            return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
                 try {
                     if (!this.bike.isConnected())
                         yield this.bike.saveConnect();

package/lib/daum/classic/DaumClassicProtocol.js

@@ -1,23 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 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) {
@@ -27,6 +8,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
+    result["default"] = mod;
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };