incyclist-services 1.0.7 → 1.0.8

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

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

package/lib/devices/configuration/service.js

@@ -61,6 +61,7 @@ class DeviceConfigurationService extends events_1.default {
                     this.logError(err, 'init()');
                 }
                 this.emitInitialized();
+                return;
             }
             this.settings = {
                 devices: this.userSettings.get('devices', []),
@@ -88,6 +89,7 @@ class DeviceConfigurationService extends events_1.default {
                     this.logError(err, 'init()->Adapterfactory.create()');
                 }
             });
+            this.removeLegacySettings();
             this.emitInitialized();
         });
     }
@@ -118,6 +120,7 @@ class DeviceConfigurationService extends events_1.default {
     }
     initFromLegacy(settings = {}) {
         var _a, _b, _c, _d, _e;
+        this.logEvent({ message: 'converting settings.json' });
         const { gearSelection, connections, modeSettings = {} } = settings;
         const { bikes = [], hrms = [] } = gearSelection || {};
         this.settings = { interfaces: [], devices: [], capabilities: [] };
@@ -136,7 +139,13 @@ class DeviceConfigurationService extends events_1.default {
             delete bike.displayName;
             if (bike.interface === 'ant')
                 delete bike.name;
-            const adapter = incyclist_devices_1.AdapterFactory.create(bike);
+            let adapter;
+            try {
+                adapter = incyclist_devices_1.AdapterFactory.create(bike);
+            }
+            catch (err) {
+                this.logError(err, 'initFromLegacy#bike');
+            }
             if (!adapter) {
                 return;
             }
@@ -186,7 +195,13 @@ class DeviceConfigurationService extends events_1.default {
             delete hrm.displayName;
             if (hrm.interface === 'ant')
                 delete hrm.name;
-            const adapter = incyclist_devices_1.AdapterFactory.create(hrm);
+            let adapter;
+            try {
+                adapter = incyclist_devices_1.AdapterFactory.create(hrm);
+            }
+            catch (err) {
+                this.logError(err, 'initFromLegacy#bike');
+            }
             if (!adapter) {
                 return;
             }
@@ -220,12 +235,18 @@ class DeviceConfigurationService extends events_1.default {
             else
                 capabilities.push({ capability: incyclist_devices_1.IncyclistCapability.HeartRate, devices: [], selected: undefined, disabled: true });
         }
-        this.userSettings.set('connections', null);
-        this.userSettings.set('gearSelection', null);
-        this.userSettings.set('preferences.gear', null);
+        this.removeLegacySettings();
         this.settings = { devices, capabilities, interfaces };
         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);
+    }
     getDeviceConfigurationInfo() {
         const { capabilities = [], devices = [] } = this.settings;
         const { adapters } = this;

package/lib/settings/user/bindings/types.d.ts

@@ -1,13 +1,13 @@
 export interface IUserSettingsBinding {
     getAll(): Promise<any>;
     set(key: string, value: any): Promise<boolean>;
-    save(settings: any): Promise<boolean>;
+    save(settings: any, final?: boolean): Promise<boolean>;
     canOverwrite(): boolean;
 }
 export declare abstract class UserSettingsBinding implements IUserSettingsBinding {
     static getInstance(): IUserSettingsBinding;
     abstract getAll(): Promise<any>;
     abstract set(key: string, value: any): Promise<boolean>;
-    abstract save(settings: any): Promise<boolean>;
+    abstract save(settings: any, final?: boolean): Promise<boolean>;
     abstract canOverwrite(): boolean;
 }

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

@@ -18,6 +18,7 @@ export declare class UserSettingsService {
     update(data: any): Promise<boolean>;
     updateSettings(data: any): Promise<boolean>;
     save(): Promise<void>;
+    onAppClose(): Promise<void>;
 }
 export declare const useUserSettings: () => UserSettingsService;
 export declare const initUserSettings: (binding: IUserSettingsBinding) => UserSettingsService;

package/lib/settings/user/service.js

@@ -16,7 +16,6 @@ exports.initUserSettings = exports.useUserSettings = exports.UserSettingsService
 const gd_eventlog_1 = require("gd-eventlog");
 const clone_1 = __importDefault(require("../../utils/clone"));
 const merge_1 = require("../../utils/merge");
-const sleep_1 = require("../../utils/sleep");
 const valid_1 = require("../../utils/valid");
 class UserSettingsService {
     constructor() {
@@ -83,8 +82,6 @@ class UserSettingsService {
     set(key, value) {
         if (!this.isInitialized)
             throw new Error('Settings are not yet initialized');
-        if (!this.binding.canOverwrite())
-            this.binding.set(key, value);
         const settings = this.settings;
         if (key === undefined || key === null || key === '') {
             throw new Error('key must be specified');
@@ -147,21 +144,27 @@ class UserSettingsService {
                 return;
             }
             this.savePromise = this.binding.save(this.settings);
+            this.isDirty = false;
             try {
                 yield this.savePromise;
                 this.savePromise = null;
-                while (this.isDirty) {
-                    yield (0, sleep_1.sleep)(50);
+                if (this.isDirty) {
                     this.isDirty = false;
                     yield this.save();
                 }
             }
             catch (err) {
-                this.isDirty = true;
+                this.logger.logEvent({ message: 'Error', fn: 'save()', error: err.message, stack: err.stack });
+                this.isDirty = false;
             }
             return;
         });
     }
+    onAppClose() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.binding.save(this.settings, true);
+        });
+    }
 }
 exports.UserSettingsService = UserSettingsService;
 const useUserSettings = () => UserSettingsService.getInstance();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "incyclist-services",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "peerDependencies": {
     "gd-eventlog": "^0.1.22"
   },