Allow http in endpoints

Add debug logging to openwebnet-handler and mqtt
slyoldfox · Jul 16, 2024 · 73039f3 · 73039f3
1 parent 053acf8
commit 73039f3
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 30 deletions.
diff --git a/lib/apis/register-endpoint.js b/lib/apis/register-endpoint.js
@@ -35,17 +35,4 @@ module.exports = class Api {
         if (q.raw)
             response.end()
     }
-
-    matchStringInFile(filename, lineMatcher, errorHandler) {
-        const lines = fs.readFileSync(filename).toString().split('\n')
-        console.log("file: " + filename + " contains " + lines.length + " lines.")
-        for (let i = 0; i < lines.length; i++) {
-            let line = lines[i]
-            if (lineMatcher(line)) {
-                console.log("   [OK]")
-                return true
-            }
-        }
-        errorHandler()
-    }
 }
diff --git a/lib/apis/validate-setup.js b/lib/apis/validate-setup.js
@@ -24,7 +24,7 @@ module.exports = class Api {
         }
 
         // Verify trusted-hosts
-        this.matchStringInFile("/home/bticino/cfg/flexisip.conf",
+        utils.matchStringInFile("/home/bticino/cfg/flexisip.conf",
             (line) => { return line.startsWith('trusted-hosts=') && line.indexOf(ip) > 0 },
             () => { errors.push(`Please add the IP ${ip} to /home/bticino/cfg/flexisip.conf or scrypted won't be able to talk to the SIP server.`) }
         )
@@ -34,17 +34,4 @@ module.exports = class Api {
         if (q.raw)
             response.end()
     }
-
-    matchStringInFile(filename, lineMatcher, errorHandler) {
-        var lines = fs.readFileSync(filename).toString().split('\n')
-        console.log("file: " + filename + " contains " + lines.length + " lines.")
-        for (let i = 0; i < lines.length; i++) {
-            let line = lines[i]
-            if (lineMatcher(line)) {
-                console.log("   [OK]")
-                return true
-            }
-        }
-        errorHandler()
-    }
 }
diff --git a/lib/endpoint-registry.js b/lib/endpoint-registry.js
@@ -1,6 +1,7 @@
 "use strict";
 
 const https = require("https")
+const http = require("http")
 const utils = require("./utils")
 const debug = utils.getDebugger("endpoint-registry")
 const CHECK_INTERVAL = 30 * 1000
@@ -46,7 +47,11 @@ class EndpointRegistry {
       this.#endpoints.forEach((v, k) => {
          let url = v[type]
          if (url) {
-            https.get(url, requestOptions, (res) => { console.log(" [" + res.statusCode + "] for endpoint: " + url) })
+            if( url.toString().indexOf("https://") >= 0 ) {
+               https.get(url, requestOptions, (res) => { console.log(" [" + res.statusCode + "] for endpoint: " + url) })
+            } else {
+               http.get(url, requestOptions, (res) => { console.log(" [" + res.statusCode + "] for endpoint: " + url) })
+            }  
          } else {
             console.warn(`Ignoring dispatch event '${type}' for endpoint: ${k}`)
          }

diff --git a/lib/handlers/openwebnet-handler.js b/lib/handlers/openwebnet-handler.js
@@ -1,4 +1,6 @@
 const btAvMedia = require("./bt-av-media")
+const utils = require("../utils")
+const debug = utils.getDebugger("openwebnet-handler")
 
 class OpenwebnetHandler {
 
@@ -18,7 +20,7 @@ class OpenwebnetHandler {
 
     handle(listener, system, msg) {
         // Uncomment the line below if you wish to debug and view the messages in the console
-        //console.log(msg)
+        debug(msg)
         this.#mqtt.dispatch(msg)
         switch (msg) {
             case msg.startsWith('*8*19*') ? msg : undefined:

diff --git a/lib/mqtt.js b/lib/mqtt.js
@@ -1,5 +1,6 @@
 const config = require('../config')
 const utils = require("./utils")
+const debug = utils.getDebugger("mqtt")
 const openwebnet = require('./openwebnet')
 const child_process = require('child_process')
 
@@ -52,7 +53,7 @@ class MQTT {
     #dispatchInternal( topic, msg ) {
         if( config.mqtt_config.enabled && config.mqtt_config.host.length > 0 ) {
             let cmd = this.#cmd + ( config.mqtt_config.retain ? ' -r' : '' ) + ' -t ' + topic + " -m '" + msg + "'"
-            //console.log("exec: " + cmd)
+            debug("exec: " + cmd)
             try {
                 child_process.exec(cmd, {timeout: 2500}, (err, stdout, stderr) => {
                     //console.log(msg)