incyclist-services 1.0.33 → 1.0.35

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

@@ -22,6 +22,7 @@ export declare class DeviceConfigurationService extends EventEmitter {
     protected logEvent(e: any): void;
     protected logError(err: Error, fn: string): void;
     init(): Promise<void>;
+    protected verifyCapabilitySettings(): void;
     protected initCapabilties(): void;
     protected initInterfaces(): void;
     isInitialized(): boolean;

package/lib/devices/configuration/service.js

@@ -97,11 +97,41 @@ class DeviceConfigurationService extends events_1.default {
                 if (info && info.devices.length > 0 && info.selected === undefined)
                     this.select(info.devices[0], capability);
             }
+            this.verifyCapabilitySettings();
             this.removeLegacySettings();
             this.logEvent({ message: 'DeviceConfig.init done' });
             this.emitInitialized();
         });
     }
+    verifyCapabilitySettings() {
+        const { capabilities } = this.settings;
+        const bikeCap = capabilities.find(c => c.capability === 'bike');
+        if (bikeCap && bikeCap.selected) {
+            const bike = bikeCap.selected;
+            const power = capabilities.find(c => c.capability === incyclist_devices_1.IncyclistCapability.Power && c.selected !== undefined);
+            const control = capabilities.find(c => c.capability === incyclist_devices_1.IncyclistCapability.Control && c.selected !== undefined);
+            const speed = capabilities.find(c => c.capability === incyclist_devices_1.IncyclistCapability.Speed && c.selected !== undefined);
+            const cadence = capabilities.find(c => c.capability === incyclist_devices_1.IncyclistCapability.Cadence && c.selected !== undefined);
+            const adapter = this.getAdapter(bike);
+            const verify = (uuid, cap) => {
+                if (!uuid && adapter.hasCapability(cap)) {
+                    const setting = capabilities.find(c => c.capability === cap);
+                    if (!setting) {
+                        capabilities.push({ capability: cap, devices: [bike], selected: bike, disabled: false });
+                    }
+                    else {
+                        setting.selected = bike;
+                        if (!setting.devices.includes(bike))
+                            setting.devices.push(bike);
+                    }
+                }
+            };
+            verify(control, incyclist_devices_1.IncyclistCapability.Control);
+            verify(power, incyclist_devices_1.IncyclistCapability.Power);
+            verify(speed, incyclist_devices_1.IncyclistCapability.Speed);
+            verify(cadence, incyclist_devices_1.IncyclistCapability.Cadence);
+        }
+    }
     initCapabilties() {
         if (!this.settings)
             this.settings = {};
@@ -681,7 +711,7 @@ class DeviceConfigurationService extends events_1.default {
         if (capability) {
             capabilites = (_b = this.settings) === null || _b === void 0 ? void 0 : _b.capabilities.filter(c => c.capability === capability);
         }
-        return capabilites.filter(c => c.capability !== 'bike' && !(c.disabled === true)).map(c => {
+        return capabilites.filter(c => c.capability !== 'bike' && !(c.disabled === true) && c.selected).map(c => {
             const { capability, selected } = c;
             return { capability: capability, selected };
         });

package/package.json

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