incyclist-services 1.0.16 → 1.0.18

package/lib/devices/access/model.d.ts

@@ -1,6 +1,6 @@
 import { DeviceSettings, IncyclistCapability } from "incyclist-devices";
-export declare type InterfaceState = 'connected' | 'disconnected' | 'unknown' | 'connecting' | 'disconnecting' | 'unavailable';
-export declare type ScanState = 'start-requested' | 'started' | 'stop-requested' | 'stopped' | 'idle';
+export type InterfaceState = 'connected' | 'disconnected' | 'unknown' | 'connecting' | 'disconnecting' | 'unavailable';
+export type ScanState = 'start-requested' | 'started' | 'stop-requested' | 'stopped' | 'idle';
 export interface InterfaceInfo {
     name: string;
     enabled: boolean;

package/lib/devices/access/service.js

@@ -21,6 +21,11 @@ const merge_1 = require("../../utils/merge");
 const sleep_1 = require("../../utils/sleep");
 const configuration_1 = require("../configuration");
 class DeviceAccessService extends events_1.default {
+    static getInstance() {
+        if (!DeviceAccessService._instance)
+            DeviceAccessService._instance = new DeviceAccessService();
+        return DeviceAccessService._instance;
+    }
     constructor() {
         super();
         this.interfaces = {};
@@ -28,11 +33,6 @@ class DeviceAccessService extends events_1.default {
         this.logger = new gd_eventlog_1.EventLogger('DeviceAccess');
         this.defaultProps = {};
     }
-    static getInstance() {
-        if (!DeviceAccessService._instance)
-            DeviceAccessService._instance = new DeviceAccessService();
-        return DeviceAccessService._instance;
-    }
     logEvent(event) {
         this.logger.logEvent(event);
         const w = global.window;

package/lib/devices/configuration/model/app/index.d.ts

@@ -1,5 +1,5 @@
 import { IncyclistCapability } from 'incyclist-devices';
-export declare type ExtendedIncyclistCapability = IncyclistCapability | 'bike';
+export type ExtendedIncyclistCapability = IncyclistCapability | 'bike';
 export interface DeviceInformation {
     udid: string;
     name: string;

package/lib/devices/configuration/model/repository/index.d.ts

@@ -1,6 +1,6 @@
 import { SerialDeviceSettings, AntDeviceSettings, BleDeviceSettings } from 'incyclist-devices';
 import { ExtendedIncyclistCapability } from '../app';
-export declare type IncyclistDeviceSettings = SerialDeviceSettings | AntDeviceSettings | BleDeviceSettings;
+export type IncyclistDeviceSettings = SerialDeviceSettings | AntDeviceSettings | BleDeviceSettings;
 export * from './legacy';
 export interface DeviceListEntry {
     udid: string;
@@ -22,7 +22,7 @@ export interface ModeListEntry {
     mode: string;
     setting: any;
 }
-export declare type CapabilitySetting = {
+export type CapabilitySetting = {
     selected: string | undefined;
     capability: ExtendedIncyclistCapability;
     disabled?: boolean;

package/lib/devices/configuration/service.js

@@ -20,17 +20,17 @@ const events_1 = __importDefault(require("events"));
 const merge_1 = require("../../utils/merge");
 const gd_eventlog_1 = require("gd-eventlog");
 class DeviceConfigurationService extends events_1.default {
+    static getInstance() {
+        if (!DeviceConfigurationService._instance)
+            DeviceConfigurationService._instance = new DeviceConfigurationService();
+        return DeviceConfigurationService._instance;
+    }
     constructor() {
         super();
         this.adapters = {};
         this.userSettings = (0, settings_1.useUserSettings)();
         this.logger = new gd_eventlog_1.EventLogger('DeviceConfig');
     }
-    static getInstance() {
-        if (!DeviceConfigurationService._instance)
-            DeviceConfigurationService._instance = new DeviceConfigurationService();
-        return DeviceConfigurationService._instance;
-    }
     logEvent(e) {
         var _a;
         (_a = this.logger) === null || _a === void 0 ? void 0 : _a.logEvent(e);
@@ -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

@@ -23,6 +23,11 @@ const settings_1 = require("../../settings");
 const gd_eventlog_1 = require("gd-eventlog");
 const logging_1 = require("../../utils/logging");
 class DeviceRideService extends events_1.default {
+    static getInstance() {
+        if (!DeviceRideService._instance)
+            DeviceRideService._instance = new DeviceRideService();
+        return DeviceRideService._instance;
+    }
     constructor() {
         super();
         this.data = {};
@@ -32,11 +37,6 @@ class DeviceRideService extends events_1.default {
         this.logger = new gd_eventlog_1.EventLogger('Ride');
         this.debug = false;
     }
-    static getInstance() {
-        if (!DeviceRideService._instance)
-            DeviceRideService._instance = new DeviceRideService();
-        return DeviceRideService._instance;
-    }
     logEvent(event) {
         this.logger.logEvent(event);
         const w = global.window;
@@ -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/lib/settings/user/bindings/json.js

@@ -16,16 +16,16 @@ const types_1 = require("./types");
 const promises_1 = __importDefault(require("fs/promises"));
 const DEFAULT_PATH = './settings.json';
 class JSONFileBindig extends types_1.UserSettingsBinding {
-    constructor(path = DEFAULT_PATH) {
-        super();
-        this.path = path;
-        this.savePromise = null;
-    }
     static getInstance(path) {
         if (!JSONFileBindig._instance)
             JSONFileBindig._instance = new JSONFileBindig(path);
         return JSONFileBindig._instance;
     }
+    constructor(path = DEFAULT_PATH) {
+        super();
+        this.path = path;
+        this.savePromise = null;
+    }
     getAll() {
         return __awaiter(this, void 0, void 0, function* () {
             const settings = yield promises_1.default.readFile(this.path);

package/lib/settings/user/service.js

@@ -18,6 +18,12 @@ const clone_1 = __importDefault(require("../../utils/clone"));
 const merge_1 = require("../../utils/merge");
 const valid_1 = require("../../utils/valid");
 class UserSettingsService {
+    static getInstance() {
+        if (!UserSettingsService._instance) {
+            UserSettingsService._instance = new UserSettingsService();
+        }
+        return UserSettingsService._instance;
+    }
     constructor() {
         this.settings = {};
         this.logger = new gd_eventlog_1.EventLogger('UserSettings');
@@ -25,12 +31,6 @@ class UserSettingsService {
         this.isDirty = false;
         this.savePromise = null;
     }
-    static getInstance() {
-        if (!UserSettingsService._instance) {
-            UserSettingsService._instance = new UserSettingsService();
-        }
-        return UserSettingsService._instance;
-    }
     setBinding(binding) {
         this.binding = binding;
     }

package/package.json

@@ -1,22 +1,23 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "peerDependencies": {
-    "gd-eventlog": "^0.1.22"
+    "gd-eventlog": "^0.1.24"
   },
   "devDependencies": {
-    "@types/jest": "^29.4.0",
-    "@types/node": "^18.14.1",
-    "@typescript-eslint/eslint-plugin": "^5.53.0",
-    "@typescript-eslint/parser": "^5.53.0",
-    "eslint": "^8.34.0",
-    "jest": "^29.4.3",
+    "@types/jest": "^29.5.3",
+    "@types/node": "^20.5.0",
+    "@typescript-eslint/eslint-plugin": "^6.4.0",
+    "@typescript-eslint/parser": "^6.4.0",
+    "eslint": "^8.47.0",
+    "eslint-config-react-app": "^7.0.1",
+    "jest": "^29.6.2",
     "jsdoc": "^4.0.2",
-    "ts-jest": "^29.0.5",
-    "typedoc": "^0.23.25",
-    "typedoc-plugin-markdown": "^3.14.0",
+    "ts-jest": "^29.1.1",
+    "typedoc": "^0.24.8",
+    "typedoc-plugin-markdown": "^3.15.4",
     "typedoc-plugin-no-inherit": "^1.4.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.1.6"
   },
   "scripts": {
     "lint": "eslint . --ext .ts",
@@ -36,7 +37,7 @@
     "lib": "./src"
   },
   "dependencies": {
-    "incyclist-devices": "^2.0.15",
+    "incyclist-devices": "^2.0.16",
     "uuid": "^9.0.0"
   }
 }