incyclist-services 1.0.28 → 1.0.30

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

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { IncyclistDeviceAdapter } from "incyclist-devices";
+import { IncyclistCapability, IncyclistDeviceAdapter } from "incyclist-devices";
 import { AdapterInfo, DeviceConfigurationInfo, DeviceConfigurationSettings, DeviceModeInfo, ExtendedIncyclistCapability, IncyclistDeviceSettings, InterfaceSetting, LegacySettings } from "./model";
 import EventEmitter from "events";
 import { EventLogger } from "gd-eventlog";
@@ -56,6 +56,10 @@ export declare class DeviceConfigurationService extends EventEmitter {
     getSelected(capability: ExtendedIncyclistCapability): IncyclistDeviceAdapter | undefined;
     protected isDisabled(capability: ExtendedIncyclistCapability): boolean;
     protected getCapabilityInfo(capability: ExtendedIncyclistCapability): CapabilityListDetails;
+    getSelectedDevices(capability?: IncyclistCapability): Array<{
+        capability: IncyclistCapability;
+        selected?: string;
+    }>;
     getInterfaceSettings(ifName: string): InterfaceSetting;
     isInterfaceEnabled(ifName: string): boolean;
     enableInterface(ifName: string): void;

package/lib/devices/configuration/service.js

@@ -675,6 +675,17 @@ class DeviceConfigurationService extends events_1.default {
         });
         return { adapters, selectedIdx, disabled };
     }
+    getSelectedDevices(capability) {
+        var _a, _b;
+        let capabilites = (_a = this.settings) === null || _a === void 0 ? void 0 : _a.capabilities;
+        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 => {
+            const { capability, selected } = c;
+            return { capability: capability, selected };
+        });
+    }
     getInterfaceSettings(ifName) {
         if (!this.settings)
             this.settings = { interfaces: [] };

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

@@ -30,6 +30,7 @@ export declare class DeviceRideService extends EventEmitter {
         name: string;
         isControl: boolean;
         capabilities: import("../configuration").ExtendedIncyclistCapability[];
+        isStarted: boolean;
     };
     protected getAdapterList(onlySelected?: boolean): AdapterRideInfo[];
     prepareEppRoute(props: RideServiceDeviceProperties): PreparedRoute;
@@ -39,6 +40,7 @@ export declare class DeviceRideService extends EventEmitter {
     setSerialPortInUse(adapter: IncyclistDeviceAdapter): void;
     protected startAdapters(adapters: AdapterRideInfo[], startType: 'start' | 'check', props?: RideServiceDeviceProperties): Promise<boolean>;
     start(props: RideServiceDeviceProperties): Promise<boolean>;
+    startRetry(props: RideServiceDeviceProperties): Promise<boolean>;
     cancelStart(): Promise<boolean>;
     startRide(_props: any): void;
     stop(udid?: string): Promise<boolean>;

package/lib/devices/ride/service.js

@@ -74,7 +74,8 @@ class DeviceRideService extends events_1.default {
         const { udid, adapter, capabilities } = adapterInfo;
         const name = adapter.getUniqueName();
         const isControl = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control);
-        return { udid, name, isControl, capabilities };
+        const isStarted = adapter.isStarted();
+        return { udid, name, isControl, capabilities, isStarted };
     }
     getAdapterList(onlySelected = true) {
         var _a;
@@ -388,26 +389,30 @@ class DeviceRideService extends events_1.default {
                     .then((success) => __awaiter(this, void 0, void 0, function* () {
                     if (success) {
                         this.emit(`${startType}-success`, this.getAdapterStateInfo(ai));
+                        this.logEvent(Object.assign({ message: `${startType} ${sType} request finished` }, logProps));
+                        if (startType === 'check')
+                            yield ai.adapter.pause().catch(console.log);
+                        if (ai.adapter.isControllable())
+                            this.setSerialPortInUse(ai.adapter);
                     }
-                    ai.isStarted = true;
-                    this.logEvent(Object.assign({ message: `${startType} ${sType} request finished` }, logProps));
-                    if (startType === 'check') {
-                        yield ai.adapter.pause().catch(console.log);
-                        ai.adapter.off('data', this.deviceDataHandler);
+                    else {
+                        this.emit(`${startType}-error`, this.getAdapterStateInfo(ai));
+                        this.logEvent(Object.assign({ message: `${startType} ${sType} request failed` }, logProps));
+                        if (startType === 'check')
+                            yield ai.adapter.stop().catch(console.log);
                     }
-                    if (ai.adapter.isControllable())
-                        this.setSerialPortInUse(ai.adapter);
+                    ai.isStarted = success;
                     return success;
                 }))
-                    .catch(err => {
+                    .catch((err) => __awaiter(this, void 0, void 0, function* () {
                     ai.isStarted = false;
                     this.logEvent(Object.assign(Object.assign({ message: `${startType} ${sType} request failed` }, logProps), { reason: err.message }));
                     this.emit(`${startType}-error`, this.getAdapterStateInfo(ai), err);
                     if (startType === 'check') {
-                        ai.adapter.off('data', this.deviceDataHandler);
+                        yield ai.adapter.stop().catch(console.log);
                     }
                     return false;
-                });
+                }));
             }));
             if (!this.startPromises)
                 return true;
@@ -432,6 +437,18 @@ class DeviceRideService extends events_1.default {
             return this.startAdapters(adapters, 'start', props);
         });
     }
+    startRetry(props) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.lazyInit();
+            const allAdapters = this.getAdapterList();
+            this.emit('start-request', allAdapters === null || allAdapters === void 0 ? void 0 : allAdapters.map(this.getAdapterStateInfo));
+            const adapters = this.getAdapterList().filter(ai => !ai.adapter.isStarted());
+            const goodToGo = yield this.waitForPreviousStartToFinish();
+            if (!goodToGo)
+                return;
+            return this.startAdapters(adapters, 'start', props);
+        });
+    }
     cancelStart() {
         return __awaiter(this, void 0, void 0, function* () {
             const adapters = this.getAdapterList();
@@ -485,18 +502,23 @@ class DeviceRideService extends events_1.default {
     }
     onData(deviceSettings, data) {
         const adapters = this.getAdapterList();
-        const hasControl = (adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.capabilities.includes(incyclist_devices_1.IncyclistCapability.Control))) !== undefined;
-        const hasPower = (adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.capabilities.includes(incyclist_devices_1.IncyclistCapability.Power))) !== undefined;
         const adapterInfo = adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.adapter.isEqual(deviceSettings));
         if (!adapterInfo)
             return;
-        adapterInfo.capabilities.forEach(capability => {
+        adapters === null || adapters === void 0 ? void 0 : adapters.forEach(ai => ai.capabilities = ai.adapter.getCapabilities());
+        const selectedDevices = this.configurationService.getSelectedDevices();
+        const enabledCapabilities = selectedDevices.filter(sd => sd.selected === adapterInfo.udid).map(c => c.capability);
+        const hasControl = (adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.capabilities.includes(incyclist_devices_1.IncyclistCapability.Control))) !== undefined;
+        const hasPower = (adapters === null || adapters === void 0 ? void 0 : adapters.find(ai => ai.capabilities.includes(incyclist_devices_1.IncyclistCapability.Power))) !== undefined;
+        enabledCapabilities.forEach(capability => {
             switch (capability) {
                 case incyclist_devices_1.IncyclistCapability.HeartRate:
                     this.data.heartrate = data.heartrate;
                     break;
                 case incyclist_devices_1.IncyclistCapability.Power:
                     this.data.power = data.power;
+                    break;
+                case incyclist_devices_1.IncyclistCapability.Speed:
                     this.data.speed = data.speed;
                     break;
                 case incyclist_devices_1.IncyclistCapability.Cadence:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.28",
+  "version": "1.0.30",
   "peerDependencies": {
     "gd-eventlog": "^0.1.24"
   },
@@ -37,7 +37,7 @@
     "lib": "./src"
   },
   "dependencies": {
-    "incyclist-devices": "^2.1.2",
+    "incyclist-devices": "^2.1.5",
     "uuid": "^9.0.0"
   }
 }