incyclist-devices 2.1.9 → 2.1.11

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

@@ -1,15 +1,23 @@
+/// <reference types="node" />
+/// <reference types="node" />
 import { IncyclistAdapterData, ControllerConfig, IAdapter, DeviceProperties, IncyclistBikeData } from '../../types';
 import { SerialDeviceSettings } from "../types";
 import { DaumSerialComms } from './types';
 import { SerialIncyclistDevice } from '../base/adapter';
 import SerialInterface from '../base/serial-interface';
+import EventEmitter from 'events';
 export default class DaumAdapter<S extends SerialDeviceSettings, P extends DeviceProperties, C extends DaumSerialComms> extends SerialIncyclistDevice<P> {
     protected static controllers: ControllerConfig;
     comms: C;
     distanceInternal: number;
     deviceData: IncyclistBikeData;
     requests: Array<any>;
-    iv: any;
+    iv: {
+        sync: NodeJS.Timeout;
+        update: NodeJS.Timeout;
+        emitter: EventEmitter;
+        stopRequested?: boolean;
+    };
     tsPrevData: number;
     adapterTime: number;
     requestBusy: boolean;
@@ -27,7 +35,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     isStopped(): boolean;
     initData(): void;
     pause(): Promise<boolean>;
-    resume(): Promise<boolean>;
+    resume(startUpdatePull?: boolean): Promise<boolean>;
     waitForPrevCheckFinished(): Promise<void>;
     check(): Promise<boolean>;
     performCheck(): Promise<boolean>;
@@ -35,7 +43,8 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     start(props?: P): Promise<boolean>;
     performStart(props?: P, isRelaunch?: boolean, wasPaused?: boolean): Promise<boolean>;
     startUpdatePull(): void;
-    stopUpdatePull(): void;
+    protected cleanupInterval(): void;
+    stopUpdatePull(): Promise<void>;
     connect(): Promise<boolean>;
     close(): Promise<boolean>;
     verifyConnection(): Promise<void>;

package/lib/serial/daum/DaumAdapter.js

@@ -18,6 +18,7 @@ const types_1 = require("../../types");
 const adapter_1 = require("../base/adapter");
 const daum_smarttrainer_1 = __importDefault(require("../../modes/daum-smarttrainer"));
 const daum_power_1 = __importDefault(require("../../modes/daum-power"));
+const events_1 = __importDefault(require("events"));
 class DaumAdapter extends adapter_1.SerialIncyclistDevice {
     constructor(settings, props) {
         super(settings, props);
@@ -114,12 +115,13 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         });
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            yield this.stopUpdatePull();
             const paused = yield _super.pause.call(this);
             (_a = this.comms) === null || _a === void 0 ? void 0 : _a.pauseLogging();
             return paused;
         });
     }
-    resume() {
+    resume(startUpdatePull = true) {
         const _super = Object.create(null, {
             resume: { get: () => super.resume }
         });
@@ -127,6 +129,8 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         return __awaiter(this, void 0, void 0, function* () {
             const resumed = yield _super.resume.call(this);
             (_a = this.comms) === null || _a === void 0 ? void 0 : _a.resumeLogging();
+            if (startUpdatePull)
+                yield this.startUpdatePull();
             return resumed;
         });
     }
@@ -190,7 +194,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             try {
                 let wasPaused = false;
                 if (isRelaunch && this.isPaused()) {
-                    this.resume();
+                    this.resume(false);
                     wasPaused = true;
                 }
                 this.startPromise = this.performStart(props, isRelaunch, wasPaused).then((started) => __awaiter(this, void 0, void 0, function* () {
@@ -244,17 +248,34 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         }, this.pullFrequency);
         this.iv = {
             sync: ivSync,
-            update: ivUpdate
+            update: ivUpdate,
+            emitter: new events_1.default()
         };
+        this.iv.emitter.once('stop', () => {
+            this.iv.stopRequested = true;
+        });
     }
-    stopUpdatePull() {
-        if (!this.iv)
-            return;
-        this.logEvent({ message: 'stop update pull', port: this.getPort() });
+    cleanupInterval() {
         clearInterval(this.iv.sync);
         clearInterval(this.iv.update);
+        this.iv.emitter.removeAllListeners();
         this.iv = undefined;
     }
+    stopUpdatePull() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.iv || !this.iv.emitter)
+                return;
+            return new Promise(done => {
+                this.iv.emitter.on('stop-done', () => {
+                    this.logEvent({ message: 'stop update pull done', port: this.getPort() });
+                    this.cleanupInterval();
+                    done();
+                });
+                this.iv.emitter.emit('stop');
+                this.logEvent({ message: 'stop update pull', port: this.getPort() });
+            });
+        });
+    }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.comms)
@@ -318,7 +339,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             if (this.paused)
                 this.resume();
             try {
-                this.stopUpdatePull();
+                yield this.stopUpdatePull();
                 yield this.comms.close();
                 this.logEvent({ message: 'stop request completed' });
                 this.stopped = true;
@@ -389,9 +410,15 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         });
     }
     bikeSync() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.sendRequests();
-            yield this.update();
+            if (!((_a = this.iv) === null || _a === void 0 ? void 0 : _a.stopRequested))
+                yield this.sendRequests();
+            if (!((_b = this.iv) === null || _b === void 0 ? void 0 : _b.stopRequested))
+                yield this.update();
+            if ((_c = this.iv) === null || _c === void 0 ? void 0 : _c.stopRequested) {
+                this.iv.emitter.emit('stop-done', 'bikeSync');
+            }
         });
     }
     updateData(bikeData) {

package/package.json

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