incyclist-devices 2.3.1 → 2.3.4

package/lib/antv2/base/interface.js

@@ -331,6 +331,7 @@ class AntInterface extends events_1.default {
     }
     startSensor(sensor, onDeviceData) {
         return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (!this.isConnected()) {
                 const connected = yield this.connect();
                 if (!connected)
@@ -355,6 +356,7 @@ class AntInterface extends events_1.default {
                     this.logEvent({ message: 'could not start sensor' });
                     channel.off('data', onData);
                 }
+                this.logEvent({ message: 'sensor started', channel: (_a = sensor.getChannel()) === null || _a === void 0 ? void 0 : _a.getChannelNo(), profile: sensor.getProfile(), deviceID: sensor.getDeviceID() });
                 return started;
             }
             catch (err) {
@@ -363,7 +365,7 @@ class AntInterface extends events_1.default {
                 try {
                     yield channel.stopSensor(sensor);
                 }
-                catch (_a) { }
+                catch (_b) { }
                 this.unblockChannel(channel);
                 return false;
             }
@@ -383,7 +385,7 @@ class AntInterface extends events_1.default {
                 return true;
             }
             const channel = sensor.getChannel();
-            if (channel !== undefined) {
+            if (channel !== undefined && channel !== null) {
                 try {
                     if (!channel.flush) {
                         this.logEvent({ message: 'old version of ant-channel detected' });

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

@@ -33,6 +33,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected instanceId: number;
     protected connectedPeripherals: IBlePeripheral[];
     protected connectAttemptCnt: number;
+    protected emitted: BlePeripheralAnnouncement[];
     static getInstance(props?: InterfaceProps): BleInterface;
     protected constructor(props: InterfaceProps);
     setProps(props: InterfaceProps): void;
@@ -74,6 +75,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected startScan(): Promise<unknown>;
     private emitCachedDevices;
     protected emitDevice(service: BlePeripheralAnnouncement): void;
+    protected alreadyEmitted(service: BlePeripheralAnnouncement): boolean;
     protected buildDeviceSettings(matching?: string[]): BleDeviceSettings[];
     protected addCompleting(service: BlePeripheralAnnouncement): void;
     protected addUnsupported(service: BlePeripheralAnnouncement): void;

package/lib/ble/base/interface.js

@@ -51,6 +51,7 @@ class BleInterface extends events_1.default {
         this.matching = [];
         this.connectedPeripherals = [];
         this.connectAttemptCnt = 0;
+        this.emitted = [];
         this.instanceId = ++instanceCount;
         this.props = props;
         this.logEnabled = props.log || true;
@@ -426,6 +427,7 @@ class BleInterface extends events_1.default {
     }
     startScan() {
         this.logEvent({ message: 'scan started', scanning: this.isScanning() });
+        this.emitted = [];
         this.emitCachedDevices();
         return new Promise(() => {
         });
@@ -438,9 +440,16 @@ class BleInterface extends events_1.default {
         });
     }
     emitDevice(service) {
+        if (this.alreadyEmitted(service)) {
+            return;
+        }
         const settings = this.createDeviceSetting(service);
         this.logEvent({ message: 'device found', settings });
         this.emit('device', settings, service);
+        this.emitted.push(service);
+    }
+    alreadyEmitted(service) {
+        return this.emitted.find(s => s.name === service.name || s.peripheral.address === service.peripheral.address) !== undefined;
     }
     buildDeviceSettings(matching = []) {
         return matching.map((name) => {

package/lib/ble/base/peripheral.js

@@ -79,7 +79,7 @@ class BlePeripheral {
     }
     onPeripheralDisconnect() {
         return __awaiter(this, void 0, void 0, function* () {
-            this.logEvent({ message: 'disconnect' });
+            this.logEvent({ message: 'peripheral disconnected' });
             try {
                 yield this.disconnect(true);
             }

package/package.json

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