incyclist-services 1.0.48 → 1.0.50

package/lib/devices/configuration/model/repository/legacy.d.ts

@@ -25,7 +25,7 @@ export interface LegacySerialSettings {
     protocols: {
         name: string;
         selected: boolean;
-        id: number;
+        id?: number;
     }[];
 }
 export interface LegacyAntSettings {

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

@@ -28,6 +28,7 @@ export declare class DeviceConfigurationService extends EventEmitter {
     init(): Promise<void>;
     setFeature(name: string, enabled: boolean): void;
     protected isNewUi(): boolean;
+    protected verifyCapabilityExists(capability: any): void;
     protected verifyCapabilitySettings(): void;
     protected initCapabilties(): void;
     protected initInterfaces(): void;

package/lib/devices/configuration/service.js

@@ -45,6 +45,7 @@ class DeviceConfigurationService extends events_1.default {
         this.logEvent({ message: 'error', fn, error: err.message, stack: err.stack });
     }
     init() {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function* () {
             yield this.userSettings.init();
             if (this.isInitialized()) {
@@ -59,32 +60,34 @@ class DeviceConfigurationService extends events_1.default {
                 settings.modeSettings = this.userSettings.get('preferences.gear', {});
                 try {
                     yield this.initFromLegacy(settings);
-                    this.verifyCapabilitySettings();
                 }
                 catch (err) {
+                    console.log('~~~ ERROR', err);
                     this.logError(err, 'init()');
                 }
-                this.emitInitialized();
-                return;
             }
-            yield this.userSettings.init();
-            this.settings = {
-                devices: this.userSettings.get('devices', []),
-                capabilities: this.userSettings.get('capabilities', []),
-                interfaces: this.userSettings.get('interfaces', [])
-            };
+            else {
+                yield this.userSettings.init();
+                this.settings = {
+                    devices: this.userSettings.get('devices', []),
+                    capabilities: this.userSettings.get('capabilities', []),
+                    interfaces: this.userSettings.get('interfaces', [])
+                };
+            }
             let emptyConfig = false;
-            if (!this.settings.capabilities || this.settings.capabilities.length === 0) {
+            if (!this.settings)
+                this.settings = {};
+            if (!this.settings.capabilities || ((_a = this.settings.capabilities) === null || _a === void 0 ? void 0 : _a.length) === 0) {
                 this.initCapabilties();
                 emptyConfig = true;
             }
-            if (!this.settings.interfaces || this.settings.interfaces.length === 0) {
+            if (!this.settings.interfaces || ((_b = this.settings.interfaces) === null || _b === void 0 ? void 0 : _b.length) === 0) {
                 this.initInterfaces();
                 emptyConfig = true;
             }
             if (emptyConfig)
                 this.updateUserSettings();
-            if (!this.settings.devices)
+            if (!((_c = this.settings) === null || _c === void 0 ? void 0 : _c.devices))
                 this.settings.devices = [];
             this.settings.devices.forEach(d => {
                 try {
@@ -106,12 +109,24 @@ class DeviceConfigurationService extends events_1.default {
     isNewUi() {
         return this.features['NEW_UI'] === true;
     }
+    verifyCapabilityExists(capability) {
+        const { capabilities } = this.settings;
+        const found = capabilities.find(c => c.capability === capability);
+        if (!found) {
+            capabilities.push({ capability, devices: [], disabled: false, selected: undefined });
+        }
+    }
     verifyCapabilitySettings() {
         var _a;
         const { capabilities } = this.settings;
         const isNewUi = this.isNewUi();
         const bikeCapIdx = capabilities.findIndex(c => c.capability === 'bike');
         if (isNewUi) {
+            this.verifyCapabilityExists(incyclist_devices_1.IncyclistCapability.Control);
+            this.verifyCapabilityExists(incyclist_devices_1.IncyclistCapability.Power);
+            this.verifyCapabilityExists(incyclist_devices_1.IncyclistCapability.HeartRate);
+            this.verifyCapabilityExists(incyclist_devices_1.IncyclistCapability.Speed);
+            this.verifyCapabilityExists(incyclist_devices_1.IncyclistCapability.Cadence);
             if (bikeCapIdx !== -1) {
                 capabilities.splice(bikeCapIdx, 1);
             }
@@ -206,11 +221,13 @@ class DeviceConfigurationService extends events_1.default {
         const gears = (0, clone_1.default)(gearSelection || {});
         const { bikes = [], hrms = [] } = gears;
         this.settings = { interfaces: [], devices: [], capabilities: [] };
+        this.initCapabilties();
         const { interfaces, devices, capabilities } = this.settings;
+        const get = ((x, def) => x === undefined || x === null ? def : x);
         interfaces.push({ name: 'ant', enabled: ((_a = connections === null || connections === void 0 ? void 0 : connections.ant) === null || _a === void 0 ? void 0 : _a.enabled) || true });
         interfaces.push({ name: 'ble', enabled: true });
-        interfaces.push({ name: 'serial', enabled: ((_b = connections === null || connections === void 0 ? void 0 : connections.serial) === null || _b === void 0 ? void 0 : _b.enabled) || true, protocol: (_d = (_c = connections === null || connections === void 0 ? void 0 : connections.serial) === null || _c === void 0 ? void 0 : _c.protocols) === null || _d === void 0 ? void 0 : _d.find(p => p.selected).name });
-        interfaces.push({ name: 'tcpip', enabled: ((_e = connections === null || connections === void 0 ? void 0 : connections.tcpip) === null || _e === void 0 ? void 0 : _e.enabled) || false, protocol: 'Daum Premium', port: 51955 });
+        interfaces.push({ name: 'serial', enabled: get((_b = connections === null || connections === void 0 ? void 0 : connections.serial) === null || _b === void 0 ? void 0 : _b.enabled, true), protocol: (_d = (_c = connections === null || connections === void 0 ? void 0 : connections.serial) === null || _c === void 0 ? void 0 : _c.protocols) === null || _d === void 0 ? void 0 : _d.find(p => p.selected).name });
+        interfaces.push({ name: 'tcpip', enabled: get((_e = connections === null || connections === void 0 ? void 0 : connections.tcpip) === null || _e === void 0 ? void 0 : _e.enabled, false), protocol: 'Daum Premium', port: 51955 });
         bikes.forEach(bike => {
             if (bike.protocol === 'Simulator')
                 bike.interface = 'simulator';

package/lib/devices/pairing/service.js

@@ -439,7 +439,6 @@ class DevicePairingService extends service_2.IncyclistService {
                     }
                     if (changedIdx !== -1) {
                         prev[changedIdx].isScanning = ifDetails.isScanning;
-                        prev[changedIdx].enabled = ifDetails.enabled;
                         prev[changedIdx].state = ifDetails.state;
                     }
                     this.emitStateChange({ interfaces: this.state.interfaces });
@@ -615,6 +614,10 @@ class DevicePairingService extends service_2.IncyclistService {
         const capabilites = adapter.getCapabilities();
         capabilites.forEach(c => {
             const info = this.getCapability(c);
+            if (!info) {
+                this.logEvent({ message: 'warning: capabability not found', c, caps: this.state.capabilities });
+                return;
+            }
             let device = this.getCapabilityDevice(c, udid);
             if (device) {
                 device.connectState = 'connected';
@@ -732,6 +735,13 @@ class DevicePairingService extends service_2.IncyclistService {
     startPairing(adapters, props) {
         return __awaiter(this, void 0, void 0, function* () {
             this.emit('pairing-start');
+            const isReady = !this.state.interfaces.find(i => i.enabled && i.state === 'connecting');
+            if (!isReady) {
+                setTimeout(() => {
+                    this.run();
+                }, 1000);
+                return;
+            }
             this.logEvent({ message: 'Start Pairing', adapters, props });
             this.processConnectedDevices(adapters);
             const selected = this.state.capabilities.map(c => c.selected);
@@ -771,11 +781,19 @@ class DevicePairingService extends service_2.IncyclistService {
         return __awaiter(this, void 0, void 0, function* () {
             const interfaces = this.state.interfaces.filter(i => this.isInterfaceEnabled(i)) || [].map(i => i.name);
             if (interfaces.length === 0) {
-                yield (0, utils_1.sleep)(500);
-                this.run();
+                setTimeout(() => {
+                    this.run();
+                }, 1000);
                 return;
             }
             this.emit('scanning-start');
+            const isReady = !this.state.interfaces.find(i => i.enabled && i.state === 'connecting');
+            if (!isReady) {
+                setTimeout(() => {
+                    this.run();
+                }, 1000);
+                return;
+            }
             this.logEvent({ message: 'Start Scanning', props });
             this.initScanningCallbacks();
             const timeout = props.enforcedScan ? 1000 * 60 * 60 : undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.48",
+  "version": "1.0.50",
   "peerDependencies": {
     "gd-eventlog": "^0.1.24"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "incyclist-devices": "^2.1.19",
+    "incyclist-devices": "^2.1.21",
     "uuid": "^9.0.0"
   }
 }