homebridge-smartsystem 6.1.7 → 6.2.2

package/config.smappee.json

@@ -1,7 +1,183 @@
 {
   "rules": [
+    {
+      "type": "sun",
+      "channel": "0",
+      "low": 30,
+      "high": 900,
+      "actions": [
+        {
+          "name": "Mood A",
+          "value": false,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 10,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood A",
+          "value": 50,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 10,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood A",
+          "value": true,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 10,
+          "logicalNodeAddress": 252
+        }
+      ],
+      "power": -3382,
+      "current": 0
+    },
+    {
+      "type": "power",
+      "channel": "4",
+      "low": 10,
+      "high": 20,
+      "actions": [
+        {
+          "name": "Mood B",
+          "value": false,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 11,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood B",
+          "value": 50,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 11,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood B",
+          "value": true,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 11,
+          "logicalNodeAddress": 252
+        }
+      ],
+      "power": 0,
+      "current": 0
+    },
+    {
+      "type": "power",
+      "channel": "7+8+9",
+      "low": 30,
+      "high": 900,
+      "actions": [
+        {
+          "name": "Mood C",
+          "value": false,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 12,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood C",
+          "value": 50,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 12,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood C",
+          "value": true,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 12,
+          "logicalNodeAddress": 252
+        }
+      ],
+      "power": 2207,
+      "current": 2
+    },
+    {
+      "type": "sun",
+      "channel": "7",
+      "low": 0,
+      "high": 0,
+      "actions": [
+        {
+          "name": "Mood C",
+          "value": false,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 12,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood C",
+          "value": 50,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 12,
+          "logicalNodeAddress": 252
+        },
+        {
+          "name": "Mood C",
+          "value": true,
+          "masterAddress": "192.168.0.97",
+          "masterPort": 5001,
+          "logicalAddress": 12,
+          "logicalNodeAddress": 252
+        }
+      ]
+    }
   ],
-  "address": "192.168.0.xxx",
+  "address": "192.168.0.186",
   "uid": "57e3e0d8-bb05-4b04-8662-1a9871998f3f",
-  "debug": false
+  "debug": false,
+  "bindings": [
+    {
+      "name": "<Solar",
+      "value": 0,
+      "masterAddress": "192.168.0.97",
+      "masterPort": 5001,
+      "logicalAddress": 102,
+      "logicalNodeAddress": 252,
+      "channel": "0+1",
+      "power": 1706
+    },
+    {
+      "name": ">Grid",
+      "value": 0,
+      "masterAddress": "192.168.0.97",
+      "masterPort": 5001,
+      "logicalAddress": 100,
+      "logicalNodeAddress": 252,
+      "channel": "2+3",
+      "power": 2494
+    },
+    {
+      "name": ">Cars",
+      "value": 0,
+      "masterAddress": "192.168.0.97",
+      "masterPort": 5001,
+      "logicalAddress": 103,
+      "logicalNodeAddress": 252,
+      "channel": "4+5",
+      "power": null
+    },
+    {
+      "name": ">Swimmingpool",
+      "value": 0,
+      "masterAddress": "192.168.0.97",
+      "masterPort": 5001,
+      "logicalAddress": 101,
+      "logicalNodeAddress": 252,
+      "channel": "8",
+      "power": null
+    }
+  ]
 }

package/config.smartapp.json

@@ -1,6 +1,69 @@
 {
+  "apiPort": 8581,
+  "apiHost": "192.168.0.99",
+  "socapp": false,
   "port": 5002,
   "switches": [
+    {
+      "name": "Shelly Valies",
+      "unitName": "Red",
+      "masterAddress": "192.168.0.97",
+      "masterPort": 5001,
+      "nomacro": "Y",
+      "nostop": "Y",
+      "logicalAddress": 107,
+      "logicalNodeAddress": 252,
+      "type": "httpdim",
+      "plug": "http://192.168.0.96/light/0?brightness=$&turn=#",
+      "data": "",
+      "method": "GET",
+      "value": 0
+    },
+    {
+      "name": "Screen Salon Top",
+      "unitName": "Salon Top",
+      "masterAddress": "192.168.0.97",
+      "masterPort": 5001,
+      "nomacro": "N",
+      "nostop": "N",
+      "logicalAddress": 105,
+      "logicalNodeAddress": 252,
+      "type": "somfy",
+      "plug": "1",
+      "data": "",
+      "method": "GET",
+      "value": 0
+    },
+    {
+      "name": "Screen Tim small",
+      "unitName": "Tim Small",
+      "masterAddress": "192.168.0.97",
+      "masterPort": 5001,
+      "nomacro": "N",
+      "nostop": "Y",
+      "logicalAddress": 104,
+      "logicalNodeAddress": 252,
+      "type": "httpupdown",
+      "plug": "2",
+      "data": "",
+      "method": "GET",
+      "value": 0
+    },
+    {
+      "name": "Test Plug",
+      "unitName": "Plug",
+      "masterAddress": "gm.coppieters.be",
+      "masterPort": 5005,
+      "nomacro": "N",
+      "nostop": "N",
+      "logicalAddress": 35,
+      "logicalNodeAddress": 16,
+      "type": "smappee",
+      "plug": "1",
+      "data": "",
+      "method": "GET",
+      "value": 0
+    }
   ],
   "debug": false
 }

package/duotecno/Q.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Q = void 0;
-const types_1 = require("./types");
+const logger_1 = require("./logger");
 class Q {
     constructor() {
         this.timer = null;
         this.queue = [];
-        types_1.logSettings["Q"] = types_1.LogLevel.log;
+        logger_1.logSettings["Q"] = logger_1.LogLevel.log;
     }
     exec(fn) {
         const len = this.queue.length;
@@ -17,30 +17,30 @@ class Q {
     }
     endWaiter() {
         if (this.timer) {
-            (0, types_1.debug)("Q", "Waiter: clearing timer");
+            (0, logger_1.debug)("Q", "Waiter: clearing timer");
             clearTimeout(this.timer);
         }
     }
     startWaiter(mSecs = 1000) {
         this.endWaiter();
-        (0, types_1.debug)("Q", "Waiter: starting timer for " + mSecs + " mSec");
+        (0, logger_1.debug)("Q", "Waiter: starting timer for " + mSecs + " mSec");
         this.timer = setTimeout(() => {
-            (0, types_1.debug)("Q", "Waiter: timer finished, calling 'do' because nobody else did");
+            (0, logger_1.debug)("Q", "Waiter: timer finished, calling 'do' because nobody else did");
             this.do();
         }, mSecs);
     }
     do() {
-        (0, types_1.debug)("Q", "Do, qlen=" + this.queue.length);
+        (0, logger_1.debug)("Q", "Do, qlen=" + this.queue.length);
         // Get the oldest function and execute
         if (this.queue.length > 0) {
             const fn = this.queue[0];
             this.queue.splice(0, 1);
-            (0, types_1.debug)("Q", "Do: calling function");
+            (0, logger_1.debug)("Q", "Do: calling function");
             fn();
         }
         // Still stuff to execute
         if (this.queue.length > 0) {
-            (0, types_1.debug)("Q", "Do, still stuff in the queue, start timer");
+            (0, logger_1.debug)("Q", "Do, still stuff in the queue, start timer");
             this.startWaiter();
         }
         else {

package/duotecno/Q.ts

@@ -1,4 +1,4 @@
-import { debug, LogLevel, logSettings } from "./types";
+import { debug, LogLevel, logSettings } from "./logger";
 
 export class Q {
   private timer = null;

package/duotecno/api.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.post = exports.get = void 0;
 const http = require("http");
-const types_1 = require("./types");
+const logger_1 = require("./logger");
 ///////////////////
 // http function //
 ///////////////////
@@ -55,7 +55,7 @@ function request(method, host, port, path, body, headers = {}) {
                 }).on('error', (e) => {
                     if (timer)
                         clearTimeout(timer);
-                    (0, types_1.err)("http", "http.get failed with " + JSON.stringify(e));
+                    (0, logger_1.err)("http", "http.get failed with " + JSON.stringify(e));
                     reject(e);
                 });
                 if (method === "POST") {
@@ -64,7 +64,7 @@ function request(method, host, port, path, body, headers = {}) {
                 httpReq.end();
             }
             catch (error) {
-                (0, types_1.err)("http", "http.get failed with " + JSON.stringify(error));
+                (0, logger_1.err)("http", "http.request " + method + " to " + host + " with " + path + " failed with " + error.message);
                 reject(error);
             }
         });

package/duotecno/api.ts

@@ -1,5 +1,5 @@
 import * as http from "http";
-import { err } from "./types";
+import { err } from "./logger";
 
 
 ///////////////////
@@ -54,7 +54,7 @@ async function request(method: string, host: string, port: number, path: string,
 
 
     } catch(error) {
-      err("http", "http.get failed with " + JSON.stringify(error));
+      err("http", "http.request " + method + " to " + host + " with " + path + " failed with " + error.message);
       reject(error);
     }
   });

package/duotecno/config.js

@@ -3,9 +3,10 @@
 // Global Config //
 ///////////////////
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setAPIConfig = exports.getAPIConfig = exports.setSubConfig = exports.getSubConfig = exports.getConfig = exports.setConfig = exports.setToken = void 0;
+exports.setAPIConfig = exports.getAPIConfig = exports.setSubConfig = exports.getSubConfig = exports.getConfig = exports.setConfig = exports.kConfigFiles = exports.isMac = exports.setToken = void 0;
 const api_1 = require("./api");
 const types_1 = require("./types");
+const logger_1 = require("./logger");
 const fs = require("fs");
 const os_1 = require("os");
 let gToken = "";
@@ -13,10 +14,10 @@ function setToken(token) {
     gToken = token;
 }
 exports.setToken = setToken;
-const isMac = ((0, os_1.platform)() === "darwin");
-const kConfigFiles = (isMac) ? (__dirname + "/..") : ((0, os_1.homedir)() + "/duotecno");
-if (!fs.existsSync(kConfigFiles))
-    fs.mkdirSync(kConfigFiles);
+exports.isMac = ((0, os_1.platform)() === "darwin");
+exports.kConfigFiles = (exports.isMac) ? (__dirname + "/..") : ((0, os_1.homedir)());
+if (!fs.existsSync(exports.kConfigFiles))
+    fs.mkdirSync(exports.kConfigFiles);
 // set up empty config
 let gPlatformConfig = types_1.Sanitizers.platform(null);
 add("smartapp"); // webserver interface
@@ -48,33 +49,34 @@ function setSubConfig(type, cfg) {
 }
 exports.setSubConfig = setSubConfig;
 // we should get the config through the homebridge platform init call !!
+// no need to call this function.
 function getAPIConfig(done) {
     let config = null;
-    if (gPlatformConfig.apiHost) {
+    if (gPlatformConfig.smartapp.apiHost) {
         const headers = { "Content-Type": "application/json" };
         if (gToken) {
             headers["Authorization"] = "Bearer " + gToken;
         }
-        (0, api_1.get)(gPlatformConfig.apiHost, gPlatformConfig.apiPort, "/api/config-editor", headers).then((resp) => {
-            (0, types_1.debug)("smartapp", "OK: " + resp);
+        (0, api_1.get)(gPlatformConfig.smartapp.apiHost, gPlatformConfig.smartapp.apiPort, "/api/config-editor/plugin/homebridge-smartsystem", headers).then((resp) => {
+            (0, logger_1.debug)("smartapp", "OK: " + resp);
             const parsed = JSON.parse(resp);
-            setConfig(parsed);
+            setConfig(parsed[0]);
             if (done)
-                done(parsed);
+                done(parsed[0]);
         }, (err) => {
-            (0, types_1.debug)("smartapp", "ERROR: " + JSON.stringify(err));
+            (0, logger_1.debug)("smartapp", "ERROR: " + JSON.stringify(err));
             done(null);
         });
     }
     else {
-        const fn = kConfigFiles + "/config.json";
+        const fn = exports.kConfigFiles + "/config.json";
         try {
             const configBuf = fs.readFileSync(fn);
             const configStr = configBuf.toString();
             config = JSON.parse(configStr);
         }
         catch (err) {
-            (0, types_1.log)("system", "Couldn't read my config file (" + fn + ") -- Creating empty config.");
+            (0, logger_1.log)("system", "Couldn't read my config file (" + fn + ") -- Creating empty config.");
         }
         // sanitize the config
         const sanitized = types_1.Sanitizers.platform(config);
@@ -84,21 +86,20 @@ function getAPIConfig(done) {
 }
 exports.getAPIConfig = getAPIConfig;
 function setAPIConfig() {
-    if (gPlatformConfig.apiHost) {
+    if (gPlatformConfig.smartapp.apiHost) {
         const headers = { "Content-Type": "application/json" };
         if (gToken) {
             headers["Authorization"] = "Bearer " + gToken;
         }
-        (0, api_1.post)(gPlatformConfig.apiHost, gPlatformConfig.apiPort, "/api/config-editor", gPlatformConfig, headers).then((resp) => (0, types_1.debug)("smartapp", "OK: " + resp), (err) => (0, types_1.debug)("smartapp", "ERROR: " + JSON.stringify(err)));
+        (0, api_1.post)(gPlatformConfig.smartapp.apiHost, gPlatformConfig.smartapp.apiPort, "/api/config-editor/plugin/homebridge-smartsystem", [gPlatformConfig], headers).then((resp) => (0, logger_1.debug)("smartapp", "OK: " + resp), (err) => (0, logger_1.debug)("smartapp", "ERROR: " + JSON.stringify(err)));
     }
-    else {
-        const fn = kConfigFiles + "/config.json";
-        try {
-            fs.writeFileSync(fn, JSON.stringify(gPlatformConfig, null, 2));
-        }
-        catch (error) {
-            (0, types_1.err)(this.type, "Couldn't write config.json file (" + fn + ")");
-        }
+    // still write the config files
+    const fn = exports.kConfigFiles + "/config.json";
+    try {
+        fs.writeFileSync(fn, JSON.stringify(gPlatformConfig, null, 2));
+    }
+    catch (error) {
+        (0, logger_1.err)("config", "Couldn't write config.json file (" + fn + ")");
     }
 }
 exports.setAPIConfig = setAPIConfig;

package/duotecno/config.ts

@@ -4,7 +4,8 @@
 ///////////////////
 
 import { get, post } from "./api";
-import { debug, err, log, PlatformConfig, Sanitizers } from "./types";
+import { PlatformConfig, Sanitizers } from "./types";
+import { debug, err, log } from "./logger";
 import * as fs from "fs";
 import { homedir, platform } from "os";
 
@@ -14,8 +15,9 @@ export function setToken(token: string) {
   gToken = token;
 }
 
-const isMac = (platform() === "darwin");
-const kConfigFiles = (isMac) ? (__dirname+"/..") : (homedir() + "/duotecno");
+export const isMac = (platform() === "darwin");
+export const kConfigFiles = (isMac) ? (__dirname+"/..") : (homedir());
+
 if (! fs.existsSync(kConfigFiles)) fs.mkdirSync(kConfigFiles);
 
 
@@ -57,20 +59,22 @@ export function setSubConfig(type: string, cfg: object) {
 
 
 // we should get the config through the homebridge platform init call !!
+// no need to call this function.
 export function getAPIConfig(done) {
   let config = null;
-  if (gPlatformConfig.apiHost) {
+  if (gPlatformConfig.smartapp.apiHost) {
     const headers = {"Content-Type": "application/json"};
     if (gToken) {
       headers["Authorization"] = "Bearer "+ gToken;
     }
-    get(gPlatformConfig.apiHost, gPlatformConfig.apiPort, "/api/config-editor", headers).then(
+    get(gPlatformConfig.smartapp.apiHost, gPlatformConfig.smartapp.apiPort, 
+        "/api/config-editor/plugin/homebridge-smartsystem", headers).then(
       (resp) => { 
         debug("smartapp", "OK: " + resp); 
         const parsed = JSON.parse(resp);
-        setConfig(parsed); 
+        setConfig(parsed[0]); 
         if (done) 
-          done(parsed);
+          done(parsed[0]);
       },
       (err) => { 
         debug("smartapp", "ERROR: " + JSON.stringify(err));
@@ -97,22 +101,25 @@ export function getAPIConfig(done) {
 }
 
 export function setAPIConfig() {
-  if (gPlatformConfig.apiHost) {
+  if (gPlatformConfig.smartapp.apiHost) {
     const headers = {"Content-Type": "application/json"};
     if (gToken) {
       headers["Authorization"] = "Bearer "+ gToken;
     }
-    post(gPlatformConfig.apiHost, gPlatformConfig.apiPort, "/api/config-editor", gPlatformConfig, headers).then(
+    post(gPlatformConfig.smartapp.apiHost, gPlatformConfig.smartapp.apiPort, 
+         "/api/config-editor/plugin/homebridge-smartsystem", [gPlatformConfig], headers).then(
       (resp) => debug("smartapp", "OK: " + resp),
       (err) => debug("smartapp", "ERROR: " + JSON.stringify(err))
     );
-  } else {
-      const fn = kConfigFiles + "/config.json";
-      try {
-        fs.writeFileSync(fn, JSON.stringify(gPlatformConfig, null, 2));
+  }
 
-      } catch(error) {
-        err(this.type, "Couldn't write config.json file (" + fn + ")");
-      }
+  // still write the config files
+  const fn = kConfigFiles + "/config.json";
+  try {
+    fs.writeFileSync(fn, JSON.stringify(gPlatformConfig, null, 2));
+
+  } catch(error) {
+    err("config", "Couldn't write config.json file (" + fn + ")");
   }
+  
 }

package/duotecno/logger.js

@@ -0,0 +1,51 @@
+"use strict";
+/////////////
+// Logging //
+/////////////
+// add LogLevels per type at runtime
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.debug = exports.log = exports.err = exports.setLogFunction = exports.logFunction = exports.logSettings = exports.LogLevel = void 0;
+var LogLevel;
+(function (LogLevel) {
+    LogLevel[LogLevel["noLog"] = 0] = "noLog";
+    LogLevel[LogLevel["log"] = 1] = "log";
+    LogLevel[LogLevel["debug"] = 2] = "debug";
+})(LogLevel = exports.LogLevel || (exports.LogLevel = {}));
+;
+exports.logSettings = {
+    "*": LogLevel.log,
+    "master": LogLevel.log,
+    "protocol": LogLevel.noLog,
+    "webapp": LogLevel.log,
+    "p1": LogLevel.log,
+    "power": LogLevel.log,
+    "smartapp": LogLevel.log
+};
+// can be overriden with server log function
+exports.logFunction = console.log;
+function setLogFunction(F) {
+    console.log(">>>>>>>>> NOT changing logfunction to: " + F.name + " <<<<<<<<<<");
+    // logFunction = (m) => { F(m) }; 
+}
+exports.setLogFunction = setLogFunction;
+function err(type, message) {
+    (0, exports.logFunction)(type + ": " + ((typeof message === "string") ? message : JSON.stringify(message)));
+}
+exports.err = err;
+function log(type, message) {
+    var _a;
+    const level = (_a = exports.logSettings[type]) !== null && _a !== void 0 ? _a : exports.logSettings["*"];
+    if (level) {
+        (0, exports.logFunction)(type + ": " + ((typeof message === "string") ? message : JSON.stringify(message)));
+    }
+}
+exports.log = log;
+function debug(type, message) {
+    var _a;
+    const level = (_a = exports.logSettings[type]) !== null && _a !== void 0 ? _a : exports.logSettings["*"];
+    if (level === LogLevel.debug) {
+        (0, exports.logFunction)(type + "> " + ((typeof message === "string") ? message : JSON.stringify(message)));
+    }
+}
+exports.debug = debug;
+//# sourceMappingURL=logger.js.map

package/duotecno/logger.ts

@@ -0,0 +1,41 @@
+
+/////////////
+// Logging //
+/////////////
+// add LogLevels per type at runtime
+
+
+export enum LogLevel { noLog = 0, log = 1, debug = 2 };
+
+export const logSettings = {
+  "*": LogLevel.log,
+  "master": LogLevel.log,
+  "protocol": LogLevel.noLog,
+  "webapp": LogLevel.log,
+  "p1": LogLevel.log,
+  "power": LogLevel.log,
+  "smartapp": LogLevel.log
+};
+// can be overriden with server log function
+
+export let logFunction = console.log;
+export function setLogFunction(F) {
+  console.log(">>>>>>>>> NOT changing logfunction to: " + F.name + " <<<<<<<<<<");
+  // logFunction = (m) => { F(m) }; 
+}
+
+export function err(type: string, message: string | object) {
+  logFunction(type + ": " + ((typeof message === "string") ? message : JSON.stringify(message)));
+}
+export function log(type: string, message: string | object) {
+  const level = logSettings[type] ?? logSettings["*"];
+  if (level) {
+    logFunction(type + ": " + ((typeof message === "string") ? message : JSON.stringify(message)));
+  }
+}
+export function debug(type: string, message: string | object) {
+  const level = logSettings[type] ?? logSettings["*"];
+  if (level === LogLevel.debug) {
+    logFunction(type + "> " + ((typeof message === "string") ? message : JSON.stringify(message)));
+  }
+}

package/duotecno/master.js

@@ -12,15 +12,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Master = void 0;
 const protocol_1 = require("./protocol");
 const types_1 = require("./types");
+const logger_1 = require("./logger");
 const base_1 = require("../server/base");
 const Q_1 = require("./Q");
 const smartsocket_1 = require("./smartsocket");
 class Master extends base_1.Base {
     // command was sent, no response received yet
     /* system.config: {
-    "language": "EN",
-    "stores": false,
-    "multiple": false,
     "socketserver": "akiworks.be",
     "socketport": 9999,
     "mood": "sfeer",
@@ -161,13 +159,13 @@ class Master extends base_1.Base {
     }
     // overwrite to add IP address
     log(msg) {
-        (0, types_1.log)("master", this.getAddress() + ": " + msg);
+        (0, logger_1.log)("master", this.getAddress() + ": " + msg);
     }
     info(msg) {
-        (0, types_1.debug)("master", this.getAddress() + ": " + msg);
+        (0, logger_1.debug)("master", this.getAddress() + ": " + msg);
     }
     err(msg) {
-        (0, types_1.log)("master", this.getAddress() + ": " + msg);
+        (0, logger_1.log)("master", this.getAddress() + ": " + msg);
     }
     writeConfig(config, fn) {
         // overwrite: don't do anything, all is stored in the system-config