homebridge-smartsystem 6.6.0 → 6.7.0

package/config.json

@@ -134,7 +134,7 @@
       }
     ]
   },
-  "p1": {
+  "p11": {
     "debug": false,
     "rules": [],
     "bindings": [
@@ -247,27 +247,25 @@
         "method": "GET",
         "type": "smappee",
         "plug": "1"
-      },
+      }
+    ],
+    "debug": false,
+    "username": "pi",
+    "password": "GMTecno",
+    "links": [
       {
         "logicalNodeAddress": 3,
-        "logicalAddress": 31,
+        "logicalAddress": 30,
         "masterAddress": "192.168.0.97",
         "masterPort": 5001,
-        "name": "Somfy Windowcovering",
-        "displayName": "Somfy Windowcovering",
+        "name": "Blue LEDje",
+        "displayName": "Blue LEDje",
         "extendedType": 0,
-        "nomacro": "N",
-        "nostop": "N",
-        "unitName": "Somfy Dimmer",
-        "value": 0,
-        "data": "{CurrentPosition: $}",
-        "header": "Pi:GMTecn",
-        "method": "PUT",
-        "type": "ohapi",
-        "plug": "http://Pi:GMTecno@192.168.0.99:8581/api/accessory/06e5b66f78fe0136ea075e742a7fb388587329a4717393b21aaa180083305704"
+        "accId": "986b901a30d92cb7bd0205be90f65786c2d87c9a95d8a0a60cb4c048deda5ce6",
+        "accName": "Tim Klein",
+        "type": "accessory"
       }
-    ],
-    "debug": false
+    ]
   },
   "system": {
     "language": "EN",
@@ -290,21 +288,6 @@
           "252": " 20211003"
         },
         "debug": false
-      },
-      {
-        "address": "192.168.0.5",
-        "port": 5005,
-        "password": "duotecno",
-        "name": "GM",
-        "active": true,
-        "nodenames": {
-          "3": "IP Server",
-          "4": "Sonos",
-          "16": "Smartbox Living",
-          "17": "Switch Living",
-          "252": " 20220925"
-        },
-        "debug": false
       }
     ],
     "cunits": [
@@ -392,6 +375,18 @@
         "used": "Y",
         "group": 0
       },
+      {
+        "logicalNodeAddress": 3,
+        "logicalAddress": 29,
+        "masterAddress": "192.168.0.97",
+        "masterPort": 5001,
+        "name": "Red LED",
+        "displayName": "Red LED",
+        "extendedType": 0,
+        "active": "N",
+        "used": "Y",
+        "group": 0
+      },
       {
         "logicalNodeAddress": 3,
         "logicalAddress": 34,
@@ -466,5 +461,6 @@
       "ip2": "",
       "gateway2": ""
     }
-  }
+  },
+  "p1": false
 }

package/duotecno/types.js

@@ -14,7 +14,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeInt = exports.now = exports.datetime = exports.time = exports.date = exports.watt = exports.hex = exports.two = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptySwitch = exports.kEmptyRule = exports.kEmptyAction = exports.kEmptyBinding = exports.SwitchType = exports.RuleType = exports.Boundaries = exports.kEmptyCommRecord = exports.WriteError = exports.kEmptySettings = exports.kEmptyNetworkConfig = exports.kEmptyGroup = exports.kEmptyScene = exports.kEmptyUnitScene = exports.kEmptyUnit = exports.UnitExtendedType = exports.UnitType = exports.UnitMotorCmd = exports.UnitState = exports.NodeType = void 0;
+exports.makeInt = exports.now = exports.datetime = exports.time = exports.date = exports.watt = exports.hex = exports.two = exports.char = exports.ascii = exports.wait = exports.Sanitizers = exports.actionValueStr = exports.actionValue = exports.kEmptyBinding = exports.kEmptyLink = exports.LinkType = exports.kEmptySwitch = exports.SwitchType = exports.kEmptyRule = exports.kEmptyAction = exports.RuleType = exports.Boundaries = exports.kEmptyCommRecord = exports.WriteError = exports.kEmptySettings = exports.kEmptyNetworkConfig = exports.kEmptyGroup = exports.kEmptyScene = exports.kEmptyUnitScene = exports.kEmptyUnit = exports.UnitExtendedType = exports.UnitType = exports.UnitMotorCmd = exports.UnitState = exports.NodeType = void 0;
 // Node types
 var NodeType;
 (function (NodeType) {
@@ -126,6 +126,13 @@ var RuleType;
     RuleType["kWater"] = "water";
 })(RuleType = exports.RuleType || (exports.RuleType = {}));
 ;
+exports.kEmptyAction = Object.assign(Object.assign({}, exports.kEmptyUnit), { value: false });
+;
+exports.kEmptyRule = {
+    type: "power", channel: "0", low: 30, high: 900,
+    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 })]
+};
+// Switches
 var SwitchType;
 (function (SwitchType) {
     SwitchType["kNoType"] = "";
@@ -137,21 +144,19 @@ var SwitchType;
     SwitchType["kOhSwitch"] = "oswitch";
     SwitchType["kOhDimmer"] = "odimmer";
     SwitchType["kOhUpDown"] = "oupdown";
-    SwitchType["kohAPI"] = "ohapi";
     SwitchType["kSomfy"] = "somfy";
 })(SwitchType = exports.SwitchType || (exports.SwitchType = {}));
-;
+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" });
+// Links
+var LinkType;
+(function (LinkType) {
+    LinkType["kNoType"] = "";
+    LinkType["kAccessory"] = "accessory";
+})(LinkType = exports.LinkType || (exports.LinkType = {}));
+exports.kEmptyLink = Object.assign(Object.assign({}, exports.kEmptyUnit), { type: LinkType.kAccessory, accName: "acc", accId: "" });
 exports.kEmptyBinding = {
     channel: "0", masterAddress: "0.0.0.0", masterPort: 5001, register: 0
 };
-exports.kEmptyAction = Object.assign(Object.assign({}, exports.kEmptyUnit), { value: false });
-;
-exports.kEmptyRule = {
-    type: "power", channel: "0", low: 30, high: 900,
-    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: "", username: "", password: "", nomacro: "N", nostop: "N" });
 ;
 ;
 ;
@@ -249,9 +254,13 @@ exports.Sanitizers = {
         config.port = config.port || 5002;
         config.switches = config.switches || [];
         config.switches = config.switches.map(sw => exports.Sanitizers.switchConfig(sw));
+        config.links = config.links || [];
+        config.links = config.links.map(sw => exports.Sanitizers.linkConfig(sw));
         config.debug = config.debug || false;
         config.apiHost = config.apiHost || "localhost";
         config.apiPort = config.apiPort || 8581;
+        config.username = config.username || "admin";
+        config.password = config.password || "";
         return config;
     },
     powerbase: function (config) {
@@ -285,6 +294,13 @@ exports.Sanitizers = {
         cfg.addresses = (config === null || config === void 0 ? void 0 : config.addresses) || "";
         return cfg;
     },
+    linkConfig: function (aLink) {
+        const link = exports.Sanitizers.unitDef(aLink);
+        link.accId = aLink.accId || "";
+        link.accName = aLink.accName || "";
+        link.type = aLink.type || LinkType.kNoType;
+        return link;
+    },
     switchConfig: function (aSwitch) {
         const sw = exports.Sanitizers.unitDef(aSwitch);
         sw.nomacro = aSwitch.nomacro || "N";
@@ -309,6 +325,12 @@ exports.Sanitizers = {
             type: aSwitch.type, plug: aSwitch.plug,
             data: aSwitch.data, method: aSwitch.method, header: aSwitch.header });
     },
+    makeLinkConfig: function (aLink) {
+        return exports.Sanitizers.linkConfig({ name: aLink.name, unitName: aLink.unitName,
+            masterAddress: aLink.masterAddress, masterPort: aLink.masterPort,
+            logicalAddress: aLink.logicalAddress, logicalNodeAddress: aLink.logicalNodeAddress,
+            accName: aLink.accName, accId: aLink.accId, type: aLink.type });
+    },
     ruleConfig(rule) {
         rule = Object.assign({}, rule);
         rule.channel = rule.channel || "0";

package/duotecno/types.ts

@@ -193,38 +193,17 @@ export const kEmptyCommRecord = { status: false, cmd: -1, message: [-1,0,0], res
 export enum Boundaries {kLow = 0, kMid = 1, kHigh = 2};
 export enum RuleType {kPower = "power", kCurrent = "current", kWater = "water"};
 
-export enum SwitchType {
-  kNoType = "", 
-  kSmappee = "smappee", 
-  kRF = "RF", 
-  kHTTPSwitch = "http", 
-  kHTTPDimmer = "httpdim",
-  kHTTPUpDown = "httpupdown",
-  kOhSwitch = "oswitch",
-  kOhDimmer = "odimmer",
-  kOhUpDown = "oupdown",
-  kohAPI = "ohapi",
-  kSomfy = "somfy"
-};
-
-
-export interface Binding {
-  masterAddress: string;
-  masterPort: number;
-  register: number;
-  channel: string;
-  value?: number;
-}
-export const kEmptyBinding: Binding = { 
-  channel: "0", masterAddress: "0.0.0.0", masterPort: 5001, register: 0
-} as const;
 
 
+///////////
+// Rules //
+///////////
 export interface Action extends UnitDef {
   value: number | boolean;
 }
-export const kEmptyAction: Action = { ...kEmptyUnit, value: false } as const;
-
+export const kEmptyAction: Action = { 
+  ...kEmptyUnit, value: false 
+} as const;
 
 export interface Rule {
   type: string;
@@ -240,44 +219,78 @@ export const kEmptyRule: Rule = {
   actions: [{...kEmptyUnit, value: false}, {...kEmptyUnit, value: 50}, {...kEmptyUnit, value: true}] 
 };
 
+
+// Switches
+
+export enum SwitchType {
+  kNoType = "", 
+  kSmappee = "smappee", 
+  kRF = "RF", 
+  kHTTPSwitch = "http", 
+  kHTTPDimmer = "httpdim",
+  kHTTPUpDown = "httpupdown",
+  kOhSwitch = "oswitch",
+  kOhDimmer = "odimmer",
+  kOhUpDown = "oupdown",
+  kSomfy = "somfy"
+}
+
 export interface Switch extends UnitDef {
-  name: string,
-  unitName: string,
-  type: SwitchType,
-  plug: number | string,
-  data: string,
-  header: string,
-  method: string,
+  unitName: string;
+  type: SwitchType;
+  plug: number | string;
+  data: string;
+  header: string;
+  method: string;
   username?: string;
   password?: string;
   unit?: Unit;
-  status?: number | boolean,
-  value?: number | boolean | string,
+  status?: number | boolean;
+  value?: number | boolean | string;
   nomacro: string;
   nostop: string;
-};
-export const kEmptySwitch: Switch = 
-  { ...kEmptyUnit, plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", 
-    header: "", username: "", password: "", nomacro: "N", nostop: "N"} as const;
+}
+
+export const kEmptySwitch: Switch = {
+   ...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 {
-  port: number;
-  apiHost: string;
-  apiPort: number;
-  switches: Array<Switch>;
+// Links
+export enum LinkType {
+  kNoType = "", 
+  kAccessory = "accessory"
 }
 
-/////////////////////
-// Smartapp config //
-/////////////////////
-export interface BaseConfig {
-  debug?: boolean;
+export interface Link extends UnitDef{
+  accName: string;
+  accId: string;
+  type: LinkType;
+  unit?: Unit;
+  status?: number | boolean;
+  value?: number | boolean | string
 }
 
+export const kEmptyLink: Link = { 
+  ...kEmptyUnit, type: LinkType.kAccessory, accName: "acc", accId: ""
+} as const;
+
+
 ///////////
 // Power //
 ///////////
+export interface Binding {
+  masterAddress: string;
+  masterPort: number;
+  register: number;
+  channel: string;
+  value?: number;
+}
+export const kEmptyBinding: Binding = { 
+  channel: "0", masterAddress: "0.0.0.0", masterPort: 5001, register: 0
+} as const;
+
 export interface PowerBaseConfig extends BaseConfig {
   address: string;
   rules: Array<Rule>;
@@ -292,6 +305,24 @@ export interface ShellyConfig extends PowerBaseConfig {
   addresses: string;
 }
 
+
+/////////////////////
+// Smartapp config //
+/////////////////////
+export interface BaseConfig {
+  debug?: boolean;
+}
+
+export interface SmartAppConfig extends BaseConfig {
+  port: number;
+  apiHost: string;
+  apiPort: number;
+  username: string; password: string;
+  switches: Array<Switch>;
+  links: Array<Link>;
+}
+
+
 ////////////////
 // Homebridge //
 ////////////////
@@ -434,9 +465,13 @@ export const Sanitizers = {
     config.port = config.port || 5002;
     config.switches = config.switches || [];
     config.switches = config.switches.map(sw => Sanitizers.switchConfig(sw));
+    config.links = config.links || [];
+    config.links = config.links.map(sw => Sanitizers.linkConfig(sw));
     config.debug = config.debug || false;
     config.apiHost = config.apiHost || "localhost";
     config.apiPort = config.apiPort || 8581; 
+    config.username = config.username || "admin"; 
+    config.password = config.password || ""; 
 
     return config;
   },
@@ -476,6 +511,14 @@ export const Sanitizers = {
     return cfg;
   },
 
+  linkConfig: function(aLink): Link {
+    const link = <Link>Sanitizers.unitDef(aLink);
+    link.accId = aLink.accId || "";
+    link.accName = aLink.accName || "";
+    link.type = aLink.type || LinkType.kNoType;
+    return link;
+  },
+
   switchConfig: function(aSwitch): Switch {
     const sw = <Switch>Sanitizers.unitDef(aSwitch);
     sw.nomacro = aSwitch.nomacro || "N";
@@ -503,6 +546,13 @@ export const Sanitizers = {
       data: aSwitch.data, method: aSwitch.method, header: aSwitch.header });
   },
 
+  makeLinkConfig: function(aLink): Link {
+    return Sanitizers.linkConfig({ name: aLink.name, unitName: aLink.unitName,
+      masterAddress: aLink.masterAddress, masterPort: aLink.masterPort,
+      logicalAddress: aLink.logicalAddress, logicalNodeAddress: aLink.logicalNodeAddress,
+      accName: aLink.accName, accId: aLink.accId, type: aLink.type });
+  },
+
   ruleConfig(rule): Rule {
     rule = {... rule};
     rule.channel = rule.channel || "0";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.6.0",
+  "version": "6.7.0",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",

package/server/HA-API.js

@@ -0,0 +1,125 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpRequest = exports.ContentType = void 0;
+const logger_1 = require("../duotecno/logger");
+const http = require("http");
+//////////////////////////////////
+// Home Assistant API           //
+// and other http based APIs    //
+//////////////////////////////////
+var ContentType;
+(function (ContentType) {
+    ContentType[ContentType["form"] = 0] = "form";
+    ContentType[ContentType["plain"] = 1] = "plain";
+    ContentType[ContentType["none"] = 2] = "none";
+    ContentType[ContentType["json"] = 3] = "json";
+})(ContentType = exports.ContentType || (exports.ContentType = {}));
+;
+function httpRequest(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': '*/*'
+                        };
+                    }
+                }
+                ;
+                // 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.debug)("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x).substring(0, 200) + "...");
+                            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);
+            }
+        });
+    });
+}
+exports.httpRequest = httpRequest;
+//# sourceMappingURL=HA-API.js.map

package/server/HA-API.ts

@@ -0,0 +1,99 @@
+import { debug, err, log } from "../duotecno/logger";
+import * as http from "http";
+
+//////////////////////////////////
+// Home Assistant API           //
+// and other http based APIs    //
+//////////////////////////////////
+export enum ContentType {form, plain, none, json};
+
+
+export async function httpRequest(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': '*/*'
+          };
+        }
+      };
+
+      // 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 };
+        }
+      }
+
+      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();
+            debug("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + JSON.stringify(x).substring(0, 200) + "...");
+            resolve(x)
+          } catch(e) {
+            err("smartapp", "http " + method + " -> " + res.statusCode + ": " + url + " = " + resp);
+            resolve({status: "NOK", result: resp});
+          };
+        });
+      });
+      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();
+
+    } catch(e) {
+      log("smartapp", "** http error ** " + (e ? e.message : "unknown") + " **");
+      reject(e);
+    }
+  });
+}