incyclist-services 1.0.23 → 1.0.25

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

@@ -36,7 +36,9 @@ export declare class DeviceConfigurationService extends EventEmitter {
         legacy?: boolean;
     }): void;
     unselect(capability: ExtendedIncyclistCapability): void;
-    add(deviceSettings: IncyclistDeviceSettings, legacyMode?: boolean): void;
+    add(deviceSettings: IncyclistDeviceSettings, props?: {
+        legacy?: boolean;
+    }): string;
     delete(udid: string, capability?: ExtendedIncyclistCapability, forceSingle?: boolean): void;
     protected deleteFromDeviceList(udid: string): void;
     protected addToCapability(udid: string, capability: ExtendedIncyclistCapability): void;
@@ -60,6 +62,7 @@ export declare class DeviceConfigurationService extends EventEmitter {
     disableInterface(ifName: string): void;
     setInterfaceSettings(ifName: any, settings: InterfaceSetting): void;
     emitInterfaceChanged(ifName: string): void;
+    emitDeviceDeleted(settings: IncyclistDeviceSettings): void;
 }
 export declare const useDeviceConfiguration: () => DeviceConfigurationService;
 export {};

package/lib/devices/configuration/service.js

@@ -373,10 +373,11 @@ class DeviceConfigurationService extends events_1.default {
             this.emitCapabiltyChanged(settings.capability);
         }
     }
-    add(deviceSettings, legacyMode = false) {
+    add(deviceSettings, props) {
         var _a, _b;
         let udid = this.getUdid(deviceSettings);
-        this.logEvent({ message: 'add device', udid, deviceSettings, legacyMode });
+        const { legacy = false } = props || {};
+        this.logEvent({ message: 'add device', udid, deviceSettings, legacy });
         const deviceAlreadyExists = udid !== undefined;
         let adapter;
         if (deviceAlreadyExists) {
@@ -401,7 +402,7 @@ class DeviceConfigurationService extends events_1.default {
                 return;
             const isBike = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Control);
             const isPower = adapter.hasCapability(incyclist_devices_1.IncyclistCapability.Power);
-            if (legacyMode) {
+            if (legacy) {
                 const isBikeCap = c.capability === 'bike';
                 const isControlCap = c.capability === incyclist_devices_1.IncyclistCapability.Control;
                 const isHrmCap = c.capability === incyclist_devices_1.IncyclistCapability.HeartRate;
@@ -428,6 +429,7 @@ class DeviceConfigurationService extends events_1.default {
         });
         this.updateUserSettings();
         this.emitCapabiltyChanged();
+        return udid;
     }
     delete(udid, capability, forceSingle = false) {
         var _a;
@@ -474,6 +476,7 @@ class DeviceConfigurationService extends events_1.default {
             this.emitCapabiltyChanged();
             this.updateUserSettings();
         }
+        this.emitDeviceDeleted(deviceSettings);
     }
     deleteFromDeviceList(udid) {
         const { devices = [] } = this.settings || {};
@@ -724,6 +727,9 @@ class DeviceConfigurationService extends events_1.default {
             this.emit('interface-changed', ifName, setting, this.settings.interfaces);
         }
     }
+    emitDeviceDeleted(settings) {
+        this.emit('device-deleted', settings);
+    }
 }
 exports.DeviceConfigurationService = DeviceConfigurationService;
 const useDeviceConfiguration = () => DeviceConfigurationService.getInstance();

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

@@ -1,8 +1,8 @@
 /// <reference types="node" />
 import EventEmitter from "events";
-import { DeviceData, DeviceSettings } from "incyclist-devices";
+import { DeviceData, DeviceSettings, ControllableDeviceAdapter } from "incyclist-devices";
 import { DeviceAccessService } from "../access/service";
-import { AdapterInfo, DeviceConfigurationService } from "../configuration";
+import { AdapterInfo, DeviceConfigurationService, IncyclistDeviceSettings } from "../configuration";
 import CyclingMode, { UpdateRequest } from "incyclist-devices/lib/modes/cycling-mode";
 import { AdapterRideInfo, PreparedRoute, RideServiceCheckFilter, RideServiceDeviceProperties } from "./model";
 import { UserSettingsService } from "../../settings";
@@ -37,6 +37,7 @@ export declare class DeviceRideService extends EventEmitter {
     protected waitForPreviousStartToFinish(): Promise<boolean>;
     startCheck(filter: RideServiceCheckFilter): Promise<void>;
     protected getAdapters(filter: RideServiceCheckFilter): AdapterRideInfo[];
+    setSerialPortInUse(adapter: ControllableDeviceAdapter): void;
     protected startAdapters(adapters: AdapterRideInfo[], startType: 'start' | 'check', props?: RideServiceDeviceProperties): Promise<boolean>;
     start(props: RideServiceDeviceProperties): Promise<boolean>;
     cancelStart(): Promise<boolean>;
@@ -48,6 +49,7 @@ export declare class DeviceRideService extends EventEmitter {
     sendUpdate(request: UpdateRequest): void;
     getCyclingMode(udid?: string): CyclingMode;
     onCyclingModeChanged(udid: string, mode: string, settings: any): Promise<void>;
+    onDeviceDeleted(settings: IncyclistDeviceSettings): void;
     enforceSimulator(enforced?: boolean): void;
 }
 export declare const useDeviceRide: () => DeviceRideService;

package/lib/devices/ride/service.js

@@ -64,7 +64,9 @@ class DeviceRideService extends events_1.default {
             }
             this.adapters = (_a = this.configurationService.getAdapters()) === null || _a === void 0 ? void 0 : _a.map(ai => Object.assign({}, Object.assign(Object.assign({}, ai), { isStarted: false })));
             const handleModeChange = this.onCyclingModeChanged.bind(this);
+            const handleDeviceDeleted = this.onDeviceDeleted.bind(this);
             this.configurationService.on('mode-changed', handleModeChange);
+            this.configurationService.on('device-deleted', handleDeviceDeleted);
             this.userSettings = (0, settings_1.useUserSettings)();
         });
     }
@@ -326,6 +328,13 @@ class DeviceRideService extends events_1.default {
         }
         return adapters || [];
     }
+    setSerialPortInUse(adapter) {
+        if (adapter.getInterface() === 'serial' || adapter.getInterface() === 'tcpip') {
+            const device = adapter;
+            const serial = device.getSerialInterface();
+            serial.setInUse(device.getPort());
+        }
+    }
     startAdapters(adapters, startType, props) {
         return __awaiter(this, void 0, void 0, function* () {
             const { forceErgMode, startPos, realityFactor, rideMode, route } = props || {};
@@ -386,6 +395,8 @@ class DeviceRideService extends events_1.default {
                         yield ai.adapter.pause().catch(console.log);
                         ai.adapter.off('data', this.deviceDataHandler);
                     }
+                    if (ai.adapter.isControllable())
+                        this.setSerialPortInUse(ai.adapter);
                     return success;
                 }))
                     .catch(err => {
@@ -443,6 +454,10 @@ class DeviceRideService extends events_1.default {
     }
     stop(udid) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (!udid)
+                this.logEvent({ message: 'stop devices' });
+            else
+                this.logEvent({ message: 'stop device', udid });
             const adapters = this.getAdapterList();
             this.emit('stop-ride');
             const promises = adapters === null || adapters === void 0 ? void 0 : adapters.filter(ai => udid ? ai.udid === udid : true).map(ai => {
@@ -543,6 +558,13 @@ class DeviceRideService extends events_1.default {
             }
         });
     }
+    onDeviceDeleted(settings) {
+        if (settings.interface === 'serial' || settings.interface === 'tcpip') {
+            const device = incyclist_devices_1.AdapterFactory.create(settings);
+            const serial = device.getSerialInterface();
+            serial.releaseInUse(device.getPort());
+        }
+    }
     enforceSimulator(enforced = true) {
         this.simulatorEnforced = enforced;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "peerDependencies": {
     "gd-eventlog": "^0.1.24"
   },
@@ -37,7 +37,7 @@
     "lib": "./src"
   },
   "dependencies": {
-    "incyclist-devices": "^2.0.29",
+    "incyclist-devices": "^2.0.35",
     "uuid": "^9.0.0"
   }
 }