incyclist-devices 1.3.0 → 1.4.1

package/lib/daum/premium/tcpserial.d.ts

@@ -1,29 +1,33 @@
+import { EventLogger } from 'gd-eventlog';
 export default class TcpSocketPort {
-    static setResponse(command: any, fn: any): void;
-    static getReponseHandler(command: any): any;
-    static reset(): void;
-    constructor(props: any);
-    callbacks: {};
-    isOpen: boolean;
-    props: any;
-    enabled: any;
-    host: any;
-    port: any;
+    callbacks: any;
+    enabled: boolean;
+    host: string;
+    port: number;
     net: any;
-    path: string;
+    props: any;
     socket: any;
-    outputQueue: any[];
+    id: number;
+    isOpen: boolean;
+    isClosed: boolean;
+    path: string;
+    outputQueue: Array<any>;
     iv: any;
+    logger: EventLogger;
+    constructor(props: any);
     flush(): void;
-    open(): void;
+    open(retry?: boolean): void;
     close(): void;
-    isClosed: boolean;
     onTimeout(): void;
     onConnect(): void;
     onError(err: any): void;
     on(event: any, callback: any): void;
+    removeAllListeners(): void;
     emit(event: any, ...args: any[]): void;
     write(message: any): void;
     unpipe(): void;
     pipe(transformer: any): any;
+    static setResponse(command: any, fn: any): void;
+    static getReponseHandler(command: any): any;
+    static reset(): void;
 }

package/lib/daum/premium/tcpserial.js

@@ -1,12 +1,19 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const net_1 = require("net");
-const TIMEOUT_OPEN = 2000;
+const net_1 = __importDefault(require("net"));
+const gd_eventlog_1 = require("gd-eventlog");
+const TIMEOUT_OPEN = 1000;
+var __responses = {};
 class TcpSocketPort {
     constructor(props) {
         this.callbacks = {};
         this.isOpen = false;
+        this.isClosed = false;
         this.props = props || {};
+        this.logger = new gd_eventlog_1.EventLogger('TCPSocket') || props.logger;
         this.enabled = this.props.enabled || true;
         this.host = this.props.host || '127.0.0.1';
         this.port = this.props.port || 10000;
@@ -19,46 +26,60 @@ class TcpSocketPort {
     }
     flush() {
     }
-    open() {
+    open(retry = false) {
         try {
-            this.socket.setTimeout(TIMEOUT_OPEN, (e) => { });
-            this.socket.on('timeout', () => { this.onTimeout(); });
-            this.socket.on('connect', () => { this.onConnect(); });
-            this.socket.on('error', (err) => { this.onError(err); });
-            this.socket.on('ready', () => {
-                this.isOpen = true;
-                this.emit('open');
-            });
+            if (!retry) {
+                this.id = Date.now();
+                this.socket.on('timeout', () => { this.onTimeout(); });
+                this.socket.on('connect', () => { this.onConnect(); });
+                this.socket.on('error', (err) => { this.onError(err); });
+                this.socket.on('ready', () => {
+                    this.logger.logEvent({ message: 'ready' });
+                });
+            }
+            this.logger.logEvent({ message: 'opening', id: this.id, retry });
             this.socket.connect(this.port, this.host);
         }
         catch (err) {
+            this.logger.logEvent({ message: 'opening error', id: this.id, error: err.message, stack: err.stack });
             this.emit('error', err);
         }
     }
     close() {
+        this.logger.logEvent({ message: 'closing', id: this.id });
         this.isOpen = false;
         this.isClosed = true;
         try {
-            this.socket.close();
+            this.socket.removeAllListeners();
             this.socket.destroy();
-            this.socket.on('timeout', () => { });
-            this.socket.on('connect', () => { });
             this.socket.on('error', () => { });
-            this.socket.on('ready', () => { });
         }
         catch (err) {
+            console.log(err);
         }
         this.emit('close');
-        setTimeout(() => { this.callbacks = {}; }, 100);
+        setTimeout(() => { this.removeAllListeners(); }, 100);
     }
     onTimeout() {
+        if (this.isOpen)
+            return;
+        this.logger.logEvent({ message: 'timeout', id: this.id });
+        try {
+            this.socket.end();
+        }
+        catch (_a) { }
         if (this.isClosed)
             return;
+        this.emit('error', new Error('timeout'));
     }
     onConnect() {
+        this.logger.logEvent({ message: 'connected', id: this.id });
+        this.isOpen = true;
         this.isClosed = false;
+        this.emit('open');
     }
     onError(err) {
+        this.logger.logEvent({ message: 'error', error: err.message });
         if (this.callbacks['error'])
             this.callbacks['error'](err);
     }
@@ -69,6 +90,9 @@ class TcpSocketPort {
         }
         this.socket.on(event, callback);
     }
+    removeAllListeners() {
+        this.callbacks = {};
+    }
     emit(event, ...args) {
         if (event === 'open' || event === 'close' || event === 'error') {
             if (this.callbacks[event])
@@ -86,15 +110,15 @@ class TcpSocketPort {
         return this.socket.pipe(transformer);
     }
     static setResponse(command, fn) {
-        if (!global.responses)
+        if (!__responses)
             this.reset();
-        global.responses[command] = fn;
+        __responses[command] = fn;
     }
     static getReponseHandler(command) {
-        return global.responses[command];
+        return __responses[command];
     }
     static reset() {
-        global.responses = {};
+        __responses = {};
     }
 }
 exports.default = TcpSocketPort;

package/lib/daum/premium/utils.d.ts

@@ -1,9 +1,9 @@
 export declare function bin2esc(arr: any): any[];
 export declare function esc2bin(arr: any): any[];
 export declare function checkSum(cmdArr: any, payload: any): string;
-export declare function buildMessage(command: any, payload: any): any[];
+export declare function buildMessage(command: any, payload?: any): any[];
 export declare function getMessageData(command: any): any[];
-export declare function hexstr(arr: any, start: any, len: any): string;
+export declare function hexstr(arr: any, start?: any, len?: any): string;
 export declare function getHex(i: any): string;
 export declare function append(cmd: any, arr: any): void;
 export declare function ascii(c: any): any;

package/lib/simulator/Simulator.d.ts

@@ -1,7 +1,7 @@
-import DeviceProtocol from '../DeviceProtocol';
-import Device from '../Device';
+import DeviceProtocolBase, { DeviceSettings } from '../DeviceProtocol';
+import DeviceAdapter from '../Device';
 import { EventLogger } from 'gd-eventlog';
-export declare class Simulator extends Device {
+export declare class Simulator extends DeviceAdapter {
     static NAME: string;
     logger: EventLogger;
     speed: number;
@@ -14,26 +14,32 @@ export declare class Simulator extends Device {
     slope: number;
     limit: any;
     startProps?: any;
-    constructor(protocol: any);
+    constructor(protocol?: any);
+    isBike(): boolean;
+    isHrm(): boolean;
+    isPower(): boolean;
+    getID(): string;
     getName(): string;
     getPort(): string;
     start(props?: any): Promise<unknown>;
     stop(): Promise<boolean>;
     pause(): Promise<boolean>;
+    resume(): Promise<boolean>;
     toggle(): Promise<boolean>;
     faster(): void;
     slower(): void;
     update(): void;
     calculateDistance(speedKps: any, timeS: any): number;
-    sendUpdate(request: any): void;
+    sendUpdate(request: any): any;
 }
-export default class SimulatorProtocol extends DeviceProtocol {
+export default class SimulatorProtocol extends DeviceProtocolBase {
     static NAME: string;
     constructor();
+    add(settings: DeviceSettings): void;
     getName(): string;
     getInterfaces(): string[];
     isBike(): boolean;
     isHrm(): boolean;
     isPower(): boolean;
-    getDevices(): any[];
+    getDevices(): import("../DeviceProtocol").Device[];
 }

package/lib/simulator/Simulator.js

@@ -1,11 +1,33 @@
 "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 __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 = require("../DeviceProtocol");
-const DeviceRegistry_1 = require("../DeviceRegistry");
-const Device_1 = require("../Device");
+const DeviceProtocol_1 = __importStar(require("../DeviceProtocol"));
+const DeviceRegistry_1 = __importDefault(require("../DeviceRegistry"));
+const Device_1 = __importDefault(require("../Device"));
 const gd_eventlog_1 = require("gd-eventlog");
-const calculations_1 = require("../calculations");
+const calculations_1 = __importDefault(require("../calculations"));
 class Simulator extends Device_1.default {
     constructor(protocol) {
         const proto = protocol || DeviceRegistry_1.default.findByName('Simulator');
@@ -21,12 +43,12 @@ class Simulator extends Device_1.default {
         this.slope = 0;
         this.limit = {};
     }
-    getName() {
-        return Simulator.NAME;
-    }
-    getPort() {
-        return 'local';
-    }
+    isBike() { return true; }
+    isHrm() { return false; }
+    isPower() { return true; }
+    getID() { return Simulator.NAME; }
+    getName() { return Simulator.NAME; }
+    getPort() { return 'local'; }
     start(props) {
         this.startProps = props;
         return new Promise((resolve) => {
@@ -50,24 +72,30 @@ class Simulator extends Device_1.default {
         return new Promise((resolve, reject) => {
             this.logger.logEvent({ message: 'stop', iv: this.iv });
             this.started = false;
-            try {
-                clearInterval(this.iv);
-                this.iv = undefined;
-            }
-            catch (err) {
-                this.logger.logEvent({ message: 'stop Error', error: err.message });
-            }
+            clearInterval(this.iv);
+            this.iv = undefined;
             this.paused = undefined;
             resolve(true);
         });
     }
     pause() {
         return new Promise((resolve, reject) => {
+            if (!this.started)
+                return reject(new Error('illegal state - pause() has been called before start()'));
             this.logger.logEvent({ message: 'pause', iv: this.iv });
             this.paused = true;
             resolve(true);
         });
     }
+    resume() {
+        return new Promise((resolve, reject) => {
+            if (!this.started)
+                reject(new Error('illegal state - resume() has been called before start()'));
+            this.logger.logEvent({ message: 'resume', iv: this.iv });
+            this.paused = false;
+            resolve(true);
+        });
+    }
     toggle() {
         if (this.started) {
             return this.stop();
@@ -108,18 +136,22 @@ class Simulator extends Device_1.default {
         if (this.speed === undefined)
             this.speed = 30;
         this.power = calculations_1.default.calculatePower(75, this.speed / 3.6, this.slope);
+        if (this.limit.targetPower) {
+            this.power = this.limit.targetPower;
+            this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
+        }
         if (this.limit.maxPower && this.power > this.limit.maxPower) {
             this.power = this.limit.maxPower;
             this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
         }
-        if (this.limit.minPower && this.power < this.limit.minPower) {
+        else if (this.limit.minPower && this.power < this.limit.minPower) {
             this.power = this.limit.minPower;
             this.speed = calculations_1.default.calculateSpeed(75, this.power, this.slope);
         }
         let distance = this.calculateDistance(this.speed, timespan / 1000);
         let data = { speed: this.speed, cadence: Math.round(this.cadence), power: Math.round(this.power), timespan, distance };
-        if (this.onData) {
-            this.onData(data);
+        if (this.onDataFn) {
+            this.onDataFn(data);
         }
     }
     calculateDistance(speedKps, timeS) {
@@ -127,7 +159,14 @@ class Simulator extends Device_1.default {
     }
     sendUpdate(request) {
         this.logger.logEvent({ message: 'bike update request', request });
-        this.limit = request;
+        const r = request || { refresh: true };
+        if (r.refresh) {
+            if (Object.keys(r).length === 1)
+                return this.limit;
+            delete r.refresh;
+        }
+        this.limit = r;
+        return this.limit;
     }
 }
 exports.Simulator = Simulator;
@@ -137,6 +176,8 @@ class SimulatorProtocol extends DeviceProtocol_1.default {
         super();
         this.devices.push(new Simulator(this));
     }
+    add(settings) {
+    }
     getName() {
         return SimulatorProtocol.NAME;
     }

package/lib/utils.d.ts

@@ -1,5 +1,7 @@
-export declare const sleep: (x: any) => Promise<unknown>;
+export declare const sleep: (ms: any) => Promise<unknown>;
 export declare function runWithRetries(fn: any, maxRetries: any, timeBetween: any): Promise<unknown>;
+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>;

package/lib/utils.js

@@ -9,10 +9,11 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Queue = exports.hexstr = exports.runWithRetries = exports.sleep = void 0;
-exports.sleep = (x) => {
-    return new Promise(ok => { setTimeout(() => { ok(); }, x); });
+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;
@@ -32,34 +33,54 @@ function runWithRetries(fn, maxRetries, timeBetween) {
                 }
                 catch (err) {
                     tLastFailure = Date.now();
-                    busy = false;
                     retries++;
-                    if (retries > maxRetries) {
+                    if (retries >= maxRetries) {
                         clearInterval(iv);
+                        busy = false;
                         return reject(err);
                     }
+                    else {
+                        busy = false;
+                    }
                 }
             }
         }), 50);
     });
 }
 exports.runWithRetries = runWithRetries;
+function floatVal(d) {
+    if (d === undefined)
+        return;
+    if (typeof d === 'number')
+        return d;
+    const res = parseFloat(d);
+    return isNaN(res) ? undefined : res;
+}
+exports.floatVal = floatVal;
+function intVal(d) {
+    if (d === undefined)
+        return;
+    if (typeof d === 'number')
+        return Math.floor(d);
+    const res = parseInt(d);
+    return isNaN(res) ? undefined : res;
+}
+exports.intVal = intVal;
 function hexstr(arr, start, len) {
-    var str = "";
-    if (start === undefined)
-        start = 0;
-    if (len === undefined) {
-        len = arr.length;
-    }
-    if (len - start > arr.length) {
-        len = arr.length - start;
+    let str = "";
+    const startIdx = start || 0;
+    const length = len || arr.length;
+    let endIdx = startIdx + length;
+    if (endIdx >= arr.length) {
+        endIdx = arr.length;
     }
-    var j = start;
-    for (var i = 0; i < len; i++) {
-        var hex = Math.abs(arr[j++]).toString(16);
-        if (i !== 0)
-            str += " ";
+    let added = 0;
+    for (var i = startIdx; i < endIdx; i++) {
+        const hex = Math.abs(arr[i]).toString(16).toUpperCase();
+        if (added !== 0)
+            str += ' ';
         str += hex;
+        added++;
     }
     return str;
 }

package/package.json

@@ -1,23 +1,24 @@
 {
   "name": "incyclist-devices",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
-    "@types/serialport": "^8.0.1"
+    "@types/serialport": "^8.0.1",
+    "gd-ant-plus": "^0.0.33"
   },
   "peerDependencies": {
-    "gd-eventlog": "^0.1.21"
+    "gd-eventlog": "^0.1.22"
   },
   "devDependencies": {
-    "@types/jest": "^25.2.1",
-    "@types/node": "^10.0.0",
-    "eslint": "^6.1.0",
-    "eslint-config-react-app": "^5.0.1",
-    "eslint-loader": "2.2.1",
-    "jest": "^25.2.7",
-    "ts-jest": "^25.3.1",
-    "typescript": "^3.8.3"
+    "@types/jest": "^27.0.3",
+    "@types/node": "^10.17.58",
+    "eslint": "^7.32.0",
+    "eslint-config-react-app": "^6.0.0",
+    "eslint-loader": "^4.0.2",
+    "jest": "^27.4.3",
+    "ts-jest": "^27.1.0",
+    "typescript": "^4.5.2"
   },
   "scripts": {
     "build": "tsc",

package/lib/ant/AntScanner.unit.tests.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/ant/AntScanner.unit.tests.js

@@ -1,25 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const AntScanner_1 = require("./AntScanner");
-const TestData = [
-    { "busNumber": 2, "deviceAddress": 3, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 512, "bDeviceClass": 0, "bDeviceSubClass": 0, "bDeviceProtocol": 0, "bMaxPacketSize0": 32, "idVendor": 4047, "idProduct": 4104, "bcdDevice": 256, "iManufacturer": 1, "iProduct": 2, "iSerialNumber": 3, "bNumConfigurations": 1 }, "portNumbers": [1, 2], "inUse": false },
-    { "busNumber": 1, "deviceAddress": 5, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 512, "bDeviceClass": 0, "bDeviceSubClass": 0, "bDeviceProtocol": 0, "bMaxPacketSize0": 8, "idVendor": 1133, "idProduct": 49174, "bcdDevice": 832, "iManufacturer": 1, "iProduct": 2, "iSerialNumber": 0, "bNumConfigurations": 1 }, "portNumbers": [1], "inUse": false },
-    { "busNumber": 2, "deviceAddress": 4, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 512, "bDeviceClass": 239, "bDeviceSubClass": 2, "bDeviceProtocol": 1, "bMaxPacketSize0": 64, "idVendor": 1266, "idProduct": 46094, "bcdDevice": 26937, "iManufacturer": 2, "iProduct": 1, "iSerialNumber": 0, "bNumConfigurations": 1 }, "portNumbers": [1, 3], "inUse": false },
-    { "busNumber": 2, "deviceAddress": 5, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 528, "bDeviceClass": 224, "bDeviceSubClass": 1, "bDeviceProtocol": 1, "bMaxPacketSize0": 64, "idVendor": 3034, "idProduct": 45057, "bcdDevice": 512, "iManufacturer": 1, "iProduct": 2, "iSerialNumber": 3, "bNumConfigurations": 1 }, "portNumbers": [1, 7], "inUse": false },
-    { "busNumber": 1, "deviceAddress": 9, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 512, "bDeviceClass": 0, "bDeviceSubClass": 0, "bDeviceProtocol": 0, "bMaxPacketSize0": 32, "idVendor": 4047, "idProduct": 4104, "bcdDevice": 256, "iManufacturer": 1, "iProduct": 2, "iSerialNumber": 3, "bNumConfigurations": 1 }, "portNumbers": [6], "inUse": false },
-    { "busNumber": 2, "deviceAddress": 2, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 512, "bDeviceClass": 9, "bDeviceSubClass": 0, "bDeviceProtocol": 1, "bMaxPacketSize0": 64, "idVendor": 32903, "idProduct": 32768, "bcdDevice": 4, "iManufacturer": 0, "iProduct": 0, "iSerialNumber": 0, "bNumConfigurations": 1 }, "portNumbers": [1], "inUse": false },
-    { "busNumber": 2, "deviceAddress": 1, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 0, "bDeviceClass": 9, "bDeviceSubClass": 0, "bDeviceProtocol": 0, "bMaxPacketSize0": 0, "idVendor": 32902, "idProduct": 39974, "bcdDevice": 0, "iManufacturer": 0, "iProduct": 0, "iSerialNumber": 0, "bNumConfigurations": 1 }, "inUse": false },
-    { "busNumber": 1, "deviceAddress": 1, "deviceDescriptor": { "bLength": 18, "bDescriptorType": 1, "bcdUSB": 0, "bDeviceClass": 9, "bDeviceSubClass": 0, "bDeviceProtocol": 0, "bMaxPacketSize0": 0, "idVendor": 32902, "idProduct": 39985, "bcdDevice": 0, "iManufacturer": 0, "iProduct": 0, "iSerialNumber": 0, "bNumConfigurations": 1 }, "inUse": false }
-];
-class MockGarminStick2 {
-}
-class MockGarminStick3 {
-}
-class MockAnt {
-    static getSticks() { return TestData; }
-}
-describe('AntScanner', () => {
-    const scanner = AntScanner_1.AntScanner(MockAnt);
-    test('getSticks', () => {
-    });
-});

package/lib/ant/antfe/AntFEProcessor.d.ts

@@ -1,40 +0,0 @@
-export default class AntFEProcessor {
-    static NAME: string;
-    static STATE: {
-        INITIALIZED: string;
-        STARTING: string;
-        START_OK: string;
-        START_FAILED: string;
-        ERROR: string;
-        FINISHING: string;
-        FINISH_OK: string;
-        FINISH_FAILED: string;
-    };
-    static isBike(): boolean;
-    static isHrm(): boolean;
-    constructor(controller: any, bikeInfo: any);
-    bikeInfo: any;
-    ignoreHrm: boolean;
-    instance: any;
-    paused: boolean;
-    started: boolean;
-    time: number;
-    iv: NodeJS.Timeout;
-    state: string;
-    data: {};
-    request: any;
-    setState(newState: any): void;
-    toggle(): void;
-    pause(): void;
-    setIgnoreHrm(ignore: any): void;
-    checkBikeStatus(): Promise<any>;
-    startTraining(): Promise<any>;
-    getBikeData(): Promise<any>;
-    sendBikeUpdate(request: any): Promise<any>;
-    onStarted(): void;
-    start(user: any): Promise<void>;
-    stop(): void;
-    update(): Promise<void>;
-    sendUpdate(data: any): Promise<void>;
-    onEvent(event: any): void | Promise<void>;
-}