incyclist-devices 2.0.25 → 2.0.27

package/lib/serial/daum/DaumAdapter.d.ts

@@ -50,7 +50,7 @@ export default class DaumAdapterBase extends SerialIncyclistDevice implements Da
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
     updateData(prev: any, bikeData: any): IncyclistBikeData;
-    transformData(): DeviceData;
+    transformData(cyclingData: IncyclistBikeData): DeviceData;
     sendRequest(request: any): Promise<any>;
     refreshRequests(): void;
     processClientRequest(request: any): Promise<unknown>;

package/lib/serial/daum/DaumAdapter.js

@@ -148,6 +148,7 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
         this.iv = undefined;
     }
     startUpdatePull() {
+        this.logger.logEvent({ message: 'start update pull', iv: this.iv, ignoreBike: this.ignoreBike, ignoreHrm: this.ignoreHrm, ignorePower: this.ignorePower });
         if (this.iv)
             return;
         if (this.ignoreBike && this.ignoreHrm && this.ignorePower)
@@ -234,21 +235,23 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
     }
     update() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: 'bike update request', stopped: this.stopped, updateBusy: this.updateBusy });
             if (this.stopped)
                 return;
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
-                this.updateData(this.cyclingData, bikeData);
-                const data = this.transformData();
+                this.logEvent({ message: 'bike data', data: bikeData });
+                const incyclistData = this.updateData(this.cyclingData, bikeData);
+                const data = this.transformData(incyclistData);
                 this.updateBusy = false;
                 this.emitData(data);
             })
                 .catch(err => {
                 this.logEvent({ message: 'bike update error', error: err.message, stack: err.stack });
                 const { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope } = this.cyclingData;
-                this.updateData(this.cyclingData, { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope });
-                this.transformData();
+                const incyclistData = this.updateData(this.cyclingData, { isPedalling, power, pedalRpm, speed, distanceInternal, heartrate, slope });
+                this.transformData(incyclistData);
                 this.updateBusy = false;
             });
         });
@@ -286,7 +289,7 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
             if (this.updateBusy || this.requestBusy) {
                 return;
             }
-            this.logEvent({ message: 'bikeSync' });
+            this.logEvent({ message: 'bikeSync', ignoreBike: this.ignoreBike });
             if (!this.ignoreBike) {
                 yield this.sendRequests();
             }
@@ -308,25 +311,23 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
         this.cyclingData = this.getCyclingMode().updateData(data);
         return this.cyclingData;
     }
-    transformData() {
-        if (this.cyclingData === undefined)
-            return;
+    transformData(cyclingData) {
         let distance = 0;
-        if (this.distanceInternal !== undefined && this.cyclingData.distanceInternal !== undefined) {
-            distance = this.cyclingData.distanceInternal - this.distanceInternal;
+        if (this.distanceInternal !== undefined && cyclingData.distanceInternal !== undefined) {
+            distance = cyclingData.distanceInternal - this.distanceInternal;
         }
-        if (this.cyclingData.distanceInternal !== undefined)
-            this.distanceInternal = this.cyclingData.distanceInternal;
+        if (cyclingData.distanceInternal !== undefined)
+            this.distanceInternal = cyclingData.distanceInternal;
         let data = {
-            speed: this.cyclingData.speed,
-            slope: this.cyclingData.slope,
-            power: (0, utils_1.intVal)(this.cyclingData.power),
-            cadence: (0, utils_1.intVal)(this.cyclingData.pedalRpm),
-            heartrate: (0, utils_1.intVal)(this.cyclingData.heartrate),
+            speed: cyclingData.speed || 0,
+            slope: cyclingData.slope,
+            power: (0, utils_1.intVal)(cyclingData.power || 0),
+            cadence: (0, utils_1.intVal)(cyclingData.pedalRpm),
+            heartrate: (0, utils_1.intVal)(cyclingData.heartrate),
             distance,
             timestamp: Date.now(),
-            deviceTime: this.cyclingData.time,
-            deviceDistanceCounter: this.cyclingData.distanceInternal
+            deviceTime: cyclingData.time,
+            deviceDistanceCounter: cyclingData.distanceInternal
         };
         if (this.ignoreHrm)
             delete data.heartrate;

package/lib/serial/daum/classic/adapter.d.ts

@@ -9,6 +9,8 @@ export default class DaumClassicAdapter extends DaumAdapter {
     static NAME: string;
     name: string;
     id: string;
+    started: boolean;
+    startPromise: Promise<unknown>;
     constructor(settings: SerialDeviceSettings, props?: DeviceProperties);
     setID(id: any): void;
     getID(): string;

package/lib/serial/daum/classic/adapter.js

@@ -45,9 +45,12 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
         this.ignoreHrm = false;
         this.ignorePower = false;
         this.ignoreBike = false;
+        this.stopped = false;
+        this.started = false;
         this.paused = undefined;
         this.iv = undefined;
         this.distanceInternal = undefined;
+        this.startPromise = undefined;
         this.initData();
     }
     setID(id) {
@@ -147,9 +150,11 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
     }
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logEvent({ message: 'initial start of device' });
+            const isRelaunch = this.started;
+            const message = isRelaunch ? 'relaunch of device' : 'initial start of device';
+            this.logEvent({ message });
             try {
-                yield this.launch(props, false);
+                yield this.launch(props, isRelaunch);
                 return true;
             }
             catch (err) {
@@ -161,10 +166,18 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
     launch(props, isRelaunch = false) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (isRelaunch) {
-                    yield this.stop();
+                if (!this.startPromise) {
+                    if (isRelaunch) {
+                        yield this.stop();
+                        this.bike.resumeLogging();
+                    }
+                    this.startPromise = this.performStart(props, isRelaunch);
+                }
+                else {
+                    this.logEvent({ message: 'start already ongoing' });
                 }
-                yield this.performStart(props, isRelaunch);
+                yield this.startPromise;
+                this.startPromise = undefined;
                 if (!isRelaunch) {
                     try {
                         const version = yield this.bike.getVersion();
@@ -174,10 +187,13 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                     catch (_a) { }
                 }
                 this.logEvent({ message: 'start result: success' });
+                this.started = true;
                 return true;
             }
             catch (err) {
                 this.logEvent({ message: 'start result: error', error: err.message });
+                this.startPromise = undefined;
+                this.started = false;
                 throw new Error(`could not start device, reason:${err.message}`);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.0.25",
+  "version": "2.0.27",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",