incyclist-devices 1.4.12 → 1.4.15

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 };
 };
@@ -61,6 +73,12 @@ class KettlerRacerAdapter extends Device_1.default {
     setIgnoreBike(ignore) {
         this.ignoreBike = ignore;
     }
+    _getComms() {
+        return this.comms;
+    }
+    _setComms(comms) {
+        this.comms = comms;
+    }
     getLogger() {
         return this.logger;
     }
@@ -79,113 +97,117 @@ class KettlerRacerAdapter extends Device_1.default {
         return bikeWeight + userWeight;
     }
     setComputerMode() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.send('setComputerMode', 'CP').then(response => {
-                if (response === 'ACK' || response === 'RUN') {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            });
+        return this.send('setComputerMode', 'CP').then(response => {
+            this.logger.logEvent({ response });
+            if (response === 'ACK' || response === 'RUN') {
+                return true;
+            }
+            else {
+                return false;
+            }
         });
     }
     setClientMode() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.send('setClientMode', 'CM').then(response => {
-                if (response === 'ACK' || response === 'RUN') {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            });
+        return this.send('setClientMode', 'CM').then(response => {
+            this.logger.logEvent({ response });
+            if (response === 'ACK' || response === 'RUN') {
+                return true;
+            }
+            else {
+                return false;
+            }
         });
     }
     reset() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.send('reset', 'RS').then(response => {
-                if (response === 'ACK' || response === 'RUN') {
-                    return true;
-                }
-                else {
-                    return false;
-                }
-            });
+        return this.send('reset', 'RS').then(response => {
+            this.logger.logEvent({ response });
+            if (response === 'ACK' || response === 'RUN') {
+                return true;
+            }
+            else {
+                return false;
+            }
         });
     }
     getIdentifier() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.send('getIdentifier', 'ID').then(response => {
-                return response.substring(0, 3);
-            });
+        return this.send('getIdentifier', 'ID').then(response => {
+            this.logger.logEvent({ response });
+            return response.substring(0, 3);
         });
     }
     getInterface() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send('getInterface', 'KI');
+            const res = yield this.send('getInterface', 'KI');
+            this.logger.logEvent({ interface: res });
+            return res;
         });
     }
     getVersion() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send('getVersion', 'VE');
+            const res = yield this.send('getVersion', 'VE');
+            this.logger.logEvent({ version: res });
+            return res;
         });
     }
     getCalibration() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send('getCalibration', 'CA');
+            return yield this.send('getCalibration', 'CA');
         });
     }
     startTraining() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send('startTraining', 'LB');
+            return yield this.send('startTraining', 'LB');
         });
     }
     unknownSN() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send('SN', 'SN');
+            return yield this.send('SN', 'SN');
         });
     }
     setBaudrate(baudrate) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send(`setBaudrate(${baudrate})`, `BR${baudrate}`);
+            return yield this.send(`setBaudrate(${baudrate})`, `BR${baudrate}`);
         });
     }
     setPower(power) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send(`setPower(${power})`, `PW${power}`);
+            return this.send(`setPower(${power})`, `PW${power}`).then(response => {
+                const data = this.parseStatus(response);
+                return data;
+            });
         });
     }
     getExtendedStatus() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.send('getExtendedStatus', 'ES1').then(response => {
-                const data = this.parseExtendedStatus(response);
-                return data;
-            });
+        return this.send('getExtendedStatus', 'ES1').then(response => {
+            const data = this.parseExtendedStatus(response);
+            return data;
         });
     }
     getStatus() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.send('getStatus', 'ST').then(response => {
-                const data = this.parseStatus(response);
-                return data;
-            });
+        return this.send('getStatus', 'ST').then(response => {
+            const data = this.parseStatus(response);
+            return data;
         });
     }
     getDB() {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.send('getDB', 'DB');
+            return yield this.send('getDB', 'DB');
         });
     }
     send(logStr, message, timeout) {
         return __awaiter(this, void 0, void 0, function* () {
-            const opened = yield this.waitForOpened();
-            if (!opened) {
-                throw new Error('connection error');
-            }
-            return new Promise((resolve, reject) => {
-                this.comms.send({ logStr, message, onError: reject, onResponse: resolve, timeout });
-            });
+            return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const opened = yield this.waitForOpened();
+                    if (!opened) {
+                        reject(new Error('connection error'));
+                    }
+                }
+                catch (err) {
+                    reject(err);
+                }
+                this.comms.send({ logStr, message, onResponse: resolve, onError: reject, timeout });
+            }));
         });
     }
     parseExtendedStatus(data) {
@@ -244,94 +266,29 @@ class KettlerRacerAdapter extends Device_1.default {
                 try {
                     if (!info.opened)
                         info.opened = yield this.waitForOpened();
-                    iv = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
+                    iv = setTimeout(() => {
+                        this.logger.logEvent({ message: "check() timeout", port: this.getPort() });
                         reject(new Error(`timeout`));
-                    }), 5000);
-                    try {
-                        yield this.getVersion();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getInterface();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getIdentifier();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getExtendedStatus();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getStatus();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.setClientMode();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getVersion();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getInterface();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getIdentifier();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getExtendedStatus();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getStatus();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.setPower(100);
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.reset();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.setComputerMode();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getVersion();
-                    }
-                    catch (e) { }
+                    }, 5000);
+                    if (!info.pcMode)
+                        info.pcMode = yield this.setClientMode();
+                    if (!info.id)
+                        info.id = yield this.getIdentifier();
+                    if (!info.version)
+                        info.version = yield this.getVersion();
                     try {
                         yield this.getInterface();
                     }
-                    catch (e) { }
-                    try {
-                        yield this.getIdentifier();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getExtendedStatus();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.getStatus();
-                    }
-                    catch (e) { }
-                    try {
-                        yield this.setPower(100);
+                    catch (e) {
+                        this.logger.logEvent({ message: 'Error', error: e.message });
                     }
-                    catch (e) { }
                     clearTimeout(iv);
                     resolve(info);
                 }
                 catch (err) {
-                    clearTimeout(iv);
+                    this.logger.logEvent({ message: 'Error', error: err.message });
+                    if (iv)
+                        clearTimeout(iv);
                     iv = undefined;
                     reject(err);
                 }
@@ -340,22 +297,40 @@ class KettlerRacerAdapter extends Device_1.default {
     }
     start(props) {
         this.logger.logEvent({ message: 'start()' });
-        const opts = props || {};
         var info = {};
-        return utils_1.runWithRetries(() => __awaiter(this, void 0, void 0, function* () {
+        return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
             try {
                 if (!info.checkDone) {
                     info.checkDone = yield this.check();
                 }
-                if (!info.started) {
-                    info.started = yield this.startTraining();
+                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) {
-                    info.data = yield this.getStatus();
+                    yield this.update();
+                    info.data = this.data;
                 }
                 return info.data;
             }
             catch (err) {
+                console.log('~~~ Error', 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}`));
             }
         }), 5, 1000)
@@ -367,6 +342,7 @@ class KettlerRacerAdapter extends Device_1.default {
     startUpdatePull() {
         if (this.iv)
             return;
+        this.logger.logEvent({ message: 'start regular device update' });
         if (this.ignoreBike && this.ignoreHrm && this.ignorePower)
             return;
         const ivSync = setInterval(() => {
@@ -564,7 +540,7 @@ class KettlerRacerAdapter extends Device_1.default {
         }));
     }
     waitForOpened() {
-        return utils_1.runWithRetries(() => {
+        return (0, utils_1.runWithRetries)(() => {
             return new Promise((resolve, reject) => {
                 try {
                     if (this.comms.isConnected()) {

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

@@ -17,7 +17,7 @@ export interface ScanDescription {
     state: ScanState;
     props: KettlerRacerScanProps;
 }
-export declare class KettlerRacerProtocol extends DeviceProtocolBase implements DeviceProtocol {
+export default class KettlerRacerProtocol extends DeviceProtocolBase implements DeviceProtocol {
     private state;
     private logger;
     private activeScans;

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 };
 };
@@ -187,5 +199,5 @@ class KettlerRacerProtocol extends DeviceProtocol_1.default {
         return this.state === ScanState.SCANNING;
     }
 }
-exports.KettlerRacerProtocol = KettlerRacerProtocol;
+exports.default = KettlerRacerProtocol;
 DeviceRegistry_1.default.register(new KettlerRacerProtocol());

package/lib/simulator/Simulator.js

@@ -1,15 +1,28 @@
 "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 (Object.hasOwnProperty.call(mod, k)) result[k] = mod[k];
-    result["default"] = mod;
+    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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Simulator = void 0;
 const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
 const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
 const Device_1 = __importDefault(require("../Device"));

package/lib/types/route.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.RouteType = void 0;
 var RouteType;
 (function (RouteType) {
     RouteType["FREE_RIDE"] = "free ride";

package/lib/types/user.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Gender = void 0;
 var Gender;
 (function (Gender) {
     Gender["MALE"] = "M";

package/lib/utils.js

@@ -9,9 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sleep = (ms) => {
+exports.Queue = exports.hexstr = exports.intVal = exports.floatVal = exports.runWithRetries = exports.sleep = void 0;
+const sleep = (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };
+exports.sleep = sleep;
 function runWithRetries(fn, maxRetries, timeBetween) {
     return new Promise((resolve, reject) => {
         let retries = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "1.4.12",
+  "version": "1.4.15",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",