incyclist-devices 2.0.27 → 2.0.29

package/lib/antv2/adapter.d.ts

@@ -33,6 +33,7 @@ export default class AntAdapter<TDeviceData extends BaseDeviceData, TData> exten
     protected dataMsgCount: number;
     protected ivWaitForData: NodeJS.Timeout;
     constructor(settings: AntDeviceSettings, props?: DeviceProperties);
+    logEvent(event: any): void;
     createSensor(settings: AntDeviceSettings): ISensor;
     isEqual(settings: AntDeviceSettings): boolean;
     connect(): Promise<boolean>;

package/lib/antv2/adapter.js

@@ -63,6 +63,16 @@ class AntAdapter extends adpater_1.default {
         this.channel = undefined;
         this.ant = ant_interface_1.default.getInstance();
     }
+    logEvent(event) {
+        if (!this.logger || this.paused)
+            return;
+        this.logger.logEvent(event);
+        const w = global.window;
+        if ((w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) || process.env.BLE_DEBUG || process.env.ANT_DEBUG) {
+            const logText = '~~~ ANT:' + this.logger.getName();
+            console.log(logText, event);
+        }
+    }
     createSensor(settings) {
         throw new Error('Method not implemented.');
     }

package/lib/antv2/fe/adapter.js

@@ -90,7 +90,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
             const update = isReset ? this.getCyclingMode().getBikeInitRequest() : this.getCyclingMode().sendBikeUpdate(request);
             if (!update)
                 return;
-            this.logger.logEvent({ message: 'send bike update requested', update, request });
+            this.logEvent({ message: 'send bike update requested', update, request });
             try {
                 const fe = this.sensor;
                 if (update.slope !== undefined) {
@@ -107,7 +107,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                         yield this.reconnect();
                     }
                 }
-                this.logger.logEvent({ message: 'sendBikeUpdate() error', error: err.message });
+                this.logEvent({ message: 'sendBikeUpdate() error', error: err.message });
             }
         });
     }
@@ -122,7 +122,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
         }
         try {
             const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
-            this.logger.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused });
+            this.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused });
             if (!this.canSendUpdate())
                 return;
             let incyclistData = this.mapToCycleModeData(deviceData);
@@ -131,7 +131,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
             this.emitData(this.data);
         }
         catch (err) {
-            this.logger.logEvent({ message: 'error', fn: 'onDeviceData()', error: err.message || err, stack: err.stack });
+            this.logEvent({ message: 'error', fn: 'onDeviceData()', error: err.message || err, stack: err.stack });
         }
     }
     canSendUpdate() {
@@ -274,7 +274,7 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                             }
                         }
                         catch (err) {
-                            this.logger.logEvent({ message: 'sending FE message error', error: err.message });
+                            this.logEvent({ message: 'sending FE message error', error: err.message });
                             this.started = false;
                         }
                         success = status.userSent && status.slopeSent;
@@ -318,18 +318,18 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
     }
     reconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logger.logEvent({ message: 'reconnect to device' });
+            this.logEvent({ message: 'reconnect to device' });
             this.isReconnecting = true;
             try {
                 yield this.stop();
                 yield this.start(this.startProps);
                 this.started = true;
                 this.isReconnecting = false;
-                this.logger.logEvent({ message: 'reconnect success' });
+                this.logEvent({ message: 'reconnect success' });
                 return true;
             }
             catch (err) {
-                this.logger.logEvent({ message: 'reconnect failed' });
+                this.logEvent({ message: 'reconnect failed' });
                 this.isReconnecting = false;
                 return false;
             }

package/lib/antv2/hr/adapter.js

@@ -57,6 +57,8 @@ class AntHrAdapter extends adapter_1.default {
             if (!this.canSendUpdate())
                 return;
             this.logEvent({ message: 'onDeviceData', data: deviceData });
+            if (this.paused)
+                return;
             this.mapData(deviceData);
             this.emitData(this.data);
         }

package/lib/base/adpater.js

@@ -67,7 +67,7 @@ class IncyclistDevice extends events_1.default {
         this.logger.logEvent(event);
         const w = global.window;
         if ((w === null || w === void 0 ? void 0 : w.DEVICE_DEBUG) || process.env.BLE_DEBUG || process.env.ANT_DEBUG) {
-            const logText = '~~~ ' + this.getInterface().toUpperCase();
+            const logText = '~~~ ' + this.logger.getName();
             console.log(logText, event);
         }
     }

package/lib/serial/daum/DaumAdapter.js

@@ -148,7 +148,7 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
         this.iv = undefined;
     }
     startUpdatePull() {
-        this.logger.logEvent({ message: 'start update pull', iv: this.iv, ignoreBike: this.ignoreBike, ignoreHrm: this.ignoreHrm, ignorePower: this.ignorePower });
+        this.logEvent({ message: 'start update pull', iv: this.iv, ignoreBike: this.ignoreBike, ignoreHrm: this.ignoreHrm, ignorePower: this.ignorePower });
         if (this.iv)
             return;
         if (this.ignoreBike && this.ignoreHrm && this.ignorePower)
@@ -235,13 +235,11 @@ class DaumAdapterBase extends adapter_1.SerialIncyclistDevice {
     }
     update() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logEvent({ message: 'bike update request', stopped: this.stopped, updateBusy: this.updateBusy });
             if (this.stopped)
                 return;
             this.updateBusy = true;
             this.getCurrentBikeData()
                 .then(bikeData => {
-                this.logEvent({ message: 'bike data', data: bikeData });
                 const incyclistData = this.updateData(this.cyclingData, bikeData);
                 const data = this.transformData(incyclistData);
                 this.updateBusy = false;

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

@@ -38,7 +38,7 @@ export default class Daum8008 {
     getPort(): string;
     isConnected(): boolean;
     pauseLogging(): void;
-    resumLogging(): void;
+    resumeLogging(): void;
     logEvent(e: any): void;
     connect(): Promise<boolean>;
     close(): Promise<void>;

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

@@ -52,7 +52,7 @@ class Daum8008 {
     pauseLogging() {
         this.isLoggingPaused = true;
     }
-    resumLogging() {
+    resumeLogging() {
         this.isLoggingPaused = false;
     }
     logEvent(e) {

package/package.json

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