incyclist-devices 2.0.23 → 2.0.25

package/lib/antv2/adapter.js

@@ -193,8 +193,9 @@ class AntAdapter extends adpater_1.default {
     }
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.started)
+            if (this.started && !this.stopped)
                 return true;
+            this.stopped = false;
             const connected = yield this.connect();
             if (!connected)
                 throw new Error(`could not start device, reason:could not connect`);

package/lib/antv2/ant-interface.js

@@ -266,12 +266,12 @@ class AntInterface extends events_1.default {
                     return stopped;
                 }
                 catch (err) {
-                    this.logEvent({ message: 'could not stop sensor', error: err.message || err, stack: err.stack });
+                    this.logEvent({ message: 'could not stop sensor', error: err.message || err, deviceID: sensor.getDeviceID(), stack: err.stack });
                     return false;
                 }
             }
             else {
-                this.logEvent({ message: 'could not stop sensor', error: 'no channel attached' });
+                this.logEvent({ message: 'could not stop sensor', deviceID: sensor.getDeviceID(), error: 'no channel attached' });
                 return false;
             }
         });

package/lib/antv2/fe/adapter.js

@@ -115,14 +115,14 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
         this.dataMsgCount++;
         this.lastDataTS = Date.now();
         super.onDeviceData(deviceData);
-        if (!this.started || this.isStopped() || this.paused)
+        if (!this.started || this.isStopped())
             return;
         if (!this.ivDataTimeout && this.dataMsgCount > 0) {
             this.startDataTimeoutCheck();
         }
         try {
             const logData = this.getLogData(deviceData, ['PairedDevices', 'RawData']);
-            this.logger.logEvent({ message: 'onDeviceData', data: logData });
+            this.logger.logEvent({ message: 'onDeviceData', data: logData, paused: this.paused });
             if (!this.canSendUpdate())
                 return;
             let incyclistData = this.mapToCycleModeData(deviceData);
@@ -181,10 +181,13 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
     start(props) {
         return __awaiter(this, void 0, void 0, function* () {
             const wasPaused = this.paused;
+            const wasStopped = this.stopped;
             this.startProps = props || {};
             if (wasPaused)
                 this.resume();
-            if (this.started && !wasPaused) {
+            if (wasStopped)
+                this.stopped = false;
+            if (this.started && !wasPaused && !wasStopped) {
                 return true;
             }
             const connected = yield this.connect();
@@ -281,13 +284,14 @@ class AntFEAdapter extends adapter_1.ControllableAntAdapter {
                     }
                 }
                 if (success) {
-                    this.logEvent({ message: 'start success' });
+                    this.logEvent({ message: 'ANT FE start success' });
                     this.started = true;
+                    this.paused = false;
                     stopTimeoutCheck();
                     resolve(true);
                 }
                 else {
-                    this.logEvent({ message: 'start failed' });
+                    this.logEvent({ message: 'ANT FE start failed' });
                     stopTimeoutCheck();
                     if (!hasData) {
                         reject(new Error('could not start device, reason: no data received'));

package/lib/antv2/pwr/adapter.js

@@ -149,9 +149,12 @@ class AntPwrAdapter extends adapter_1.ControllableAntAdapter {
         });
         return __awaiter(this, void 0, void 0, function* () {
             const wasPaused = this.paused;
+            const wasStopped = this.stopped;
             if (wasPaused)
                 this.resume();
-            if (this.started && !wasPaused) {
+            if (wasStopped)
+                this.stopped = false;
+            if (this.started && !wasPaused && !wasStopped) {
                 return true;
             }
             return yield _super.start.call(this, props);

package/lib/ble/base/adapter.js

@@ -164,7 +164,13 @@ class BleAdapter extends adpater_1.default {
     }
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.started)
+            const wasPaused = this.paused;
+            const wasStopped = this.stopped;
+            if (wasPaused)
+                this.resume();
+            if (wasStopped)
+                this.stopped = false;
+            if (this.started && !wasPaused && !wasStopped)
                 return true;
             const connected = yield this.connect();
             if (!connected)

package/lib/ble/fm/adapter.js

@@ -113,9 +113,12 @@ class BleFmAdapter extends adapter_1.BleControllableAdapter {
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
             const wasPaused = this.paused;
+            const wasStopped = this.stopped;
             if (wasPaused)
                 this.resume();
-            if (this.started && !wasPaused)
+            if (wasStopped)
+                this.stopped = false;
+            if (this.started && !wasPaused && !wasStopped)
                 return true;
             this.logEvent(Object.assign(Object.assign({ message: 'starting device' }, this.getSettings()), { protocol: this.getProtocolName(), props, isStarted: this.started, isConnected: this.getComms().isConnected() }));
             const { restart = wasPaused } = props;

package/lib/ble/tacx/adapter.js

@@ -40,7 +40,13 @@ class BleTacxFEAdapter extends fm_1.BleFmAdapter {
     }
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.started)
+            const wasPaused = this.paused;
+            const wasStopped = this.stopped;
+            if (wasPaused)
+                this.resume();
+            if (wasStopped)
+                this.stopped = false;
+            if (this.started && !wasPaused && !wasStopped)
                 return true;
             if (this.ble.isScanning()) {
                 this.logger.logEvent({ message: 'stop previous scan', isScanning: this.ble.isScanning() });

package/lib/ble/wahoo/adapter.js

@@ -40,6 +40,14 @@ class BleWahooAdapter extends fm_1.BleFmAdapter {
     }
     start(props = {}) {
         return __awaiter(this, void 0, void 0, function* () {
+            const wasPaused = this.paused;
+            const wasStopped = this.stopped;
+            if (wasPaused)
+                this.resume();
+            if (wasStopped)
+                this.stopped = false;
+            if (this.started && !wasPaused && !wasStopped)
+                return true;
             this.logger.logEvent({ message: 'start requested', protocol: this.getProtocolName(), props });
             try {
                 if (this.ble.isScanning()) {

package/package.json

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