incyclist-services 1.2.0 → 1.2.1

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

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

package/lib/devices/configuration/service.js

@@ -106,9 +106,6 @@ class DeviceConfigurationService extends events_1.default {
     setFeature(name, enabled) {
         this.features[name] = enabled;
     }
-    isNewUi() {
-        return this.features['NEW_UI'] === true;
-    }
     verifyCapabilityExists(capability) {
         const { capabilities } = this.settings;
         const found = capabilities.find(c => c.capability === capability);
@@ -117,74 +114,20 @@ class DeviceConfigurationService extends events_1.default {
         }
     }
     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);
-            }
-            return;
-        }
-        else {
-            if (bikeCapIdx === -1) {
-                const control = capabilities.find(c => c.capability === incyclist_devices_1.IncyclistCapability.Control && c.selected !== undefined);
-                const bike = Object.assign({}, control);
-                bike.capability = 'bike';
-                capabilities.push(bike);
-            }
-        }
-        const bikeCap = capabilities.find(c => c.capability === 'bike');
-        for (const capability of ['bike', incyclist_devices_1.IncyclistCapability.Control]) {
-            const info = capabilities.find(c => c.capability === capability);
-            if (((_a = info === null || info === void 0 ? void 0 : info.devices) === null || _a === void 0 ? void 0 : _a.length) > 0 && (info === null || info === void 0 ? void 0 : info.selected) === undefined)
-                this.select(info.devices[0], capability);
-        }
-        if (bikeCap === null || bikeCap === void 0 ? void 0 : 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);
-            let changed = false;
-            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 });
-                        changed = true;
-                    }
-                    else {
-                        setting.selected = bike;
-                        if (!setting.devices.includes(bike))
-                            setting.devices.push(bike);
-                        changed = true;
-                    }
-                }
-            };
-            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);
-            if (changed) {
-                this.updateUserSettings();
-                this.logEvent({ message: 'capability changed after verification', capabilities });
-            }
+        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);
         }
+        return;
     }
     initCapabilties() {
-        const isNewUi = this.isNewUi();
         const target = [incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Cadence, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.HeartRate];
-        if (!isNewUi) {
-            target.push('bike');
-        }
         if (!this.settings)
             this.settings = {};
         if (!this.settings.capabilities)
@@ -213,11 +156,7 @@ class DeviceConfigurationService extends events_1.default {
         var _a, _b, _c, _d, _e;
         const { gearSelection, connections, modeSettings = {} } = settings;
         this.logEvent({ message: 'converting settings.json', gearSelection, connections });
-        const isNewUi = this.isNewUi();
         const all = [incyclist_devices_1.IncyclistCapability.Control, incyclist_devices_1.IncyclistCapability.Power, incyclist_devices_1.IncyclistCapability.Cadence, incyclist_devices_1.IncyclistCapability.Speed, incyclist_devices_1.IncyclistCapability.HeartRate];
-        if (!isNewUi) {
-            all.push('bike');
-        }
         const gears = (0, clone_1.default)(gearSelection || {});
         const { bikes = [], hrms = [] } = gears;
         this.settings = { interfaces: [], devices: [], capabilities: [] };
@@ -275,7 +214,7 @@ class DeviceConfigurationService extends events_1.default {
                     this.addToCapability(udid, cc);
                 if (isSelected) {
                     const cap = cc;
-                    if ((!isNewUi && cap === 'bike') || adapter.hasCapability(cap)) {
+                    if (adapter.hasCapability(cap)) {
                         const selectedDevice = capabilities.find(c => c.capability === cap);
                         selectedDevice.selected = udid;
                     }
@@ -407,8 +346,7 @@ class DeviceConfigurationService extends events_1.default {
     select(udid, capability, props) {
         var _a, _b, _c;
         this.logEvent({ message: 'select device', udid, capability, props });
-        const isNewUi = this.isNewUi();
-        const { noRecursive = false, legacy = false, emit = true } = props || {};
+        const { emit = true } = props || {};
         const deviceSettings = (_b = (_a = this.settings.devices) === null || _a === void 0 ? void 0 : _a.find(d => d.udid === udid)) === null || _b === void 0 ? void 0 : _b.settings;
         if (!deviceSettings)
             return;
@@ -417,62 +355,13 @@ class DeviceConfigurationService extends events_1.default {
             this.logEvent({ message: 'error: could not find adapter', fn: 'select', udid, capability, adapters: (_c = Object.keys(this.adapters)) === null || _c === void 0 ? void 0 : _c.join(',') });
             return;
         }
-        if (isNewUi) {
-            if (capability === 'bike')
-                return;
-            this.selectSingleDevice(udid, capability);
-            if (emit)
-                this.emitCapabiltyChanged(capability);
-            this.updateUserSettings();
-            return;
-        }
-        if ((capability === 'bike') && !adapter.isControllable())
+        if (capability === 'bike')
             return;
-        const isControl = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control) || (legacy && !isNewUi && capability === 'bike');
         this.selectSingleDevice(udid, capability);
-        this.emitCapabiltyChanged(capability);
-        if (noRecursive)
-            return;
-        if (isControl) {
-            if (capability !== 'bike' && capability !== incyclist_devices_1.IncyclistCapability.Control) {
-                if (!isNewUi)
-                    this.select(udid, 'bike', { noRecursive: true, legacy });
-                this.select(udid, incyclist_devices_1.IncyclistCapability.Control, { noRecursive: true, legacy });
-            }
-            else {
-                if (!isNewUi && capability === 'bike' && isControl) {
-                    this.select(udid, incyclist_devices_1.IncyclistCapability.Control, { noRecursive: true, legacy });
-                    this.select(udid, incyclist_devices_1.IncyclistCapability.Power, { noRecursive: true, legacy });
-                    if (legacy) {
-                        this.select(udid, incyclist_devices_1.IncyclistCapability.Speed, { noRecursive: true, legacy });
-                        this.select(udid, incyclist_devices_1.IncyclistCapability.Cadence, { noRecursive: true, legacy });
-                    }
-                    if (adapter.hasCapability(incyclist_devices_1.IncyclistCapability.HeartRate)) {
-                        const hrm = this.getSelected(incyclist_devices_1.IncyclistCapability.HeartRate);
-                        if (!hrm && !this.isDisabled(incyclist_devices_1.IncyclistCapability.HeartRate)) {
-                            this.select(udid, incyclist_devices_1.IncyclistCapability.HeartRate);
-                        }
-                        else if (hrm && hrm.hasCapability(incyclist_devices_1.IncyclistCapability.Control)) {
-                            this.select(udid, incyclist_devices_1.IncyclistCapability.HeartRate);
-                        }
-                    }
-                }
-                const otherCapabilties = this.settings.capabilities.filter(c => c.capability !== 'bike' && c.capability !== incyclist_devices_1.IncyclistCapability.Control && !c.disabled && c.selected !== udid);
-                const selectedControllable = otherCapabilties.filter(c => { var _a; return c.selected && ((_a = this.adapters[c.selected]) === null || _a === void 0 ? void 0 : _a.hasCapability(incyclist_devices_1.IncyclistCapability.Control)); });
-                selectedControllable.forEach(c => {
-                    if (adapter.hasCapability(c.capability)) {
-                        this.select(udid, c.capability);
-                    }
-                    else
-                        this.unselect(c.capability);
-                });
-            }
-        }
-        else if (!isControl && !isNewUi && capability === 'bike') {
-            this.unselect(incyclist_devices_1.IncyclistCapability.Control);
-            this.select(udid, incyclist_devices_1.IncyclistCapability.Power, { noRecursive: true, legacy });
-        }
+        if (emit)
+            this.emitCapabiltyChanged(capability);
         this.updateUserSettings();
+        return;
     }
     selectSingleDevice(udid, capability) {
         var _a;
@@ -496,7 +385,6 @@ class DeviceConfigurationService extends events_1.default {
     }
     add(deviceSettings, props) {
         var _a, _b;
-        const isNewUi = this.isNewUi();
         let udid = this.getUdid(deviceSettings);
         const { legacy = false } = props || {};
         this.logEvent({ message: 'add device', udid, deviceSettings, legacy });
@@ -525,30 +413,10 @@ class DeviceConfigurationService extends events_1.default {
             if (c.devices.includes(udid))
                 return udid;
             const isBike = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control);
-            const isPower = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Power);
-            if (legacy && !isNewUi) {
-                const isBikeCap = c.capability === 'bike';
-                const isControlCap = c.capability === incyclist_devices_1.IncyclistCapability.Control;
-                const isHrmCap = c.capability === incyclist_devices_1.IncyclistCapability.HeartRate;
-                const canAdd = (isBikeCap && (isBike || isPower)) ||
-                    (isControlCap && isBike) ||
-                    (!isHrmCap && !isControlCap && (isBike || isPower)) ||
-                    adapter.hasCapability(c.capability);
-                const canSelect = (isBikeCap || isControlCap || isHrmCap) &&
-                    (!c.selected && !c.disabled &&
-                        (isBike || isPower || c.capability === incyclist_devices_1.IncyclistCapability.HeartRate));
-                if (canAdd) {
-                    c.devices.push(udid);
-                    if (canSelect)
-                        c.selected = udid;
-                }
-            }
-            else {
-                if (adapter.hasCapability(c.capability) || (!isNewUi && c.capability === 'bike' && (isBike || isPower))) {
-                    c.devices.push(udid);
-                    if (!c.selected && !c.disabled && (isBike || c.capability === incyclist_devices_1.IncyclistCapability.HeartRate))
-                        c.selected = udid;
-                }
+            if (adapter.hasCapability(c.capability) && c.capability !== 'bike') {
+                c.devices.push(udid);
+                if (!c.selected && !c.disabled && (isBike || c.capability === incyclist_devices_1.IncyclistCapability.HeartRate))
+                    c.selected = udid;
             }
         });
         this.updateUserSettings();
@@ -611,8 +479,8 @@ class DeviceConfigurationService extends events_1.default {
         }
     }
     addToCapability(udid, capability) {
-        const isNewUi = this.isNewUi();
-        if (isNewUi && capability === 'bike')
+        var _a;
+        if (capability === 'bike')
             return;
         if (!this.settings)
             this.settings = {};
@@ -624,12 +492,9 @@ class DeviceConfigurationService extends events_1.default {
             capabilities.push({ capability, devices: [udid], selected: udid });
         }
         else {
-            if (!record.devices.includes(udid))
+            if (!((_a = record.devices) === null || _a === void 0 ? void 0 : _a.includes(udid)))
                 record.devices.push(udid);
         }
-        if (capability !== 'bike' && !this.adapters[udid].hasCapability(capability)) {
-            this.adapters[udid].addCapability(capability);
-        }
     }
     getUdid(deviceSettings) {
         const udids = Object.keys(this.adapters);
@@ -661,12 +526,10 @@ class DeviceConfigurationService extends events_1.default {
         this.userSettings.set('interfaces', this.settings.interfaces);
     }
     canStartRide() {
-        const isNewUi = this.isNewUi();
         const { devices, capabilities } = this.settings || {};
         if (!devices || !capabilities)
             return false;
-        const canStart = ((!isNewUi && this.getSelected('bike') !== undefined) ||
-            this.getSelected(incyclist_devices_1.IncyclistCapability.Control) !== undefined ||
+        const canStart = (this.getSelected(incyclist_devices_1.IncyclistCapability.Control) !== undefined ||
             this.getSelected(incyclist_devices_1.IncyclistCapability.Power) !== undefined ||
             this.getSelected(incyclist_devices_1.IncyclistCapability.Speed) !== undefined);
         return canStart;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "peerDependencies": {
     "gd-eventlog": "^0.1.26"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "axios": "^1.6.1",
-    "incyclist-devices": "^2.2.0",
+    "incyclist-devices": "^2.2.1",
     "promise.any": "^2.0.6",
     "uuid": "^9.0.0",
     "xml2js": "^0.6.2"