incyclist-devices 1.4.12 → 1.4.15

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.d.ts

@@ -9,7 +9,7 @@ export declare type SerialCommsProps = {
     port: string;
     settings?: any;
 };
-declare enum SerialCommsState {
+export declare enum SerialCommsState {
     Idle = 0,
     Connecting = 1,
     Connected = 2,
@@ -17,6 +17,11 @@ declare enum SerialCommsState {
     Disconnected = 4,
     Error = 5
 }
+export declare enum SendState {
+    Idle = 0,
+    Sending = 1,
+    Receiving = 2
+}
 export default class KettlerSerialComms<T extends Command> extends EventEmitter {
     private logger;
     private port;
@@ -27,12 +32,17 @@ export default class KettlerSerialComms<T extends Command> extends EventEmitter
     private worker;
     private sendState;
     private currentCmd;
+    private currentTimeout;
     private protocol;
     constructor(opts: SerialCommsProps);
     getPort(): string;
     setPort(port: any): void;
+    getLogger(): EventLogger;
     isConnected(): boolean;
     stateIn: (allowedStates: SerialCommsState[]) => boolean;
+    _setState(state: SerialCommsState): void;
+    _setSendState(state: SendState): void;
+    _setCurrentCmd(cmd: T): void;
     onPortOpen(): void;
     onPortClose(): Promise<void>;
     onPortError(err: any): void;
@@ -40,9 +50,9 @@ export default class KettlerSerialComms<T extends Command> extends EventEmitter
     close(): void;
     startWorker(): void;
     stopWorker(): void;
+    clearTimeout(): void;
     onData(data: string | Buffer): void;
     write(cmd: Command): void;
     sendNextCommand(): Command | undefined;
     send(cmd: Command): void;
 }
-export {};

package/lib/kettler/comms.js

@@ -12,10 +12,11 @@ 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"));
-const DEFAULT_RCV_TIMEOUT = 500;
+const DEFAULT_RCV_TIMEOUT = 1500;
 const DEBUG_LOGGER = {
     log: (e, ...args) => console.log(e, ...args),
     logEvent: (event) => console.log(JSON.stringify(event))
@@ -28,13 +29,13 @@ var SerialCommsState;
     SerialCommsState[SerialCommsState["Disconnecting"] = 3] = "Disconnecting";
     SerialCommsState[SerialCommsState["Disconnected"] = 4] = "Disconnected";
     SerialCommsState[SerialCommsState["Error"] = 5] = "Error";
-})(SerialCommsState || (SerialCommsState = {}));
+})(SerialCommsState = exports.SerialCommsState || (exports.SerialCommsState = {}));
 var SendState;
 (function (SendState) {
     SendState[SendState["Idle"] = 0] = "Idle";
     SendState[SendState["Sending"] = 1] = "Sending";
     SendState[SendState["Receiving"] = 2] = "Receiving";
-})(SendState || (SendState = {}));
+})(SendState = exports.SendState || (exports.SendState = {}));
 const CRLF = '\r\n';
 class KettlerSerialComms extends events_1.default {
     constructor(opts) {
@@ -58,9 +59,21 @@ class KettlerSerialComms extends events_1.default {
     setPort(port) {
         this.port = port;
     }
+    getLogger() {
+        return this.logger;
+    }
     isConnected() {
         return this.state === SerialCommsState.Connected;
     }
+    _setState(state) {
+        this.state = state;
+    }
+    _setSendState(state) {
+        this.sendState = state;
+    }
+    _setCurrentCmd(cmd) {
+        this.currentCmd = cmd;
+    }
     onPortOpen() {
         this.logger.logEvent({ message: 'port opened', port: this.getPort() });
         this.state = SerialCommsState.Connected;
@@ -134,26 +147,34 @@ class KettlerSerialComms extends events_1.default {
             this.worker = undefined;
         }
     }
+    clearTimeout() {
+        if (this.currentTimeout) {
+            clearTimeout(this.currentTimeout);
+            this.currentTimeout = undefined;
+        }
+    }
     onData(data) {
-        this.sendState = SendState.Idle;
-        this.currentCmd = undefined;
+        this.clearTimeout();
         this.logger.logEvent({ message: "sendCommand:receiving:", data: data });
+        this.sendState = SendState.Idle;
         if (typeof data === 'string') {
-            if (data.length > 2)
-                data = data.trim();
-            this.currentCmd.onResponse(data);
+            if (this.currentCmd.onResponse)
+                this.currentCmd.onResponse(data);
         }
         else {
-            this.currentCmd.onResponse(data);
+            if (this.currentCmd.onResponse)
+                this.currentCmd.onResponse(data);
         }
+        this.currentCmd = undefined;
     }
     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() });
-            cmd.onError(err);
+            if (cmd.onError)
+                cmd.onError(err);
             this.sendState = SendState.Idle;
             this.currentCmd = undefined;
         };
@@ -165,9 +186,9 @@ class KettlerSerialComms extends events_1.default {
                 this.sendState = SendState.Receiving;
                 this.currentCmd = cmd;
                 if (timeout) {
-                    setTimeout(() => {
+                    this.currentTimeout = setTimeout(() => {
                         if (this.sendState === SendState.Receiving) {
-                            onError(new Error("timeout"));
+                            onError(new Error("response timeout"));
                         }
                     }, timeout);
                 }
@@ -188,6 +209,7 @@ class KettlerSerialComms extends events_1.default {
             this.write(cmd);
     }
     send(cmd) {
+        this.logger.logEvent({ message: 'send()', cmd: cmd.logStr, port: this.getPort(), queueSize: this.queue.size() });
         this.queue.enqueue(cmd);
     }
 }

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

@@ -2,6 +2,7 @@ import { DeviceSettings } from "../../DeviceProtocol";
 import DeviceAdapterBase, { DeviceAdapter, DeviceData, Bike } from "../../Device";
 import { DeviceProtocol } from "../../DeviceProtocol";
 import { EventLogger } from "gd-eventlog";
+import SerialComms from "../comms";
 import { Command } from "../../types/command";
 import CyclingMode, { IncyclistBikeData } from "../../CyclingMode";
 import { User } from "../../types/user";
@@ -33,7 +34,6 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     private ignorePower;
     private logger;
     private paused;
-    private comms;
     private iv;
     private requests;
     private data;
@@ -41,6 +41,7 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     private kettlerData;
     private updateBusy;
     private requestBusy;
+    private comms;
     constructor(protocol: DeviceProtocol, settings: DeviceSettings);
     isBike(): boolean;
     isPower(): boolean;
@@ -52,6 +53,8 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     setIgnoreHrm(ignore: boolean): void;
     setIgnorePower(ignore: boolean): void;
     setIgnoreBike(ignore: boolean): void;
+    _getComms(): SerialComms<KettlerRacerCommand>;
+    _setComms(comms: SerialComms<KettlerRacerCommand>): void;
     getLogger(): EventLogger;
     getUserSettings(): User;
     getWeight(): number;
@@ -65,7 +68,7 @@ export default class KettlerRacerAdapter extends DeviceAdapterBase implements De
     startTraining(): Promise<string>;
     unknownSN(): Promise<string>;
     setBaudrate(baudrate: number): Promise<string>;
-    setPower(power: number): Promise<string>;
+    setPower(power: number): Promise<KettlerBikeData>;
     getExtendedStatus(): Promise<KettlerExtendedBikeData>;
     getStatus(): Promise<KettlerBikeData>;
     getDB(): Promise<string>;