incyclist-devices 2.1.26 → 2.1.29

package/lib/antv2/base/adapter.d.ts

@@ -62,7 +62,7 @@ export default class AntAdapter<TDeviceData extends BaseDeviceData> extends Incy
     reportStartStatus(): boolean;
     protected waitForInitialData(startupTimeout: any): Promise<void>;
     protected initSensor(props: any): Promise<boolean>;
-    start(props?: AntDeviceProperties): Promise<boolean>;
+    start(startProps?: AntDeviceProperties): Promise<boolean>;
     stop(): Promise<boolean>;
     startSensor(): Promise<boolean>;
     stopSensor(): Promise<void>;

package/lib/antv2/base/adapter.js

@@ -351,8 +351,9 @@ class AntAdapter extends adpater_1.default {
             }
         });
     }
-    start(props = {}) {
+    start(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
+            const props = this.getStartProps(startProps);
             const preCheckResult = yield this.startPreChecks(props);
             if (preCheckResult === 'done')
                 return this.started;
@@ -361,7 +362,7 @@ class AntAdapter extends adpater_1.default {
             this.logEvent({ message: 'starting device', device: this.getName(), props, isStarted: this.started });
             this.resetStartStatus();
             this.resetData();
-            const { startupTimeout = this.getDefaultStartupTimeout() } = props || {};
+            const { startupTimeout = this.getDefaultStartupTimeout() } = props;
             const retryDelay = this.getDefaultReconnectDelay();
             const totalTimeout = Math.min(startupTimeout + 10000, (startupTimeout + retryDelay) * MAX_RETRIES);
             const doStart = () => __awaiter(this, void 0, void 0, function* () {

package/lib/antv2/base/interface.js

@@ -33,8 +33,8 @@ class AntInterface extends events_1.default {
         this.connectPromise = null;
         this.channelsInUse = [];
         this.logEnabled = props.log || true;
-        const { binding, logger } = props;
-        this.setLogger(logger || new gd_eventlog_1.EventLogger('Ant+'));
+        const { binding } = props;
+        this.setLogger(new gd_eventlog_1.EventLogger('Ant+'));
         if (binding) {
             this.setBinding(binding);
         }

package/lib/base/adpater.d.ts

@@ -30,6 +30,7 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     isSame(adapter: IAdapter): boolean;
     isEqual(settings: DeviceSettings): boolean;
     getInterface(): string;
+    restart(pause?: number): Promise<boolean>;
     check(): Promise<boolean>;
     start(props?: DeviceProperties): Promise<boolean>;
     stop(): Promise<boolean>;
@@ -62,6 +63,7 @@ export default class IncyclistDevice<P extends DeviceProperties> extends EventEm
     isStarted(): boolean;
     isPaused(): boolean;
     getData(): IncyclistAdapterData;
+    getStartProps(startProps?: P): P;
     hasDataListeners(): boolean | OnDeviceDataCallback;
     onData(callback: OnDeviceDataCallback): void;
 }

package/lib/base/adpater.js

@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("../types");
 const events_1 = __importDefault(require("events"));
 const consts_1 = require("./consts");
+const utils_1 = require("../utils/utils");
 class IncyclistDevice extends events_1.default {
     constructor(settings, props) {
         super();
@@ -64,6 +65,16 @@ class IncyclistDevice extends events_1.default {
     getInterface() {
         return typeof this.settings.interface === 'string' ? this.settings.interface : this.settings.interface.getName();
     }
+    restart(pause) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const stopped = yield this.stop();
+            if (!stopped)
+                return false;
+            if (pause)
+                yield (0, utils_1.sleep)(pause);
+            return yield this.start();
+        });
+    }
     check() { throw new Error("Method not implemented."); }
     start(props) { throw new Error("Method not implemented."); }
     stop() { throw new Error("Method not implemented."); }
@@ -234,6 +245,11 @@ class IncyclistDevice extends events_1.default {
     getData() {
         return this.data;
     }
+    getStartProps(startProps) {
+        if (startProps)
+            this.props = startProps;
+        return startProps || {};
+    }
     hasDataListeners() {
         return this.onDataFn || this.listenerCount('data') > 0;
     }

package/lib/ble/base/adapter.d.ts

@@ -34,7 +34,7 @@ export default class BleAdapter<TDeviceData extends BleDeviceData, TDevice exten
     setProperties(props: BleDeviceProperties): void;
     check(): Promise<boolean>;
     startPreChecks(props: BleStartProperties): Promise<'done' | 'connected' | 'connection-failed'>;
-    start(props?: BleStartProperties): Promise<boolean>;
+    start(startProps?: BleStartProperties): Promise<boolean>;
     stop(): Promise<boolean>;
     pause(): Promise<boolean>;
     resume(): Promise<boolean>;

package/lib/ble/base/adapter.js

@@ -164,9 +164,10 @@ class BleAdapter extends adpater_1.default {
             return 'connected';
         });
     }
-    start(props = {}) {
+    start(startProps) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const props = this.getStartProps(startProps);
             const preCheckResult = yield this.startPreChecks(props);
             if (preCheckResult === 'done')
                 return this.started;

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

@@ -40,7 +40,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     check(): Promise<boolean>;
     performCheck(): Promise<boolean>;
     waitForPrevStartFinished(): Promise<void>;
-    start(props?: P): Promise<boolean>;
+    start(startProps?: P): Promise<boolean>;
     performStart(props?: P, isRelaunch?: boolean, wasPaused?: boolean): Promise<boolean>;
     startUpdatePull(): void;
     protected cleanupInterval(): void;
@@ -56,7 +56,7 @@ export default class DaumAdapter<S extends SerialDeviceSettings, P extends Devic
     sendRequests(): Promise<void>;
     bikeSync(): Promise<void>;
     updateData(bikeData: IncyclistBikeData): IncyclistBikeData;
-    transformData(cyclingData: IncyclistBikeData): IncyclistAdapterData;
+    transformData(cyclingData: IncyclistBikeData, fromBike?: boolean): IncyclistAdapterData;
     sendRequest(request: any): Promise<any>;
     refreshRequests(): void;
     processClientRequest(request: any): Promise<unknown>;

package/lib/serial/daum/DaumAdapter.js

@@ -183,9 +183,10 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             }
         });
     }
-    start(props) {
+    start(startProps) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const props = this.getStartProps(startProps);
             yield this.waitForPrevCheckFinished();
             yield this.waitForPrevStartFinished();
             const isRelaunch = this.started;
@@ -197,7 +198,8 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                     this.resume(false);
                     wasPaused = true;
                 }
-                this.startPromise = this.performStart(props, isRelaunch, wasPaused).then((started) => __awaiter(this, void 0, void 0, function* () {
+                const p = Object.keys(props).length ? props : undefined;
+                this.startPromise = this.performStart(p, isRelaunch, wasPaused).then((started) => __awaiter(this, void 0, void 0, function* () {
                     if (!started) {
                         this.logEvent({ message: 'start result: not started' });
                         this.started = false;
@@ -380,7 +382,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
                 try {
                     this.logEvent({ message: 'bike update error', port: this.getPort(), error: err.message, stack: err.stack });
                     const incyclistData = this.updateData(this.deviceData);
-                    this.transformData(incyclistData);
+                    this.transformData(incyclistData, false);
                 }
                 catch (_a) { }
                 this.updateBusy = false;
@@ -443,7 +445,7 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
         this.deviceData = this.getCyclingMode().updateData(data);
         return this.deviceData;
     }
-    transformData(cyclingData) {
+    transformData(cyclingData, fromBike = true) {
         let distance = 0;
         if (this.distanceInternal !== undefined && cyclingData.distanceInternal !== undefined) {
             distance = cyclingData.distanceInternal - this.distanceInternal;
@@ -457,10 +459,10 @@ class DaumAdapter extends adapter_1.SerialIncyclistDevice {
             cadence: (0, utils_1.intVal)(cyclingData.pedalRpm),
             heartrate: (0, utils_1.intVal)(cyclingData.heartrate),
             distance,
-            timestamp: Date.now(),
             deviceTime: cyclingData.time,
             deviceDistanceCounter: cyclingData.distanceInternal
         };
+        data.timestamp = fromBike ? Date.now() : this.data.timestamp;
         this.data = data;
         return data;
     }

package/lib/serial/kettler/ergo-racer/adapter.d.ts

@@ -64,7 +64,7 @@ export default class KettlerRacerAdapter extends SerialIncyclistDevice<DevicePro
     parseExtendedStatus(data: string): KettlerExtendedBikeData;
     parseStatus(data: string): KettlerBikeData;
     check(): Promise<boolean>;
-    start(props?: any): Promise<boolean>;
+    start(startProps?: any): Promise<boolean>;
     startUpdatePull(): void;
     canEmitData(): boolean;
     stop(): Promise<boolean>;

package/lib/serial/kettler/ergo-racer/adapter.js

@@ -271,8 +271,9 @@ class KettlerRacerAdapter extends adapter_1.SerialIncyclistDevice {
             }));
         });
     }
-    start(props) {
+    start(startProps) {
         return __awaiter(this, void 0, void 0, function* () {
+            const props = this.getStartProps(startProps);
             this.logEvent({ message: 'start()' });
             var info = {};
             yield this.waitForOpened(true);

package/package.json

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