incyclist-services 1.0.16 → 1.0.17

package/lib/devices/configuration/service.js

@@ -87,7 +87,7 @@ class DeviceConfigurationService extends events_1.default {
                     this.adapters[d.udid] = incyclist_devices_1.AdapterFactory.create(d.settings);
                 }
                 catch (err) {
-                    this.logError(err, 'init()->Adapterfactory.create()');
+                    this.logEvent({ message: 'error', fn: 'init()->Adapterfactory.create()', error: err.message, udid: d.udid, settings: d.settings, devices: this.settings.devices, stack: err.stack, });
                 }
             });
             const { capabilities } = this.settings;
@@ -294,18 +294,22 @@ class DeviceConfigurationService extends events_1.default {
         this.emitCapabiltyChanged();
     }
     select(udid, capability, props) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         this.logEvent({ message: 'select device', udid, capability, props });
         const { noRecursive = false, legacy = false } = 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;
         const adapter = this.adapters[udid] || incyclist_devices_1.AdapterFactory.create(deviceSettings);
+        if (!adapter) {
+            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 (capability === 'bike' && !adapter.isControllable())
             return;
         const isControl = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control) || (legacy && capability === 'bike');
         this.addToCapability(udid, capability);
-        const capSettings = (_c = this.settings.capabilities) === null || _c === void 0 ? void 0 : _c.find(c => c.capability === capability);
+        const capSettings = (_d = this.settings.capabilities) === null || _d === void 0 ? void 0 : _d.find(c => c.capability === capability);
         capSettings.selected = udid;
         if (capSettings.disabled)
             delete capSettings.disabled;
@@ -530,7 +534,7 @@ class DeviceConfigurationService extends events_1.default {
             this.getSelected(incyclist_devices_1.IncyclistCapability.Speed) !== undefined);
     }
     getModeSettings(requestedUdid, requestedMode) {
-        var _a, _b;
+        var _a, _b, _c;
         const { capabilities, devices } = this.settings;
         if (!this.isInitialized())
             return;
@@ -546,6 +550,10 @@ class DeviceConfigurationService extends events_1.default {
             let mode, modes, settings;
             let modeObj;
             const adapter = incyclist_devices_1.AdapterFactory.create(device.settings);
+            if (!adapter) {
+                this.logEvent({ message: 'Error: could not find adapter', requestedUdid, requestedMode, devices, adapters: (_c = Object.keys(this.adapters)) === null || _c === void 0 ? void 0 : _c.join(',') });
+                return;
+            }
             mode = requestedMode || device.mode;
             if (adapter.getSupportedCyclingModes) {
                 modes = adapter.getSupportedCyclingModes();

package/lib/devices/ride/service.js

@@ -338,7 +338,7 @@ class DeviceRideService extends events_1.default {
                         startProps.timeout = 30000;
                 }
                 if (startType === 'start') {
-                    if (ai.adapter.isControllable()) {
+                    if (ai.adapter && ai.adapter.isControllable()) {
                         const d = ai.adapter;
                         let mode, settings;
                         if (!this.simulatorEnforced) {
@@ -508,7 +508,7 @@ class DeviceRideService extends events_1.default {
     sendUpdate(request) {
         const adapters = this.getAdapterList();
         adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => {
-            if (ai.adapter.isControllable()) {
+            if (ai.adapter && ai.adapter.isControllable()) {
                 const d = ai.adapter;
                 d.sendUpdate(request);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.16",
+  "version": "1.0.17",
   "peerDependencies": {
     "gd-eventlog": "^0.1.22"
   },