incyclist-devices 1.5.33 → 1.5.35

package/lib/cycling-mode.d.ts

@@ -7,6 +7,7 @@ export declare type UpdateRequest = {
     targetPowerDelta?: number;
     reset?: boolean;
     refresh?: boolean;
+    init?: boolean;
 };
 export declare enum CyclingModeProperyType {
     Integer = "Integer",

package/lib/daum/ERGCyclingMode.js

@@ -36,7 +36,7 @@ class ERGCyclingMode extends power_base_1.default {
     }
     getBikeInitRequest() {
         const startPower = this.getSetting('startPower');
-        return { targetPower: startPower };
+        return { targetPower: startPower, init: true };
     }
     sendBikeUpdate(request) {
         const getData = () => {
@@ -79,40 +79,42 @@ class ERGCyclingMode extends power_base_1.default {
             }
             if (request.refresh) {
                 delete request.refresh;
-                if (this.prevRequest !== undefined && !this.event.gearUpdated && !this.event.rpmUpdated) {
+                if (this.prevRequest !== undefined && this.prevRequest.targetPower !== undefined && !this.event.gearUpdated && !this.event.rpmUpdated) {
                     newRequest.targetPower = this.prevRequest.targetPower;
                 }
-                else {
+                else if (this.event.gearUpdated || this.event.rpmUpdated) {
                     newRequest.targetPower = this.calculateTargetPower(request);
                 }
-                if (this.prevRequest !== undefined && Object.keys(this.prevRequest).length > 0) {
+                else if (this.prevRequest !== undefined && Object.keys(this.prevRequest).length > 0) {
                     request = Object.assign({}, this.prevRequest);
                 }
                 else {
                     newRequest.targetPower = this.calculateTargetPower(request);
                 }
             }
-            if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
-                request.targetPower = request.maxPower;
-            }
-            if (request.targetPower === undefined) {
-                newRequest.targetPower = this.calculateTargetPower(request);
-            }
             else {
-                newRequest.targetPower = request.targetPower;
-            }
-            delete request.slope;
-            if (request.maxPower !== undefined) {
-                if (newRequest.targetPower !== undefined && newRequest.targetPower > request.maxPower) {
-                    newRequest.targetPower = request.maxPower;
+                if (request.maxPower !== undefined && request.minPower !== undefined && request.maxPower === request.minPower) {
+                    request.targetPower = request.maxPower;
                 }
-                newRequest.maxPower = request.maxPower;
-            }
-            if (request.minPower !== undefined) {
-                if (newRequest.targetPower !== undefined && newRequest.targetPower < request.minPower) {
-                    newRequest.targetPower = request.minPower;
+                if (request.targetPower === undefined) {
+                    newRequest.targetPower = this.calculateTargetPower(request);
+                }
+                else {
+                    newRequest.targetPower = request.targetPower;
+                }
+                delete request.slope;
+                if (request.maxPower !== undefined) {
+                    if (newRequest.targetPower !== undefined && newRequest.targetPower > request.maxPower) {
+                        newRequest.targetPower = request.maxPower;
+                    }
+                    newRequest.maxPower = request.maxPower;
+                }
+                if (request.minPower !== undefined) {
+                    if (newRequest.targetPower !== undefined && newRequest.targetPower < request.minPower) {
+                        newRequest.targetPower = request.minPower;
+                    }
+                    newRequest.minPower = request.minPower;
                 }
-                newRequest.minPower = request.minPower;
             }
             if (newRequest.targetPower !== undefined && prevData.power !== undefined && newRequest.targetPower === prevData.power) {
                 delete newRequest.targetPower;
@@ -122,6 +124,8 @@ class ERGCyclingMode extends power_base_1.default {
         catch (err) {
             this.logger.logEvent({ message: "error", fn: 'sendBikeUpdate()', error: err.message || err, stack: err.stack });
         }
+        this.event.gearUpdated = false;
+        this.event.rpmUpdated = false;
         return newRequest;
     }
     updateData(bikeData) {
@@ -132,7 +136,7 @@ class ERGCyclingMode extends power_base_1.default {
         const bikeType = this.getSetting('bikeType').toLowerCase();
         delete this.event.gearUpdated;
         delete this.event.rpmUpdated;
-        if (prevData === {} || prevData.speed === undefined || prevData.speed === 0) {
+        if (Object.keys(prevData).length === 0 || prevData.speed === undefined || prevData.speed === 0) {
             this.event.starting = true;
             this.event.tsStart = Date.now();
         }

package/lib/daum/premium/bike.js

@@ -143,8 +143,8 @@ class Daum8i {
                         this.logEvent({ message: "creating SerialPort", port: this.port, settings });
                         this.sp = new __SerialPort(this.port, settings);
                     }
-                    this.sp.once('open', this.onPortOpen.bind(this));
-                    this.sp.once('close', this.onPortClose.bind(this));
+                    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); });
                 }
@@ -317,10 +317,15 @@ class Daum8i {
                     if (!isClosed)
                         resolve(false);
                 }, timeout);
-                this.sp.removeAllListeners('close');
-                this.sp.removeAllListeners('error');
+                try {
+                    this.sp.removeAllListeners('close');
+                    this.sp.removeAllListeners('error');
+                }
+                catch (err) {
+                    this.logger.logEvent({ message: 'error', fn: 'closePort()', error: err.message });
+                }
                 this.sp.on('error', () => { });
-                this.sp.once('close', () => {
+                this.sp.on('close', () => {
                     clearTimeout(to);
                     isClosed = true;
                     resolve(true);

package/package.json

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