incyclist-services 1.0.9 → 1.0.11

package/lib/devices/access/service.d.ts

@@ -18,7 +18,7 @@ export declare class DeviceAccessService extends EventEmitter {
     protected logEvent(event: any): void;
     setDefaultInterfaceProperties(props: InterfaceAccessProps): void;
     enableInterface(ifaceName: string, binding?: any, props?: InterfaceAccessProps): void;
-    disableInterface(ifaceName: string): void;
+    disableInterface(ifaceName: string, avalailable?: boolean): void;
     setInterfaceProperties(ifaceName: string, props: InterfaceAccessProps): void;
     getInterfaceInfo(ifaceName: string): InterfaceInfo;
     protected getInterface(ifaceName: string): IncyclistInterface;

package/lib/devices/access/service.js

@@ -69,7 +69,7 @@ class DeviceAccessService extends events_1.default {
             this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);
         }
     }
-    disableInterface(ifaceName) {
+    disableInterface(ifaceName, avalailable = true) {
         const existing = this.interfaces[ifaceName];
         if (!existing)
             return;
@@ -84,6 +84,12 @@ class DeviceAccessService extends events_1.default {
             return;
         }
         existing.enabled = false;
+        if (!avalailable) {
+            existing.state = 'unavailable';
+            existing.unavailable = true;
+            this.emit('interface-changed', ifaceName, { name: ifaceName, state: 'unavailable', isScanning: false });
+            return;
+        }
         this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);
     }
     setInterfaceProperties(ifaceName, props) {
@@ -175,21 +181,17 @@ class DeviceAccessService extends events_1.default {
                 interfaces.forEach((i) => {
                     i.on('device', (deviceSettings) => __awaiter(this, void 0, void 0, function* () {
                         var _a, _b;
-                        console.log('~~~ detected device:', deviceSettings);
                         if (adapters.find(a => a.isEqual(deviceSettings))) {
-                            console.log('~~~ device already detected');
                             return;
                         }
                         if (filter.profile && deviceSettings.profile !== filter.profile) {
-                            console.log('~~~ device does not match profile', filter.profile);
                             return;
                         }
                         if (filter.protocol && deviceSettings.protocol !== filter.protocol) {
-                            console.log('~~~ device does not match protocol', filter.protocol);
                             return;
                         }
                         if (filter.protocols && !filter.protocols.includes(deviceSettings.protocol)) {
-                            console.log('~~~ device does not match protocols', filter.protocol);
+                            return;
                         }
                         const adapter = incyclist_devices_1.AdapterFactory.create(deviceSettings);
                         if (filter.capabilities) {
@@ -198,7 +200,6 @@ class DeviceAccessService extends events_1.default {
                                 found = found || adapter.getCapabilities().includes(capability);
                             });
                             if (!found) {
-                                console.log('~~~ device does not match capabilties', filter.capabilities);
                                 return;
                             }
                         }
@@ -219,11 +220,11 @@ class DeviceAccessService extends events_1.default {
                                     yield adapter.stop();
                                 }
                                 catch (err) {
-                                    console.log(err);
+                                    this.logEvent({ message: 'could not start device', device: adapter === null || adapter === void 0 ? void 0 : adapter.getUniqueName(), reason: err.message });
                                 }
                             }
                             catch (err) {
-                                console.log('~~~ start error', err);
+                                this.logEvent({ message: 'error', fn: 'scan#adapte', error: err.message, stack: err.stack });
                             }
                         }
                     }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "peerDependencies": {
     "gd-eventlog": "^0.1.22"
   },
@@ -36,7 +36,7 @@
     "lib": "./src"
   },
   "dependencies": {
-    "incyclist-devices": "^2.0.8",
+    "incyclist-devices": "^2.0.11",
     "uuid": "^9.0.0"
   }
 }