Improve how settings are saved for devices in storage #383

tavicu · Oct 4, 2021 · f5902bf · f5902bf
1 parent 7179c89
commit f5902bf
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 21 deletions.
diff --git a/lib/device.js b/lib/device.js
@@ -36,8 +36,7 @@ module.exports = class Device extends EventEmitter {
 
         this.initLogger();
         this.initStorage();
-        this.initRefresh();
-        this.initInfo();
+        this.initEvents();
 
         this.cache       = new Cache(this);
         this.remote      = new Remote(this);
@@ -86,17 +85,46 @@ module.exports = class Device extends EventEmitter {
     initStorage() {
         this.storage = new Proxy(Storage.get(this.UUID), {
             set: (obj, prop, value) => {
-                obj[prop] = value;
+                if (prop == 'update' && typeof value == 'object') {
+                    for (const key in value) {
+                        obj[key] = value[key];
+                    }
+                } else {
+                    obj[prop] = value;
+                }
+
                 Storage.save();
                 return true;
             }
         });
     }
 
-    initRefresh() {
-        if ([null, false].indexOf(this.config.refresh) !== -1) { return; }
+    initEvents() {
+        // Save informations on storage every
+        // time we fetch them from TV
+        this.on('api.getInfo', (data) => {
+            if (!data) return;
+
+            this.storage['update'] = {
+                frametv: data.device.FrameTVSupport == 'true',
+                tokenauth: data.device.TokenAuthSupport == 'true',
+                powerstate: data.device.PowerState !== undefined
+            };
+        });
+
+        // Trigger request to get informations
+        // after device was loaded
+        this.on('loaded', () => {
+            this.remote.getInfo()
+                .then(() => this.remote.init())
+                .catch(() => {});
+        });
 
+        // Add accessories refresh interval
+        // after device was paired
         this.on('paired', () => {
+            if ([null, false].indexOf(this.config.refresh) !== -1) { return; }
+
             let intervals = require('./options/refresh')(this.config);
 
             if (intervals.main) {
@@ -108,25 +136,13 @@ module.exports = class Device extends EventEmitter {
             }
         });
 
+        // Refresh all accessories when
+        // state of TV was changed
         this.on('state.change', () => {
             this.accessories.forEach(element => element.services.main && element.services.main.getValue())
         });
     }
 
-    initInfo() {
-        this.on('loaded', () => {
-            this.remote.getInfo().then(data => {
-                this.storage['frametv']    = data.device.FrameTVSupport == 'true';
-                this.storage['tokenauth']  = data.device.TokenAuthSupport == 'true';
-                this.storage['powerstate'] = data.device.PowerState !== undefined;
-
-                // Reinitialize Remote after we
-                // fetch device informations
-                this.remote.init();
-            }).catch(() => {});
-        });
-    }
-
     hasOption(key) {
         return key && this.config.options && this.config.options.includes(key);
     }

diff --git a/lib/methods/base.js b/lib/methods/base.js
@@ -104,7 +104,8 @@ module.exports = class Base {
         return fetch(`http://${this.ip}:8001/api/v2/`, {
             signal: timeoutSignal(this.timeout < 500 ? 500 : this.timeout)
         })
-        .then(body => body.json());
+        .then(body => body.json())
+        .then(data => this.device.emit('api.getInfo', data) && data);
     }
 
     /**

diff --git a/lib/remote.js b/lib/remote.js
@@ -203,7 +203,7 @@ module.exports = class Remote {
      * @return {object}
      */
     async getInfo() {
-        if (!await this.api.getActivePing()) {
+        if (!await this.api.getStatePing()) {
             throw new TvOfflineError();
         }