incyclist-services 1.0.20 → 1.0.22

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

@@ -26,7 +26,7 @@ export declare class DeviceConfigurationService extends EventEmitter {
     protected initInterfaces(): void;
     isInitialized(): boolean;
     initFromLegacy(settings?: LegacySettings): void;
-    protected removeLegacySettings(): void;
+    protected removeLegacySettings(): Promise<void>;
     protected getDeviceConfigurationInfo(): DeviceConfigurationInfo;
     protected emitCapabiltyChanged(capability?: ExtendedIncyclistCapability): void;
     protected emitInitialized(): void;

package/lib/devices/configuration/service.js

@@ -19,6 +19,7 @@ const uuid_1 = require("uuid");
 const events_1 = __importDefault(require("events"));
 const merge_1 = require("../../utils/merge");
 const gd_eventlog_1 = require("gd-eventlog");
+const clone_1 = __importDefault(require("../../utils/clone"));
 class DeviceConfigurationService extends events_1.default {
     static getInstance() {
         if (!DeviceConfigurationService._instance)
@@ -49,8 +50,7 @@ class DeviceConfigurationService extends events_1.default {
                 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)) {
+            if ((this.userSettings.get('gearSelection', 'removed') !== 'removed' || this.userSettings.get('connections', 'removed') !== 'removed')) {
                 const settings = {};
                 settings.connections = this.userSettings.get('connections', {});
                 settings.gearSelection = this.userSettings.get('gearSelection', {});
@@ -64,6 +64,7 @@ class DeviceConfigurationService extends events_1.default {
                 this.emitInitialized();
                 return;
             }
+            yield this.userSettings.init();
             this.settings = {
                 devices: this.userSettings.get('devices', []),
                 capabilities: this.userSettings.get('capabilities', []),
@@ -129,8 +130,9 @@ class DeviceConfigurationService extends events_1.default {
     initFromLegacy(settings = {}) {
         var _a, _b, _c, _d, _e;
         const { gearSelection, connections, modeSettings = {} } = settings;
-        this.logEvent({ message: 'converting settings.json', gearSelection });
-        const { bikes = [], hrms = [] } = gearSelection || {};
+        this.logEvent({ message: 'converting settings.json', gearSelection, connections });
+        const gears = (0, clone_1.default)(gearSelection || {});
+        const { bikes = [], hrms = [] } = gears;
         this.settings = { interfaces: [], devices: [], capabilities: [] };
         const { interfaces, devices, capabilities } = this.settings;
         interfaces.push({ name: 'ant', enabled: ((_a = connections === null || connections === void 0 ? void 0 : connections.ant) === null || _a === void 0 ? void 0 : _a.enabled) || true });
@@ -191,7 +193,7 @@ class DeviceConfigurationService extends events_1.default {
             });
             const key = legacyProfile ? `${legacyProtocol}-${legacyProfile}` : legacyProtocol;
             const modeInfo = modeSettings[key];
-            if (modeInfo) {
+            if (modeInfo && deviceEntry) {
                 deviceEntry.modes = {};
                 deviceEntry.modes[modeInfo.mode] = modeInfo.settings;
                 deviceEntry.mode = modeInfo.mode;
@@ -248,12 +250,16 @@ class DeviceConfigurationService extends events_1.default {
         this.updateUserSettings();
     }
     removeLegacySettings() {
-        if (this.userSettings.get('connections', null) !== null)
-            this.userSettings.set('connections', null);
-        if (this.userSettings.get('gearSelection', null) !== null)
-            this.userSettings.set('gearSelection', null);
-        if (this.userSettings.get('preferences.gear', null) !== null)
-            this.userSettings.set('preferences.gear', null);
+        return __awaiter(this, void 0, void 0, function* () {
+            this.userSettings.set('connections', 'removed', false);
+            this.userSettings.set('gearSelection', 'removed', false);
+            this.userSettings.set('preferences.gear', 'removed', false);
+            yield this.userSettings.save();
+            this.userSettings.set('connections', null, false);
+            this.userSettings.set('gearSelection', null, false);
+            this.userSettings.set('preferences.gear', null, false);
+            yield this.userSettings.save();
+        });
     }
     getDeviceConfigurationInfo() {
         const { capabilities = [], devices = [] } = this.settings;

package/lib/settings/user/service.d.ts

@@ -14,7 +14,7 @@ export declare class UserSettingsService {
     init(): Promise<boolean>;
     getAll(): any;
     get(key: string, defValue: any): any;
-    set(key: string, value: any): void;
+    set(key: string, value: any, save?: boolean): void;
     update(data: any): Promise<boolean>;
     updateSettings(data: any): Promise<boolean>;
     save(): Promise<void>;

package/lib/settings/user/service.js

@@ -79,7 +79,7 @@ class UserSettingsService {
             }
         }
     }
-    set(key, value) {
+    set(key, value, save = true) {
         if (!this.isInitialized)
             throw new Error('Settings are not yet initialized');
         const settings = this.settings;
@@ -92,7 +92,8 @@ class UserSettingsService {
                 delete settings[key];
             else
                 settings[key] = value;
-            this.save();
+            if (save)
+                this.save();
             return value;
         }
         let child = {};
@@ -103,7 +104,8 @@ class UserSettingsService {
                     delete child[k];
                 else
                     child[k] = value;
-                this.save();
+                if (save)
+                    this.save();
                 return value;
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.20",
+  "version": "1.0.22",
   "peerDependencies": {
     "gd-eventlog": "^0.1.24"
   },
@@ -37,7 +37,7 @@
     "lib": "./src"
   },
   "dependencies": {
-    "incyclist-devices": "^2.0.18",
+    "incyclist-devices": "^2.0.24",
     "uuid": "^9.0.0"
   }
 }