incyclist-devices 2.2.8 → 2.2.9

package/lib/antv2/base/adapter.js

@@ -438,8 +438,10 @@ class AntAdapter extends adpater_1.default {
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
             let stopped;
-            this.logger.logEvent({ message: 'stopping device', device: this.getName() });
             this.internalEmitter.emit('stop');
+            if (this.stopped)
+                return;
+            this.logger.logEvent({ message: 'stopping device', device: this.getName() });
             this.promiseWaitForData = null;
             if (this.startStatus) {
                 this.startStatus.interrupted = true;

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

@@ -45,6 +45,8 @@ export default class AntInterface extends EventEmitter implements IncyclistInter
     scannerWaitForConnection(): Promise<void>;
     scan(props?: AntScanProps): Promise<AntDeviceSettings[]>;
     isScanning(): boolean;
+    protected stopAllSensors(sensors: Array<ISensor>): Promise<void>;
+    protected stopDevices(detected: AntDeviceSettings[]): Promise<void>;
     stopScan(): Promise<boolean>;
     startSensor(sensor: ISensor, onDeviceData: (data: any) => void): Promise<boolean>;
     private blockChannel;

package/lib/antv2/base/interface.js

@@ -16,6 +16,7 @@ const events_1 = __importDefault(require("events"));
 const gd_eventlog_1 = require("gd-eventlog");
 const sensor_factory_1 = __importDefault(require("../factories/sensor-factory"));
 const utils_1 = require("../../utils/utils");
+const incyclist_devices_1 = require("incyclist-devices");
 class AntInterface extends events_1.default {
     static getInstance(props = {}) {
         if (AntInterface._instance === undefined)
@@ -237,6 +238,8 @@ class AntInterface extends events_1.default {
                 this.activeScan.emitter.on('stop', () => __awaiter(this, void 0, void 0, function* () {
                     this.activeScan.emitter.removeAllListeners();
                     this.emit('stop-scan');
+                    yield this.stopDevices(detected);
+                    yield this.stopAllSensors(sensors);
                     const stopped = yield this.activeScan.channel.stopScanner();
                     this.logEvent({ message: 'scan stopped' });
                     removeListeners(channel);
@@ -276,6 +279,38 @@ class AntInterface extends events_1.default {
     isScanning() {
         return this.scanPromise !== undefined && this.scanPromise !== null;
     }
+    stopAllSensors(sensors) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'stopping all sensors ' });
+            let promises = [];
+            sensors.forEach((sensor) => {
+                promises.push(this.stopSensor(sensor).catch(err => {
+                    var _a;
+                    this.logger.logEvent({ message: 'could not stop sensor', error: err.message, channel: (_a = sensor.getChannel()) === null || _a === void 0 ? void 0 : _a.getChannelNo(), stack: err.stack });
+                }));
+            });
+            if (promises.length > 0) {
+                yield Promise.allSettled(promises);
+            }
+            this.logger.logEvent({ message: 'sensors stopped' });
+        });
+    }
+    stopDevices(detected) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.logger.logEvent({ message: 'stopping devices' });
+            let promises = [];
+            detected.forEach((settings) => {
+                const adapter = incyclist_devices_1.AdapterFactory.create(settings);
+                promises.push(adapter.stop().catch(err => {
+                    this.logger.logEvent({ message: 'could not stop device', error: err.message, deviceID: settings.deviceID, stack: err.stack });
+                }));
+            });
+            if (promises.length > 0) {
+                yield Promise.allSettled(promises);
+            }
+            this.logger.logEvent({ message: 'devices stopped' });
+        });
+    }
     stopScan() {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'stopping scan ..' });
@@ -348,7 +383,7 @@ class AntInterface extends events_1.default {
                 return true;
             }
             const channel = sensor.getChannel();
-            if (channel) {
+            if (channel !== undefined) {
                 try {
                     if (!channel.flush) {
                         this.logEvent({ message: 'old version of ant-channel detected' });
@@ -371,8 +406,7 @@ class AntInterface extends events_1.default {
                 }
             }
             else {
-                this.logEvent({ message: 'could not stop sensor', deviceID: sensor.getDeviceID(), error: 'no channel attached' });
-                return false;
+                return true;
             }
         });
     }

package/package.json

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