incyclist-devices 2.0.7 → 2.0.8

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

@@ -131,16 +131,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);
+            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);
+            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) {
@@ -178,7 +192,7 @@ class DaumClassicAdapter extends DaumAdapter_1.default {
             try {
                 this.logger.logEvent({ message: 'start attempt', isRelaunch, isConnected: this.bike.isConnected() });
                 if (!isRelaunch && !this.bike.isConnected())
-                    yield this.bike.saveConnect();
+                    yield this.connect();
                 yield this.getBike().resetDevice();
                 if (!startState.setProg) {
                     yield this.getBike().setProg(0);

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.8",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",