From 348666572ed11c9955e51c6d5becc24e3ff4f348 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Reinhard=20X=2E=20F=C3=BCrst?= <rexfue@gmail.com>
Date: Thu, 4 Apr 2019 21:16:18 +0200
Subject: [PATCH] Funktioniert - im Docker

---
 build_and_copy.sh |  4 ++--
 config.json       |  3 +++
 package-lock.json |  5 +++++
 package.json      |  1 +
 routes/switch.js  | 30 +++++++++++++++++++++++-------
 5 files changed, 34 insertions(+), 9 deletions(-)
 create mode 100644 config.json

diff --git a/build_and_copy.sh b/build_and_copy.sh
index 6ce3609..3b8fc02 100755
--- a/build_and_copy.sh
+++ b/build_and_copy.sh
@@ -26,6 +26,6 @@ fi
 if [ $2 != "" ]
 then
     dat=`date +%Y%m%d%H%M`
-    ssh $2 "docker tag $1 $1:V_$dat"
-    docker save $1 | bzip2 | pv | ssh $2 'bunzip2 | docker load'
+    ssh -p 22022 $2 "docker tag $1 $1:V_$dat"
+    docker save $1 | bzip2 | pv | ssh -p 22022 $2 'bunzip2 | docker load'
 fi
\ No newline at end of file
diff --git a/config.json b/config.json
new file mode 100644
index 0000000..33b74ab
--- /dev/null
+++ b/config.json
@@ -0,0 +1,3 @@
+{
+  "brenndauer": 7200
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 6de9072..9f0120c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -71,6 +71,11 @@
       "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
       "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
     },
+    "await-fs": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/await-fs/-/await-fs-1.0.0.tgz",
+      "integrity": "sha1-QAnTAIYz/WYlqgCfCm8aujY38wE="
+    },
     "babel-runtime": {
       "version": "6.26.0",
       "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
diff --git a/package.json b/package.json
index 60b8f78..60c1b73 100644
--- a/package.json
+++ b/package.json
@@ -6,6 +6,7 @@
     "start": "node ./bin/www >>/var/log/laufschrift.log 2>&1"
   },
   "dependencies": {
+    "await-fs": "^1.0.0",
     "cookie-parser": "~1.4.3",
     "debug": "~2.6.9",
     "express": "~4.16.0",
diff --git a/routes/switch.js b/routes/switch.js
index f3b36b9..511128e 100644
--- a/routes/switch.js
+++ b/routes/switch.js
@@ -2,10 +2,13 @@ var express = require('express');
 let  router = express.Router();
 let mqtt = require('mqtt');
 let moment = require('moment');
-let toSend = null;
-let tio;
+const fs = require('await-fs');
 
-const brenndauer = 300;                                      // 20sec Relais ON
+
+const configName = "config.json"
+
+
+let brenndauer = 300;                                      // 20sec Relais ON
 
 // MQTT:
 let MQTTHOST = process.env.MQTTHOST;
@@ -13,20 +16,21 @@ let MQTTPORT = process.env.MQTTPORT;
 let MQTTUSR = process.env.MQTTUSR;
 let MQTTPWD = process.env.MQTTPWD;
 
-/*
+
 if (MQTTHOST === undefined) { MQTTHOST = 'localhost';}
 if (MQTTPORT === undefined) { MQTTPORT = 1883;}
 if (MQTTUSR === undefined) { MQTTUSR = "";}
 if (MQTTPWD === undefined) { MQTTPWD = "";}
-*/
 
+/*
 if (MQTTHOST === undefined) { MQTTHOST = 'laufschrift.rexfue.de';}
 if (MQTTPORT === undefined) { MQTTPORT = 1883;}
 if (MQTTUSR === undefined) { MQTTUSR = "stwLauf";}
 if (MQTTPWD === undefined) { MQTTPWD = "37CrNcgP";}
+*/
+// console.log("H",MQTTHOST," P",MQTTPORT," U",MQTTUSR," p",MQTTPWD);
 
-console.log("H",MQTTHOST," P",MQTTPORT," U",MQTTUSR," p",MQTTPWD);
-
+let tio;
 let connected = false;
 let relais = 'MIST';
 let client = mqtt.connect("mqtt://" + MQTTHOST + ":" + MQTTPORT,{username: MQTTUSR, password: MQTTPWD});
@@ -53,6 +57,18 @@ client.on('reconnect', function(){
 // beim start mal den Zustand abfragen
 doPublish("");
 
+// Konfig einlesen und entsprechende Variablen einstellen
+(async () => {
+    try{
+        let json = await fs.readFile('config.json','utf8')
+        js = JSON.parse(json);
+        brenndauer = js.brenndauer;
+        console.log(brenndauer);
+    }catch(err){
+        console.log(err)
+    }
+})()
+
 
 function doPublish(payload) {
 //    retur.relais='pending';