incyclist-devices 2.1.21 → 2.1.22

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

@@ -1,10 +1,15 @@
 /// <reference types="node" />
 import EventEmitter from "events";
 import { EventLogger } from "gd-eventlog";
-import { IAntDevice, IChannel, ISensor } from "incyclist-ant-plus";
+import { Channel, IAntDevice, IChannel, ISensor } from "incyclist-ant-plus";
 import { AntDeviceSettings, AntScanProps, AntInterfaceProps } from "../types";
 import { IncyclistInterface } from "../../types";
 import AntDeviceBinding from "./binding";
+type ChannelUsage = 'scan' | 'sensor';
+interface ChannelInfo {
+    channel: Channel;
+    usage: ChannelUsage;
+}
 export default class AntInterface extends EventEmitter implements IncyclistInterface {
     static _instance: AntInterface;
     static INTERFACE_NAME: string;
@@ -22,6 +27,7 @@ export default class AntInterface extends EventEmitter implements IncyclistInter
     };
     protected props: AntInterfaceProps;
     protected logEnabled: boolean;
+    protected channelsInUse: Array<ChannelInfo>;
     constructor(props: AntInterfaceProps);
     getName(): string;
     getBinding(): typeof AntDeviceBinding;
@@ -42,5 +48,8 @@ export default class AntInterface extends EventEmitter implements IncyclistInter
     isScanning(): boolean;
     stopScan(): Promise<boolean>;
     startSensor(sensor: ISensor, onDeviceData: (data: any) => void): Promise<boolean>;
+    private blockChannel;
+    private unblockChannel;
     stopSensor(sensor: ISensor): Promise<boolean>;
 }
+export {};

package/lib/antv2/base/interface.js

@@ -31,6 +31,7 @@ class AntInterface extends events_1.default {
         this.device = undefined;
         this.connected = false;
         this.connectPromise = null;
+        this.channelsInUse = [];
         this.logEnabled = props.log || true;
         const { binding, logger } = props;
         this.setLogger(logger || new gd_eventlog_1.EventLogger('Ant+'));
@@ -106,16 +107,32 @@ class AntInterface extends events_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             this.logEvent({ message: 'ANT+ disconnecting ...' });
             let closed = false;
-            if (this.device) {
-                try {
-                    closed = yield this.device.close();
+            try {
+                let promises = [];
+                if (this.channelsInUse.length > 0) {
+                    this.channelsInUse.forEach(c => {
+                        if (c.usage === 'scan')
+                            promises.push(this.stopScan());
+                        else
+                            promises.push(c.channel.stopAllSensors());
+                    });
+                    yield Promise.allSettled(promises);
+                    yield (0, utils_1.sleep)(200);
+                }
+                if (this.device) {
+                    try {
+                        closed = yield this.device.close();
+                    }
+                    catch (_a) {
+                        closed = false;
+                    }
                 }
-                catch (_a) {
-                    closed = false;
+                else {
+                    closed = true;
                 }
             }
-            else {
-                closed = true;
+            catch (err) {
+                this.logEvent({ message: 'Error', fn: '', error: err.message, stack: err.stack });
             }
             this.logEvent({ message: 'ANT+ disconnected' });
             this.connectPromise = null;
@@ -205,10 +222,12 @@ class AntInterface extends events_1.default {
                 addListeners(channel);
                 try {
                     const success = yield channel.startScanner();
+                    this.blockChannel(channel, 'scan');
                     this.logEvent({ message: 'scan started', success });
                 }
                 catch (err) {
                     this.logEvent({ message: 'scan could not be started', error: err.message, stack: err.stack });
+                    this.unblockChannel(channel);
                     removeListeners(channel);
                     return done(detected);
                 }
@@ -261,10 +280,12 @@ class AntInterface extends events_1.default {
                 this.logEvent({ message: 'stopping scan done ..' });
                 return true;
             }
+            const channel = this.activeScan.channel;
             return new Promise(done => {
                 this.activeScan.emitter.emit('stop');
                 this.once('scan stopped', (res) => {
                     this.logEvent({ message: 'stopping scan done ..' });
+                    this.unblockChannel(channel);
                     done(res);
                 });
             });
@@ -281,6 +302,7 @@ class AntInterface extends events_1.default {
             channel = this.device.getChannel();
             if (!channel)
                 return false;
+            this.blockChannel(channel, 'sensor');
             channel.setProps({ logger: this.logger });
             const onData = (profile, deviceID, data, tag) => {
                 if (profile === sensor.getProfile() && deviceID === sensor.getDeviceID())
@@ -304,10 +326,19 @@ class AntInterface extends events_1.default {
                     yield channel.stopSensor(sensor);
                 }
                 catch (_a) { }
+                this.unblockChannel(channel);
                 return false;
             }
         });
     }
+    blockChannel(channel, usage) {
+        this.channelsInUse.push({ channel: channel, usage });
+    }
+    unblockChannel(channel) {
+        const idx = this.channelsInUse.findIndex(c => { var _a; return ((_a = c.channel) === null || _a === void 0 ? void 0 : _a.getChannelNo()) === channel.getChannelNo(); });
+        if (idx !== -1)
+            this.channelsInUse.splice(idx, 1);
+    }
     stopSensor(sensor) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.isConnected()) {
@@ -328,6 +359,7 @@ class AntInterface extends events_1.default {
                     channel.flush();
                     channel.removeAllListeners('data');
                     const stopped = yield channel.stopSensor(sensor);
+                    this.unblockChannel(channel);
                     return stopped;
                 }
                 catch (err) {

package/package.json

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