incyclist-devices 2.1.14 → 2.1.15

package/lib/serial/base/comms.d.ts

@@ -58,6 +58,7 @@ export default class SerialPortComms<T extends CommsState, C extends Request, R
     onData(data: any, depth?: number): Promise<void>;
     send(command: C): Promise<R>;
     portWrite(buffer: Buffer): Promise<void>;
+    portRead(size?: number): Promise<any>;
     write(buffer: Buffer): Promise<void>;
     ensurePrevCmdFinish(logPayload: any): Promise<void>;
     ensureConnection(): Promise<void>;

package/lib/serial/base/comms.js

@@ -240,6 +240,15 @@ class SerialPortComms {
             }
         });
     }
+    portRead(size) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.sp) {
+                this.logEvent({ message: 'write failed', error: 'port is not opened' });
+                return;
+            }
+            return yield this.sp.read(size);
+        });
+    }
     write(buffer) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.writePromise) {

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

@@ -105,21 +105,22 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                 if (!isRelaunch && !this.getComms().isConnected()) {
                     yield this.verifyConnection();
                 }
-                yield this.getComms().resetDevice();
-                if (!startState.setProg) {
+                if (!wasPaused)
+                    yield this.getComms().resetDevice();
+                if (!wasPaused && !startState.setProg) {
                     yield this.getComms().setProg(0);
                     startState.setProg = true;
                 }
-                if (!startState.setPerson) {
+                if (!wasPaused && !startState.setPerson) {
                     yield this.getComms().setPerson(user);
                     startState.setPerson = true;
                 }
-                if (!startState.setBikeType) {
+                if (!wasPaused && !startState.setBikeType) {
                     const bikeType = this.getCyclingMode().getSetting('bikeType') || 'race';
                     yield this.getComms().setBikeType(bikeType.toLowerCase());
                     startState.setBikeType = true;
                 }
-                if (!startState.startProg) {
+                if (!wasPaused && !startState.startProg) {
                     yield this.getComms().startProg();
                     startState.startProg = true;
                 }

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

@@ -6,6 +6,7 @@ import { DeviceType, IncyclistBikeData, User } from '../../../types';
 export default class Daum8008 extends SerialPortComms<DaumClassicCommsState, DaumClassicRequest, DaumClassicResponse> implements DaumSerialComms {
     protected bikeNo: number;
     protected prevFailedPayload: any;
+    protected expected: any;
     constructor(props: SerialCommProps);
     validatePath(path: string): string;
     getDefaultLoggerName(): string;

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

@@ -22,6 +22,7 @@ class Daum8008 extends comms_1.default {
     constructor(props) {
         super(props);
         this.bikeNo = 0;
+        this.expected = undefined;
     }
     validatePath(path) {
         return path;
@@ -36,19 +37,7 @@ class Daum8008 extends comms_1.default {
     }
     initForResponse(expected) {
         return __awaiter(this, void 0, void 0, function* () {
-            const parser = this.portPipe(new ByteLength({ length: expected }));
-            if (!parser)
-                return;
-            const onDataHandler = (data) => {
-                if (data.length < expected) {
-                    this.logEvent({ message: 'Partial response', data: Buffer.from(data).toString('hex') });
-                    return;
-                }
-                this.portUnpipe();
-                parser.off('data', onDataHandler);
-                this.recvState.data.enqueue({ type: 'Response', data });
-            };
-            parser.on('data', onDataHandler);
+            this.expected = expected;
         });
     }
     waitForResponse() {
@@ -58,10 +47,9 @@ class Daum8008 extends comms_1.default {
             let start = Date.now();
             let tsTimeout = start + timeout;
             while (waitingForResponse && Date.now() < tsTimeout) {
-                const response = this.recvState.data.dequeue();
-                if (response) {
-                    return response;
-                }
+                const data = yield this.portRead(this.expected);
+                if (data)
+                    return { type: 'Response', data };
                 yield (0, utils_1.sleep)(5);
             }
             throw new types_1.ResponseTimeout();

package/package.json

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