incyclist-devices 1.5.10 → 1.5.12

package/lib/ant/antpwr/pwr-adapter.js

@@ -1,251 +1,251 @@
-"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 gd_eventlog_1 = require("gd-eventlog");
-const AntAdapter_1 = __importDefault(require("../AntAdapter"));
-const utils_1 = require("../utils");
-const power_meter_1 = __importDefault(require("../../modes/power-meter"));
-const floatVal = (d) => d ? parseFloat(d) : d;
-const intVal = (d) => d ? parseInt(d) : d;
-const hex = (v) => Math.abs(v).toString(16).toUpperCase();
-const DEFAULT_START_TIMEOUT = 5000;
-class AntFEAdapter extends AntAdapter_1.default {
-    constructor(DeviceID, port, stick, protocol) {
-        super(protocol);
-        this.logger = new gd_eventlog_1.EventLogger('Ant+PWR');
-        this.logger.logEvent({ message: 'Ant+PWR Adapter created', DeviceID, port });
-        this.deviceID = DeviceID;
-        this.port = port;
-        this.stick = stick;
-        this.deviceData = {
-            DeviceID
-        };
-        this.data = {};
-        this.started = false;
-        this.starting = false;
-        this.connected = false;
-        this.mode = this.getDefaultCyclingMode();
-    }
-    isBike() { return true; }
-    isHrm() { return false; }
-    isPower() { return true; }
-    getProfile() {
-        return 'Power Meter';
-    }
-    getName() {
-        return `Ant+PWR ${this.deviceID}`;
-    }
-    getDisplayName() {
-        const { DeviceID, ManId } = this.deviceData;
-        return `${(0, utils_1.getBrand)(ManId)} PWR ${DeviceID}`;
-    }
-    getCyclingMode() {
-        if (!this.mode)
-            this.mode = this.getDefaultCyclingMode();
-        return this.mode;
-    }
-    getDefaultCyclingMode() {
-        return new power_meter_1.default(this);
-    }
-    getSupportedCyclingModes() {
-        return [power_meter_1.default];
-    }
-    onAttached() {
-        this.logger.logEvent({ message: 'Device connected' });
-        this.connected = true;
-    }
-    getLogData(data, excludeList) {
-        const logData = JSON.parse(JSON.stringify(data));
-        excludeList.forEach((key) => {
-            delete logData[key];
-        });
-        return logData;
-    }
-    onDeviceData(deviceData) {
-        if (!this.started || this.isStopped())
-            return;
-        this.deviceData = deviceData;
-        try {
-            if (this.onDataFn && !(this.ignoreBike && this.ignorePower) && !this.paused) {
-                if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
-                    const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
-                    this.logger.logEvent({ message: 'onDeviceData', data: logData });
-                    let incyclistData = this.mapData(deviceData);
-                    incyclistData = this.getCyclingMode().updateData(incyclistData);
-                    const data = this.transformData(incyclistData);
-                    this.onDataFn(data);
-                    this.lastUpdate = Date.now();
-                }
-            }
-        }
-        catch (err) {
-        }
-    }
-    onDeviceEvent(data) {
-        try {
-            const cmdInfo = this.currentCmd;
-            if (!cmdInfo)
-                return;
-            const msg = cmdInfo.msg.readUInt8(2);
-            const Constants = this.getProtocol().getAnt().Constants;
-            const { expectedResponse } = cmdInfo;
-            if (data.message === msg) {
-                if (expectedResponse === undefined && data.code === Constants.EVENT_TRANSFER_TX_COMPLETED) {
-                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
-                    return;
-                }
-                if (expectedResponse === undefined && data.code !== Constants.EVENT_TRANSFER_TX_COMPLETED) {
-                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
-                    return;
-                }
-            }
-            if (data.message === 1) {
-                if (expectedResponse !== undefined && data.code === expectedResponse) {
-                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
-                    return;
-                }
-                if (expectedResponse === undefined && (data.code === Constants.EVENT_TRANSFER_TX_COMPLETED || data.code === 3)) {
-                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
-                    return;
-                }
-                if (data.code === Constants.EVENT_TRANSFER_TX_FAILED || data.code === Constants.EVENT_CHANNEL_COLLISION) {
-                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
-                    return;
-                }
-            }
-            if (this.currentCmd !== undefined && data.message === Constants.MESSAGE_CHANNEL_ACKNOWLEDGED_DATA && data.code === 31) {
-                this.logger.log("could not send (TRANSFER_IN_PROGRESS)");
-                this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
-                return;
-            }
-            this.logger.logEvent({ message: "Incoming Event ", event: { message: hex(data.message), code: hex(data.code) } });
-        }
-        catch (err) {
-            this.logger.logEvent({ message: 'Error', fn: 'parseEvent', event: { message: hex(data.message), code: hex(data.code) }, error: err.message || err });
-        }
-    }
-    sendUpdate(request) {
-        if (this.paused)
-            return;
-        this.getCyclingMode().sendBikeUpdate(request);
-    }
-    mapData(deviceData) {
-        const data = {
-            isPedalling: false,
-            power: 0,
-            pedalRpm: 0,
-            speed: 0,
-            heartrate: 0,
-            distanceInternal: 0,
-            slope: undefined,
-            time: undefined
-        };
-        data.slope = (deviceData.Slope !== undefined ? deviceData.Slope : data.slope);
-        data.power = (deviceData.Power !== undefined ? deviceData.Power : data.power);
-        data.pedalRpm = (deviceData.Cadence !== undefined ? deviceData.Cadence : data.pedalRpm);
-        data.time = (deviceData.TimeStamp !== undefined ? deviceData.TimeStamp : data.time);
-        data.isPedalling = data.pedalRpm > 0;
-        return data;
-    }
-    transformData(bikeData) {
-        if (bikeData === undefined)
-            return;
-        let distance = 0;
-        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
-            distance = intVal(bikeData.distanceInternal - this.distanceInternal);
-        }
-        if (bikeData.distanceInternal !== undefined)
-            this.distanceInternal = bikeData.distanceInternal;
-        let data = {
-            speed: floatVal(bikeData.speed),
-            slope: floatVal(bikeData.slope),
-            power: intVal(bikeData.power),
-            cadence: intVal(bikeData.pedalRpm),
-            distance,
-            timestamp: Date.now()
-        };
-        if (this.ignorePower) {
-            delete data.power;
-            delete data.cadence;
-        }
-        if (this.ignoreBike) {
-            data = {};
-        }
-        return data;
-    }
-    start(props) {
-        const _super = Object.create(null, {
-            start: { get: () => super.start }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.start.call(this, props);
-            this.logger.logEvent({ message: 'start()', props });
-            const opts = props || {};
-            const { args = {} } = opts;
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                if (this.ignoreBike && this.ignorePower) {
-                    this.logger.logEvent({ message: 'start() not done: bike disabled' });
-                    return resolve(false);
-                }
-                if (this.starting) {
-                    this.logger.logEvent({ message: 'start() not done: bike starting' });
-                    return resolve(false);
-                }
-                if (this.started) {
-                    this.logger.logEvent({ message: 'start() done: bike was already started' });
-                    return resolve(true);
-                }
-                this.starting = true;
-                const Ant = this.getProtocol().getAnt();
-                const protocol = this.getProtocol();
-                let start = Date.now();
-                let timeout = start + (args.timeout || DEFAULT_START_TIMEOUT);
-                const iv = setInterval(() => {
-                    if (Date.now() > timeout) {
-                        clearInterval(iv);
-                        this.starting = false;
-                        reject(new Error('timeout'));
-                    }
-                    if (this.isStopped()) {
-                        clearInterval(iv);
-                        this.starting = false;
-                        reject(new Error('stopped'));
-                    }
-                }, 100);
-                protocol.attachSensors(this, Ant.BicyclePowerSensor, 'powerData')
-                    .then(() => {
-                    this.starting = false;
-                    this.started = true;
-                    clearInterval(iv);
-                    resolve(true);
-                })
-                    .catch(err => reject(err));
-            }));
-        });
-    }
-    stop() {
-        const _super = Object.create(null, {
-            stop: { get: () => super.stop }
-        });
-        return __awaiter(this, void 0, void 0, function* () {
-            yield _super.stop.call(this);
-            this.logger.logEvent({ message: 'stop()' });
-            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                this.starting = false;
-                return resolve(true);
-            }));
-        });
-    }
-}
-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 gd_eventlog_1 = require("gd-eventlog");
+const AntAdapter_1 = __importDefault(require("../AntAdapter"));
+const utils_1 = require("../utils");
+const power_meter_1 = __importDefault(require("../../modes/power-meter"));
+const floatVal = (d) => d ? parseFloat(d) : d;
+const intVal = (d) => d ? parseInt(d) : d;
+const hex = (v) => Math.abs(v).toString(16).toUpperCase();
+const DEFAULT_START_TIMEOUT = 5000;
+class AntFEAdapter extends AntAdapter_1.default {
+    constructor(DeviceID, port, stick, protocol) {
+        super(protocol);
+        this.logger = new gd_eventlog_1.EventLogger('Ant+PWR');
+        this.logger.logEvent({ message: 'Ant+PWR Adapter created', DeviceID, port });
+        this.deviceID = DeviceID;
+        this.port = port;
+        this.stick = stick;
+        this.deviceData = {
+            DeviceID
+        };
+        this.data = {};
+        this.started = false;
+        this.starting = false;
+        this.connected = false;
+        this.mode = this.getDefaultCyclingMode();
+    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getProfile() {
+        return 'Power Meter';
+    }
+    getName() {
+        return `Ant+PWR ${this.deviceID}`;
+    }
+    getDisplayName() {
+        const { DeviceID, ManId } = this.deviceData;
+        return `${(0, utils_1.getBrand)(ManId)} PWR ${DeviceID}`;
+    }
+    getCyclingMode() {
+        if (!this.mode)
+            this.mode = this.getDefaultCyclingMode();
+        return this.mode;
+    }
+    getDefaultCyclingMode() {
+        return new power_meter_1.default(this);
+    }
+    getSupportedCyclingModes() {
+        return [power_meter_1.default];
+    }
+    onAttached() {
+        this.logger.logEvent({ message: 'Device connected' });
+        this.connected = true;
+    }
+    getLogData(data, excludeList) {
+        const logData = JSON.parse(JSON.stringify(data));
+        excludeList.forEach((key) => {
+            delete logData[key];
+        });
+        return logData;
+    }
+    onDeviceData(deviceData) {
+        if (!this.started || this.isStopped())
+            return;
+        this.deviceData = deviceData;
+        try {
+            if (this.onDataFn && !(this.ignoreBike && this.ignorePower) && !this.paused) {
+                if (!this.lastUpdate || (Date.now() - this.lastUpdate) > this.updateFrequency) {
+                    const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
+                    this.logger.logEvent({ message: 'onDeviceData', data: logData });
+                    let incyclistData = this.mapData(deviceData);
+                    incyclistData = this.getCyclingMode().updateData(incyclistData);
+                    const data = this.transformData(incyclistData);
+                    this.onDataFn(data);
+                    this.lastUpdate = Date.now();
+                }
+            }
+        }
+        catch (err) {
+        }
+    }
+    onDeviceEvent(data) {
+        try {
+            const cmdInfo = this.currentCmd;
+            if (!cmdInfo)
+                return;
+            const msg = cmdInfo.msg.readUInt8(2);
+            const Constants = this.getProtocol().getAnt().Constants;
+            const { expectedResponse } = cmdInfo;
+            if (data.message === msg) {
+                if (expectedResponse === undefined && data.code === Constants.EVENT_TRANSFER_TX_COMPLETED) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (expectedResponse === undefined && data.code !== Constants.EVENT_TRANSFER_TX_COMPLETED) {
+                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+            }
+            if (data.message === 1) {
+                if (expectedResponse !== undefined && data.code === expectedResponse) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (expectedResponse === undefined && (data.code === Constants.EVENT_TRANSFER_TX_COMPLETED || data.code === 3)) {
+                    this.currentCmd.response = { success: true, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+                if (data.code === Constants.EVENT_TRANSFER_TX_FAILED || data.code === Constants.EVENT_CHANNEL_COLLISION) {
+                    this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                    return;
+                }
+            }
+            if (this.currentCmd !== undefined && data.message === Constants.MESSAGE_CHANNEL_ACKNOWLEDGED_DATA && data.code === 31) {
+                this.logger.log("could not send (TRANSFER_IN_PROGRESS)");
+                this.currentCmd.response = { success: false, message: hex(data.message), code: hex(data.code) };
+                return;
+            }
+            this.logger.logEvent({ message: "Incoming Event ", event: { message: hex(data.message), code: hex(data.code) } });
+        }
+        catch (err) {
+            this.logger.logEvent({ message: 'Error', fn: 'parseEvent', event: { message: hex(data.message), code: hex(data.code) }, error: err.message || err });
+        }
+    }
+    sendUpdate(request) {
+        if (this.paused)
+            return;
+        this.getCyclingMode().sendBikeUpdate(request);
+    }
+    mapData(deviceData) {
+        const data = {
+            isPedalling: false,
+            power: 0,
+            pedalRpm: 0,
+            speed: 0,
+            heartrate: 0,
+            distanceInternal: 0,
+            slope: undefined,
+            time: undefined
+        };
+        data.slope = (deviceData.Slope !== undefined ? deviceData.Slope : data.slope);
+        data.power = (deviceData.Power !== undefined ? deviceData.Power : data.power);
+        data.pedalRpm = (deviceData.Cadence !== undefined ? deviceData.Cadence : data.pedalRpm);
+        data.time = (deviceData.TimeStamp !== undefined ? deviceData.TimeStamp : data.time);
+        data.isPedalling = data.pedalRpm > 0;
+        return data;
+    }
+    transformData(bikeData) {
+        if (bikeData === undefined)
+            return;
+        let distance = 0;
+        if (this.distanceInternal !== undefined && bikeData.distanceInternal !== undefined) {
+            distance = intVal(bikeData.distanceInternal - this.distanceInternal);
+        }
+        if (bikeData.distanceInternal !== undefined)
+            this.distanceInternal = bikeData.distanceInternal;
+        let data = {
+            speed: floatVal(bikeData.speed),
+            slope: floatVal(bikeData.slope),
+            power: intVal(bikeData.power),
+            cadence: intVal(bikeData.pedalRpm),
+            distance,
+            timestamp: Date.now()
+        };
+        if (this.ignorePower) {
+            delete data.power;
+            delete data.cadence;
+        }
+        if (this.ignoreBike) {
+            data = {};
+        }
+        return data;
+    }
+    start(props) {
+        const _super = Object.create(null, {
+            start: { get: () => super.start }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.start.call(this, props);
+            this.logger.logEvent({ message: 'start()', props });
+            const opts = props || {};
+            const { args = {} } = opts;
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                if (this.ignoreBike && this.ignorePower) {
+                    this.logger.logEvent({ message: 'start() not done: bike disabled' });
+                    return resolve(false);
+                }
+                if (this.starting) {
+                    this.logger.logEvent({ message: 'start() not done: bike starting' });
+                    return resolve(false);
+                }
+                if (this.started) {
+                    this.logger.logEvent({ message: 'start() done: bike was already started' });
+                    return resolve(true);
+                }
+                this.starting = true;
+                const Ant = this.getProtocol().getAnt();
+                const protocol = this.getProtocol();
+                let start = Date.now();
+                let timeout = start + (args.timeout || DEFAULT_START_TIMEOUT);
+                const iv = setInterval(() => {
+                    if (Date.now() > timeout) {
+                        clearInterval(iv);
+                        this.starting = false;
+                        reject(new Error('timeout'));
+                    }
+                    if (this.isStopped()) {
+                        clearInterval(iv);
+                        this.starting = false;
+                        reject(new Error('stopped'));
+                    }
+                }, 100);
+                protocol.attachSensors(this, Ant.BicyclePowerSensor, 'powerData')
+                    .then(() => {
+                    this.starting = false;
+                    this.started = true;
+                    clearInterval(iv);
+                    resolve(true);
+                })
+                    .catch(err => reject(err));
+            }));
+        });
+    }
+    stop() {
+        const _super = Object.create(null, {
+            stop: { get: () => super.stop }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.stop.call(this);
+            this.logger.logEvent({ message: 'stop()' });
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                this.starting = false;
+                return resolve(true);
+            }));
+        });
+    }
+}
+exports.default = AntFEAdapter;

package/lib/ant/utils.d.ts

@@ -1 +1 @@
-export declare const getBrand: (manId: any) => "ANT+" | "Garmin" | "Timex" | "Suunto" | "Seiko" | "Sigma" | "Polar" | "VDO" | "Wahoo" | "Elite" | "Tacx";
+export declare const getBrand: (manId: any) => "ANT+" | "Garmin" | "Timex" | "Suunto" | "Seiko" | "Sigma" | "Polar" | "VDO" | "Wahoo" | "Elite" | "Tacx";

package/lib/ant/utils.js

@@ -1,23 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBrand = void 0;
-const getBrand = (manId) => {
-    if (manId === undefined)
-        return "ANT+";
-    switch (manId) {
-        case 1: return "Garmin";
-        case 16: return "Timex";
-        case 23: return "Suunto";
-        case 52: return "Seiko";
-        case 53: return "Seiko";
-        case 70: return "Sigma";
-        case 123: return "Polar";
-        case 287: return "VDO";
-        case 32: return "Wahoo";
-        case 86: return "Elite";
-        case 89: return "Tacx";
-        default:
-            return "ANT+";
-    }
-};
-exports.getBrand = getBrand;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getBrand = void 0;
+const getBrand = (manId) => {
+    if (manId === undefined)
+        return "ANT+";
+    switch (manId) {
+        case 1: return "Garmin";
+        case 16: return "Timex";
+        case 23: return "Suunto";
+        case 52: return "Seiko";
+        case 53: return "Seiko";
+        case 70: return "Sigma";
+        case 123: return "Polar";
+        case 287: return "VDO";
+        case 32: return "Wahoo";
+        case 86: return "Elite";
+        case 89: return "Tacx";
+        default:
+            return "ANT+";
+    }
+};
+exports.getBrand = getBrand;

package/lib/antv2/AntAdapter.d.ts

@@ -0,0 +1,48 @@
+import IncyclistDevice from '../device';
+import { EventLogger } from 'gd-eventlog';
+import AntInterface from "./ant-interface";
+import AntProtocol from "./incyclist-protocol";
+import { ISensor } from "incyclist-ant-plus";
+export declare const DEFAULT_UPDATE_FREQUENCY = 1000;
+export default class AntAdapter extends IncyclistDevice {
+    paused: boolean;
+    stopped: boolean;
+    ignoreHrm: boolean;
+    ignoreBike: boolean;
+    ignorePower: boolean;
+    deviceData: any;
+    data: any;
+    logger: EventLogger;
+    lastUpdate?: number;
+    updateFrequency: number;
+    userSettings: {
+        weight?: number;
+    };
+    bikeSettings: {
+        weight?: number;
+    };
+    protected ant: AntInterface;
+    protected sensor: ISensor;
+    constructor(sensor: ISensor, protocol: AntProtocol);
+    isSame(device: IncyclistDevice): boolean;
+    setSensor(sensor: any): void;
+    getID(): string;
+    setIgnoreHrm(ignore: any): void;
+    setIgnoreBike(ignore: any): void;
+    setIgnorePower(ignore: any): void;
+    getProfile(): string;
+    getPort(): string;
+    getWeight(): number;
+    isStopped(): boolean;
+    onDeviceData(data: any): void;
+    onDeviceEvent(data: any): void;
+    onAttached(): void;
+    update(): void;
+    check(): void;
+    connect(): void;
+    close(): void;
+    pause(): Promise<boolean>;
+    resume(): Promise<boolean>;
+    start(props?: any): Promise<any>;
+    stop(): Promise<boolean>;
+}