incyclist-services 1.0.25 → 1.0.28

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

@@ -1,12 +1,11 @@
 /// <reference types="node" />
 import EventEmitter from "events";
-import { DeviceData, DeviceSettings, ControllableDeviceAdapter } from "incyclist-devices";
 import { DeviceAccessService } from "../access/service";
 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";
 import { EventLogger } from 'gd-eventlog';
+import { CyclingMode, DeviceData, DeviceSettings, IncyclistDeviceAdapter, UpdateRequest } from "incyclist-devices";
 export declare class DeviceRideService extends EventEmitter {
     protected static _instance: DeviceRideService;
     protected configurationService: DeviceConfigurationService;
@@ -37,7 +36,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;
+    setSerialPortInUse(adapter: IncyclistDeviceAdapter): void;
     protected startAdapters(adapters: AdapterRideInfo[], startType: 'start' | 'check', props?: RideServiceDeviceProperties): Promise<boolean>;
     start(props: RideServiceDeviceProperties): Promise<boolean>;
     cancelStart(): Promise<boolean>;

package/lib/devices/ride/service.js

@@ -14,7 +14,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.useDeviceRide = exports.DeviceRideService = void 0;
 const events_1 = __importDefault(require("events"));
-const incyclist_devices_1 = require("incyclist-devices");
 const sleep_1 = require("../../utils/sleep");
 const service_1 = require("../access/service");
 const configuration_1 = require("../configuration");
@@ -22,6 +21,7 @@ const clone_1 = __importDefault(require("../../utils/clone"));
 const settings_1 = require("../../settings");
 const gd_eventlog_1 = require("gd-eventlog");
 const logging_1 = require("../../utils/logging");
+const incyclist_devices_1 = require("incyclist-devices");
 class DeviceRideService extends events_1.default {
     static getInstance() {
         if (!DeviceRideService._instance)
@@ -352,7 +352,7 @@ class DeviceRideService extends events_1.default {
                         let mode, settings;
                         if (!this.simulatorEnforced) {
                             if (forceErgMode) {
-                                const modes = d.getSupportedCyclingModes().filter(C => C.isERG);
+                                const modes = d.getSupportedCyclingModes().filter(C => C.supportsERGMode());
                                 if (modes.length > 0) {
                                     mode = new modes[0](d);
                                     const modeInfo = this.configurationService.getModeSettings(ai.udid, mode);

package/lib/utils/merge.js

@@ -2,6 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.merge = void 0;
 function merge(base, data, depth = 0) {
+    if (!base)
+        return;
     let key;
     for (key in data) {
         if (typeof (data[key]) === 'object' && depth < 4) {

package/package.json

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