incyclist-services 1.0.55 → 1.0.56

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

@@ -52,10 +52,12 @@ export interface InternalPairingState extends PairingState {
     scanTo?: NodeJS.Timeout;
     tsPrevStart?: number;
     check?: {
-        promise: Promise<boolean>;
+        preparing?: number;
+        promise?: Promise<boolean>;
     };
     scan?: {
-        promise: Promise<DeviceSettings[]>;
+        preparing?: number;
+        promise?: Promise<DeviceSettings[]>;
         adapters?: Array<{
             udid: string;
             adapter: IncyclistDeviceAdapter;

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

@@ -12,6 +12,8 @@ export interface Services {
 }
 export declare class DevicePairingService extends IncyclistService {
     protected static _instance: DevicePairingService;
+    protected static checkCounter: number;
+    protected static scanCounter: number;
     protected configuration: DeviceConfigurationService;
     protected access: DeviceAccessService;
     protected rideService: DeviceRideService;

package/lib/devices/pairing/service.js

@@ -431,7 +431,6 @@ class DevicePairingService extends service_2.IncyclistService {
             const current = getInterfaceSettings(ifName, prev);
             const changed = (current.state !== ifDetails.state || current.isScanning !== ifDetails.isScanning || current.enabled !== ifDetails.enabled);
             if (!changed) {
-                console.log('~~~ DEUBUG: if change, no change', ifName, ifDetails);
                 return;
             }
             this.logEvent({ message: 'interface state changed', interface: ifName, state: ifDetails.state });
@@ -765,6 +764,10 @@ class DevicePairingService extends service_2.IncyclistService {
     }
     startPairing(adapters, props) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.isPairing())
+                return;
+            const preparing = DevicePairingService.checkCounter++;
+            this.state.check = { preparing };
             this.emit('pairing-start');
             const requiredInterfaces = this.getPairingInterfaces();
             const busyRequired = this.state.interfaces
@@ -773,8 +776,10 @@ class DevicePairingService extends service_2.IncyclistService {
             const isReady = busyRequired === undefined;
             if (!isReady) {
                 setTimeout(() => {
-                    if (!this.isPairing() && !this.isScanning())
+                    if ((!this.isPairing() || this.state.check.preparing === preparing) && !this.isScanning()) {
+                        delete this.state.check;
                         this.run();
+                    }
                 }, 1000);
                 return;
             }
@@ -782,6 +787,9 @@ class DevicePairingService extends service_2.IncyclistService {
             this.processConnectedDevices(adapters);
             const selected = this.state.capabilities.map(c => c.selected);
             const target = adapters.filter(ai => !ai.adapter.isStarted() && selected.includes(ai.udid));
+            if (this.isPairing() && this.state.check.preparing !== preparing) {
+                return;
+            }
             this.initPairingCallbacks();
             const selectedAdapters = target.map(ai => (Object.assign(Object.assign({}, ai), { isStarted: false })));
             const promise = this.rideService.startAdapters(selectedAdapters, 'pair');
@@ -819,18 +827,26 @@ class DevicePairingService extends service_2.IncyclistService {
         return __awaiter(this, void 0, void 0, function* () {
             const interfaces = this.state.interfaces.filter(i => this.isInterfaceEnabled(i) && i.state === 'connected')
                 .map(i => i.name);
+            if (this.isScanning())
+                return;
+            const preparing = DevicePairingService.scanCounter++;
+            this.state.scan = { preparing };
             if (interfaces.length === 0) {
                 if (this.state.scanTo)
                     return;
                 this.state.scanTo = setTimeout(() => {
                     delete this.state.scanTo;
-                    if (!this.isPairing() && !this.isScanning())
+                    if (!this.isPairing() && (!this.isScanning() || this.state.scan.preparing === preparing)) {
+                        delete this.state.scan;
                         this.run();
+                    }
                 }, 1000);
                 return;
             }
             this.emit('scanning-start');
             this.state.tsPrevStart = Date.now();
+            if (this.isScanning() && this.state.scan.preparing !== preparing)
+                return;
             this.logEvent({ message: 'Start Scanning', interfaces: interfaces.join(','), props });
             this.initScanningCallbacks();
             const timeout = props.enforcedScan ? 1000 * 60 * 60 : undefined;
@@ -1139,5 +1155,7 @@ class DevicePairingService extends service_2.IncyclistService {
     }
 }
 exports.DevicePairingService = DevicePairingService;
+DevicePairingService.checkCounter = 0;
+DevicePairingService.scanCounter = 0;
 const useDevicePairing = () => DevicePairingService.getInstance();
 exports.useDevicePairing = useDevicePairing;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.55",
+  "version": "1.0.56",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "incyclist-devices": "^2.1.22",
+    "incyclist-devices": "^2.1.23",
     "uuid": "^9.0.0"
   }
 }