Merge pull request #303 from Grizzelbee/development

Development
Grizzelbee · Jun 20, 2024 · 8e57861 · 8e57861
2 parents df53614 + ae130e2
commit 8e57861
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 19 deletions.
diff --git a/admin/jsonConfig.json b/admin/jsonConfig.json
@@ -58,7 +58,7 @@
       "type": "checkbox",
       "label": "token_received",
       "tooltip": "token_received_desc",
-      "defaultFunc": "data.token.length>0",
+      "defaultFunc": "data.token_received=(data.token.length > 0)",
       "disabled": "true",
       "sm": 30,
       "md": 94,

diff --git a/dyson-utils.js b/dyson-utils.js
@@ -217,7 +217,7 @@ module.exports.zeroFill = function (number, width) {
  * @returns {void}
  * @throws
  */
-module.exports.checkAdapterConfig = function (adapter) {
+module.exports.checkAdapterConfig = async function (adapter) {
   const config = adapter.config;
 
   if (

diff --git a/main.js b/main.js
@@ -1338,11 +1338,11 @@ class dysonAirPurifier extends utils.Adapter {
                 }
               });
             // Sets the interval for status updates
-            adapterLog.info(
-              `Starting Polltimer with a ${adapter.config.pollInterval} seconds interval for device ${thisDevice.Serial}.`
-            );
             // start refresh scheduler with interval from adapters config
             if (adapter.config.pollInterval > 0) {
+              adapterLog.info(
+                `Starting Polltimer with a ${adapter.config.pollInterval} seconds interval for device ${thisDevice.Serial}.`
+              );
               thisDevice.updateIntervalHandle = setInterval(()=> {
                 adapter.pollDeviceInfo(thisDevice, adapterLog, '@ regular schedule');
               }, adapter.config.pollInterval * 1000);
@@ -1496,7 +1496,7 @@ class dysonAirPurifier extends utils.Adapter {
     // Terminate adapter after first start because configuration is not yet received
     // Adapter is restarted automatically when config page is closed
     try {
-      dysonUtils.checkAdapterConfig(this);
+      await dysonUtils.checkAdapterConfig(this);
       await this.main();
     } catch (error) {
       this.log.warn(
@@ -1588,6 +1588,7 @@ class dysonAirPurifier extends utils.Adapter {
         this.log.info(`Cleaned up timeout for ${thisDevice.Serial}.`);
         // todo unsubscribe to any subscribes
       }
+      this.setState('info.connection', false, true);
       this.log.info('Cleaned up everything...');
       callback();
     } catch (e) {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -54,7 +54,7 @@
     "flatted": "^3.3.1",
     "https": "^1.0.0",
     "lodash": "^4.17.21",
-    "mqtt": "^5.7.0",
+    "mqtt": "^5.7.1",
     "path": "^0.12.7"
   },
   "devDependencies": {