incyclist-devices 2.0.7 → 2.0.9

package/lib/serial/daum/DaumAdapter.js

@@ -188,6 +188,10 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
         if (!this.logger)
             return;
         this.logger.logEvent(event);
+        const w = global.window;
+        if (w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) {
+            console.log('~~~ Serial', event);
+        }
     }
     stop() {
         if (this.stopped)

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

@@ -21,8 +21,8 @@ export default class DaumClassicAdapter extends DaumAdapter {
     check(): Promise<boolean>;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;
-    startRide(props: DaumClassicDeviceProperties): Promise<boolean>;
-    start(props: DaumClassicDeviceProperties): Promise<boolean>;
+    startRide(props?: DaumClassicDeviceProperties): Promise<boolean>;
+    start(props?: DaumClassicDeviceProperties): Promise<boolean>;
     launch(props: DaumClassicDeviceProperties, isRelaunch?: boolean): Promise<boolean>;
     performStart(props?: DaumClassicDeviceProperties, isRelaunch?: boolean): Promise<unknown>;
     getCurrentBikeData(): any;

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

@@ -82,9 +82,9 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             if (this.isStopped())
                 return false;
             return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                this.logger.logEvent({ message: "checking device", port: this.getPort() });
+                this.logEvent({ message: "checking device", port: this.getPort() });
                 const iv = setTimeout(() => __awaiter(this, void 0, void 0, function* () {
-                    this.logger.logEvent({ message: "checking device failed", port: this.getPort(), reason: 'timeout' });
+                    this.logEvent({ message: "checking device failed", port: this.getPort(), reason: 'timeout' });
                     resolve(false);
                 }), 5000);
                 try {
@@ -92,6 +92,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                     if (!connected) {
                         clearTimeout(iv);
                         resolve(false);
+                        return;
                     }
                     const address = (yield this.bike.getAddress()) || {};
                     info.bikeNo = address.bike;
@@ -101,11 +102,11 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                     this.setName('Daum ' + info.cockpit);
                     this.setID(info.serialNo);
                     clearTimeout(iv);
-                    this.logger.logEvent({ message: "checking device success", port: this.getPort(), info });
+                    this.logEvent({ message: "checking device success", port: this.getPort(), info });
                     resolve(true);
                 }
                 catch (err) {
-                    this.logger.logEvent({ message: "checking device failed", port: this.getPort(), reason: err.message || err });
+                    this.logEvent({ message: "checking device failed", port: this.getPort(), reason: err.message || err });
                     resolve(false);
                 }
             }));
@@ -131,16 +132,30 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             return resumed;
         });
     }
-    startRide(props) {
+    startRide(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'relaunch of device' });
-            return yield this.launch(props, true);
+            this.logEvent({ message: 'relaunch of device' });
+            try {
+                yield this.launch(props, true);
+                return true;
+            }
+            catch (err) {
+                this.logEvent({ message: 'start result: error', error: err.message });
+                throw err;
+            }
         });
     }
-    start(props) {
+    start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'initial start of device' });
-            return yield this.launch(props, false);
+            this.logEvent({ message: 'initial start of device' });
+            try {
+                yield this.launch(props, false);
+                return true;
+            }
+            catch (err) {
+                this.logEvent({ message: 'start result: error', error: err.message });
+                throw err;
+            }
         });
     }
     launch(props, isRelaunch = false) {
@@ -158,11 +173,11 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                     }
                     catch (_a) { }
                 }
-                this.logger.logEvent({ message: 'start result: success' });
+                this.logEvent({ message: 'start result: success' });
                 return true;
             }
             catch (err) {
-                this.logger.logEvent({ message: 'start result: error', error: err.message });
+                this.logEvent({ message: 'start result: error', error: err.message });
                 throw new Error(`could not start device, reason:${err.message}`);
             }
         });
@@ -176,9 +191,12 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
         let startState = {};
         return (0, utils_1.runWithRetries)(() => __awaiter(this, void 0, void 0, function* () {
             try {
-                this.logger.logEvent({ message: 'start attempt', isRelaunch, isConnected: this.bike.isConnected() });
-                if (!isRelaunch && !this.bike.isConnected())
-                    yield this.bike.saveConnect();
+                this.logEvent({ message: 'start attempt', isRelaunch, isConnected: this.bike.isConnected() });
+                if (!isRelaunch && !this.bike.isConnected()) {
+                    const connected = yield this.connect();
+                    if (!connected)
+                        throw new Error('Could not connect');
+                }
                 yield this.getBike().resetDevice();
                 if (!startState.setProg) {
                     yield this.getBike().setProg(0);
@@ -214,7 +232,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
                 return data;
             }
             catch (err) {
-                this.logger.logEvent({ message: 'start attempt failed', error: err.message });
+                this.logEvent({ message: 'start attempt failed', error: err.message });
                 if (startState.checkRunData) {
                     startState = {};
                 }

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

@@ -60,6 +60,10 @@ class Daum8008 {
     logEvent(e) {
         if (!this.isLoggingPaused)
             this.logger.logEvent(e);
+        const w = global.window;
+        if (w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) {
+            console.log('~~~ DaumClassic', e);
+        }
     }
     connect() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -67,8 +71,10 @@ class Daum8008 {
                 return true;
             }
             try {
+                this.logEvent({ message: 'connect attempt', port: this.portName });
                 const port = yield this.serial.openPort(this.portName);
                 if (port !== null) {
+                    this.logEvent({ message: 'connect success', port: this.portName });
                     this.connected = true;
                     this.sp = port;
                     this.sp.on('close', this.onPortClose.bind(this));
@@ -76,10 +82,12 @@ class Daum8008 {
                     return true;
                 }
                 else {
+                    this.logEvent({ message: 'connect failure' });
                     return false;
                 }
             }
-            catch (_a) {
+            catch (err) {
+                this.logEvent({ message: 'connect failure', reason: err.message });
                 return false;
             }
         });

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

@@ -44,6 +44,8 @@ export type DaumClassicUser = {
 };
 interface BikeData {
     cockpitVersion: number;
+    cockpitType: number;
+    serialNo: string;
     isPedalling: boolean;
     bikeType: number;
     person: DaumClassicUser;

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

@@ -77,6 +77,8 @@ class DaumClassicMockImpl {
 exports.DaumClassicMockImpl = DaumClassicMockImpl;
 const DEFAULT_BIKE_DATA = {
     cockpitVersion: 3,
+    serialNo: '4464:<;8',
+    cockpitType: 50,
     isPedalling: false,
     bikeType: 0,
     person: { weight: 75, length: 180, age: 30, sex: 0 }
@@ -208,7 +210,10 @@ class DaumClassicMockBinding extends binding_mock_1.MockPortBinding {
     onGetVersion(payload) {
         const bikeNo = payload.readUInt8(0);
         if (bikeNo >= 0 && bikeNo < 10) {
-            const response = Buffer.from([0x73, bikeNo, this.simulator.bikes[bikeNo].cockpitVersion]);
+            const { cockpitType, serialNo } = this.simulator.bikes[bikeNo] || {};
+            const response = Buffer.from([0x73, bikeNo, 0, 0, 0, 0, 0, 0, 0, 0, cockpitType]);
+            for (let i = 0; i < serialNo.length && i < 8; i++)
+                response.writeUInt8(serialNo.charCodeAt(i), i + 2);
             this.emitData(response);
         }
     }

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

@@ -158,7 +158,7 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
             }
             catch (err) {
                 this.logEvent({ message: 'start result: error', error: err.message });
-                throw new Error(`could not start device, reason:${err.message}`);
+                throw err;
             }
         });
     }
@@ -171,7 +171,7 @@ class DaumPremiumAdapter extends DaumAdapter_1.default {
             }
             catch (err) {
                 this.logEvent({ message: 'start result: error', error: err.message });
-                throw new Error(`could not start device, reason:${err.message}`);
+                throw err;
             }
         });
     }

package/package.json

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