homebridge-smartsystem 6.1.7 → 6.2.2

package/server/smartapp.js

@@ -21,10 +21,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SmartApp = void 0;
 const webapp_1 = require("./webapp");
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const protocol_1 = require("../duotecno/protocol");
 const http = require("http");
 const somfy = require("./somfy");
 const fs_1 = require("fs");
+const api_1 = require("../duotecno/api");
+const config_1 = require("../duotecno/config");
 const kMaster = { name: "master", type: "string", default: "0.0.0.0:5001" };
 const kAddress = { name: "address", type: "string", default: "0.0.0.0" };
 const kAddressOld = { name: "addressX", type: "string", default: "0.0.0.0" };
@@ -46,12 +49,12 @@ var ContentType;
 (function (ContentType) {
     ContentType[ContentType["form"] = 0] = "form";
     ContentType[ContentType["plain"] = 1] = "plain";
+    ContentType[ContentType["none"] = 2] = "none";
 })(ContentType || (ContentType = {}));
 ;
 class SmartApp extends webapp_1.WebApp {
-    constructor(system, power, platform, dev = false) {
-        super("smartapp" + (dev ? "-dev" : ""));
-        // this.readConfig();
+    constructor(system, power, platform) {
+        super("smartapp");
         this.system = system;
         // get status change updates
         this.system.emitter.on('update', this.informChange.bind(this));
@@ -70,6 +73,7 @@ class SmartApp extends webapp_1.WebApp {
         this.addFile("nodeDetail", __dirname + "/views/node-details.ejs", "text/html");
         this.addFile("serviceList", __dirname + "/views/service-list.ejs", "text/html");
         this.addFile("power", __dirname + "/views/power.ejs", "text/html");
+        this.addFile("login", __dirname + "/views/login.ejs", "text/html");
         this.addFile("settings", __dirname + "/views/settings.ejs", "text/html");
         this.addFile("switchDetail", __dirname + "/views/switch-details.ejs", "text/html");
         this.addFile("switchList", __dirname + "/views/switch-list.ejs", "text/html");
@@ -95,7 +99,7 @@ class SmartApp extends webapp_1.WebApp {
             context["notReadyMessage"] = "=== waiting >> found " +
                 this.system.allActiveUnits().length + " units out of " + this.system.activeUnitsConfig().length + " selected after " +
                 this.platform.startWaiting + " sec ===";
-            (0, types_1.log)("smartapp", "Platform not ready -> " + context["notReadyMessage"]);
+            (0, logger_1.log)("smartapp", "Platform not ready -> " + context["notReadyMessage"]);
         }
         else {
             context["notReady"] = false;
@@ -105,12 +109,35 @@ class SmartApp extends webapp_1.WebApp {
     //////////////
     // password //
     //////////////
-    pwOK(context, pw) {
-        return (pw === this.password);
+    pwOK(context, user, pw) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.token = "";
+            (0, config_1.setToken)("");
+            try {
+                const body = { username: user, password: pw };
+                const header = { "Content-Type": "application/json" };
+                const resp = yield (0, api_1.post)(this.config.apiHost, this.config.apiPort, "/api/auth/login", body, header);
+                const respBody = JSON.parse(resp);
+                if (respBody.access_token) {
+                    this.token = respBody.access_token;
+                    (0, config_1.setToken)(this.token);
+                    return true;
+                }
+            }
+            catch (e) {
+                (0, logger_1.debug)("smartapp", "Login API failed " + JSON.stringify(e));
+            }
+            return false;
+        });
     }
     //////////////////////////////
     // Router                   //
     //////////////////////////////
+    needsLogin(context) {
+        const noNeed = ((context.request === "units") || (context.request === "switches")) &&
+            ((context.action == "press") || (context.action == "get") || (context.action == "set"));
+        return super.needsLogin(context) && (context.request != "files") && (!noNeed);
+    }
     doRequest(context) {
         const _super = Object.create(null, {
             doRequest: { get: () => super.doRequest }
@@ -356,7 +383,7 @@ class SmartApp extends webapp_1.WebApp {
     // Switches //
     //////////////
     initSwitchUnits() {
-        (0, types_1.log)("smartapp", "Init " + this.switches.length + " Switches -> add units");
+        (0, logger_1.log)("smartapp", "Init " + this.switches.length + " Switches -> add units");
         const smappee = this.power.smappee;
         this.switches.forEach(swtch => {
             swtch.unit = swtch.unit ||
@@ -379,17 +406,17 @@ class SmartApp extends webapp_1.WebApp {
                     swtch.status = swtch.unit.status;
                 }
                 else {
-                    (0, types_1.log)("smartapp", "** error ** missing unit: " + (0, types_1.hex)(swtch.logicalNodeAddress) + "/" + (0, types_1.hex)(swtch.logicalAddress) + " **");
+                    (0, logger_1.log)("smartapp", "** error ** missing unit: " + (0, types_1.hex)(swtch.logicalNodeAddress) + "/" + (0, types_1.hex)(swtch.logicalAddress) + " **");
                 }
             }
         });
     }
     alertSwitch(type, plugNr, value) {
-        (0, types_1.debug)("smartapp", "Received " + type + " switch status change: " + plugNr + " -> " + value);
+        (0, logger_1.debug)("smartapp", "Received " + type + " switch status change: " + plugNr + " -> " + value);
         if ((this.power.smappee) && (type === types_1.SwitchType.kSmappee)) {
             this.switches.forEach(swtch => {
                 if ((swtch.type == types_1.SwitchType.kSmappee) && (swtch.plug == plugNr) && swtch.unit) {
-                    (0, types_1.debug)("smartapp", " -> Switch was attached to unit = " + swtch.unit.getDisplayName() + " -> setting state to " + value);
+                    (0, logger_1.debug)("smartapp", " -> Switch was attached to unit = " + swtch.unit.getDisplayName() + " -> setting state to " + value);
                     swtch.unit.setState(value);
                 }
             });
@@ -440,7 +467,7 @@ class SmartApp extends webapp_1.WebApp {
                 if (!((kind === "M") && (swtch.nomacro === "Y")))
                     this.setSwitch(swtch);
                 else
-                    (0, types_1.debug)("smartapp", "*** macro changed blocked by switch");
+                    (0, logger_1.debug)("smartapp", "*** macro changed blocked by switch");
             }
         });
     }
@@ -452,8 +479,9 @@ class SmartApp extends webapp_1.WebApp {
         const stype = context.getParam({ name: "type", type: "string", default: types_1.SwitchType.kNoType });
         const name = context.getParam({ name: "name", type: "string", default: "--" });
         const data = context.getParam({ name: "data", type: "string", default: "" });
+        const header = context.getParam({ name: "header", type: "string", default: "" });
         const method = context.getParam({ name: "method", type: "string", default: "GET" });
-        return { name, unitName, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype, plug, data, method, nomacro, nostop };
+        return { name, unitName, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype, plug, data, header, method, nomacro, nostop };
     }
     updateSwitch(inx, swtch) {
         if ((inx >= 0) && (inx < this.switches.length)) {
@@ -489,10 +517,10 @@ class SmartApp extends webapp_1.WebApp {
             swtch.unit.value = +newvalue;
         }
         if (!swtch) {
-            (0, types_1.err)("smartapp", "Didn't find switch with inx: " + inx);
+            (0, logger_1.err)("smartapp", "Didn't find switch with inx: " + inx);
         }
         else if (!swtch.unit) {
-            (0, types_1.err)("smartapp", "Don't have unit for switch: " + swtch.unitname);
+            (0, logger_1.err)("smartapp", "Don't have unit for switch: " + swtch.unitname);
         }
         else {
             if ((swtch.type === types_1.SwitchType.kSmappee) && (this.power.smappee)) {
@@ -520,7 +548,7 @@ class SmartApp extends webapp_1.WebApp {
                 this.somfy(swtch);
             }
             else {
-                (0, types_1.err)("smartapp", "Don't know how to set a switch of type " + swtch.type);
+                (0, logger_1.err)("smartapp", "Don't know how to set a switch of type " + swtch.type);
             }
         }
     }
@@ -565,8 +593,13 @@ class SmartApp extends webapp_1.WebApp {
     }
     httpSwitch(swtch) {
         const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
-        (0, types_1.log)("smartapp", "HTTP-Switch(" + !!swtch.unit.status + ") -> " + req);
-        this.wrequest(req);
+        let data = "";
+        if (swtch.data) {
+            // we have body data
+            data = this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value);
+        }
+        (0, logger_1.log)("smartapp", "HTTP-Switch(" + !!swtch.unit.status + ") -> " + req);
+        this.wrequest(req, swtch.method, data, ContentType.form, swtch.header);
     }
     httpUpDown(swtch) {
         let url = swtch.plug + "";
@@ -577,12 +610,17 @@ class SmartApp extends webapp_1.WebApp {
         if (val < parts.length) {
             base += parts[val];
         }
+        let data = "";
+        if (swtch.data) {
+            // we have body data
+            data = this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value);
+        }
         if ((val === 1) && (swtch.nostop == 'Y')) {
-            (0, types_1.debug)("smartapp", "Blocked stop for HTTP-UpDown " + swtch.name);
+            (0, logger_1.debug)("smartapp", "Blocked stop for HTTP-UpDown " + swtch.name);
         }
         else {
-            (0, types_1.log)("smartapp", "UpDown(" + val + ") -> " + base);
-            this.wrequest(base);
+            (0, logger_1.log)("smartapp", "UpDown(" + val + ") -> " + base);
+            this.wrequest(base, swtch.method, data, ContentType.form, swtch.header);
         }
     }
     httpDimmer(swtch) {
@@ -593,28 +631,45 @@ class SmartApp extends webapp_1.WebApp {
             // we have body data
             data = this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value);
         }
-        (0, types_1.debug)("smartapp", "Dimmer(" + !!swtch.unit.status + "," + swtch.unit.value + ") -> " + req + " + " + data);
-        this.wrequest(req, swtch.method, data);
+        (0, logger_1.debug)("smartapp", "Dimmer(" + !!swtch.unit.status + "," + swtch.unit.value + ") -> " + req + " + " + data);
+        this.wrequest(req, swtch.method, data, ContentType.form, swtch.header);
     }
-    wrequest(url, method = "GET", formdata, contentType = ContentType.form) {
+    wrequest(url, method = "GET", formdata = "", contentType = ContentType.form, header = "") {
         try {
             // const data = querystring.stringify(formdata);
             const options = { method };
             if (formdata) {
                 if (contentType === ContentType.form) {
-                    options["headers"] = {
+                    options.headers = {
                         'Content-Type': 'application/x-www-form-urlencoded',
                         'Content-Length': Buffer.byteLength(formdata)
                     };
                 }
                 else if (contentType === ContentType.plain) {
-                    options["headers"] = {
+                    options.headers = {
                         'Content-Type': 'text/plain',
                         'Accept': 'application/json'
                     };
                 }
             }
             ;
+            if (header) {
+                if (!options.headers)
+                    options.headers = {};
+                if (header.substring(0, 1) === "{") {
+                    try {
+                        options.headers = Object.assign(Object.assign({}, options.headers), JSON.parse(header));
+                    }
+                    catch (e) {
+                        (0, logger_1.err)("smartapp", "error parsing :" + header + " -> " + JSON.stringify(e));
+                    }
+                }
+                else {
+                    const s = header.split(":");
+                    options.headers[s[0]] = s[1];
+                }
+            }
+            (0, logger_1.debug)("smartapp", "Sending to " + url + " with options: " + JSON.stringify(options));
             const req = http.request(url, options, res => {
                 let resp = "";
                 // res.setEncoding('utf8');
@@ -627,10 +682,10 @@ class SmartApp extends webapp_1.WebApp {
                         const x = JSON.parse(resp);
                         if ((x.type === "Buffer") && x.data)
                             x.data = x.data.toString();
-                        (0, types_1.debug)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x));
+                        (0, logger_1.debug)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x));
                     }
                     catch (e) {
-                        (0, types_1.debug)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + resp);
+                        (0, logger_1.debug)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + resp);
                     }
                     ;
                 });
@@ -639,15 +694,15 @@ class SmartApp extends webapp_1.WebApp {
                 req.write(formdata);
             }
             req.on("error", (e) => {
-                (0, types_1.log)("smartapp", "The request to " + url + ", error: " + e.message);
+                (0, logger_1.log)("smartapp", "The request to " + url + ", error: " + e.message);
             });
             req.on("timeout", (e) => {
-                (0, types_1.log)("smartapp", "The request to " + url + ", timeout: " + e.message);
+                (0, logger_1.log)("smartapp", "The request to " + url + ", timeout: " + e.message);
             });
             req.end();
         }
         catch (e) {
-            (0, types_1.log)("smartapp", "** http error ** " + e.message + " **");
+            (0, logger_1.log)("smartapp", "** http error ** " + e.message + " **");
         }
     }
     //////////////
@@ -655,21 +710,21 @@ class SmartApp extends webapp_1.WebApp {
     //////////////
     ohSwitch(swtch) {
         const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
-        (0, types_1.debug)("smartapp", "OH-Switch(" + !!swtch.unit.status + ") -> " + req);
-        this.wrequest(req, swtch.method, swtch.unit.status ? "ON" : "OFF", ContentType.plain);
+        (0, logger_1.debug)("smartapp", "OH-Switch(" + !!swtch.unit.status + ") -> " + req);
+        this.wrequest(req, swtch.method, swtch.unit.status ? "ON" : "OFF", ContentType.plain, swtch.header);
     }
     ohDimmer(swtch) {
         const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
         const val = (swtch.unit.value == 1) ? "ON" : swtch.unit.value.toString();
-        (0, types_1.debug)("smartapp", "OH-Dimmer(" + !!swtch.unit.status + ", " + val + ") -> " + req);
-        this.wrequest(req, swtch.method, swtch.unit.status ? val : "OFF", ContentType.plain);
+        (0, logger_1.debug)("smartapp", "OH-Dimmer(" + !!swtch.unit.status + ", " + val + ") -> " + req);
+        this.wrequest(req, swtch.method, swtch.unit.status ? val : "OFF", ContentType.plain, swtch.header);
     }
     ohUpDown(swtch) {
         let data;
         // 1=stopped, 2-closed, 3=opened, 4=closing, 5=opening
         if ((swtch.unit.status == 0) || (swtch.unit.status == 1) || (swtch.unit.status == 2)) {
             if (swtch.nostop == 'Y')
-                (0, types_1.debug)("smartapp", "Blocked stop for OH-UpDown " + swtch.name);
+                (0, logger_1.debug)("smartapp", "Blocked stop for OH-UpDown " + swtch.name);
             else
                 data = "STOP";
         }
@@ -681,8 +736,8 @@ class SmartApp extends webapp_1.WebApp {
         }
         if (data) {
             const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
-            (0, types_1.debug)("smartapp", "OH-UpDown(" + swtch.unit.value + ", " + data + ") -> " + req);
-            this.wrequest(req, swtch.method, data, ContentType.plain);
+            (0, logger_1.debug)("smartapp", "OH-UpDown(" + swtch.unit.value + ", " + data + ") -> " + req);
+            this.wrequest(req, swtch.method, data, ContentType.plain, swtch.header);
         }
     }
     //////////////////////////////
@@ -894,7 +949,7 @@ class SmartApp extends webapp_1.WebApp {
     }
     setState(master, nodeLogicalAddress, unitLogicalAddress, value) {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, types_1.log)("smartapp", "setState requested with node = " + nodeLogicalAddress + ", unit = " + unitLogicalAddress + " -> " + value);
+            (0, logger_1.log)("smartapp", "setState requested with node = " + nodeLogicalAddress + ", unit = " + unitLogicalAddress + " -> " + value);
             if ((value === "Y") || (value === "N"))
                 value = (value === "Y");
             else {
@@ -911,7 +966,7 @@ class SmartApp extends webapp_1.WebApp {
     }
     getState(master, nodeLogicalAddress, unitLogicalAddress) {
         return __awaiter(this, void 0, void 0, function* () {
-            (0, types_1.log)("smartapp", "getState requested with node = " + nodeLogicalAddress + ", unit = " + unitLogicalAddress);
+            (0, logger_1.log)("smartapp", "getState requested with node = " + nodeLogicalAddress + ", unit = " + unitLogicalAddress);
             let unit = this.system.findUnit(master, nodeLogicalAddress, unitLogicalAddress);
             if (!unit)
                 return { message: "Unit not found " + master.getName() + "/" + nodeLogicalAddress + "/" + unitLogicalAddress };

package/server/smartapp.ts

@@ -9,7 +9,8 @@
 // v2.0: mar/apr 2020
 
 import { Context, HttpResponse, WebApp } from "./webapp";
-import { log, Sanitizers, Rule, kEmptyRule, actionValue, Action, kEmptySwitch, Switch, SwitchType, hex, Binding, NetworkConfig, SettingsConfig, kEmptySettings, debug, err } from "../duotecno/types";
+import { Sanitizers, Rule, kEmptyRule, actionValue, Action, kEmptySwitch, Switch, SwitchType, hex, Binding, NetworkConfig, SettingsConfig, kEmptySettings } from "../duotecno/types";
+import { log, debug, err } from "../duotecno/logger";
 import { System } from "../duotecno/system";
 import { Node, Unit } from "../duotecno/protocol";
 import { Smappee } from "./smappee";
@@ -20,6 +21,8 @@ import * as somfy  from "./somfy";
 import { existsSync, truncateSync, writeFileSync } from 'fs';
 import { Shelly } from './shelly';
 import { P1 } from './p1';
+import { post } from "../duotecno/api";
+import { getConfig, setAPIConfig, setToken } from "../duotecno/config";
 
 const kMaster = {name: "master", type: "string", default: "0.0.0.0:5001"} as const;
 const kAddress = {name: "address", type: "string", default: "0.0.0.0"} as const;
@@ -42,7 +45,7 @@ const isMac = existsSync("/Volumes");
 const kDHCPConfigFile = isMac ? "./config.dhcpcd" : "/etc/dhcpcd.conf";
 
 
-enum ContentType {form, plain};
+enum ContentType {form, plain, none};
 
 export interface Power {
   smappee?: Smappee;
@@ -57,10 +60,8 @@ export class SmartApp extends WebApp {
   switches: Array<Switch>;
 
 
-  constructor(system: System, power: Power, platform: Platform, dev = false) {
-    super("smartapp" + (dev ? "-dev" : ""));
-
-    // this.readConfig();
+  constructor(system: System, power: Power, platform: Platform) {
+    super("smartapp");
     this.system = system;
 
     // get status change updates
@@ -84,6 +85,7 @@ export class SmartApp extends WebApp {
     this.addFile("nodeDetail", __dirname + "/views/node-details.ejs", "text/html");
     this.addFile("serviceList", __dirname + "/views/service-list.ejs", "text/html");
     this.addFile("power", __dirname + "/views/power.ejs", "text/html");
+    this.addFile("login", __dirname + "/views/login.ejs", "text/html");
     this.addFile("settings", __dirname + "/views/settings.ejs", "text/html");
     this.addFile("switchDetail", __dirname + "/views/switch-details.ejs", "text/html");
     this.addFile("switchList", __dirname + "/views/switch-list.ejs", "text/html");
@@ -101,6 +103,7 @@ export class SmartApp extends WebApp {
     super.writeConfig();
   }
 
+
   readConfig() {
     super.readConfig();
 
@@ -108,6 +111,7 @@ export class SmartApp extends WebApp {
     this.switches = this.config.switches.map(s => Sanitizers.switchConfig(s));
   }
 
+
   checkReady(context: Context) {
     if (this.platform && !this.platform.ready) {
       context["notReady"] = true;
@@ -124,14 +128,35 @@ export class SmartApp extends WebApp {
   //////////////
   // password //
   //////////////
-  pwOK(context: Context, pw: string): boolean {
-    return (pw === this.password);
+  async pwOK(context: Context, user: string, pw: string): Promise<boolean> {
+    this.token = "";
+    setToken("");
+    try {
+      const body = { username : user, password: pw };
+      const header = {"Content-Type": "application/json"};
+      const resp = await post(this.config.apiHost, this.config.apiPort, "/api/auth/login", body, header);
+      const respBody = JSON.parse(resp);
+      if (respBody.access_token) {
+        this.token = respBody.access_token;
+        setToken(this.token);
+        return true;
+      }
+    } catch(e) {
+      debug("smartapp", "Login API failed " + JSON.stringify(e));
+    }
+    return false;
   }
 
   //////////////////////////////
   // Router                   //
   //////////////////////////////
 
+  needsLogin(context: Context): boolean {
+    const noNeed = ((context.request === "units") || (context.request === "switches")) && 
+                   ((context.action == "press") || (context.action == "get") || (context.action == "set"));
+    return super.needsLogin(context) && (context.request != "files") && (!noNeed);
+  }
+
   async doRequest(context: Context): Promise<HttpResponse> {
     this.checkReady(context);
 
@@ -230,7 +255,7 @@ export class SmartApp extends WebApp {
       config = this.scrapeSettings(context);
       context.request = "install";
       this.write("settings", config);
-      this.writeDHCP(context, config);
+      this.writeDHCP(context, <SettingsConfig>config);
 
     } else if (context.action === "reset") {
       config = { ...kEmptySettings };
@@ -499,8 +524,9 @@ export class SmartApp extends WebApp {
     const stype = context.getParam({name: "type", type: "string", default: SwitchType.kNoType });
     const name = context.getParam({name: "name", type: "string", default: "--" });
     const data = context.getParam({name: "data", type: "string", default: "" });
+    const header = context.getParam({name: "header", type: "string", default: "" });
     const method = context.getParam({name: "method", type: "string", default: "GET" });
-    return { name, unitName, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype, plug, data, method, nomacro, nostop };
+    return { name, unitName, masterAddress, masterPort, logicalAddress, logicalNodeAddress, type: stype, plug, data, header, method, nomacro, nostop };
   }
 
   updateSwitch(inx: number, swtch: Switch) {
@@ -621,8 +647,15 @@ export class SmartApp extends WebApp {
 
   httpSwitch(swtch: Switch) {
     const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
+
+    let data = "";
+    if (swtch.data) {
+      // we have body data
+      data = this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value);
+    }
+
     log("smartapp", "HTTP-Switch(" + !!swtch.unit.status + ") -> " + req);
-    this.wrequest(req);
+    this.wrequest(req, swtch.method, data, ContentType.form, swtch.header);
   }
 
   httpUpDown(swtch: Switch) {
@@ -635,12 +668,18 @@ export class SmartApp extends WebApp {
       base += parts[val];
     }
 
+    let data = "";
+    if (swtch.data) {
+      // we have body data
+      data = this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value);
+    }
+
     if ((val === 1) && (swtch.nostop == 'Y')) { 
       debug("smartapp", "Blocked stop for HTTP-UpDown " + swtch.name);
 
     } else {
       log("smartapp", "UpDown(" + val + ") -> " + base);
-      this.wrequest(base);
+      this.wrequest(base, swtch.method, data, ContentType.form, swtch.header);
     }
   }
 
@@ -654,29 +693,43 @@ export class SmartApp extends WebApp {
       data = this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value);
     }
     debug("smartapp", "Dimmer(" + !!swtch.unit.status + "," + swtch.unit.value + ") -> " + req + " + " + data);
-    this.wrequest(req, swtch.method, data);
+    this.wrequest(req, swtch.method, data, ContentType.form, swtch.header);
   }
 
 
-  wrequest(url: string, method = "GET", formdata?, contentType = ContentType.form) {
+  wrequest(url: string, method = "GET", formdata = "", contentType = ContentType.form, header = "") {
     try {
       // const data = querystring.stringify(formdata);
-      const options = { method };
+      const options: {method: string, [key: string]: object | string} = { method };
 
       if (formdata) {
         if (contentType === ContentType.form) {
-          options["headers"] = {
+          options.headers = {
             'Content-Type': 'application/x-www-form-urlencoded',
             'Content-Length': Buffer.byteLength(formdata)
           }
         } else if (contentType === ContentType.plain) {
-          options["headers"] = {
+          options.headers = {
             'Content-Type': 'text/plain',
             'Accept': 'application/json'
           };
         }
       };
+      if (header) {
+        if (!options.headers) options.headers = {};
+        if (header.substring(0,1) === "{") {
+          try {
+            options.headers = { ...<object>options.headers, ...JSON.parse(header)};
+          } catch(e) {
+            err("smartapp", "error parsing :" + header + " -> " + JSON.stringify(e));
+          }
+        } else {
+          const s = header.split(":");
+          options.headers[s[0]] = s[1];
+        }
+      }
 
+      debug("smartapp", "Sending to " + url + " with options: " + JSON.stringify(options));
       const req = http.request(url, options, res => {
         let resp = "";
         // res.setEncoding('utf8');
@@ -717,13 +770,13 @@ export class SmartApp extends WebApp {
   ohSwitch(swtch: Switch) {
     const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
     debug("smartapp", "OH-Switch(" + !!swtch.unit.status + ") -> " + req);
-    this.wrequest(req, swtch.method, swtch.unit.status ? "ON" : "OFF", ContentType.plain);
+    this.wrequest(req, swtch.method, swtch.unit.status ? "ON" : "OFF", ContentType.plain, swtch.header);
   }
   ohDimmer(swtch: Switch) {
     const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
     const val = (swtch.unit.value == 1) ? "ON" : swtch.unit.value.toString();
     debug("smartapp", "OH-Dimmer(" + !!swtch.unit.status + ", " + val + ") -> " + req);
-    this.wrequest(req, swtch.method, swtch.unit.status ? val : "OFF", ContentType.plain);
+    this.wrequest(req, swtch.method, swtch.unit.status ? val : "OFF", ContentType.plain, swtch.header);
   }
   ohUpDown(swtch: Switch) {
     let data;
@@ -745,7 +798,7 @@ export class SmartApp extends WebApp {
     if (data) {
       const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
       debug("smartapp", "OH-UpDown(" + <number>swtch.unit.value +", " + data + ") -> " + req);
-      this.wrequest(req, swtch.method, data, ContentType.plain);
+      this.wrequest(req, swtch.method, data, ContentType.plain, swtch.header);
     }
   }
 

package/server/socapp.js

@@ -14,7 +14,7 @@ const fs = require("fs");
 const mime = require("mime-types");
 const net = require("net");
 const ws_1 = require("ws");
-const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const support_1 = require("./support");
 const webapp_1 = require("./webapp");
 ////////////////
@@ -26,7 +26,7 @@ class SocApp extends webapp_1.WebApp {
         // hashmap with all connected clients
         this.clients = {};
         if (this.config.debug)
-            types_1.logSettings["proxy"] = types_1.LogLevel.debug;
+            logger_1.logSettings["proxy"] = logger_1.LogLevel.debug;
         this.port = port || this.config.port || this.port || 80;
         this.system = system;
         this.support = new support_1.Support(system);
@@ -53,7 +53,7 @@ class SocApp extends webapp_1.WebApp {
                     return this.serveFile(context, context.path);
                 }
                 catch (error) {
-                    (0, types_1.err)("proxy", "Error serving URL: " + context.req.url);
+                    (0, logger_1.err)("proxy", "Error serving URL: " + context.req.url);
                     return this.serveFile(context, "/index.html");
                     // return this.notFound(context.req.url);
                 }
@@ -61,7 +61,7 @@ class SocApp extends webapp_1.WebApp {
         });
     }
     serve() {
-        (0, types_1.log)("proxy", "SocApp - Start http server on port " + this.port);
+        (0, logger_1.log)("proxy", "SocApp - Start http server on port " + this.port);
         super.serve(() => {
             const wsServer = new ws_1.Server({ server: this.server });
             wsServer.on('connection', this.handleClient.bind(this));
@@ -71,7 +71,7 @@ class SocApp extends webapp_1.WebApp {
         var _a, _b;
         const data = fs.readFileSync("www" + fn);
         const type = mime.lookup(fn) || "application/text";
-        (0, types_1.log)("proxy", "Serve - " + (((_b = (_a = context.req) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || "no-remote") + ": " + fn + " - " + type);
+        (0, logger_1.log)("proxy", "Serve - " + (((_b = (_a = context.req) === null || _a === void 0 ? void 0 : _a.socket) === null || _b === void 0 ? void 0 : _b.remoteAddress) || "no-remote") + ": " + fn + " - " + type);
         return { status: 200, data, type };
     }
     renderLog() {
@@ -96,7 +96,7 @@ class SocApp extends webapp_1.WebApp {
     handleClient(client, req) {
         let target;
         const clientAddr = client._socket.remoteAddress;
-        const logger = (msg) => (0, types_1.log)('proxy', clientAddr + ': ' + msg);
+        const logger = (msg) => (0, logger_1.log)('proxy', clientAddr + ': ' + msg);
         const info = (this.config.debug) ?
             (msg) => logger('Proxy - ' + clientAddr + ': ' + msg) :
             (msg) => null;

package/server/socapp.ts

@@ -3,7 +3,8 @@ import * as mime from 'mime-types';
 import * as net from 'net';
 import { Server as WSServer } from 'ws';
 import { System } from '../duotecno/system';
-import { LogFunction, log, logSettings, LogLevel, err } from '../duotecno/types';
+import { LogFunction } from '../duotecno/types';
+import { log, logSettings, LogLevel, err } from "../duotecno/logger";
 import { Support } from './support';
 import { Context, HttpResponse, WebApp } from "./webapp";