incyclist-devices 2.0.34 → 2.0.36

package/lib/types/route.d.ts

@@ -5,11 +5,6 @@ export type Point = {
     distance: number;
     slope?: number;
 };
-export declare enum RouteType {
-    FREE_RIDE = "free ride",
-    FOLLOW_ROUTE = "follow route",
-    VIDEO = "video"
-}
 export type Route = {
     programId: number;
     points: Point[];

package/lib/types/route.js

@@ -1,9 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RouteType = void 0;
-var RouteType;
-(function (RouteType) {
-    RouteType["FREE_RIDE"] = "free ride";
-    RouteType["FOLLOW_ROUTE"] = "follow route";
-    RouteType["VIDEO"] = "video";
-})(RouteType || (exports.RouteType = RouteType = {}));

package/lib/utils/calculations.js

@@ -22,8 +22,6 @@ class C {
             throw new IllegalArgumentException("m must be a positive number");
         if (power === undefined || power === null || power < 0)
             throw new IllegalArgumentException("power must be a positive number");
-        if (slope === undefined || slope === null)
-            slope = 0;
         const _rho = props.rho || rho;
         const _cRR = props.cRR || cRR;
         const _cwA = props.cwA || cwABike[props.bikeType || 'race'] || cwABike.race;
@@ -64,11 +62,9 @@ class C {
             throw new IllegalArgumentException("m must be a positive number");
         if (v === undefined || v === null || v < 0)
             throw new IllegalArgumentException("v must be a positive number");
-        if (slope === undefined || slope === null)
-            slope = 0;
         let _rho = props.rho || rho;
         let _cRR = props.cRR || cRR;
-        let _cwA = props.cwA || cwABike[props.bikeType || 'race'] || cwABike.race;
+        let _cwA = props.cwA || cwABike[props.bikeType || 'race'];
         let sl = Math.sin(Math.atan(slope / 100));
         let P = (0.5 * _rho * _cwA) * Math.pow(v, 3.0) + (sl + _cRR) * m * g * v;
         return P;

package/lib/utils/utils.d.ts

@@ -5,7 +5,7 @@ export declare function floatVal(d?: number | string): number;
 export declare function intVal(d?: number | string): number;
 export declare function hexstr(arr: any, start?: any, len?: any): string;
 export declare class Queue<T> {
-    data: Array<T>;
+    protected data: Array<T>;
     constructor(values?: Array<T>);
     size(): number;
     clear(): void;
@@ -13,3 +13,4 @@ export declare class Queue<T> {
     dequeue(): T;
     enqueue(value: T): void;
 }
+export declare function waitWithTimeout(promise: Promise<any>, timeout: number, onTimeout?: () => void): Promise<any>;

package/lib/utils/utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Queue = exports.hexstr = exports.intVal = exports.floatVal = exports.runWithRetries = exports.resolveNextTick = exports.sleep = void 0;
+exports.waitWithTimeout = exports.Queue = exports.hexstr = exports.intVal = exports.floatVal = exports.runWithRetries = exports.resolveNextTick = exports.sleep = void 0;
 const sleep = (ms) => {
     return new Promise(resolve => setTimeout(resolve, ms));
 };
@@ -99,13 +99,13 @@ class Queue {
             this.data = values;
     }
     size() {
-        return this.data ? this.data.length : 0;
+        return this.data.length;
     }
     clear() {
         this.data = [];
     }
     isEmpty() {
-        return this.data === undefined || this.data.length === 0;
+        return this.size() === 0;
     }
     dequeue() {
         const removed = this.data.splice(0, 1);
@@ -116,3 +116,39 @@ class Queue {
     }
 }
 exports.Queue = Queue;
+function waitWithTimeout(promise, timeout, onTimeout) {
+    return __awaiter(this, void 0, void 0, function* () {
+        let to;
+        let hasTimedOut = false;
+        const toPromise = (ms) => {
+            return new Promise((resolve, reject) => {
+                to = setTimeout(() => {
+                    hasTimedOut = true;
+                    if (!onTimeout) {
+                        reject(new Error('Timeout'));
+                    }
+                    else {
+                        try {
+                            onTimeout();
+                            resolve();
+                        }
+                        catch (err) {
+                            reject(err);
+                        }
+                    }
+                }, ms);
+            });
+        };
+        let res;
+        try {
+            res = yield Promise.race([promise, toPromise(timeout)]);
+        }
+        catch (err) {
+            if (err.message === 'Timeout' && hasTimedOut)
+                throw err;
+        }
+        clearTimeout(to);
+        return res;
+    });
+}
+exports.waitWithTimeout = waitWithTimeout;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.0.34",
+  "version": "2.0.36",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",
@@ -29,7 +29,8 @@
     "build": "tsc",
     "test": "jest --coverage",
     "test:ci": "jest --coverage --forceExit",
-    "dev": "tsc --watch"
+    "dev": "tsc --watch",
+    "postversion": "git push && git push --tags"
   },
   "files": [
     "lib/"