incyclist-services 1.0.2 → 1.0.3

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

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

package/lib/devices/access/service.js

@@ -21,11 +21,6 @@ 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 = {};
@@ -33,6 +28,11 @@ 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;
+    }
     setDefaultInterfaceProperties(props) {
         this.defaultProps = props;
     }

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

@@ -1,5 +1,5 @@
 import { IncyclistCapability } from 'incyclist-devices';
-export type ExtendedIncyclistCapability = IncyclistCapability | 'bike';
+export declare 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 type IncyclistDeviceSettings = SerialDeviceSettings | AntDeviceSettings | BleDeviceSettings;
+export declare 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 type CapabilitySetting = {
+export declare 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);

package/lib/devices/ride/service.js

@@ -23,11 +23,6 @@ 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 = {};
@@ -37,6 +32,11 @@ 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);
         if (this.debug)

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 {
-    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;
     }
+    static getInstance(path) {
+        if (!JSONFileBindig._instance)
+            JSONFileBindig._instance = new JSONFileBindig(path);
+        return JSONFileBindig._instance;
+    }
     getAll() {
         return __awaiter(this, void 0, void 0, function* () {
             const settings = yield promises_1.default.readFile(this.path);

package/lib/settings/user/service.js

@@ -19,12 +19,6 @@ const merge_1 = require("../../utils/merge");
 const sleep_1 = require("../../utils/sleep");
 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');
@@ -32,6 +26,12 @@ 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/lib/utils/sleep.d.ts

@@ -1 +1 @@
-export declare const sleep: (ms: number) => unknown;
+export declare const sleep: (ms: number) => Promise<void>;

package/package.json

@@ -1,9 +1,8 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "peerDependencies": {
-    "gd-eventlog": "^0.1.22",
-    "incyclist-devices": "^2.0.1"
+    "gd-eventlog": "^0.1.22"
   },
   "devDependencies": {
     "@types/jest": "^29.4.0",
@@ -37,6 +36,7 @@
     "lib": "./src"
   },
   "dependencies": {
+    "incyclist-devices": "^2.0.3",
     "uuid": "^9.0.0"
   }
 }