incyclist-devices 1.5.21 → 1.5.22

package/lib/antv2/fe.js

@@ -217,7 +217,7 @@ class AntFEAdapter extends ant_device_1.default {
                 }), timeout);
                 this.setFEDefaultTimeout();
                 let success = false;
-                let status;
+                let status = { userSent: false, slopeSent: false };
                 let retry = 0;
                 while (!success && retry < MAX_RETRIES) {
                     retry++;
@@ -239,7 +239,8 @@ class AntFEAdapter extends ant_device_1.default {
                         status.userSent = status.userSent || (yield fe.sendUserConfiguration(userWeight, bikeWeight, args.wheelDiameter, args.gearRatio));
                         status.slopeSent = status.slopeSent || (yield fe.sendTrackResistance(0.0));
                     }
-                    catch (error) {
+                    catch (err) {
+                        this.logger.logEvent({ message: 'sending FE message error', error: err.message });
                         try {
                             yield yield this.ant.stopSensor(this.sensor);
                         }
@@ -254,6 +255,7 @@ class AntFEAdapter extends ant_device_1.default {
                 if (success) {
                     this.logger.logEvent({ message: 'start success' });
                     stopTimeoutCheck();
+                    resolve(true);
                 }
                 else {
                     this.logger.logEvent({ message: 'start failed' });

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

@@ -44,7 +44,7 @@ declare class Daum8i {
     getUserWeight(): any;
     getBikeWeight(): number;
     unblock(): void;
-    connect(): void;
+    connect(): Promise<void>;
     reconnect(): Promise<void>;
     saveConnect(): Promise<unknown>;
     onPortOpen(): void;

package/lib/daum/premium/bike.js

@@ -118,87 +118,98 @@ class Daum8i {
         this.blocked = false;
     }
     connect() {
-        this.logEvent({ message: "connect()", sp: (this.sp !== undefined), connected: this.connected, blocked: this.blocked, port: this.portName, settings: this.settings });
-        if (this.connected || this.blocked) {
-            return;
-        }
-        this.state.busy = true;
-        this.state.commandsInQueue = {};
-        try {
-            if (this.sp !== undefined) {
-                try {
-                    this.sp.removeAllListeners();
-                    this.sp.close();
-                }
-                catch (err) {
-                }
-                this.sp = undefined;
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: "connect()", sp: (this.sp !== undefined), connected: this.connected, blocked: this.blocked, port: this.portName, settings: this.settings });
+            if (this.connected || this.blocked) {
+                return;
             }
-            if (this.sp === undefined) {
-                if (this.tcpip) {
-                    const { host, port } = this.tcpipConnection;
-                    const { logger } = this.props;
-                    this.logEvent({ message: "creating TCPSocketPort", host, port });
-                    this.sp = new tcpserial_1.default({ host, port, net, timeout: OPEN_TIMEOUT, logger });
+            this.state.busy = true;
+            this.state.commandsInQueue = {};
+            try {
+                if (this.sp !== undefined) {
+                    try {
+                        this.sp.removeAllListeners();
+                        yield this.sp.close();
+                    }
+                    catch (err) {
+                    }
+                    this.sp = undefined;
                 }
-                else {
-                    const settings = this.settings.port || {};
-                    settings.autoOpen = false;
-                    this.logEvent({ message: "creating SerialPort", port: this.port, settings });
-                    this.sp = new __SerialPort(this.port, settings);
+                if (this.sp === undefined) {
+                    if (this.tcpip) {
+                        const { host, port } = this.tcpipConnection;
+                        const { logger } = this.props;
+                        this.logEvent({ message: "creating TCPSocketPort", host, port });
+                        this.sp = new tcpserial_1.default({ host, port, net, timeout: OPEN_TIMEOUT, logger });
+                    }
+                    else {
+                        const settings = this.settings.port || {};
+                        settings.autoOpen = false;
+                        this.logEvent({ message: "creating SerialPort", port: this.port, settings });
+                        this.sp = new __SerialPort(this.port, settings);
+                    }
+                    this.sp.on('open', this.onPortOpen.bind(this));
+                    this.sp.on('close', this.onPortClose.bind(this));
+                    this.sp.on('error', (error) => { this.onPortError(error); });
+                    this.sp.on('data', (data) => { this.onData(data); });
                 }
-                this.sp.on('open', this.onPortOpen.bind(this));
-                this.sp.on('close', this.onPortClose.bind(this));
-                this.sp.on('error', (error) => { this.onPortError(error); });
-                this.sp.on('data', (data) => { this.onData(data); });
+                const start = Date.now();
+                this.state.connecting = true;
+                this.state.opening = { start, timeout: start + this.getTimeoutValue() };
+                this.logEvent({ message: "opening port ..." });
+                yield this.sp.open();
             }
-            const start = Date.now();
-            this.state.connecting = true;
-            this.state.opening = { start, timeout: start + this.getTimeoutValue() };
-            this.logEvent({ message: "opening port ..." });
-            this.sp.open();
-        }
-        catch (err) {
-            this.logEvent({ message: "scan:error:", error: err.message, stack: err.stack });
-            this.state.busy = false;
-        }
+            catch (err) {
+                this.logEvent({ message: "connect:error:", error: err.message, stack: err.stack });
+                this.state.busy = false;
+            }
+        });
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.saveClose();
-            yield this.saveConnect();
+            try {
+                yield this.saveClose();
+                yield this.saveConnect();
+            }
+            catch (_a) { }
         });
     }
     saveConnect() {
-        return new Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
             if (this.isConnected()) {
                 this.state.connecting = false;
                 return resolve(true);
             }
-            this.connect();
+            try {
+                yield this.connect();
+            }
+            catch (_a) { }
             const tTimeout = Date.now() + TIMEOUT_START;
             const iv = setInterval(() => {
-                if (this.state.error !== undefined) {
-                    clearInterval(iv);
-                    this.forceClose();
-                    reject(this.state.error);
-                    this.state = { opened: false, closed: true, busy: false };
-                }
-                else if (this.isConnected()) {
-                    this.state.connecting = false;
-                    resolve(true);
-                    clearInterval(iv);
-                }
-                else {
-                    if (Date.now() > tTimeout) {
-                        this.state.connecting = false;
+                try {
+                    if (this.state.error !== undefined) {
+                        clearInterval(iv);
                         this.forceClose();
+                        reject(this.state.error);
+                        this.state = { opened: false, closed: true, busy: false };
+                    }
+                    else if (this.isConnected()) {
+                        this.state.connecting = false;
+                        resolve(true);
                         clearInterval(iv);
-                        reject(new Error('timeout'));
+                    }
+                    else {
+                        if (Date.now() > tTimeout) {
+                            this.state.connecting = false;
+                            this.forceClose();
+                            clearInterval(iv);
+                            reject(new Error('timeout'));
+                        }
                     }
                 }
+                catch (_a) { }
             }, 100);
-        });
+        }));
     }
     onPortOpen() {
         this.error = undefined;
@@ -239,11 +250,14 @@ class Daum8i {
         this.error = error;
         if (this.blocked) {
             if (!this.state.closed) {
-                if (this.sp) {
-                    this.sp.removeAllListeners();
-                    this.sp.close();
-                    this.sp = undefined;
+                try {
+                    if (this.sp) {
+                        this.sp.removeAllListeners();
+                        this.sp.close();
+                        this.sp = undefined;
+                    }
                 }
+                catch (_a) { }
                 this.state = { opened: false, closed: true, busy: false };
             }
             return;
@@ -300,7 +314,10 @@ class Daum8i {
             sp.flush();
         }
         catch (_a) { }
-        sp.close();
+        try {
+            sp.close();
+        }
+        catch (_b) { }
         this.connected = false;
         if (updateState)
             this.state = { opened: false, closed: true, busy: false };

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "incyclist-devices",
-  "version": "1.5.21",
+  "version": "1.5.22",
   "dependencies": {
     "@serialport/parser-byte-length": "^9.0.1",
     "@serialport/parser-delimiter": "^9.0.1",
     "@types/serialport": "^8.0.1",
     "gd-ant-plus": "^0.0.33",
-    "incyclist-ant-plus": "^0.1.13",
+    "incyclist-ant-plus": "file:../ant-plus",
+    "incyclist-devices": "^1.5.21",
     "win32filetime": "^1.0.2"
   },
   "peerDependencies": {