incyclist-devices 1.3.0 → 1.4.1

package/lib/daum/premium/DaumPremiumProtocol.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,11 +27,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-const DeviceProtocol_1 = require("../../DeviceProtocol");
-const DeviceRegistry_1 = require("../../DeviceRegistry");
+const DeviceProtocol_1 = __importStar(require("../../DeviceProtocol"));
+const DeviceRegistry_1 = __importDefault(require("../../DeviceRegistry"));
 const bike_1 = require("../premium/bike");
-const DaumPremiumAdapter_1 = require("./DaumPremiumAdapter");
+const DaumPremiumAdapter_1 = __importDefault(require("./DaumPremiumAdapter"));
 const gd_eventlog_1 = require("gd-eventlog");
 const PROTOCOL_NAME = "Daum Premium";
 const DefaultState = {
@@ -27,6 +49,19 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
         this.logger = new gd_eventlog_1.EventLogger('DaumPremium');
         this.devices = [];
     }
+    add(settings) {
+        if (settings.interface && settings.interface === DeviceProtocol_1.INTERFACE.TCPIP) {
+            bike_1.Daum8iTcp.setNetImpl(DeviceProtocol_1.default.getNetImpl());
+            const { host } = settings;
+            const portName = `${host}:51955`;
+            return this.addDevice(bike_1.Daum8iTcp, { host, port: 51955, interface: DeviceProtocol_1.INTERFACE.TCPIP }, portName);
+        }
+        if (settings.interface && settings.interface === DeviceProtocol_1.INTERFACE.SERIAL) {
+            bike_1.Daum8iSerial.setSerialPort(DeviceProtocol_1.default.getSerialPort());
+            const { port } = settings;
+            return this.addDevice(bike_1.Daum8iSerial, { port, interface: DeviceProtocol_1.INTERFACE.SERIAL }, port);
+        }
+    }
     getName() {
         return PROTOCOL_NAME;
     }
@@ -45,6 +80,7 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
     scan(props) {
         const opts = props || {};
         this.logger.logEvent({ message: 'start scan', opts });
+        this.state.scanning = true;
         if (opts.interface === DeviceProtocol_1.INTERFACE.TCPIP) {
             this.scanTcpip(opts);
         }
@@ -60,7 +96,8 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
             this.devices.push(device);
         }
         else {
-            const idx = this.devices.findIndex(d => d.getBike().getPort() === portName);
+            const devices = this.devices;
+            const idx = devices.findIndex(d => d.getBike().getPort() === portName);
             if (idx === -1) {
                 const bike = new DeviceClass(opts);
                 device = new DaumPremiumAdapter_1.default(this, bike);
@@ -91,6 +128,9 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
             this.state.activeScans.push({ iv, device });
         }
     }
+    isScanning() {
+        return this.state.scanning;
+    }
     stopScan() {
         return __awaiter(this, void 0, void 0, function* () {
             this.logger.logEvent({ message: 'stop scan', activeScans: this.state.activeScans });
@@ -103,8 +143,9 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
                 });
                 this.state.activeScans = [];
             }
-            for (let i = 0; i < this.devices.length; i++) {
-                const d = this.devices[i];
+            const devices = this.devices;
+            for (let i = 0; i < devices.length; i++) {
+                const d = devices[i];
                 if (!d.isSelected() && !d.isDetected()) {
                     try {
                         yield d.getBike().saveClose(true);
@@ -114,8 +155,8 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
                     }
                 }
             }
-            for (let i = 0; i < this.devices.length; i++) {
-                const d = this.devices[i];
+            for (let i = 0; i < devices.length; i++) {
+                const d = devices[i];
                 if (!d.isSelected() && !d.isDetected()) {
                     try {
                         yield d.getBike().unblock();
@@ -136,7 +177,7 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
             return;
         scan.scanning = true;
         device.check()
-            .then(() => {
+            .then(() => __awaiter(this, void 0, void 0, function* () {
             if (this.state.stopScanning)
                 return;
             const { onDeviceFound, onScanFinished, id } = opts;
@@ -146,10 +187,16 @@ class DaumPremiumProtocol extends DeviceProtocol_1.default {
             if (onScanFinished) {
                 onScanFinished(id);
             }
+            try {
+                yield device.getBike().saveClose();
+            }
+            catch (err) {
+                this.logger.logEvent({ message: 'scanCommand warning: Could not close port', error: err.message });
+            }
             clearInterval(scan.iv);
             scan.iv = undefined;
             scan.scanning = false;
-        })
+        }))
             .catch(() => {
             scan.scanning = false;
         });

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

@@ -1,77 +1,74 @@
-export class Daum8iTcp extends Daum8i {
-    constructor(props: any);
-}
-export class Daum8iSerial extends Daum8i {
-    constructor(props: any);
-}
+import { Queue } from '../../utils';
+import { EventLogger } from 'gd-eventlog';
 declare class Daum8i {
-    static getClassName(): string;
-    static setSerialPort(spClass: any): void;
-    static setNetImpl(netClass: any): void;
-    static getSupportedInterfaces(): string[];
-    constructor(props: any);
-    LOG: EventLogger;
-    portName: any;
-    tcpip: boolean;
+    portName: string;
+    logger: EventLogger;
     serial: boolean;
+    tcpip: boolean;
     tcpipConnection: {
-        host: any;
-        port: any;
+        host: string;
+        port: string;
     };
-    port: any;
+    port: string;
     settings: any;
     sendRetryDelay: number;
     sp: any;
+    props: any;
     connected: boolean;
     blocked: boolean;
-    state: {
-        ack: {
-            wait: boolean;
-            startWait: any;
-        };
-        commandsInQueue: {};
-    };
-    bikeData: {
-        userWeight: number;
-        bikeWeight: number;
-        maxPower: number;
-    };
-    processor: IndoorBikeProcessor;
+    state: any;
+    bikeData: any;
+    processor: any;
+    error: Error;
+    queue: Queue<any>;
+    cmdCurrent: any;
+    cmdStart: number;
+    constructor(props: any);
+    static getClassName(): string;
     getType(): string;
-    getPort(): any;
+    static setSerialPort(spClass: any): void;
+    static setNetImpl(netClass: any): void;
+    static getSupportedInterfaces(): string[];
+    getPort(): string;
     isConnected(): boolean;
     setUser(user: any, callback: any): void;
     getUserWeight(): any;
     getBikeWeight(): number;
     unblock(): void;
-    connect(retry: any): void;
-    firstOpen: boolean;
+    connect(): void;
     reconnect(): Promise<void>;
-    saveConnect(): Promise<any>;
+    saveConnect(): Promise<unknown>;
     onPortOpen(): void;
-    error: any;
     onPortClose(): void;
-    onPortError(error: any): NodeJS.Timeout;
+    getLogState(): {
+        sending: any;
+        busy: any;
+        writeBusy: any;
+        opening: any;
+        connecting: any;
+        waitingForStart: any;
+        waitingForEnd: any;
+        waitingForAck: any;
+        retry: any;
+    };
+    onPortError(error: any): void;
     errorHandler(): void;
-    saveClose(force: any): Promise<any>;
+    saveClose(force?: any): Promise<unknown>;
+    forceClose(updateState?: boolean): void;
     close(): void;
-    bikeCmdWorker: any;
-    queue: any;
     sendTimeout(message: any): void;
-    cmdCurrent: any;
-    cmdStart: any;
-    checkForTimeout(reject: any): void;
-    getTimeoutValue(cmd: any): number;
-    onData(data: any): void;
-    sendDaum8iCommand(command: any, queryType: any, payload: any, cb: any): Promise<any>;
+    checkForResponse(): boolean;
+    getTimeoutValue(cmd?: any): number;
+    onData(data: any): any;
+    sendDaum8iCommand(command: any, queryType: any, payload: any): Promise<unknown>;
     sendACK(): void;
     sendNAK(): void;
-    sendReservedDaum8iCommand(command: any, cmdType: any, data: any, onData: any, onError: any): Promise<any[]>;
+    sendReservedDaum8iCommand(command: any, cmdType: any, data: any): Promise<any[]>;
     getProtocolVersion(): Promise<string>;
-    getDashboardVersion(): Promise<any>;
-    getDeviceType(): Promise<string>;
-    getActualBikeType(): Promise<string>;
-    setActualBikeType(actualBikeType: any): Promise<string>;
+    getDashboardVersion(): Promise<unknown>;
+    getDeviceType(): Promise<any>;
+    getActualBikeType(): Promise<any>;
+    setActualBikeType(actualBikeType: any): Promise<any>;
     getTrainingData(): Promise<{
         time: number;
         heartrate: number;
@@ -96,6 +93,20 @@ declare class Daum8i {
     setGear(gear: any): Promise<number>;
     getGear(): Promise<number>;
 }
-import { EventLogger } from "gd-eventlog";
-import IndoorBikeProcessor from "../indoorbike.js";
+export declare class Daum8iTcp extends Daum8i {
+    static getClassName(): string;
+    getType(): string;
+    static setSerialPort(spClass: any): void;
+    getInterface(): string;
+    static setNetImpl(netClass: any): void;
+    static getSupportedInterfaces(): string[];
+}
+export declare class Daum8iSerial extends Daum8i {
+    static getClassName(): string;
+    getType(): string;
+    getInterface(): string;
+    static setSerialPort(spClass: any): void;
+    static setNetImpl(netClass: any): void;
+    static getSupportedInterfaces(): string[];
+}
 export {};