incyclist-devices 1.5.11 → 1.5.13

package/lib/antv2/fe.js

@@ -1,262 +1,262 @@
-"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 ant_device_1 = __importDefault(require("./ant-device"));
-const utils_1 = require("../ant/utils");
-const gd_eventlog_1 = require("gd-eventlog");
-const ant_fe_st_mode_1 = __importDefault(require("../ant/antfe/ant-fe-st-mode"));
-const ant_fe_erg_mode_1 = __importDefault(require("../ant/antfe/ant-fe-erg-mode"));
-const ant_fe_adv_st_mode_1 = __importDefault(require("../ant/antfe/ant-fe-adv-st-mode"));
-const DEFAULT_USER_WEIGHT = 75;
-const DEFAULT_BIKE_WEIGHT = 10;
-const DEFAULT_BIKE_WEIGHT_MOUNTAIN = 14.5;
-class AntFEAdapter extends ant_device_1.default {
-    constructor(sensor, protocol) {
-        super(sensor, protocol);
-        this.started = false;
-        this.deviceData = {
-            DeviceID: sensor.getDeviceID()
-        };
-        this.msgCount = 0;
-        this.logger = new gd_eventlog_1.EventLogger('Ant+FE');
-    }
-    isBike() { return true; }
-    isHrm() { return false; }
-    isPower() { return true; }
-    getName() {
-        const deviceID = this.sensor.getDeviceID();
-        return `Ant+FE ${deviceID}`;
-    }
-    getDisplayName() {
-        const { DeviceID, ManId } = this.deviceData;
-        return `${(0, utils_1.getBrand)(ManId)} FE ${DeviceID}`;
-    }
-    getSupportedCyclingModes() {
-        return [ant_fe_st_mode_1.default, ant_fe_erg_mode_1.default, ant_fe_adv_st_mode_1.default];
-    }
-    setCyclingMode(mode, settings) {
-        let selectedMode;
-        if (typeof mode === 'string') {
-            const supported = this.getSupportedCyclingModes();
-            const CyclingModeClass = supported.find(M => { const m = new M(this); return m.getName() === mode; });
-            if (CyclingModeClass) {
-                this.cyclingMode = new CyclingModeClass(this, settings);
-                return;
-            }
-            selectedMode = this.getDefaultCyclingMode();
-        }
-        else {
-            selectedMode = mode;
-        }
-        this.cyclingMode = selectedMode;
-        this.cyclingMode.setSettings(settings);
-    }
-    getCyclingMode() {
-        if (!this.cyclingMode)
-            this.cyclingMode = this.getDefaultCyclingMode();
-        return this.cyclingMode;
-    }
-    getDefaultCyclingMode() {
-        return new ant_fe_st_mode_1.default(this);
-    }
-    getLogData(data, excludeList) {
-        const logData = JSON.parse(JSON.stringify(data));
-        excludeList.forEach((key) => {
-            delete logData[key];
-        });
-        return logData;
-    }
-    sendUpdate(request) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.paused)
-                return;
-            const update = this.getCyclingMode().sendBikeUpdate(request);
-            this.logger.logEvent({ message: 'send bike update requested', update, request });
-            try {
-                const fe = this.sensor;
-                const isReset = (!request || request.reset || Object.keys(request).length === 0);
-                if (isReset)
-                    yield fe.sendTrackResistance(0);
-                if (update.slope !== undefined) {
-                    yield fe.sendTrackResistance(update.slope);
-                }
-                if (update.targetPower !== undefined) {
-                    yield fe.sendTargetPower(update.targetPower);
-                }
-                else if (request.maxPower !== undefined) {
-                    if (this.data.power && this.data.power > request.maxPower)
-                        yield fe.sendTargetPower(request.maxPower);
-                }
-                else if (request.minPower !== undefined) {
-                    if (this.data.power && this.data.power < request.minPower)
-                        yield fe.sendTargetPower(request.minPower);
-                }
-            }
-            catch (err) {
-                this.logger.logEvent({ message: 'sendBikeUpdate() error', error: err.message });
-            }
-        });
-    }
-    onDeviceData(deviceData) {
-        if (!this.started || this.isStopped())
-            return;
-        this.deviceData = deviceData;
-        try {
-            const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
-            this.logger.logEvent({ message: 'onDeviceData', data: logData });
-            if (this.onDataFn && !(this.ignoreHrm && this.ignoreBike && this.ignorePower) && !this.paused) {
-                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();
-                }
-            }
-        }
-        catch (err) {
-            this.logger.logEvent({ message: 'error', fn: 'onDeviceData()', error: err.message || err, stack: err.stack });
-        }
-    }
-    mapData(deviceData) {
-        const data = {
-            isPedalling: false,
-            power: 0,
-            pedalRpm: undefined,
-            speed: 0,
-            heartrate: 0,
-            distanceInternal: 0,
-            slope: undefined,
-            time: undefined
-        };
-        data.speed = (deviceData.VirtualSpeed !== undefined ? deviceData.VirtualSpeed : (deviceData.RealSpeed || 0)) * 3.6;
-        data.slope = (deviceData.Incline !== undefined ? deviceData.Incline : data.slope);
-        data.power = (deviceData.InstantaneousPower !== undefined ? deviceData.InstantaneousPower : data.power);
-        data.time = (deviceData.ElapsedTime !== undefined ? deviceData.ElapsedTime : data.time);
-        data.pedalRpm = (deviceData.Cadence !== undefined ? deviceData.Cadence : data.pedalRpm);
-        data.isPedalling = data.pedalRpm > 0 || (data.pedalRpm === undefined && data.power > 0);
-        return data;
-    }
-    transformData(bikeData) {
-        if (bikeData === undefined)
-            return;
-        let distance = 0;
-        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
-            distance = 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,
-            heartrate: bikeData.heartrate !== undefined ? Math.round(bikeData.heartrate) : undefined,
-            distance,
-            timestamp: Date.now()
-        };
-        if (this.ignorePower) {
-            delete data.power;
-            delete data.cadence;
-        }
-        if (this.ignoreBike) {
-            data = { heartrate: data.heartrate };
-        }
-        if (this.ignoreHrm || !this.isHrm())
-            delete data.heartrate;
-        return data;
-    }
-    start(props) {
-        const _super = Object.create(null, {
-            start: { get: () => super.start }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            _super.start.call(this, props);
-            this.logger.logEvent({ message: 'start', props });
-            this.msgCount = 0;
-            const opts = props || {};
-            const { args = {}, user = {} } = opts;
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                const { timeout = 20000 } = props || {};
-                let start = Date.now();
-                let startTimeout = start + timeout;
-                const status = { userSent: false, slopeSent: false };
-                let iv;
-                const stopInterval = () => {
-                    if (iv)
-                        clearInterval(iv);
-                    iv = undefined;
-                };
-                if (timeout) {
-                    iv = setInterval(() => __awaiter(this, void 0, void 0, function* () {
-                        if (Date.now() > startTimeout) {
-                            stopInterval();
-                            yield this.stop();
-                            reject(new Error(`could not start device, reason:timeout`));
-                        }
-                        if (this.started && this.msgCount > 1 && status.userSent) {
-                            this.logger.logEvent({ message: 'start success' });
-                            stopInterval();
-                        }
-                    }), 100);
-                }
-                this.started = yield this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
-                if (!this.started) {
-                    stopInterval();
-                    this.stop();
-                    return reject(new Error(`could not start device`));
-                }
-                try {
-                    const fe = this.sensor;
-                    const mode = this.getCyclingMode();
-                    const bikeType = mode ? mode.getSetting('bikeType').toLowerCase() : 'race';
-                    const defaultBikeWeight = bikeType === 'mountain' ? DEFAULT_BIKE_WEIGHT_MOUNTAIN : DEFAULT_BIKE_WEIGHT;
-                    const userWeight = args.userWeight || user.weight || DEFAULT_USER_WEIGHT;
-                    const bikeWeight = args.bikeWeight || defaultBikeWeight;
-                    let i = 0;
-                    while (i < 3 && (!status.userSent || !status.slopeSent)) {
-                        if (!timeout || iv)
-                            status.userSent = status.userSent || (yield fe.sendUserConfiguration(userWeight, bikeWeight, args.wheelDiameter, args.gearRatio));
-                        if (!timeout || iv)
-                            status.slopeSent = status.slopeSent || (yield fe.sendTrackResistance(0.0));
-                        i++;
-                    }
-                    stopInterval();
-                    if (status.userSent) {
-                        this.logger.logEvent({ message: 'start success' });
-                        return resolve(true);
-                    }
-                    this.logger.logEvent({ message: 'start failure' });
-                    this.stop();
-                    return reject(new Error(`could not start device, reason: could not send commands`));
-                }
-                catch (error) {
-                    reject(new Error(`could not start device, reason:${error.message}`));
-                    return;
-                }
-            }));
-        });
-    }
-    stop() {
-        const _super = Object.create(null, {
-            stop: { get: () => super.stop }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            const stopped = yield this.ant.stopSensor(this.sensor);
-            _super.stop.call(this);
-            return stopped;
-        });
-    }
-}
-exports.default = AntFEAdapter;
+"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 ant_device_1 = __importDefault(require("./ant-device"));
+const utils_1 = require("../ant/utils");
+const gd_eventlog_1 = require("gd-eventlog");
+const ant_fe_st_mode_1 = __importDefault(require("../ant/antfe/ant-fe-st-mode"));
+const ant_fe_erg_mode_1 = __importDefault(require("../ant/antfe/ant-fe-erg-mode"));
+const ant_fe_adv_st_mode_1 = __importDefault(require("../ant/antfe/ant-fe-adv-st-mode"));
+const DEFAULT_USER_WEIGHT = 75;
+const DEFAULT_BIKE_WEIGHT = 10;
+const DEFAULT_BIKE_WEIGHT_MOUNTAIN = 14.5;
+class AntFEAdapter extends ant_device_1.default {
+    constructor(sensor, protocol) {
+        super(sensor, protocol);
+        this.started = false;
+        this.deviceData = {
+            DeviceID: sensor.getDeviceID()
+        };
+        this.msgCount = 0;
+        this.logger = new gd_eventlog_1.EventLogger('Ant+FE');
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getName() {
+        const deviceID = this.sensor.getDeviceID();
+        return `Ant+FE ${deviceID}`;
+    }
+    getDisplayName() {
+        const { DeviceID, ManId } = this.deviceData;
+        return `${(0, utils_1.getBrand)(ManId)} FE ${DeviceID}`;
+    }
+    getSupportedCyclingModes() {
+        return [ant_fe_st_mode_1.default, ant_fe_erg_mode_1.default, ant_fe_adv_st_mode_1.default];
+    }
+    setCyclingMode(mode, settings) {
+        let selectedMode;
+        if (typeof mode === 'string') {
+            const supported = this.getSupportedCyclingModes();
+            const CyclingModeClass = supported.find(M => { const m = new M(this); return m.getName() === mode; });
+            if (CyclingModeClass) {
+                this.cyclingMode = new CyclingModeClass(this, settings);
+                return;
+            }
+            selectedMode = this.getDefaultCyclingMode();
+        }
+        else {
+            selectedMode = mode;
+        }
+        this.cyclingMode = selectedMode;
+        this.cyclingMode.setSettings(settings);
+    }
+    getCyclingMode() {
+        if (!this.cyclingMode)
+            this.cyclingMode = this.getDefaultCyclingMode();
+        return this.cyclingMode;
+    }
+    getDefaultCyclingMode() {
+        return new ant_fe_st_mode_1.default(this);
+    }
+    getLogData(data, excludeList) {
+        const logData = JSON.parse(JSON.stringify(data));
+        excludeList.forEach((key) => {
+            delete logData[key];
+        });
+        return logData;
+    }
+    sendUpdate(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.paused)
+                return;
+            const update = this.getCyclingMode().sendBikeUpdate(request);
+            this.logger.logEvent({ message: 'send bike update requested', update, request });
+            try {
+                const fe = this.sensor;
+                const isReset = (!request || request.reset || Object.keys(request).length === 0);
+                if (isReset)
+                    yield fe.sendTrackResistance(0);
+                if (update.slope !== undefined) {
+                    yield fe.sendTrackResistance(update.slope);
+                }
+                if (update.targetPower !== undefined) {
+                    yield fe.sendTargetPower(update.targetPower);
+                }
+                else if (request.maxPower !== undefined) {
+                    if (this.data.power && this.data.power > request.maxPower)
+                        yield fe.sendTargetPower(request.maxPower);
+                }
+                else if (request.minPower !== undefined) {
+                    if (this.data.power && this.data.power < request.minPower)
+                        yield fe.sendTargetPower(request.minPower);
+                }
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'sendBikeUpdate() error', error: err.message });
+            }
+        });
+    }
+    onDeviceData(deviceData) {
+        if (!this.started || this.isStopped())
+            return;
+        this.deviceData = deviceData;
+        try {
+            const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
+            this.logger.logEvent({ message: 'onDeviceData', data: logData });
+            if (this.onDataFn && !(this.ignoreHrm && this.ignoreBike && this.ignorePower) && !this.paused) {
+                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();
+                }
+            }
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'error', fn: 'onDeviceData()', error: err.message || err, stack: err.stack });
+        }
+    }
+    mapData(deviceData) {
+        const data = {
+            isPedalling: false,
+            power: 0,
+            pedalRpm: undefined,
+            speed: 0,
+            heartrate: 0,
+            distanceInternal: 0,
+            slope: undefined,
+            time: undefined
+        };
+        data.speed = (deviceData.VirtualSpeed !== undefined ? deviceData.VirtualSpeed : (deviceData.RealSpeed || 0)) * 3.6;
+        data.slope = (deviceData.Incline !== undefined ? deviceData.Incline : data.slope);
+        data.power = (deviceData.InstantaneousPower !== undefined ? deviceData.InstantaneousPower : data.power);
+        data.time = (deviceData.ElapsedTime !== undefined ? deviceData.ElapsedTime : data.time);
+        data.pedalRpm = (deviceData.Cadence !== undefined ? deviceData.Cadence : data.pedalRpm);
+        data.isPedalling = data.pedalRpm > 0 || (data.pedalRpm === undefined && data.power > 0);
+        return data;
+    }
+    transformData(bikeData) {
+        if (bikeData === undefined)
+            return;
+        let distance = 0;
+        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
+            distance = 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,
+            heartrate: bikeData.heartrate !== undefined ? Math.round(bikeData.heartrate) : undefined,
+            distance,
+            timestamp: Date.now()
+        };
+        if (this.ignorePower) {
+            delete data.power;
+            delete data.cadence;
+        }
+        if (this.ignoreBike) {
+            data = { heartrate: data.heartrate };
+        }
+        if (this.ignoreHrm || !this.isHrm())
+            delete data.heartrate;
+        return data;
+    }
+    start(props) {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            _super.start.call(this, props);
+            this.logger.logEvent({ message: 'start', props });
+            this.msgCount = 0;
+            const opts = props || {};
+            const { args = {}, user = {} } = opts;
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                const { timeout = 20000 } = props || {};
+                let start = Date.now();
+                let startTimeout = start + timeout;
+                const status = { userSent: false, slopeSent: false };
+                let iv;
+                const stopInterval = () => {
+                    if (iv)
+                        clearInterval(iv);
+                    iv = undefined;
+                };
+                if (timeout) {
+                    iv = setInterval(() => __awaiter(this, void 0, void 0, function* () {
+                        if (Date.now() > startTimeout) {
+                            stopInterval();
+                            yield this.stop();
+                            reject(new Error(`could not start device, reason:timeout`));
+                        }
+                        if (this.started && this.msgCount > 1 && status.userSent) {
+                            this.logger.logEvent({ message: 'start success' });
+                            stopInterval();
+                        }
+                    }), 100);
+                }
+                this.started = yield this.ant.startSensor(this.sensor, this.onDeviceData.bind(this));
+                if (!this.started) {
+                    stopInterval();
+                    this.stop();
+                    return reject(new Error(`could not start device`));
+                }
+                try {
+                    const fe = this.sensor;
+                    const mode = this.getCyclingMode();
+                    const bikeType = mode ? mode.getSetting('bikeType').toLowerCase() : 'race';
+                    const defaultBikeWeight = bikeType === 'mountain' ? DEFAULT_BIKE_WEIGHT_MOUNTAIN : DEFAULT_BIKE_WEIGHT;
+                    const userWeight = args.userWeight || user.weight || DEFAULT_USER_WEIGHT;
+                    const bikeWeight = args.bikeWeight || defaultBikeWeight;
+                    let i = 0;
+                    while (i < 3 && (!status.userSent || !status.slopeSent)) {
+                        if (!timeout || iv)
+                            status.userSent = status.userSent || (yield fe.sendUserConfiguration(userWeight, bikeWeight, args.wheelDiameter, args.gearRatio));
+                        if (!timeout || iv)
+                            status.slopeSent = status.slopeSent || (yield fe.sendTrackResistance(0.0));
+                        i++;
+                    }
+                    stopInterval();
+                    if (status.userSent) {
+                        this.logger.logEvent({ message: 'start success' });
+                        return resolve(true);
+                    }
+                    this.logger.logEvent({ message: 'start failure' });
+                    this.stop();
+                    return reject(new Error(`could not start device, reason: could not send commands`));
+                }
+                catch (error) {
+                    reject(new Error(`could not start device, reason:${error.message}`));
+                    return;
+                }
+            }));
+        });
+    }
+    stop() {
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            const stopped = yield this.ant.stopSensor(this.sensor);
+            _super.stop.call(this);
+            return stopped;
+        });
+    }
+}
+exports.default = AntFEAdapter;

package/lib/antv2/hr.d.ts

@@ -1,18 +1,18 @@
-import { ISensor } from "incyclist-ant-plus";
-import AntAdapter from "./ant-device";
-import AntProtocol from "./incyclist-protocol";
-import { EventLogger } from "gd-eventlog";
-export default class AntHrAdapter extends AntAdapter {
-    protected started: boolean;
-    protected logger: EventLogger;
-    constructor(sensor: ISensor, protocol: AntProtocol);
-    isBike(): boolean;
-    isHrm(): boolean;
-    isPower(): boolean;
-    getName(): string;
-    getDisplayName(): string;
-    onDeviceData(deviceData: any): void;
-    updateData(data: any, deviceData: any): any;
-    start(props?: any): Promise<any>;
-    stop(): Promise<boolean>;
-}
+import { ISensor } from "incyclist-ant-plus";
+import AntAdapter from "./ant-device";
+import AntProtocol from "./incyclist-protocol";
+import { EventLogger } from "gd-eventlog";
+export default class AntHrAdapter extends AntAdapter {
+    protected started: boolean;
+    protected logger: EventLogger;
+    constructor(sensor: ISensor, protocol: AntProtocol);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    getName(): string;
+    getDisplayName(): string;
+    onDeviceData(deviceData: any): void;
+    updateData(data: any, deviceData: any): any;
+    start(props?: any): Promise<any>;
+    stop(): Promise<boolean>;
+}