incyclist-services 1.0.40 → 1.0.42

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

@@ -59,7 +59,7 @@ export declare class DevicePairingService extends EventEmitter {
     protected onConfigurationUpdate(newCapabilities: DeviceConfigurationInfo): void;
     protected onInterfaceStateChanged(ifName: any, ifDetails: any, interfacesNew?: any): Promise<any>;
     protected isInterfaceEnabled(target: string | InterfaceSetting): boolean;
-    protected logCapabilities(capabilities: Array<CapabilityData>): CapabilityData[];
+    protected logCapabilities(capabilities?: Array<CapabilityData>): CapabilityData[];
     protected initPairingCallbacks(): void;
     protected removePairingCallbacks(): void;
     protected initScanningCallbacks(): void;

package/lib/devices/pairing/service.js

@@ -95,6 +95,9 @@ class DevicePairingService extends events_1.default {
                 this.state.capabilities = (0, exports.mappedCapabilities)(capabilities);
                 this.state.interfaces = this.access.enrichWithAccessState(interfaces);
                 this.state.canStartRide = this.configuration.canStartRide();
+                this.state.stopRequested = false;
+                this.state.stopped = false;
+                this.logCapabilities();
                 this.state.interfaces.forEach(i => {
                     if (!this.isInterfaceEnabled(i.name))
                         this.disableAdaptersOnInterface(i.name);
@@ -121,10 +124,14 @@ class DevicePairingService extends events_1.default {
     }
     stop() {
         return __awaiter(this, void 0, void 0, function* () {
+            this.logEvent({ message: 'Stop Pairing' });
             try {
                 yield this._stop();
+                this.pauseAdapters(this.state.adapters);
                 this.state.stopRequested = true;
                 this.removeConfigHandlers();
+                this.settings = {};
+                this.state.initialized = false;
             }
             catch (err) {
                 this.logError(err, 'stop');
@@ -310,21 +317,21 @@ class DevicePairingService extends events_1.default {
             this.onScanningDataHandler = this.rideService.onData.bind(this.rideService);
             this.configuration = this.configuration || (0, configuration_1.useDeviceConfiguration)();
             if (this.configuration.isInitialized()) {
-                this.logCapabilities(this.state.capabilities);
                 this.state.initialized = true;
                 return done();
             }
-            this.configuration.once('initialized', (capabilitiesLoaded, interfacesLoaded) => {
-                this.onConfigLoaded(capabilitiesLoaded, interfacesLoaded);
-                this.logCapabilities(this.state.capabilities);
-                done();
-            });
-            this.configuration.init();
+            else {
+                this.configuration.once('initialized', (capabilitiesLoaded, interfacesLoaded) => {
+                    this.onConfigLoaded(capabilitiesLoaded, interfacesLoaded);
+                    done();
+                });
+                this.configuration.init();
+            }
         });
     }
     getExternaState(toEmit) {
         const newState = toEmit || this.state;
-        const state = (0, clone_1.default)(newState);
+        const state = Object.assign({}, newState);
         delete state.adapters;
         delete state.check;
         delete state.scan;
@@ -334,9 +341,11 @@ class DevicePairingService extends events_1.default {
     }
     emitStateChange(newState) {
         const { onStateChanged, onDeviceSelectStateChanged } = this.settings || {};
+        if (this.state.stopRequested)
+            return;
         const state = this.getExternaState(newState);
         if (onStateChanged && typeof onStateChanged === 'function') {
-            onStateChanged((0, clone_1.default)(state));
+            onStateChanged(Object.assign({}, state));
         }
         if (onDeviceSelectStateChanged && typeof onDeviceSelectStateChanged === 'function')
             onDeviceSelectStateChanged(this.getDeviceSelectionState());
@@ -402,9 +411,10 @@ class DevicePairingService extends events_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const prev = this.state.interfaces;
             const current = getInterfaceSettings(ifName, prev);
-            const changed = (current.state !== ifDetails.state || current.isScanning !== ifDetails.isScanning || current.enabled || ifDetails.enabled);
-            if (!changed)
+            const changed = (current.state !== ifDetails.state || current.isScanning !== ifDetails.isScanning || current.enabled !== ifDetails.enabled);
+            if (!changed) {
                 return;
+            }
             try {
                 if (interfacesNew) {
                     const getData = (i) => ({ name: i.name, enabled: i.enabled, state: i.state });
@@ -416,7 +426,6 @@ class DevicePairingService extends events_1.default {
                 }
                 else if (prev) {
                     const changedIdx = prev.findIndex(i => i.name === ifName);
-                    console.log(ifDetails.state, current.state);
                     if (ifDetails.state === 'disconnected' && current.state !== 'disconnected') {
                         this.failAdaptersOnInterface(ifName);
                     }
@@ -444,7 +453,7 @@ class DevicePairingService extends events_1.default {
         return interfaces.find(i => i.name === name && i.enabled && i.state !== 'unavailable') !== undefined;
     }
     logCapabilities(capabilities) {
-        const ci = capabilities || [];
+        const ci = capabilities || this.state.capabilities;
         ci.forEach(c => {
             var _a;
             const { devices = [], disabled } = c;
@@ -698,8 +707,9 @@ class DevicePairingService extends events_1.default {
             this.state.props = props;
             const adapters = this.state.adapters = this.configuration.getAdapters(false);
             const goodToGo = yield this.rideService.waitForPreviousStartToFinish();
-            if (!goodToGo)
+            if (!goodToGo) {
                 return;
+            }
             const configOKToStart = this.configuration.canStartRide();
             if (this.state.stopRequested || this.state.stopped) {
                 this.state.stopped = true;
@@ -719,7 +729,8 @@ class DevicePairingService extends events_1.default {
             this.emit('pairing-start');
             this.logEvent({ message: 'Start Pairing', adapters, props });
             this.processConnectedDevices(adapters);
-            const target = adapters.filter(ai => !ai.adapter.isStarted());
+            const selected = this.state.capabilities.map(c => c.selected);
+            const target = adapters.filter(ai => !ai.adapter.isStarted() && selected.includes(ai.udid));
             this.initPairingCallbacks();
             const selectedAdapters = target.map(ai => (Object.assign(Object.assign({}, ai), { isStarted: false })));
             const promise = this.rideService.startAdapters(selectedAdapters, 'pair');
@@ -850,7 +861,6 @@ class DevicePairingService extends events_1.default {
     failAdaptersOnInterface(name) {
         const target = this.getAdaptersOnInterface(name);
         const { capabilities } = this.state;
-        console.log('failAdaptersOnInterface', name, target);
         target.forEach(ai => {
             const { udid } = ai;
             capabilities.forEach(c => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.40",
+  "version": "1.0.42",
   "peerDependencies": {
     "gd-eventlog": "^0.1.24"
   },