homebridge-smartsystem 6.1.7 → 6.2.2

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.debug = exports.log = exports.err = exports.setLogFunction = exports.logFunction = exports.logSettings = exports.LogLevel = 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.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;
 // Node types
 var NodeType;
 (function (NodeType) {
@@ -81,58 +81,6 @@ var UnitExtendedType;
     UnitExtendedType[UnitExtendedType["kUnlocker"] = 204] = "kUnlocker";
 })(UnitExtendedType = exports.UnitExtendedType /* extends UnitType */ || (exports.UnitExtendedType /* extends UnitType */ = {}));
 ;
-// kLightbulb  == kSwitch with no "*" or "$" in the name
-// kDoor == kSwitchingMotor with "*" in the name
-// kGarageDoor == kSwitchingMotor with "$" in the name
-// kCondition  == kMood with "*" in the name
-// kLock == kMood with $ in the name
-// kUnlocker = kMood with $ in the name
-/////////////
-// Logging //
-/////////////
-// add LogLevels per type at runtime
-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
-};
-// 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;
 ;
 ;
 ;
@@ -200,7 +148,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", nomacro: "N", nostop: "N" });
+exports.kEmptySwitch = Object.assign(Object.assign({}, exports.kEmptyUnit), { plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", header: "", nomacro: "N", nostop: "N" });
 ;
 ;
 ;
@@ -243,13 +191,11 @@ exports.Sanitizers = {
             config = {};
         config.manufacturer = config.manufacturer || "Duotecno-Coppieters";
         config.platform = config.platform || "DuotecnoPlatform";
-        if (config.platform === "DuotecnoPlatform") {
-            config.smappee = config.smappee || "./config.smappee.json";
-            config.p1 = config.p1 || "./config.p1.json";
-            config.shelly = config.shelly || "./config.shelly.json";
-            config.smartapp = config.smartapp || "./config.smartapp.json";
-            config.system = config.system || "./config.system.json";
-        }
+        config.smappee = config.smappee || false;
+        config.p1 = config.p1 || false;
+        config.shelly = config.shelly || false;
+        config.smartapp = config.smartapp || null;
+        config.system = exports.Sanitizers.system(config.system);
         return config;
     },
     homebridge: function (config) {
@@ -260,19 +206,18 @@ exports.Sanitizers = {
         config.bridge.username = config.bridge.username || "CC:22:3D:E3:A3:01";
         config.bridge.port = config.bridge.port || 51827;
         config.bridge.pin = config.bridge.pin || "577-03-001";
-        config.description = config.description || "Duotecno Platform";
-        config.password = config.password || ("!@#$%^&*()" + new Date().getTime());
         config.platforms = config.platforms || [{}];
         for (let p in config.platforms)
-            this.platform(config.platforms[p]);
+            if (config.platforms[p].platform == "DuotecnoPlatform")
+                config.platforms[p] = exports.Sanitizers.platform(config.platforms[p]);
         config.accessories = []; //config.accessories || [<AccessoryConfig>{}];
-        //for (let a in config.accessories) this.accessory(config.accessories[a]);
+        //for (let a in config.accessories) Sanitizers.accessory(config.accessories[a]);
         return config;
     },
     settings: function (config) {
         if (!config)
             config = {};
-        config.network = this.networkConfig(config.network);
+        config.network = exports.Sanitizers.networkConfig(config.network);
         return config;
     },
     networkConfig: function (config) {
@@ -300,54 +245,60 @@ exports.Sanitizers = {
             config = {};
         config.port = config.port || 5002;
         config.switches = config.switches || [];
-        config.switches.forEach(sw => this.switchConfig(sw));
+        config.switches = config.switches.map(sw => exports.Sanitizers.switchConfig(sw));
         config.debug = config.debug || false;
+        config.apiHost = config.apiHost || "localhost";
+        config.apiPort = config.apiPort || 8581;
         return config;
     },
     powerbase: function (config) {
         if (!config)
             config = {};
         config.rules = config.rules || [];
-        config.rules = config.rules.map(sw => this.ruleConfig(sw));
+        config.rules = config.rules.map(sw => exports.Sanitizers.ruleConfig(sw));
         config.bindings = config.bindings || [];
-        config.bindings = config.bindings.map(b => this.bindingConfig(b));
+        config.bindings = config.bindings.map(b => exports.Sanitizers.bindingConfig(b));
         config.address = config.address || "";
         return config;
     },
     smappee: function (config) {
-        config = this.powerbase(config);
-        config.uid = config.uid || "--none--";
-        return config;
+        if (!config)
+            config = {};
+        const cfg = exports.Sanitizers.powerbase(config);
+        cfg.uid = config.uid || "--none--";
+        return cfg;
     },
     p1: function (config) {
-        config = this.powerbase(config);
+        config = exports.Sanitizers.powerbase(config);
         return config;
     },
     shelly: function (config) {
-        config = this.powerbase(config);
+        config = exports.Sanitizers.powerbase(config);
         return config;
     },
     switchConfig: function (aSwitch) {
-        this.unitDef(aSwitch);
-        aSwitch.nomacro = aSwitch.nomacro || "N";
-        aSwitch.nostop = aSwitch.nostop || "N";
-        aSwitch.name = aSwitch.name || "--";
-        aSwitch.unitName = aSwitch.unitName || "";
-        aSwitch.value = aSwitch.value || 0;
-        aSwitch.data = aSwitch.data || "";
-        aSwitch.method = aSwitch.method || "GET";
-        aSwitch.type = aSwitch.type || SwitchType.kNoType;
+        const sw = exports.Sanitizers.unitDef(aSwitch);
+        sw.nomacro = aSwitch.nomacro || "N";
+        sw.nostop = aSwitch.nostop || "N";
+        sw.name = aSwitch.name || "--";
+        sw.unitName = aSwitch.unitName || "";
+        sw.value = aSwitch.value || 0;
+        sw.data = aSwitch.data || "";
+        sw.header = aSwitch.header || "";
+        sw.method = aSwitch.method || "GET";
+        sw.type = aSwitch.type || SwitchType.kNoType;
         // don't destroy 0 plug
         if (typeof aSwitch.plug === "string")
-            aSwitch.plug = aSwitch.plug || "";
-        return aSwitch;
+            sw.plug = aSwitch.plug || "";
+        return sw;
     },
     makeSwitchConfig: function (aSwitch) {
-        return this.switchConfig({ name: aSwitch.name, unitName: aSwitch.unitName,
+        return exports.Sanitizers.switchConfig({ name: aSwitch.name, unitName: aSwitch.unitName,
             masterAddress: aSwitch.masterAddress, masterPort: aSwitch.masterPort,
             nomacro: aSwitch.nomacro, nostop: aSwitch.nostop,
             logicalAddress: aSwitch.logicalAddress, logicalNodeAddress: aSwitch.logicalNodeAddress,
-            type: aSwitch.type, plug: aSwitch.plug, data: aSwitch.data, method: aSwitch.method });
+            type: aSwitch.type, plug: aSwitch.plug,
+            data: aSwitch.data, method: aSwitch.method, header: aSwitch.header });
     },
     ruleConfig(rule) {
         rule = Object.assign({}, rule);
@@ -368,10 +319,10 @@ exports.Sanitizers = {
         return rule;
     },
     bindingConfig(binding) {
-        binding = this.unitDef(Object.assign({}, binding));
-        binding.channel = binding.channel || "0";
-        binding.power = binding.power || NaN;
-        return binding;
+        const b = exports.Sanitizers.unitDef(Object.assign({}, binding));
+        b.channel = binding.channel || "0";
+        b.power = binding.power || NaN;
+        return b;
     },
     masterConfig: function (config) {
         config = (config) ? Object.assign({}, config) : {};
@@ -392,36 +343,16 @@ exports.Sanitizers = {
         if (!config)
             config = {};
         config.mood = config.mood || "sfeer";
-        config.language = config.language || "EN";
         config.debug = config.debug || false;
-        config.stores = config.stores || false;
-        config.multiple = config.multiple || false;
         config.socketserver = config.socketserver || 'ws.duotecno.eu';
         // correct old settings
         if (config.socketserver == 'akiworks.be')
             config.socketserver = 'ws.duotecno.eu';
         config.socketport = config.socketport || 9999;
         config.cmasters = config.cmasters || [];
-        config.cmasters.forEach(m => this.masterConfig(m));
+        config.cmasters = config.cmasters.map(m => exports.Sanitizers.masterConfig(m));
         config.cunits = config.cunits || [];
-        config.cunits.forEach(u => this.unitConfig(u));
-        return config;
-    },
-    ////////////
-    // Groups //
-    group: function (config) {
-        if (!config)
-            return exports.kEmptyGroup;
-        config.name = config.name || exports.kEmptyGroup.name;
-        config.id = config.id || exports.kEmptyGroup.id;
-        config.order = config.order || exports.kEmptyGroup.order;
-        config.visible = (typeof config.visible === "boolean") ? config.visible : exports.kEmptyGroup.visible;
-        return config;
-    },
-    groups: function (config) {
-        if (!config)
-            return [Object.assign({}, exports.kEmptyGroup)];
-        config.forEach(g => exports.Sanitizers["group"](g));
+        config.cunits = config.cunits.map(u => exports.Sanitizers.unitConfig(u));
         return config;
     },
     //////////
@@ -438,17 +369,18 @@ exports.Sanitizers = {
     //////////
     // Unit //
     unitDef: function (info) {
-        info.logicalNodeAddress = info.logicalNodeAddress || 0;
-        info.logicalAddress = info.logicalAddress || 0;
-        info.masterAddress = info.masterAddress || '';
-        info.masterPort = info.masterPort || 5001;
-        return info;
+        return {
+            logicalNodeAddress: info.logicalNodeAddress || 0,
+            logicalAddress: info.logicalAddress || 0,
+            masterAddress: info.masterAddress || '',
+            masterPort: info.masterPort || 5001
+        };
     },
     unitConfig: function (config) {
         if (!config) {
             config = {};
         }
-        this.unitDef(config);
+        config = exports.Sanitizers.unitDef(config);
         config.active = config.active || 'N';
         config.used = config.used || config.active;
         if (typeof config.group === 'string') {
@@ -462,7 +394,7 @@ exports.Sanitizers = {
         if (!config) {
             config = {};
         }
-        this.unitDef(config);
+        config = exports.Sanitizers.unitDef(config);
         if (typeof config.value === "undefined")
             config.value = 0;
         if (typeof config.value === "string")
@@ -471,7 +403,8 @@ exports.Sanitizers = {
             logicalAddress: config.logicalAddress,
             masterAddress: config.masterAddress,
             masterPort: config.masterPort,
-            value: config.value };
+            value: config.value,
+            name: config.name };
     },
     ////////////
     // Scenes //
@@ -486,16 +419,16 @@ exports.Sanitizers = {
             newConfig.order = parseInt(config.order);
         }
         newConfig.order = config.order || exports.kEmptyScene.order;
-        newConfig.trigger = this.unitScene(config.trigger);
+        newConfig.trigger = exports.Sanitizers.unitScene(config.trigger);
         config.units = config.units || exports.kEmptyScene.units;
-        newConfig.units = config.units.map(u => this.unitScene(u));
+        newConfig.units = config.units.map(u => exports.Sanitizers.unitScene(u));
         return newConfig;
     },
     scenes: function (config) {
         if (!config) {
-            return [this.sceneConfig()];
+            return [exports.Sanitizers.sceneConfig()];
         }
-        config.forEach(s => this.sceneConfig(s));
+        config = config.map(s => exports.Sanitizers.sceneConfig(s));
         return config;
     },
     ///////////////////////////////////
@@ -528,12 +461,6 @@ exports.Sanitizers = {
         return info;
     }
 };
-// add dev entries for dev configs
-exports.Sanitizers["system-dev"] = exports.Sanitizers["system"];
-exports.Sanitizers["smartapp-dev"] = exports.Sanitizers["smartapp"];
-exports.Sanitizers["smappee-dev"] = exports.Sanitizers["smappee"];
-exports.Sanitizers["p1-dev"] = exports.Sanitizers["p1"];
-exports.Sanitizers["shelly-dev"] = exports.Sanitizers["shelly"];
 //////////////////////
 // Helper functions //
 //////////////////////