incyclist-devices 1.4.19 → 1.4.22

package/lib/daum/premium/bike.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Daum8iSerial = exports.Daum8iTcp = void 0;
 const constants_1 = require("../constants");
 const tcpserial_1 = __importDefault(require("./tcpserial"));
 const utils_1 = require("./utils");
@@ -407,7 +408,7 @@ class Daum8i {
             incoming = bufferData;
         }
         const response = [...incoming];
-        this.logger.logEvent({ message: 'sendCommand:RECV', data: utils_1.hexstr(response) });
+        this.logger.logEvent({ message: 'sendCommand:RECV', data: (0, utils_1.hexstr)(response) });
         for (let i = 0; i < incoming.length; i++) {
             const getRemaining = () => {
                 let remaining = '';
@@ -440,11 +441,11 @@ class Daum8i {
             }
             else if (c === 0x17) {
                 const remaining = getRemaining();
-                this.logger.logEvent({ message: "sendCommand:received:", duration: Date.now() - this.state.sending.tsRequest, port: portName, cmd: `${cmd} [${utils_1.hexstr(cmd)}]`, remaining: utils_1.hexstr(remaining) });
+                this.logger.logEvent({ message: "sendCommand:received:", duration: Date.now() - this.state.sending.tsRequest, port: portName, cmd: `${cmd} [${(0, utils_1.hexstr)(cmd)}]`, remaining: (0, utils_1.hexstr)(remaining) });
                 this.state.waitingForEnd = false;
                 const cmdStr = cmd.substring(0, cmd.length - 2);
                 const checksumExtracted = cmd.slice(-2);
-                const checksumCalculated = utils_1.checkSum(utils_1.getAsciiArrayFromStr(cmdStr), []);
+                const checksumCalculated = (0, utils_1.checkSum)((0, utils_1.getAsciiArrayFromStr)(cmdStr), []);
                 if (checksumExtracted === checksumCalculated) {
                     this.sendACK();
                     if (this.state.sending && this.state.sending.responseCheckIv) {
@@ -486,8 +487,8 @@ class Daum8i {
                 this.state.busy = true;
             }
             else {
-                const message = utils_1.buildMessage(command, payload);
-                this.logger.logEvent({ message: 'sendCommand:waiting', port: this.portName, cmd: command, hex: utils_1.hexstr(message) });
+                const message = (0, utils_1.buildMessage)(command, payload);
+                this.logger.logEvent({ message: 'sendCommand:waiting', port: this.portName, cmd: command, hex: (0, utils_1.hexstr)(message) });
                 const busyWait = () => {
                     return new Promise((done) => {
                         let start = Date.now();
@@ -508,7 +509,7 @@ class Daum8i {
                 };
                 const res = yield busyWait();
                 if (!res) {
-                    this.logger.logEvent({ message: 'sendCommand:busy timeout', port: this.portName, cmd: command, hex: utils_1.hexstr(message), duration: Date.now() - tsRequest });
+                    this.logger.logEvent({ message: 'sendCommand:busy timeout', port: this.portName, cmd: command, hex: (0, utils_1.hexstr)(message), duration: Date.now() - tsRequest });
                     return reject(new Error('BUSY timeout'));
                 }
                 this.state.busy = true;
@@ -526,10 +527,10 @@ class Daum8i {
             const portName = this.portName;
             this.state.received = [];
             try {
-                const message = utils_1.buildMessage(command, payload);
+                const message = (0, utils_1.buildMessage)(command, payload);
                 const start = Date.now();
                 const timeout = start + this.getTimeoutValue();
-                this.logger.logEvent({ message: "sendCommand:sending:", port: this.portName, cmd: command, hex: utils_1.hexstr(message) });
+                this.logger.logEvent({ message: "sendCommand:sending:", port: this.portName, cmd: command, hex: (0, utils_1.hexstr)(message) });
                 this.state.writeBusy = true;
                 if (!this.connected || port === undefined) {
                     this.logger.logEvent({ message: "sendCommand:error: not connected", port: this.portName });
@@ -589,10 +590,10 @@ class Daum8i {
             buffer.writeUInt16LE(0, 2);
         }
         const cmdData = Uint8Array.from(buffer);
-        return this.sendDaum8iCommand('M70', cmdType, utils_1.bin2esc(cmdData))
+        return this.sendDaum8iCommand('M70', cmdType, (0, utils_1.bin2esc)(cmdData))
             .then((res) => {
             const resData = Uint8Array.from(res, x => x.charCodeAt(0));
-            const cmd = utils_1.esc2bin(resData);
+            const cmd = (0, utils_1.esc2bin)(resData);
             return cmd;
         });
     }
@@ -617,7 +618,7 @@ class Daum8i {
             else if (str === '7')
                 deviceType = 'lyps';
             else
-                throw (new Error(`unknown device type ${typeof str === 'string' ? utils_1.ascii(str.charAt(0)) : str}`));
+                throw (new Error(`unknown device type ${typeof str === 'string' ? (0, utils_1.ascii)(str.charAt(0)) : str}`));
             return deviceType;
         });
     }
@@ -632,7 +633,7 @@ class Daum8i {
             else if (str === '2')
                 deviceType = constants_1.ACTUAL_BIKE_TYPE.MOUNTAIN;
             else {
-                throw (new Error(`unknown actual device type ${typeof str === 'string' ? utils_1.ascii(str.charAt(0)) : str}`));
+                throw (new Error(`unknown actual device type ${typeof str === 'string' ? (0, utils_1.ascii)(str.charAt(0)) : str}`));
             }
             this.state.actualBikeType = deviceType;
             return deviceType;
@@ -674,12 +675,12 @@ class Daum8i {
     getTrainingData() {
         return this.sendDaum8iCommand('X70', 'AF', [])
             .then((data) => {
-            const td = utils_1.parseTrainingData(data);
+            const td = (0, utils_1.parseTrainingData)(data);
             return td;
         });
     }
     setLoadControl(enabled) {
-        const val = enabled ? utils_1.ascii('1') : utils_1.ascii('0');
+        const val = enabled ? (0, utils_1.ascii)('1') : (0, utils_1.ascii)('0');
         return this.sendDaum8iCommand('S20', 'BF', [val])
             .then((data) => {
             const res = data === '1';
@@ -713,7 +714,7 @@ class Daum8i {
     setPerson(person) {
         const { sex, age, length, weight } = person;
         this.logger.logEvent({ message: 'setPerson() request', sex, age, length, weight });
-        return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PERSON_SET, 'BF', utils_1.getPersonData(person))
+        return this.sendReservedDaum8iCommand(utils_1.ReservedCommands.PERSON_SET, 'BF', (0, utils_1.getPersonData)(person))
             .then((res) => {
             const buffer = Buffer.from(res);
             const success = buffer.readInt16LE(0) === utils_1.ReservedCommands.PERSON_SET;
@@ -737,9 +738,9 @@ class Daum8i {
     }
     programUploadStart(bikeType, route) {
         const payload = Buffer.alloc(40);
-        const epp = route ? utils_1.routeToEpp(route) : undefined;
+        const epp = route ? (0, utils_1.routeToEpp)(route) : undefined;
         const eppLength = epp ? epp.length : 0;
-        const bikeTypeVal = utils_1.getBikeType(bikeType);
+        const bikeTypeVal = (0, utils_1.getBikeType)(bikeType);
         const wBits = route.lapMode ? DS_BITS_ENDLESS_RACE : DS_BITS_OFF;
         payload.writeInt32LE(0, 0);
         payload.writeInt8(bikeTypeVal, 4);

package/lib/daum/premium/utils.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getPersonData = exports.parseTrainingData = exports.routeToEpp = exports.getBikeType = exports.BikeType = exports.ReservedCommands = exports.Int32ToIntArray = exports.Int16ToIntArray = exports.Float32ToIntArray = exports.Float32ToHex = exports.getAsciiArrayFromStr = exports.asciiArrayToString = exports.charArrayToString = exports.ascii = exports.append = exports.getHex = exports.hexstr = exports.getMessageData = exports.buildMessage = exports.checkSum = exports.esc2bin = exports.bin2esc = void 0;
 const win32filetime_1 = __importDefault(require("win32filetime"));
 const sum = (arr) => arr.reduce((a, b) => a + b, 0);
 function bin2esc(arr) {

package/lib/kettler/comms.js

@@ -12,6 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SendState = exports.SerialCommsState = void 0;
 const gd_eventlog_1 = require("gd-eventlog");
 const utils_1 = require("../utils");
 const events_1 = __importDefault(require("events"));
@@ -193,7 +194,7 @@ class KettlerSerialComms extends events_1.default {
     write(cmd) {
         this.sendState = SendState.Sending;
         const { logStr, message, timeout = (this.settings.timeout || DEFAULT_RCV_TIMEOUT) } = cmd;
-        const msg = typeof message === 'string' ? message : utils_1.hexstr(message);
+        const msg = typeof message === 'string' ? message : (0, utils_1.hexstr)(message);
         const onError = (err) => {
             this.logger.logEvent({ message: "sendCommand:error:", cmd: logStr, error: err.message, port: this.getPort() });
             if (cmd.onError)

package/lib/kettler/ergo-racer/adapter.d.ts

@@ -37,11 +37,12 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     private iv;
     private requests;
     private data;
-    private idata;
+    private internalData;
     private kettlerData;
     private updateBusy;
     private requestBusy;
     private comms;
+    private prevDistance;
     constructor(protocol: DeviceProtocol, settings: DeviceSettings);
     isBike(): boolean;
     isPower(): boolean;
@@ -76,7 +77,7 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     parseExtendedStatus(data: string): KettlerExtendedBikeData;
     parseStatus(data: string): KettlerBikeData;
     check(): Promise<boolean>;
-    start(props?: any): Promise<any>;
+    start(props?: any): Promise<IncyclistBikeData>;
     startUpdatePull(): void;
     stop(): Promise<boolean>;
     pause(): Promise<boolean>;
@@ -91,7 +92,7 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     sendData(): void;
     refreshRequests(): void;
     processClientRequest(request: any): Promise<unknown>;
-    waitForOpened(): Promise<boolean>;
+    waitForOpened(retries?: boolean): Promise<boolean>;
     waitForClosed(): Promise<boolean>;
     getSupportedCyclingModes(): any[];
     setCyclingMode(mode: CyclingMode | string, settings?: any): void;

package/lib/kettler/ergo-racer/adapter.js

@@ -1,4 +1,23 @@
 "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) {
@@ -8,13 +27,6 @@ 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 };
 };
@@ -220,7 +232,7 @@ class KettlerRacerAdapter extends Device_1.default {
             }
             const distance = parseInt(states[3]);
             if (!isNaN(distance)) {
-                result.distance = distance;
+                result.distance = distance * 100;
             }
             const requestedPower = parseInt(states[4]);
             if (!isNaN(requestedPower)) {
@@ -228,7 +240,7 @@ class KettlerRacerAdapter extends Device_1.default {
             }
             const energy = parseInt(states[5]);
             if (!isNaN(energy)) {
-                result.requestedPower = energy;
+                result.energy = energy;
             }
             const timeStr = states[6];
             const time = timeStr.split(':');
@@ -284,46 +296,49 @@ class KettlerRacerAdapter extends Device_1.default {
         });
     }
     start(props) {
-        this.logger.logEvent({ message: 'start()' });
-        var info = {};
-        return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
-            try {
-                if (!info.checkDone) {
-                    info.checkDone = yield this.check();
-                }
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'start()' });
+            var info = {};
+            yield this.waitForOpened(true);
+            return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    if (!info.started) {
-                        info.started = yield this.startTraining();
+                    if (!info.checkDone) {
+                        info.checkDone = yield this.check();
                     }
+                    try {
+                        if (!info.started) {
+                            info.started = yield this.startTraining();
+                        }
+                    }
+                    catch (e) {
+                        this.logger.logEvent({ message: 'Error', error: e.message });
+                    }
+                    try {
+                        yield this.setPower(100);
+                    }
+                    catch (e) {
+                        this.logger.logEvent({ message: 'Error', error: e.message });
+                    }
+                    if (!info.data) {
+                        yield this.update();
+                        info.data = this.data;
+                    }
+                    return info.data;
                 }
-                catch (e) {
-                    this.logger.logEvent({ message: 'Error', error: e.message });
-                }
-                try {
-                    yield this.setPower(100);
-                }
-                catch (e) {
-                    this.logger.logEvent({ message: 'Error', error: e.message });
-                }
-                if (!info.data) {
-                    yield this.update();
-                    info.data = this.data;
-                }
-                return info.data;
-            }
-            catch (err) {
-                try {
-                    yield this.reset();
-                }
-                catch (e) {
-                    this.logger.logEvent({ message: 'Error', error: e.message });
+                catch (err) {
+                    try {
+                        yield this.reset();
+                    }
+                    catch (e) {
+                        this.logger.logEvent({ message: 'Error', error: e.message });
+                    }
+                    throw (new Error(`could not start device, reason:${err.message}`));
                 }
-                throw (new Error(`could not start device, reason:${err.message}`));
-            }
-        }), 5, 1000)
-            .then(data => {
-            this.startUpdatePull();
-            return data;
+            }), 5, 1000)
+                .then((data) => {
+                this.startUpdatePull();
+                return data;
+            });
         });
     }
     startUpdatePull() {
@@ -394,6 +409,10 @@ class KettlerRacerAdapter extends Device_1.default {
     }
     transformData(internalData, bikeData) {
         let data = {};
+        const prevDistance = this.prevDistance || 0;
+        let distance = internalData.distanceInternal - prevDistance;
+        if (distance < 0)
+            distance = internalData.distanceInternal < 100 ? internalData.distanceInternal : 0;
         data.heartrate = internalData.heartrate;
         data.timestamp = Date.now();
         data.deviceTime = bikeData.time;
@@ -401,8 +420,10 @@ class KettlerRacerAdapter extends Device_1.default {
             data.speed = internalData.speed;
             data.power = internalData.power;
             data.cadence = internalData.pedalRpm;
-            data.distance = internalData.distanceInternal;
+            data.distance = distance;
             data.deviceDistanceCounter = bikeData.distance;
+            data.internalDistanceCounter = internalData.distanceInternal;
+            this.prevDistance = internalData.distanceInternal;
         }
         if (this.ignoreHrm)
             delete this.data.heartrate;
@@ -415,13 +436,14 @@ class KettlerRacerAdapter extends Device_1.default {
     update() {
         return __awaiter(this, void 0, void 0, function* () {
             this.updateBusy = true;
-            this.getStatus()
+            return this.getStatus()
                 .then((bikeData) => {
                 if (bikeData) {
                     try {
                         this.kettlerData = bikeData;
                         let data = this.mapData(bikeData);
                         data = this.getCyclingMode().updateData(data);
+                        this.internalData = data;
                         this.data = this.transformData(data, bikeData);
                     }
                     catch (err) {
@@ -533,34 +555,38 @@ class KettlerRacerAdapter extends Device_1.default {
             resolve(bikeRequest);
         }));
     }
-    waitForOpened() {
-        return utils_1.runWithRetries(() => {
-            return new Promise((resolve, reject) => {
-                try {
-                    if (this.comms.isConnected()) {
-                        resolve(true);
-                        return;
-                    }
-                    const cleanup = () => {
-                        this.comms.removeAllListeners();
-                    };
-                    const onOpen = () => {
-                        resolve(true);
-                        cleanup();
-                    };
-                    const onError = (err) => { reject(err); cleanup(); };
-                    const onClose = () => { cleanup(); };
-                    this.comms.on('opened', onOpen);
-                    this.comms.on('closed', onClose);
-                    this.comms.on('error', onError);
-                    this.logger.logEvent({ message: 'opening', port: this.getPort() });
-                    this.comms.open();
-                }
-                catch (err) {
-                    this.logger.logEvent({ message: 'error', fn: 'waitForOpened()', error: err.message || err });
-                    reject(err);
+    waitForOpened(retries = false) {
+        const run = (resolve, reject) => {
+            try {
+                if (this.comms.isConnected()) {
+                    resolve(true);
+                    return;
                 }
-            });
+                const cleanup = () => {
+                    this.comms.removeAllListeners();
+                };
+                const onOpen = () => {
+                    resolve(true);
+                    cleanup();
+                };
+                const onError = (err) => { reject(err); cleanup(); };
+                const onClose = () => { cleanup(); };
+                this.comms.on('opened', onOpen);
+                this.comms.on('closed', onClose);
+                this.comms.on('error', onError);
+                this.logger.logEvent({ message: 'opening', port: this.getPort() });
+                this.comms.open();
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'error', fn: 'waitForOpened()', error: err.message || err });
+                reject(err);
+            }
+        };
+        if (!retries) {
+            return new Promise((resolve, reject) => run(resolve, reject));
+        }
+        return (0, utils_1.runWithRetries)(() => {
+            return new Promise((resolve, reject) => run(resolve, reject));
         }, 3, 1000);
     }
     waitForClosed() {

package/lib/kettler/ergo-racer/protocol.js

@@ -1,4 +1,23 @@
 "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) {
@@ -8,13 +27,6 @@ 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 };
 };

package/lib/simulator/Simulator.d.ts

@@ -1,6 +1,11 @@
-import DeviceProtocolBase, { DeviceSettings } from '../DeviceProtocol';
+import DeviceProtocolBase, { DeviceSettings, DeviceProtocol } from '../DeviceProtocol';
 import DeviceAdapter from '../Device';
 import { EventLogger } from 'gd-eventlog';
+import CyclingMode, { IncyclistBikeData } from '../CyclingMode';
+interface SimulatorSettings extends DeviceSettings {
+    isBot?: boolean;
+    settings?: any;
+}
 export declare class Simulator extends DeviceAdapter {
     static NAME: string;
     logger: EventLogger;
@@ -14,13 +19,23 @@ export declare class Simulator extends DeviceAdapter {
     slope: number;
     limit: any;
     startProps?: any;
-    constructor(protocol?: any);
+    cyclingMode: CyclingMode;
+    startTS: number;
+    data: IncyclistBikeData;
+    isBot: boolean;
+    ignoreHrm: boolean;
+    constructor(protocol?: DeviceProtocol, props?: SimulatorSettings);
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
     getID(): string;
     getName(): string;
     getPort(): string;
+    setIgnoreHrm(ignore: any): void;
+    getSupportedCyclingModes(): Array<any>;
+    getDefaultCyclingMode(): CyclingMode;
+    getCyclingMode(): CyclingMode;
+    setCyclingMode(mode: CyclingMode | string, settings?: any): void;
     start(props?: any): Promise<unknown>;
     stop(): Promise<boolean>;
     pause(): Promise<boolean>;
@@ -30,12 +45,12 @@ export declare class Simulator extends DeviceAdapter {
     slower(): void;
     update(): void;
     calculateDistance(speedKps: any, timeS: any): number;
-    sendUpdate(request: any): any;
+    sendUpdate(request: any): import("../CyclingMode").UpdateRequest;
 }
 export default class SimulatorProtocol extends DeviceProtocolBase {
     static NAME: string;
     constructor();
-    add(settings: DeviceSettings): void;
+    add(settings: SimulatorSettings): any;
     getName(): string;
     getInterfaces(): string[];
     isBike(): boolean;
@@ -43,3 +58,4 @@ export default class SimulatorProtocol extends DeviceProtocolBase {
     isPower(): boolean;
     getDevices(): import("../DeviceProtocol").Device[];
 }
+export {};