incyclist-services 1.0.8 → 1.0.10

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.d.ts

@@ -18,7 +18,7 @@ export declare class DeviceAccessService extends EventEmitter {
     protected logEvent(event: any): void;
     setDefaultInterfaceProperties(props: InterfaceAccessProps): void;
     enableInterface(ifaceName: string, binding?: any, props?: InterfaceAccessProps): void;
-    disableInterface(ifaceName: string): void;
+    disableInterface(ifaceName: string, avalailable?: boolean): void;
     setInterfaceProperties(ifaceName: string, props: InterfaceAccessProps): void;
     getInterfaceInfo(ifaceName: string): InterfaceInfo;
     protected getInterface(ifaceName: string): IncyclistInterface;

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;
@@ -69,7 +69,7 @@ class DeviceAccessService extends events_1.default {
             this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);
         }
     }
-    disableInterface(ifaceName) {
+    disableInterface(ifaceName, avalailable = true) {
         const existing = this.interfaces[ifaceName];
         if (!existing)
             return;
@@ -84,6 +84,12 @@ class DeviceAccessService extends events_1.default {
             return;
         }
         existing.enabled = false;
+        if (!avalailable) {
+            existing.state = 'unavailable';
+            existing.unavailable = true;
+            this.emit('interface-changed', ifaceName, { name: ifaceName, state: 'unavailable', isScanning: false });
+            return;
+        }
         this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);
     }
     setInterfaceProperties(ifaceName, props) {
@@ -175,21 +181,17 @@ class DeviceAccessService extends events_1.default {
                 interfaces.forEach((i) => {
                     i.on('device', (deviceSettings) => __awaiter(this, void 0, void 0, function* () {
                         var _a, _b;
-                        console.log('~~~ detected device:', deviceSettings);
                         if (adapters.find(a => a.isEqual(deviceSettings))) {
-                            console.log('~~~ device already detected');
                             return;
                         }
                         if (filter.profile && deviceSettings.profile !== filter.profile) {
-                            console.log('~~~ device does not match profile', filter.profile);
                             return;
                         }
                         if (filter.protocol && deviceSettings.protocol !== filter.protocol) {
-                            console.log('~~~ device does not match protocol', filter.protocol);
                             return;
                         }
                         if (filter.protocols && !filter.protocols.includes(deviceSettings.protocol)) {
-                            console.log('~~~ device does not match protocols', filter.protocol);
+                            return;
                         }
                         const adapter = incyclist_devices_1.AdapterFactory.create(deviceSettings);
                         if (filter.capabilities) {
@@ -198,7 +200,6 @@ class DeviceAccessService extends events_1.default {
                                 found = found || adapter.getCapabilities().includes(capability);
                             });
                             if (!found) {
-                                console.log('~~~ device does not match capabilties', filter.capabilities);
                                 return;
                             }
                         }
@@ -219,11 +220,11 @@ class DeviceAccessService extends events_1.default {
                                     yield adapter.stop();
                                 }
                                 catch (err) {
-                                    console.log(err);
+                                    this.logEvent({ message: 'could not start device', device: adapter === null || adapter === void 0 ? void 0 : adapter.getUniqueName(), reason: err.message });
                                 }
                             }
                             catch (err) {
-                                console.log('~~~ start error', err);
+                                this.logEvent({ message: 'error', fn: 'scan#adapte', error: err.message, stack: err.stack });
                             }
                         }
                     }));

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);
@@ -48,6 +48,7 @@ class DeviceConfigurationService extends events_1.default {
                 this.emitInitialized();
                 return;
             }
+            this.logEvent({ message: 'DeviceConfig.init' });
             yield this.userSettings.init();
             if (this.userSettings.get('devices', null) == null && (this.userSettings.get('gearSelection', null) !== null || this.userSettings.get('connections', null) !== null)) {
                 const settings = {};
@@ -90,6 +91,7 @@ class DeviceConfigurationService extends events_1.default {
                 }
             });
             this.removeLegacySettings();
+            this.logEvent({ message: 'DeviceConfig.init done' });
             this.emitInitialized();
         });
     }
@@ -287,6 +289,7 @@ class DeviceConfigurationService extends events_1.default {
     }
     select(udid, capability, props) {
         var _a, _b, _c;
+        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)
@@ -335,6 +338,7 @@ class DeviceConfigurationService extends events_1.default {
         this.updateUserSettings();
     }
     unselect(capability) {
+        this.logEvent({ message: 'unselect device', capability });
         if (!this.settings || !this.settings.capabilities)
             return;
         const settings = this.settings.capabilities.find(c => c.capability === capability);
@@ -347,6 +351,7 @@ class DeviceConfigurationService extends events_1.default {
     add(deviceSettings, legacyMode = false) {
         var _a, _b;
         let udid = this.getUdid(deviceSettings);
+        this.logEvent({ message: 'add device', udid, deviceSettings, legacyMode });
         const deviceAlreadyExists = udid !== undefined;
         let adapter;
         if (deviceAlreadyExists) {
@@ -401,6 +406,7 @@ class DeviceConfigurationService extends events_1.default {
     }
     delete(udid, capability, forceSingle = false) {
         var _a;
+        this.logEvent({ message: 'delete device', udid, capability, forceSingle });
         const deviceSettings = (_a = this.settings.devices.find(d => d.udid === udid)) === null || _a === void 0 ? void 0 : _a.settings;
         if (!deviceSettings)
             return;
@@ -545,6 +551,7 @@ class DeviceConfigurationService extends events_1.default {
         }
     }
     setMode(udid, mode) {
+        this.logEvent({ message: 'set device mode', udid, mode });
         if (!this.isInitialized())
             return;
         const device = this.settings.devices.find(d => d.udid === udid);
@@ -558,6 +565,7 @@ class DeviceConfigurationService extends events_1.default {
         this.emitModeChanged(udid, mode, settings);
     }
     setModeSettings(udid, mode, settings) {
+        this.logEvent({ message: 'set device mode settings', udid, mode, settings });
         if (!this.isInitialized())
             return;
         const device = this.settings.devices.find(d => d.udid === udid);
@@ -644,6 +652,7 @@ class DeviceConfigurationService extends events_1.default {
         return setting.enabled;
     }
     enableInterface(ifName) {
+        this.logEvent({ message: 'enable interface', ifName });
         const setting = this.getInterfaceSettings(ifName);
         if (setting)
             setting.enabled = true;
@@ -653,6 +662,7 @@ class DeviceConfigurationService extends events_1.default {
         this.emitInterfaceChanged(ifName);
     }
     disableInterface(ifName) {
+        this.logEvent({ message: 'disable interface', ifName });
         const setting = this.getInterfaceSettings(ifName);
         if (setting)
             setting.enabled = false;
@@ -662,6 +672,7 @@ class DeviceConfigurationService extends events_1.default {
         this.emitInterfaceChanged(ifName);
     }
     setInterfaceSettings(ifName, settings) {
+        this.logEvent({ message: 'set interface settings', ifName, settings });
         if (settings.name && settings.name !== ifName)
             return;
         const idx = this.settings.interfaces.findIndex(i => i.name === ifName);

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;

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,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "peerDependencies": {
     "gd-eventlog": "^0.1.22"
   },
@@ -36,7 +36,7 @@
     "lib": "./src"
   },
   "dependencies": {
-    "incyclist-devices": "^2.0.7",
+    "incyclist-devices": "^2.0.9",
     "uuid": "^9.0.0"
   }
 }