homebridge-smartsystem 6.1.7 → 6.2.2

package/duotecno/master.ts

@@ -1,5 +1,6 @@
 import { Node, Protocol, Unit, recName, Rec, TempPreset } from "./protocol";
-import { MasterConfig, WriteError, CommRecord, Message, Sanitizers, log, debug } from "./types";
+import { MasterConfig, WriteError, CommRecord, Message, Sanitizers } from "./types";
+import { log, debug } from "./logger";
 import { System } from "./system";
 import { Base } from "../server/base";
 
@@ -30,9 +31,6 @@ export class Master extends Base {
   // command was sent, no response received yet
 
   /* system.config: {
-  "language": "EN",
-  "stores": false,
-  "multiple": false,
   "socketserver": "akiworks.be",
   "socketport": 9999,
   "mood": "sfeer",

package/duotecno/protocol.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Protocol = exports.Unit = exports.Node = exports.recName = exports.Rec = exports.TempPreset = exports.cmdName = void 0;
 const types_1 = require("./types");
+const logger_1 = require("./logger");
 // Duotecno master IP protocol implementation
 // Johan Coppieters
 //
@@ -522,14 +523,14 @@ exports.Protocol = {
             // if no enclosing "[...]", add them
             if (data[0] != "[")
                 data = "[" + data + "]";
-            (0, types_1.log)("protocol", "sending: " + cmdName(cmd) + " - " + data);
+            (0, logger_1.log)("protocol", "sending: " + cmdName(cmd) + " - " + data);
             try {
                 // append a LF char and send
                 socket.write(data + String.fromCharCode(10));
                 return types_1.WriteError.writeOK;
             }
             catch (err) {
-                (0, types_1.log)("protocol", "error sending through socket " + err.message);
+                (0, logger_1.log)("protocol", "error sending through socket " + err.message);
                 return types_1.WriteError.writeFatal;
             }
         }
@@ -574,7 +575,7 @@ exports.Protocol = {
                 // get the first byte to see what kind of incoming data
                 nextRec.cmd = nextRec.message[0];
                 nextRec.isStatus = this.isStatus(nextRec.cmd);
-                (0, types_1.debug)("protocol", "processing: " + (nextRec.isStatus ? "status -> " : "") + msg);
+                (0, logger_1.debug)("protocol", "processing: " + (nextRec.isStatus ? "status -> " : "") + msg);
             }
         }
         return nextRec;
@@ -684,7 +685,7 @@ exports.Protocol = {
             unit.hsun = next.message[13] * 256 + next.message[14]; // 10x temperature
             unit.moon = next.message[15] * 256 + next.message[16]; // 10x temperature
             unit.hmoon = next.message[17] * 256 + next.message[18]; // 10x temperature
-            (0, types_1.debug)("protocol", "received status - " + unit.getDisplayName() + ", temperature = " + unit.value / 10.0 + ", sun = " + unit.sun);
+            (0, logger_1.debug)("protocol", "received status - " + unit.getDisplayName() + ", temperature = " + unit.value / 10.0 + ", sun = " + unit.sun);
             kind = "S";
             // Dimmers, switches and moods have 
             //  - status (0=off,1=on,2=pir-on)
@@ -694,21 +695,21 @@ exports.Protocol = {
             // switch -> boolean
             unit.status = next.message[6];
             unit.value = (next.message[6] > 0);
-            (0, types_1.debug)("protocol", "received status - switch = " + unit.value);
+            (0, logger_1.debug)("protocol", "received status - switch = " + unit.value);
             kind = "S";
         }
         else if (next.cmd === Rec.Dimmer) {
             // dimmer -> 0 .. 99
             unit.status = next.message[6];
             unit.value = next.message[7];
-            (0, types_1.debug)("protocol", "received status - dimmer -> value=" + unit.value + " / status=" + unit.status);
+            (0, logger_1.debug)("protocol", "received status - dimmer -> value=" + unit.value + " / status=" + unit.status);
             kind = "S";
         }
         else if (next.cmd === Rec.Mood) {
             // control -> boolean
             unit.status = next.message[6];
             unit.value = (next.message[6] != 0);
-            (0, types_1.debug)("protocol", "received status - mood = " + unit.value);
+            (0, logger_1.debug)("protocol", "received status - mood = " + unit.value);
             kind = "S";
         }
         else if (next.cmd === Rec.Motor) {
@@ -716,7 +717,7 @@ exports.Protocol = {
             // 0 = stopped, 1 stopped/down, 2 = stopped/up, 3 = busy/down, 4 = busy/up
             unit.status = next.message[6];
             unit.value = next.message[6];
-            (0, types_1.debug)("protocol", "received status - motor = " + unit.value);
+            (0, logger_1.debug)("protocol", "received status - motor = " + unit.value);
             kind = "S";
         }
         else if (next.cmd === Rec.Macro) {
@@ -738,7 +739,7 @@ exports.Protocol = {
                 (next.message[4] === 11)) {
                 unit.value = next.message[6] * 256 + next.message[7];
             }
-            (0, types_1.debug)("protocol", "received status - macro -> value=" + unit.value + " / status=" + unit.status);
+            (0, logger_1.debug)("protocol", "received status - macro -> value=" + unit.value + " / status=" + unit.status);
             kind = "M";
         }
         // clear the timer to turn the mood off again.

package/duotecno/protocol.ts

@@ -1,4 +1,5 @@
-import { CommRecord, Message, Sanitizers, NodeInfo, UnitInfo, DBInfo, WriteError, hex, NodeType, UnitType, UnitExtendedType, UnitState, two, debug, log } from "./types";
+import { CommRecord, Message, Sanitizers, NodeInfo, UnitInfo, DBInfo, WriteError, hex, NodeType, UnitType, UnitExtendedType, UnitState, two } from "./types";
+import { debug, log } from "./logger";
 import { Master } from "./master";
 import { SmartSocket } from "./smartsocket";
 import { EventEmitter } from "events";

package/duotecno/system.js

@@ -11,13 +11,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.System = void 0;
 const master_1 = require("./master");
-const types_1 = require("./types");
+const logger_1 = require("./logger");
 const protocol_1 = require("./protocol");
 const base_1 = require("../server/base");
 const events_1 = require("events");
 class System extends base_1.Base {
-    constructor(dev = false) {
-        super("system" + (dev ? "-dev" : ""));
+    constructor() {
+        super("system");
         this.isBrowser = true;
         this.isSplitted = false;
         this.moods = [];
@@ -29,8 +29,6 @@ class System extends base_1.Base {
         this.emitter = new events_1.EventEmitter();
         protocol_1.Protocol.setEmitter(this.emitter);
         this.emitter.on('update', this.checkScenes.bind(this));
-        // this.readConfig();
-        this.readGroups();
         this.readScenes();
         // open all masters listed in the config
         this.masters = [];
@@ -46,7 +44,7 @@ class System extends base_1.Base {
                         yield this.openMaster(this.config.cmasters[inx], readDB);
                 }
                 catch (err) {
-                    (0, types_1.log)("system", err);
+                    (0, logger_1.log)("system", err);
                 }
             }
         });
@@ -66,18 +64,18 @@ class System extends base_1.Base {
             if ((typeof master.config.active === "boolean") && (!master.config.active))
                 return;
             try {
-                (0, types_1.log)("system", "opening master: " + master.getAddress());
+                (0, logger_1.log)("system", "opening master: " + master.getAddress());
                 yield master.open();
                 if (!(yield master.login()))
                     throw (new Error("Failed to log in"));
-                (0, types_1.log)("system", "logged in on: " + master.getAddress());
+                (0, logger_1.log)("system", "logged in on: " + master.getAddress());
                 yield master.getDatabase(readDB);
-                (0, types_1.log)("system", "master: " + master.getAddress() + " opened with " + master.nodes.length + " nodes.");
+                (0, logger_1.log)("system", "master: " + master.getAddress() + " opened with " + master.nodes.length + " nodes.");
                 this.triggerRebuild();
                 return master;
             }
             catch (e) {
-                (0, types_1.err)("system", "failed to open master (" + e.toString() + ")");
+                (0, logger_1.err)("system", "failed to open master (" + e.toString() + ")");
                 return null;
                 // throw(e);
             }
@@ -96,7 +94,7 @@ class System extends base_1.Base {
                     yield master.close();
                 }
                 catch (e) {
-                    (0, types_1.err)("system", "failed to close master on " + master.getAddress() + ":" + master.getPort());
+                    (0, logger_1.err)("system", "failed to close master on " + master.getAddress() + ":" + master.getPort());
                 }
             }
             // remove from list
@@ -149,7 +147,7 @@ class System extends base_1.Base {
                 this.writeConfig();
             }
             else {
-                (0, types_1.err)("system", "didn't find the master " + master.getAddress() + ":" + master.getConfig().port + " in the config");
+                (0, logger_1.err)("system", "didn't find the master " + master.getAddress() + ":" + master.getConfig().port + " in the config");
             }
         });
     }
@@ -189,19 +187,6 @@ class System extends base_1.Base {
             }
         }
     }
-    selectGroup(group) {
-        if (this.config.multiple) {
-            // multiple groups = just turn on/off
-            group.visible = !group.visible;
-        }
-        else {
-            // turn of other groups if this one becomes visible
-            if (!group.visible)
-                this.groups.forEach(g => g.visible = false);
-            group.visible = !group.visible;
-        }
-        this.writeGroups();
-    }
     //////////////////////////////////////
     // Finding masters, nodes and units //
     //////////////////////////////////////
@@ -355,14 +340,14 @@ class System extends base_1.Base {
             return 0;
         }
         // sort masters, nodes in masters, units in nodes.
-        (0, types_1.log)("system", "rebuildMasters (" + this.masters.length + ") -> nodes -> units");
+        (0, logger_1.log)("system", "rebuildMasters (" + this.masters.length + ") -> nodes -> units");
         this.masters.sort(compare);
         this.masters.forEach((m) => {
             m.nodes.sort(compare);
             m.nodes.forEach((n) => n.units.sort(compare));
         });
         // sort selected controls, temperatures and moods.
-        (0, types_1.log)("system", "rebuildServices");
+        (0, logger_1.log)("system", "rebuildServices");
         const services = this.allActiveUnits();
         this.controls = services.filter(s => s.isCtrl()).sort(compareN);
         this.temperatures = services.filter(s => s.isTemperature()).sort(compareN);
@@ -372,7 +357,7 @@ class System extends base_1.Base {
         // should be of all active masters, nodes and units !!
         // this.allMasters(m => m.allNodes(n => {if (n.nrUnits != n.units.length) complete = false; }))
         if (complete) {
-            (0, types_1.log)("system", "emitting READY");
+            (0, logger_1.log)("system", "emitting READY");
             this.emitter.emit('ready', this.masters.length);
         }
     }
@@ -383,13 +368,13 @@ class System extends base_1.Base {
         // called by updateState that is listening for status changes
         const scene = this.scenes.find(s => unit.isUnit(s.trigger.masterAddress, s.trigger.masterPort, s.trigger.logicalNodeAddress, s.trigger.logicalAddress));
         if (scene) {
-            (0, types_1.debug)("system", "scene found -> " + scene.name + ", value = " + scene.trigger.value + " unit = " + unit.value);
+            (0, logger_1.debug)("system", "scene found -> " + scene.name + ", value = " + scene.trigger.value + " unit = " + unit.value);
             console.log(scene);
             //  if (unit.sameValue(scene.trigger.value)) {
             scene.units.forEach(u => {
                 const unit = this.findUnit(u.masterAddress, u.masterPort, u.logicalNodeAddress, u.logicalAddress);
                 if (unit) {
-                    (0, types_1.debug)("system", " - attached unit found -> " + unit.getDisplayName() + " -> " + u.value);
+                    (0, logger_1.debug)("system", " - attached unit found -> " + unit.getDisplayName() + " -> " + u.value);
                     unit.setState(u.value);
                 }
             });
@@ -399,23 +384,14 @@ class System extends base_1.Base {
     //////////////////
     // Config stuff //
     //////////////////
-    readGroups() {
-        this.groups = this.read("groups");
-        // order the groups and reset the order indices
-        this.groups.sort((a, b) => a.order - b.order);
-        this.groups.forEach((g, i) => g.order = i);
-    }
     readScenes() {
         this.scenes = this.read("scenes");
-        // order the groups and reset the order indices
+        // order the scenes and reset the order indices
         this.scenes.sort((a, b) => a.order - b.order);
         this.scenes.forEach((g, i) => g.order = i);
     }
     writeScenes() {
-        this.groups = this.write("scenes", this.scenes);
-    }
-    writeGroups() {
-        this.groups = this.write("groups", this.groups);
+        this.write("scenes", this.scenes);
     }
 }
 exports.System = System;

package/duotecno/system.ts

@@ -1,5 +1,6 @@
 import { Master } from "./master";
-import { SystemConfig, MasterConfig, UnitConfig, YN, GroupConfig, SceneConfig, log, err, debug } from "./types";
+import { SystemConfig, MasterConfig, UnitConfig, YN, GroupConfig, SceneConfig } from "./types";
+import { log, err, debug } from "./logger";
 import { Node, Unit, Protocol } from "./protocol";
 import { Base } from "../server/base";
 import { EventEmitter } from "events";
@@ -8,7 +9,6 @@ import { EventEmitter } from "events";
 export class System extends Base {
   public masters: Array<Master>;
   public config: SystemConfig;
-  public groups: Array<GroupConfig>;
   public isBrowser: boolean = true;
   public isSplitted: boolean = false;
 
@@ -21,16 +21,14 @@ export class System extends Base {
   public stores: Array<Unit> = [];
   public scenes: Array<SceneConfig> = [];
 
-  constructor(dev = false) {
-    super("system" + (dev ? "-dev" : ""));
+  constructor() {
+    super("system");
 
     this.trigger = null;
     this.emitter = new EventEmitter();
     Protocol.setEmitter(this.emitter);
     this.emitter.on('update', this.checkScenes.bind(this));
 
-    // this.readConfig();
-    this.readGroups();
     this.readScenes();
 
     // open all masters listed in the config
@@ -200,20 +198,6 @@ export class System extends Base {
   }
 
 
-  selectGroup(group: GroupConfig) {
-    if (this.config.multiple) {
-      // multiple groups = just turn on/off
-      group.visible = !group.visible;
-
-    } else {
-      // turn of other groups if this one becomes visible
-      if (!group.visible) 
-        this.groups.forEach(g => g.visible = false);
-      group.visible = ! group.visible;
-    }
-    this.writeGroups();
-  }
-
   //////////////////////////////////////
   // Finding masters, nodes and units //
   //////////////////////////////////////
@@ -430,27 +414,16 @@ export class System extends Base {
   // Config stuff //
   //////////////////
 
-  readGroups() {
-    this.groups = this.read("groups");
-
-    // order the groups and reset the order indices
-    this.groups.sort((a,b) => a.order-b.order);
-    this.groups.forEach((g,i) => g.order = i);
-  }
   readScenes() {
-    this.scenes = this.read("scenes");
+    this.scenes = <SceneConfig[]>this.read("scenes");
 
-    // order the groups and reset the order indices
+    // order the scenes and reset the order indices
     this.scenes.sort((a,b) => a.order-b.order);
     this.scenes.forEach((g,i) => g.order = i);
   }
 
   writeScenes() {
-    this.groups = this.write("scenes", this.scenes);
-  }
-
-  writeGroups() {
-    this.groups = this.write("groups", this.groups);
+    this.write("scenes", this.scenes);
   }