incyclist-devices 2.3.0-beta.15 → 2.3.0-beta.17

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

@@ -35,6 +35,7 @@ export declare class BleInterface extends EventEmitter implements IBleInterface<
     protected connectAttemptCnt: number;
     static getInstance(props?: InterfaceProps): BleInterface;
     protected constructor(props: InterfaceProps);
+    setProps(props: InterfaceProps): void;
     getLogger(): EventLogger;
     setLogger(logger: EventLogger): void;
     getName(): string;

package/lib/ble/base/interface.js

@@ -28,6 +28,7 @@ class BleInterface extends events_1.default {
         if (BleInterface._instance === undefined)
             BleInterface._instance = new BleInterface(props);
         else {
+            BleInterface._instance.setProps(props);
             if (props.binding) {
                 BleInterface._instance.setBinding(props.binding);
             }
@@ -60,9 +61,13 @@ class BleInterface extends events_1.default {
         }
         this.internalEvents = new events_1.default();
         this.onDiscovered = this.onPeripheralFound.bind(this);
-        if (this.binding)
+        const { enabled = true } = props;
+        if (this.binding && enabled)
             this.autoConnect();
     }
+    setProps(props) {
+        this.props = props;
+    }
     getLogger() {
         return this.logger;
     }
@@ -73,8 +78,9 @@ class BleInterface extends events_1.default {
         return BleInterface.INTERFACE_NAME;
     }
     setBinding(binding) {
+        const prev = this.binding;
         this.binding = binding;
-        if (!this.isConnected()) {
+        if (!prev && !this.isConnected() && this.props.enabled) {
             this.autoConnect();
         }
     }
@@ -504,7 +510,7 @@ class BleInterface extends events_1.default {
         const expected = this.expectedServices.map(utils_1.parseUUID);
         const supported = (_b = found.filter(uuid => expected.includes(uuid))) !== null && _b !== void 0 ? _b : [];
         if (!supported.length) {
-            this.logEvent({ message: 'service not supported', name: service.name, uuids: service.serviceUUIDs });
+            this.logEvent({ message: 'peripheral not supported', name: service.name, uuids: service.serviceUUIDs });
             this.addUnsupported(service);
         }
         return supported.length > 0;

package/lib/direct-connect/base/interface.d.ts

@@ -29,6 +29,7 @@ export default class DirectConnectInterface extends EventEmitter implements IBle
     protected connected: boolean;
     static getInstance(props?: InterfaceProps): DirectConnectInterface;
     constructor(props: InterfaceProps);
+    setProps(props: InterfaceProps): void;
     createPeripheral(announcement: MulticastDnsAnnouncement): IBlePeripheral;
     createDeviceSetting(service: MulticastDnsAnnouncement): BleDeviceSettings;
     createPeripheralFromSettings(settings: DeviceSettings): IBlePeripheral;

package/lib/direct-connect/base/interface.js

@@ -27,6 +27,7 @@ class DirectConnectInterface extends events_1.default {
         if (DirectConnectInterface._instance === undefined)
             DirectConnectInterface._instance = new DirectConnectInterface(props);
         else {
+            DirectConnectInterface._instance.setProps(props);
             if (props.binding) {
                 DirectConnectInterface._instance.setBinding(props.binding);
             }
@@ -54,9 +55,13 @@ class DirectConnectInterface extends events_1.default {
         }
         this.internalEvents = new events_1.default();
         this.instance = ++instanceId;
-        if (this.binding)
+        const { enabled } = props;
+        if (this.binding && (enabled !== null && enabled !== void 0 ? enabled : false))
             this.autoConnect();
     }
+    setProps(props) {
+        this.props = props;
+    }
     createPeripheral(announcement) {
         return peripheral_1.DirectConnectPeripheral.create(announcement);
     }
@@ -83,7 +88,7 @@ class DirectConnectInterface extends events_1.default {
     setBinding(binding) {
         const prev = this.binding;
         this.binding = binding;
-        if (!prev)
+        if (!prev && this.props.enabled)
             this.autoConnect();
     }
     getBinding() {
@@ -238,10 +243,10 @@ class DirectConnectInterface extends events_1.default {
                 this.services[idx] = { ts: Date.now(), service };
             }
             else {
-                this.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
                 this.services.push({ ts: Date.now(), service });
                 if (!((_a = service.serviceUUIDs) === null || _a === void 0 ? void 0 : _a.length))
                     return;
+                this.logEvent({ message: 'device announced', device: service.name, announcement: service, source });
                 this.emitDevice(service);
                 (_b = this.matching) === null || _b === void 0 ? void 0 : _b.push(service.name);
             }

package/lib/types/interface.d.ts

@@ -5,6 +5,7 @@ export type InterfaceProps = {
     binding?: any;
     logger?: EventLogger;
     log?: boolean;
+    enabled?: boolean;
 };
 export interface IncyclistInterface extends EventEmitter {
     getName(): string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-devices",
-  "version": "2.3.0-beta.15",
+  "version": "2.3.0-beta.17",
   "dependencies": {
     "@serialport/bindings-interface": "^1.2.2",
     "@serialport/parser-byte-length": "^9.0.1",