Merge branch 'readonlymode'

hobbyquaker · Mar 14, 2021 · 55638f5 · 55638f5
2 parents 26f678a + c0e3287
commit 55638f5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -107,6 +107,8 @@ Options:
                                                                [default: "info"]
   -w, --disable-watch      disable file watching (don't exit process on file
                            changes)                             [default: false]
+  --disable-lwt            disable last-will-and-testament (usefull if the
+                           remote broker is read-only)          [default: false]
   -l, --latitude                                              [default: 48.7408]
   -m, --longitude                                              [default: 9.1778]                                            
 </pre>

diff --git a/config.js b/config.js
@@ -9,6 +9,7 @@ const config = require('yargs')
     .describe('help', 'show help')
     .describe('dir', 'directory to scan for .js and .coffee files. can be used multiple times.')
     .describe('disable-watch', 'disable file watching (don\'t exit process on file changes)')
+    .describe('disable-lwt', 'disable last-will-and-testament (usefull if the remote broker is read-only)')
     .alias({
         c: 'config',
         d: 'dir',
@@ -21,7 +22,6 @@ const config = require('yargs')
         u: 'url',
         v: 'verbosity',
         w: 'disable-watch'
-
     })
     .default({
         url: 'mqtt://127.0.0.1',
@@ -31,7 +31,8 @@ const config = require('yargs')
         'variable-prefix': 'var',
         verbosity: 'info',
         'disable-variables': false,
-        'disable-watch': false
+        'disable-watch': false,
+        'disable-lwt': false
     })
     .config('config')
     .version()

diff --git a/index.js b/index.js
@@ -117,8 +117,17 @@ function sunScheduleEvent(obj, shift) {
 }
 
 // MQTT
-const mqtt = modules.mqtt.connect(config.url, {will: {topic: config.name + '/connected', payload: '0', retain: true}});
-mqtt.publish(config.name + '/connected', '2', {retain: true});
+function connect(config) {
+    var mqtt;
+    if (config.disableLwt) {
+        mqtt = modules.mqtt.connect(config.url);
+    } else {
+        mqtt = modules.mqtt.connect(config.url, {will: {topic: config.name + '/connected', payload: '0', retain: true}});
+        mqtt.publish(config.name + '/connected', '2', {retain: true});
+    }
+    return mqtt;
+}
+const mqtt = connect(config);
 
 let firstConnect = true;
 let startTimeout;