homebridge-smartsystem 6.5.0 → 6.6.0

package/README.md

@@ -287,6 +287,13 @@ Homebridge UI version
 - 1: ask/show protocol version -> publish
 - 2 & 3: test on protocol version, not firmware for using registers, due to bug in master firmware pre v101.x 
 
+### v6.5.0 - 18-05-2025 - Homebridge 2.0
+- 0: published
+
+### v6.6.0 - 21-05-2025 - OpenHAB
+- 0: Extra "Switch" type openHAB, uses username/password to ask for a token
+
+
 ## Hardware 
 A Raspberry Pi that connects to a Duotecno IP Node 
 and (if configured) to a Smappee Infinity (power and plugs) 

package/config.json

@@ -250,21 +250,21 @@
       },
       {
         "logicalNodeAddress": 3,
-        "logicalAddress": 34,
+        "logicalAddress": 31,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
-        "name": "Demo",
-        "displayName": "Demo",
+        "name": "Somfy Windowcovering",
+        "displayName": "Somfy Windowcovering",
         "extendedType": 0,
         "nomacro": "N",
         "nostop": "N",
-        "unitName": "unit 3:34",
+        "unitName": "Somfy Dimmer",
         "value": 0,
-        "data": "b=2",
-        "header": "{\"a\":101, \"b\": \"hallo\"}",
+        "data": "{CurrentPosition: $}",
+        "header": "Pi:GMTecn",
         "method": "PUT",
-        "type": "http",
-        "plug": "http://localhost:3001/api/demo/haha?set=#B"
+        "type": "ohapi",
+        "plug": "http://Pi:GMTecno@192.168.0.99:8581/api/accessory/06e5b66f78fe0136ea075e742a7fb388587329a4717393b21aaa180083305704"
       }
     ],
     "debug": false
@@ -368,6 +368,18 @@
         "used": "Y",
         "group": 0
       },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 31,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "2|Dimmer",
+        "displayName": "Somfy Dimmer",
+        "extendedType": 0,
+        "active": "Y",
+        "used": "Y",
+        "group": 0
+      },
       {
         "logicalNodeAddress": 3,
         "logicalAddress": 30,
@@ -375,7 +387,7 @@
         "masterPort": 5001,
         "name": "Blue LED",
         "displayName": "Blue LED",
-        "extendedType": 1,
+        "extendedType": 0,
         "active": "N",
         "used": "Y",
         "group": 0

package/duotecno/api.ts

@@ -2,6 +2,8 @@ import * as http from "http";
 import { err } from "./logger";
 
 
+
+
 ///////////////////
 // http function //
 ///////////////////

package/duotecno/types.js

@@ -137,6 +137,7 @@ var SwitchType;
     SwitchType["kOhSwitch"] = "oswitch";
     SwitchType["kOhDimmer"] = "odimmer";
     SwitchType["kOhUpDown"] = "oupdown";
+    SwitchType["kohAPI"] = "ohapi";
     SwitchType["kSomfy"] = "somfy";
 })(SwitchType = exports.SwitchType || (exports.SwitchType = {}));
 ;
@@ -150,7 +151,7 @@ exports.kEmptyRule = {
     actions: [Object.assign(Object.assign({}, exports.kEmptyUnit), { value: false }), Object.assign(Object.assign({}, exports.kEmptyUnit), { value: 50 }), Object.assign(Object.assign({}, exports.kEmptyUnit), { value: true })]
 };
 ;
-exports.kEmptySwitch = Object.assign(Object.assign({}, exports.kEmptyUnit), { plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", header: "", nomacro: "N", nostop: "N" });
+exports.kEmptySwitch = Object.assign(Object.assign({}, exports.kEmptyUnit), { plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", header: "", username: "", password: "", nomacro: "N", nostop: "N" });
 ;
 ;
 ;
@@ -496,7 +497,7 @@ function char(ascii) {
 }
 exports.char = char;
 function two(n) {
-    return (n < 10) ? ("0" + n) : n.toString();
+    return (+n < 10) ? ("0" + n) : n.toString();
 }
 exports.two = two;
 function hex(n) {

package/duotecno/types.ts

@@ -203,6 +203,7 @@ export enum SwitchType {
   kOhSwitch = "oswitch",
   kOhDimmer = "odimmer",
   kOhUpDown = "oupdown",
+  kohAPI = "ohapi",
   kSomfy = "somfy"
 };
 
@@ -247,6 +248,8 @@ export interface Switch extends UnitDef {
   data: string,
   header: string,
   method: string,
+  username?: string;
+  password?: string;
   unit?: Unit;
   status?: number | boolean,
   value?: number | boolean | string,
@@ -254,7 +257,8 @@ export interface Switch extends UnitDef {
   nostop: string;
 };
 export const kEmptySwitch: Switch = 
-  { ...kEmptyUnit, plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", header: "", nomacro: "N", nostop: "N"} as const;
+  { ...kEmptyUnit, plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", 
+    header: "", username: "", password: "", nomacro: "N", nostop: "N"} as const;
 
 
 export interface SmartAppConfig extends BaseConfig {
@@ -700,7 +704,7 @@ export function char(ascii:  number): string {
 
 
 export function two(n: number | string) { 
-  return (n < 10) ? ("0" + n) : n.toString();
+  return (+n < 10) ? ("0" + n) : n.toString();
 }
 export function hex(n: number): string {
   n = Math.floor(n);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.5.0",
+  "version": "6.6.0",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
@@ -23,7 +23,9 @@
     "proxy",
     "duotecno",
     "homebridge",
-    "homebridge-plugin"
+    "homebridge-plugin",
+    "openHAB",
+    "Somfy"
   ],
   "repository": {
     "type": "git",

package/server/platform.ts

@@ -242,7 +242,7 @@ export class Platform extends Base {
         case UnitExtendedType.kMood:
         case UnitExtendedType.kCondition:
         case UnitExtendedType.kInput:
-              this.accessoryList.push( new Mood(this.homebridgeAPI, unit) );
+          this.accessoryList.push( new Mood(this.homebridgeAPI, unit) );
           break;
 
         case UnitExtendedType.kTemperature:

package/server/smartapp.js

@@ -26,7 +26,6 @@ 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" };
@@ -51,6 +50,7 @@ var ContentType;
     ContentType[ContentType["form"] = 0] = "form";
     ContentType[ContentType["plain"] = 1] = "plain";
     ContentType[ContentType["none"] = 2] = "none";
+    ContentType[ContentType["json"] = 3] = "json";
 })(ContentType || (ContentType = {}));
 ;
 class SmartApp extends webapp_1.WebApp {
@@ -117,12 +117,9 @@ class SmartApp extends webapp_1.WebApp {
             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;
+                const access_token = yield this.habLogin(this.config.apiHost + ":" + this.config.apiPort, user, pw);
+                if (access_token) {
+                    this.token = access_token;
                     (0, config_1.setToken)(this.token);
                     return true;
                 }
@@ -541,6 +538,9 @@ class SmartApp extends webapp_1.WebApp {
             else if (swtch.type === types_1.SwitchType.kHTTPUpDown) {
                 this.httpUpDown(swtch);
             }
+            else if (swtch.type === types_1.SwitchType.kohAPI) {
+                this.ohAPI(swtch);
+            }
             else if (swtch.type === types_1.SwitchType.kOhSwitch) {
                 this.ohSwitch(swtch);
             }
@@ -640,80 +640,176 @@ class SmartApp extends webapp_1.WebApp {
         (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, header = "") {
-        try {
-            // const data = querystring.stringify(formdata);
-            const options = { method };
-            if (formdata) {
-                if (contentType === ContentType.form) {
-                    options.headers = {
-                        'Content-Type': 'application/x-www-form-urlencoded',
-                        'Content-Length': Buffer.byteLength(formdata)
-                    };
-                }
-                else if (contentType === ContentType.plain) {
-                    options.headers = {
-                        'Content-Type': 'text/plain',
-                        'Accept': 'application/json'
-                    };
-                }
+    ////////////////////////
+    // http request stuff //
+    ////////////////////////
+    habLogin(url, username, password) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (url.indexOf("://") === -1)
+                url = "http://" + url;
+            const header = { "Content-Type": "application/json", "accept": "*/*" };
+            const data = { username, password };
+            const respBody = yield this.wrequest(url + "/api/auth/login", 'POST', JSON.stringify(data), ContentType.json, JSON.stringify(header));
+            if (!respBody.access_token) {
+                (0, logger_1.err)("hab", "habLogin: failed -> " + JSON.stringify(respBody));
+                return "";
             }
-            ;
-            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 {
+                return respBody.access_token;
+            }
+        });
+    }
+    habCheckToken(token, url, username, password) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!token || !url) {
+                (0, logger_1.err)("hab", "habCheckToken: failed -> no token or no url");
+                return false;
+            }
+            const header = {
+                "Content-Type": "application/json", "accept": "*/*",
+                "access_token": token
+            };
+            const target = url.split("/api")[0];
+            const resp = yield this.wrequest(target + "/api/auth/check", 'GET', "", ContentType.none, header);
+            if (resp['status'] === "OK") {
+                return true;
+            }
+            else {
+                if (username && password) {
+                    this.token = yield this.habLogin(target, username, password);
+                    return !!this.token;
                 }
                 else {
-                    const s = header.split(":");
-                    options.headers[s[0]] = s[1];
+                    (0, logger_1.err)("hab", "habCheckToken: failed -> no username or password");
+                    return false;
                 }
             }
-            (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');
-                res.on('data', chunk => {
-                    resp += chunk;
-                });
-                res.on('end', () => {
-                    // try to make something out of it...
-                    try {
-                        const x = JSON.parse(resp);
-                        if ((x.type === "Buffer") && x.data)
-                            x.data = x.data.toString();
-                        (0, logger_1.debug)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x));
-                    }
-                    catch (e) {
-                        (0, logger_1.debug)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + resp);
+        });
+    }
+    wrequest(url, method = "GET", formdata = "", contentType = ContentType.form, header = "") {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (url.indexOf("://") === -1)
+                url = "http://" + url;
+            return new Promise((resolve, reject) => {
+                try {
+                    // const data = querystring.stringify(formdata);
+                    const options = { method };
+                    if (formdata) {
+                        if (contentType === ContentType.form) {
+                            options.headers = {
+                                'Content-Type': 'application/x-www-form-urlencoded',
+                                'Content-Length': Buffer.byteLength(formdata)
+                            };
+                        }
+                        else if (contentType === ContentType.plain) {
+                            options.headers = {
+                                'Content-Type': 'text/plain',
+                                'Accept': 'application/json'
+                            };
+                        }
+                        else if (contentType === ContentType.json) {
+                            options.headers = {
+                                'Content-Type': 'application/json',
+                                'Accept': '*/*'
+                            };
+                        }
                     }
                     ;
-                });
-            });
-            if (formdata) {
-                req.write(formdata);
-            }
-            req.on("error", (e) => {
-                (0, logger_1.log)("smartapp", "The request to " + url + ", error: " + (e ? e.message : "unknown"));
-            });
-            req.on("timeout", (e) => {
-                (0, logger_1.log)("smartapp", "The request to " + url + ", timeout: " + (e ? e.message : "unknown"));
+                    // header provide as string or object
+                    if (header) {
+                        if (!options.headers)
+                            options.headers = {};
+                        if (typeof header === "string") {
+                            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];
+                            }
+                        }
+                        else {
+                            // header is an object
+                            options.headers = Object.assign(Object.assign({}, options.headers), header);
+                        }
+                    }
+                    (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');
+                        res.on('error', error => {
+                            (0, logger_1.log)("smartapp", "The request to " + url + ", error: " + (error ? error.message : "unknown"));
+                            reject(error);
+                        });
+                        res.on('data', chunk => {
+                            resp += chunk;
+                        });
+                        res.on('end', () => {
+                            // try to make something out of it...
+                            try {
+                                const x = JSON.parse(resp);
+                                if ((x.type === "Buffer") && x.data)
+                                    x.data = x.data.toString();
+                                (0, logger_1.log)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x));
+                                resolve(x);
+                            }
+                            catch (e) {
+                                (0, logger_1.err)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + resp);
+                                resolve({ status: "NOK", result: resp });
+                            }
+                            ;
+                        });
+                    });
+                    if (formdata) {
+                        req.write(formdata);
+                    }
+                    req.on("error", (e) => {
+                        (0, logger_1.log)("smartapp", "The request to " + url + ", error: " + (e ? e.message : "unknown"));
+                    });
+                    req.on("timeout", (e) => {
+                        (0, logger_1.log)("smartapp", "The request to " + url + ", timeout: " + (e ? e.message : "unknown"));
+                    });
+                    req.end();
+                }
+                catch (e) {
+                    (0, logger_1.log)("smartapp", "** http error ** " + (e ? e.message : "unknown") + " **");
+                    reject(e);
+                }
             });
-            req.end();
-        }
-        catch (e) {
-            (0, logger_1.log)("smartapp", "** http error ** " + (e ? e.message : "unknown") + " **");
-        }
+        });
     }
     //////////////
     // open HAB //
     //////////////
+    ohAPI(swtch) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const str = "" + swtch.plug;
+            // http://username:password@example.com/api/...
+            const protocol = str.indexOf("://");
+            const login = (protocol === -1) ? str : str.substring(protocol + 3);
+            // username:password@example.com/api/...
+            const urlParts = login.split("@");
+            const userPw = urlParts[0].split(":");
+            let req = this.makeVariableURL(urlParts[1], !!swtch.unit.status, +swtch.unit.value);
+            req = ((protocol === -1) ? "http" : str.substring(0, protocol)) + "://" + req;
+            (0, logger_1.debug)("smartapp", "OH-API(" + !!swtch.unit.status + ", " + swtch.unit.value + ") -> " + req);
+            if (userPw.length !== 2) {
+                // no user/pw given, try the API call without a token
+                yield this.wrequest(req, swtch.method, this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value), ContentType.json, swtch.header);
+            }
+            else {
+                // user/pw given -> check token
+                if (yield this.habCheckToken(this.token, req, userPw[0], userPw[1])) {
+                    yield this.wrequest(req, swtch.method, this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value), ContentType.json, swtch.header);
+                }
+            }
+        });
+    }
     ohSwitch(swtch) {
         const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
         (0, logger_1.debug)("smartapp", "OH-Switch(" + !!swtch.unit.status + ") -> " + req);

package/server/smartapp.ts

@@ -21,7 +21,6 @@ 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 { setToken } from "../duotecno/config";
 import { PowerBase } from "./powerbase";
 
@@ -47,7 +46,7 @@ const isMac = existsSync("/Volumes");
 const kDHCPConfigFile = isMac ? "./config.dhcpcd" : "/etc/dhcpcd.conf";
 
 
-enum ContentType {form, plain, none};
+enum ContentType {form, plain, none, json};
 
 export interface Power {
   smappee?: Smappee;
@@ -137,12 +136,9 @@ export class SmartApp extends WebApp {
     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;
+      const access_token = await this.habLogin(this.config.apiHost +":"+ this.config.apiPort, user, pw);
+      if (access_token) {
+        this.token = access_token;
         setToken(this.token);
         return true;
       }
@@ -554,6 +550,8 @@ export class SmartApp extends WebApp {
   }
 
 
+  setSwitch(inx: number, newstate?: boolean, newvalue?: number)
+  setSwitch(inx: Switch, newstate?: boolean, newvalue?: number)
   setSwitch(inx: number | Switch, newstate?: boolean, newvalue?: number) {
     // find the switch if an index is given
     let swtch = null;
@@ -594,6 +592,9 @@ export class SmartApp extends WebApp {
       } else if (swtch.type === SwitchType.kHTTPUpDown) {
         this.httpUpDown(swtch);
 
+      } else if (swtch.type === SwitchType.kohAPI) {
+        this.ohAPI(swtch);
+
       } else if (swtch.type === SwitchType.kOhSwitch) {
         this.ohSwitch(swtch);
 
@@ -704,77 +705,172 @@ export class SmartApp extends WebApp {
     this.wrequest(req, swtch.method, data, ContentType.form, swtch.header);
   }
 
+  ////////////////////////
+  // http request stuff //
+  ////////////////////////
 
-  wrequest(url: string, method = "GET", formdata = "", contentType = ContentType.form, header = "") {
-    try {
-      // const data = querystring.stringify(formdata);
-      const options: {method: string, [key: string]: object | string} = { method };
-
-      if (formdata) {
-        if (contentType === ContentType.form) {
-          options.headers = {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Content-Length': Buffer.byteLength(formdata)
+  async habLogin(url: string, username: string, password: string): Promise<string> {
+    if (url.indexOf("://") === -1)  url = "http://" + url;
+
+    const header = {"Content-Type": "application/json", "accept": "*/*"};
+    const data = {username, password};
+    const respBody = await this.wrequest(url + "/api/auth/login", 'POST', JSON.stringify(data), ContentType.json, JSON.stringify(header));
+
+    if (!respBody.access_token) {
+      err("hab", "habLogin: failed -> " + JSON.stringify(respBody));
+      return "";
+
+    } else {
+      return respBody.access_token
+    }
+  }
+
+  async habCheckToken(token: string, url: string, username?: string, password?: string): Promise<boolean> {
+    if (!token || ! url) {
+      err("hab", "habCheckToken: failed -> no token or no url");
+      return false;
+    }
+
+    const header = {
+      "Content-Type": "application/json", "accept": "*/*",
+      "access_token": token
+    };
+    const target = url.split("/api")[0];
+    const resp = await this.wrequest(target + "/api/auth/check", 'GET', "", ContentType.none, header);
+    if (resp['status'] === "OK") {
+      return true;
+    } else {
+      if (username && password) {
+        this.token = await this.habLogin(target, username, password);
+        return !!this.token;
+        
+      } else {
+        err("hab", "habCheckToken: failed -> no username or password");
+        return false;
+      }
+    }
+  }
+
+
+  async wrequest(url: string, method = "GET", formdata = "", contentType = ContentType.form, header: string | object = ""): Promise<Record<string, any>> {
+      if (url.indexOf("://") === -1)  url = "http://" + url;
+
+      return new Promise((resolve, reject) => {
+      try {
+        // const data = querystring.stringify(formdata);
+        const options: {method: string, [key: string]: object | string} = { method };
+
+        if (formdata) {
+          if (contentType === ContentType.form) {  
+            options.headers = {
+              'Content-Type': 'application/x-www-form-urlencoded',
+              'Content-Length': Buffer.byteLength(formdata)
+            }
+          } else if (contentType === ContentType.plain) {
+            options.headers = {
+              'Content-Type': 'text/plain',
+              'Accept': 'application/json'
+            };
+          } else if (contentType === ContentType.json) {
+            options.headers = {
+              'Content-Type': 'application/json',
+              'Accept': '*/*'
+            };
           }
-        } else if (contentType === ContentType.plain) {
-          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));
+        };
+
+        // header provide as string or object
+        if (header) {
+          if (!options.headers) options.headers = {};
+          if (typeof header === "string") {
+            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];
+            }
+          } else {
+            // header is an object
+            options.headers = { ...<object>options.headers, ...header };
           }
-        } 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');
-        res.on('data', chunk => {
-          resp += chunk;
+        debug("smartapp", "Sending to " + url + " with options: " + JSON.stringify(options));
+        const req = http.request(url, options, res => {
+          let resp = "";
+          // res.setEncoding('utf8');
+          res.on('error', error => {
+            log("smartapp", "The request to " + url + ", error: " + (error ? error.message : "unknown"));
+            reject(error);
+          });
+          res.on('data', chunk => {
+            resp += chunk;
+          });
+          res.on('end', () => {
+            // try to make something out of it...
+            try { 
+              const x = JSON.parse(resp); 
+              if ((x.type === "Buffer") && x.data) x.data = x.data.toString();
+              log("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x));
+              resolve(x)
+            } catch(e) {
+              err("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + resp);
+              resolve({status: "NOK", result: resp});
+            };
+          });
         });
-        res.on('end', () => {
-          // try to make something out of it...
-          try { 
-            const x = JSON.parse(resp); 
-            if ((x.type === "Buffer") && x.data) x.data = x.data.toString();
-            debug("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x));
-          } catch(e) {
-            debug("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + resp);
-          };
+        if (formdata) {
+          req.write(formdata);
+        }
+        req.on("error", (e) => {
+          log("smartapp", "The request to " + url + ", error: " + (e ? e.message : "unknown"));
         });
-      });
-      if (formdata) {
-        req.write(formdata);
-      }
-      req.on("error", (e) => {
-        log("smartapp", "The request to " + url + ", error: " + (e ? e.message : "unknown"));
-      });
-      req.on("timeout", (e) => {
-        log("smartapp", "The request to " + url + ", timeout: " + (e ? e.message : "unknown"));
-      });
-      req.end();
+        req.on("timeout", (e) => {
+          log("smartapp", "The request to " + url + ", timeout: " + (e ? e.message : "unknown"));
+        });
+        req.end();
 
-    } catch(e) {
-      log("smartapp", "** http error ** " + (e ? e.message : "unknown") + " **");
-    }
+      } catch(e) {
+        log("smartapp", "** http error ** " + (e ? e.message : "unknown") + " **");
+        reject(e);
+      }
+    });
   }
 
 
   //////////////
   // open HAB //
   //////////////
+  async ohAPI(swtch: Switch) {
+    const str = "" + swtch.plug;
+    // http://username:password@example.com/api/...
+    const protocol = str.indexOf("://");
+    const login = (protocol === -1) ? str : str.substring(protocol + 3);
+    // username:password@example.com/api/...
+    const urlParts = login.split("@");
+    const userPw = urlParts[0].split(":");
+
+    let req = this.makeVariableURL(urlParts[1], !!swtch.unit.status, +swtch.unit.value);
+    req = ((protocol === -1) ? "http" : str.substring(0, protocol))+ "://" + req;
+
+    debug("smartapp", "OH-API(" + !!swtch.unit.status + ", " + swtch.unit.value + ") -> " + req);
+
+    if (userPw.length !== 2) {
+      // no user/pw given, try the API call without a token
+      await this.wrequest(req, swtch.method, this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value), ContentType.json, swtch.header);
+
+    } else {
+      // user/pw given -> check token
+      if (await this.habCheckToken(this.token, req, userPw[0], userPw[1])) {
+        await this.wrequest(req, swtch.method, this.makeVariableURL(swtch.data, !!swtch.unit.status, +swtch.unit.value), ContentType.json, swtch.header);
+      }
+    }
+  }
+
   ohSwitch(swtch: Switch) {
     const req = this.makeVariableURL(swtch.plug, !!swtch.unit.status, +swtch.unit.value);
     debug("smartapp", "OH-Switch(" + !!swtch.unit.status + ") -> " + req);

package/server/views/switch-details.ejs

@@ -36,10 +36,10 @@
           <div class="input-field col s4">
             <select name="master" id="master">
               <% for (let m of masters) { %>
-                <option value="<%= m.getURL() %>" "<%= (m.same(swtch.master, swtch.port)) ? "selected" : "" %>"><%= m.getURL() %></option>
+                <option value="<%= m.getURL() %>" <%= (m.same(swtch.masterAddress, swtch.masterPort)) ? "selected" : "" %>><%= m.getURL() %></option>
               <% } %>
             </select>
-            <label for="master">Master</label>
+            <label for="master">Master of trigger unit</label>
           </div>
           <div class="switch input-field col s4">
             <label>Respond to Macro's
@@ -59,7 +59,7 @@
           <div class="input-field col s12">
             <input placeholder="0" id="unit" name="unit" type="text" 
                    value="<%= hex(swtch.logicalNodeAddress) %>;<%= hex(swtch.logicalAddress) %><%= (swtch.unitName) ? (' (' + swtch.unitName + ')') : '' %>">
-            <label for="unit">Unit (hex or unit name)</label>
+            <label for="unit">Trigger unit in hex (example: 0xfc;0x12) or unit name</label>
           </div>
         </div>
 
@@ -71,6 +71,7 @@
               <option value="http" <%= (swtch.type == 'http') ? 'selected' : '' %>>HTTP Switch</option>
               <option value="httpdim" <%= (swtch.type == 'httpdim') ? 'selected' : '' %>>HTTP Dimmer</option>
               <option value="httpupdown" <%= (swtch.type == 'httpupdown') ? 'selected' : '' %>>HTTP Up/Down</option>
+              <option value="ohapi" <%= (swtch.type == 'ohapi') ? 'selected' : '' %>>openHAB API</option>
               <option value="oswitch" <%= (swtch.type == 'oswitch') ? 'selected' : '' %>>openHAB Switch</option>
               <option value="odimmer" <%= (swtch.type == 'odimmer') ? 'selected' : '' %>>openHAB Dimmer</option>
               <option value="oupdown" <%= (swtch.type == 'oupdown') ? 'selected' : '' %>>openHAB Up/Down</option>