incyclist-services 1.0.73 → 1.0.74

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

@@ -53,11 +53,13 @@ export declare class DevicePairingService extends IncyclistService {
     protected waitForInit(): Promise<void>;
     protected getExternaState(toEmit: PairingState): PairingState;
     protected emitStateChange(newState?: PairingState): void;
+    protected emitStartStatus(): void;
     protected onInterfaceConfigChanged(ifName: string, settings: InterfaceSetting): void;
     protected mergeState(current: any, newState: any): void;
     protected onConfigurationUpdate(newCapabilities: DeviceConfigurationInfo): void;
     protected onInterfaceStateChanged(ifName: any, ifDetails: any, interfacesNew?: any): Promise<any>;
     protected isInterfaceEnabled(target: string | InterfaceSetting): boolean;
+    protected isInterfaceInUse(target: string | InterfaceSetting): CapabilityData;
     protected logCapabilities(capabilities?: Array<CapabilityData>): CapabilityData[];
     protected initPairingCallbacks(): void;
     protected removePairingCallbacks(): void;
@@ -74,6 +76,7 @@ export declare class DevicePairingService extends IncyclistService {
     private markConnected;
     protected disconnectInterface(name: string): void;
     protected connectInterface(name: string): void;
+    protected updateCapabilityConfig(): void;
     protected checkCanStart(): boolean;
     protected checkPairingSuccess(): boolean;
     private stopScanning;

package/lib/devices/pairing/service.js

@@ -64,19 +64,22 @@ class DevicePairingService extends service_2.IncyclistService {
                 this.state.deleted = [];
             }
             try {
-                if (this.settings.onStateChanged) {
-                    this.settings.onStateChanged = onStateChanged;
+                yield this.loadConfiguration();
+                this.updateCapabilityConfig();
+                const alreadyInitialized = this.settings.onStateChanged !== undefined && this.settings.onStateChanged !== null;
+                this.settings.onStateChanged = onStateChanged;
+                if (alreadyInitialized) {
                     this.emitStateChange(this.state);
+                    this.emitStartStatus();
                     return;
                 }
-                yield this.loadConfiguration();
+                this.initConfigHandlers();
                 this.state.interfaces.forEach(i => {
                     if (!this.isInterfaceEnabled(i.name))
                         this.unselectOnInterface(i.name);
                 });
-                this.settings.onStateChanged = onStateChanged;
                 this.emitStateChange(this.state);
-                this.initConfigHandlers();
+                this.emitStartStatus();
                 this.run();
             }
             catch (err) {
@@ -88,8 +91,6 @@ class DevicePairingService extends service_2.IncyclistService {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.waitForInit();
             const { capabilities, interfaces } = this.configuration.load();
-            const state = Object.assign({}, this.state);
-            delete state.adapters;
             this.state.capabilities = this.mappedCapabilities(capabilities);
             this.state.interfaces = this.access.enrichWithAccessState(interfaces);
             this.state.canStartRide = this.configuration.canStartRide();
@@ -378,6 +379,13 @@ class DevicePairingService extends service_2.IncyclistService {
         if (onDeviceSelectStateChanged && typeof onDeviceSelectStateChanged === 'function')
             onDeviceSelectStateChanged(this.getDeviceSelectionState());
     }
+    emitStartStatus() {
+        const { onStateChanged } = this.settings || {};
+        const { canStartRide } = this.state;
+        if (onStateChanged && typeof onStateChanged === 'function') {
+            onStateChanged({ canStartRide });
+        }
+    }
     onInterfaceConfigChanged(ifName, settings) {
         this.logEvent({ message: 'Interface Config changed', interface: ifName, settings });
         const prev = this.state.interfaces;
@@ -488,7 +496,7 @@ class DevicePairingService extends service_2.IncyclistService {
                     else if (ifDetails.state !== 'unavailable' && current.state === 'unavailable') {
                         this.enableAdaptersOnInterface(ifName);
                     }
-                    else if (ifDetails.state === 'connected' && current.state !== 'connected' && !this.isPairing()) {
+                    else if (ifDetails.state === 'connected' && current.state !== 'connected' && !this.isPairing() && !this.state.canStartRide) {
                         restartScan = true;
                     }
                     else if (ifDetails.state === 'connected' && current.state !== 'connected' && this.isPairingWaiting()) {
@@ -498,9 +506,10 @@ class DevicePairingService extends service_2.IncyclistService {
                         prev[changedIdx].isScanning = ifDetails.isScanning;
                         prev[changedIdx].state = ifDetails.state;
                     }
-                    if (restartScan)
+                    if (restartScan) {
                         this.restart();
-                    if (restartPair) {
+                    }
+                    if (restartPair && this.isInterfaceInUse(ifName)) {
                         this.restartPair();
                     }
                     this.emitStateChange({ interfaces: this.state.interfaces });
@@ -518,6 +527,12 @@ class DevicePairingService extends service_2.IncyclistService {
         const { interfaces } = this.state;
         return interfaces.find(i => i.name === name && i.enabled && i.state !== 'unavailable') !== undefined;
     }
+    isInterfaceInUse(target) {
+        const name = (typeof target === 'string') ? target : target.name;
+        const { capabilities } = this.state;
+        const res = capabilities.find(c => c.interface === name);
+        return res;
+    }
     logCapabilities(capabilities) {
         const ci = capabilities || this.state.capabilities;
         ci.forEach(c => {
@@ -713,6 +728,19 @@ class DevicePairingService extends service_2.IncyclistService {
             this.logError(err, 'enableInterface');
         }
     }
+    updateCapabilityConfig() {
+        try {
+            const { capabilities } = this.state;
+            capabilities.forEach(c => {
+                var _a;
+                if (c.connectState !== 'connected' && c.selected && ((_a = this.getDeviceAdapter(c.selected)) === null || _a === void 0 ? void 0 : _a.isStarted()))
+                    c.connectState = 'connected';
+            });
+        }
+        catch (err) {
+            console.log(err);
+        }
+    }
     checkCanStart() {
         try {
             const prev = this.state.canStartRide;
@@ -725,8 +753,8 @@ class DevicePairingService extends service_2.IncyclistService {
             const power = this.getCapability(incyclist_devices_1.IncyclistCapability.Power);
             const canStartRide = ((control === null || control === void 0 ? void 0 : control.connectState) === 'connected' || (power === null || power === void 0 ? void 0 : power.connectState) === 'connected');
             this.state.canStartRide = canStartRide;
-            if (this.state.canStartRide !== prev) {
-                this.emitStateChange({ canStartRide });
+            if (canStartRide !== prev) {
+                this.emitStartStatus();
             }
         }
         catch (err) {
@@ -793,7 +821,10 @@ class DevicePairingService extends service_2.IncyclistService {
                 return;
             }
             if (configOKToStart && !this.deviceSelectState && !props.enforcedScan) {
-                yield this.startPairing(adapters, props);
+                if (!(this.checkPairingSuccess() === true))
+                    yield this.startPairing(adapters, props);
+                else
+                    this.emitStateChange();
             }
             else {
                 yield this.startScanning(adapters, props);
@@ -802,7 +833,7 @@ class DevicePairingService extends service_2.IncyclistService {
     }
     startPairing(adapters, props) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.isPairing())
+            if (this.isPairing() || this.checkPairingSuccess())
                 return;
             const preparing = DevicePairingService.checkCounter++;
             this.state.check = { preparing };
@@ -824,7 +855,7 @@ class DevicePairingService extends service_2.IncyclistService {
             this.processConnectedDevices(adapters);
             const selected = this.state.capabilities.map(c => c.selected);
             const target = adapters.filter(ai => selected.includes(ai.udid));
-            if (this.isPairing() && this.state.check.preparing !== preparing) {
+            if ((this.isPairing() && this.state.check.preparing !== preparing) || (this.checkPairingSuccess() === true)) {
                 return;
             }
             this.initPairingCallbacks();
@@ -834,6 +865,7 @@ class DevicePairingService extends service_2.IncyclistService {
             this.onPairingStarted();
             this.logEvent({ message: 'Start Pairing', adapters, props });
             yield this.state.check.promise;
+            this.checkCanStart();
             if (this.state.check)
                 delete this.state.check;
             this.emit('pairing-done');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.73",
+  "version": "1.0.74",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },