homebridge-smartsystem 6.1.7 → 6.2.2

package/server/base.ts

@@ -1,13 +1,5 @@
-import * as fs from 'fs';
-import { debug, err, log, LogFunction, LogLevel, logSettings, Sanitizers } from "../duotecno/types";
-
-
-import { existsSync, mkdirSync } from "fs";
-import { homedir, platform } from "os";
-
-const isMac = (platform() === "darwin");
-const kConfigFiles = (isMac) ? (__dirname+"/..") : (homedir() + "/duotecno");
-if (! existsSync(kConfigFiles)) mkdirSync(kConfigFiles);
+import { debug, LogLevel, logSettings } from "../duotecno/logger";
+import { setSubConfig, getSubConfig, setAPIConfig } from '../duotecno/config';
 
 
 ///////////////
@@ -18,7 +10,7 @@ export class Base {
   type: string;
   debug: boolean;
   config: any;
-  configFiles = kConfigFiles;
+
 
   constructor(type: string, config?) {
     this.type = type || "base";
@@ -43,43 +35,18 @@ export class Base {
     this.config = this.read(this.type);
     this.debug = (!!this.config.debug) || false;
   }
-
   writeConfig() {
     this.write(this.type, this.config);
   }
 
-
-  read(type: string, fname: string = "") {
-    const fn = fname || (this.configFiles + "/config." + type + ".json");
-    let config = null;
-
-    try {
-      const configBuf = fs.readFileSync(fn);
-      const configStr = configBuf.toString();
-      config = JSON.parse(configStr);
-
-    } catch(err) {
-      log("system", "Couldn't read my config file (" + fn + ") -- Creating empty config.")
-    }
-
-    // sanitize the config
-    const temp = Sanitizers[type](config);
-
-    // write if we created it (new intallations or new config params)
-    if (!config && temp) this.write(type, temp, fname);
-    return temp;
+  read(type: string) {
+    return getSubConfig(type);
   }
+  write(type: string, config) {
+    setSubConfig(type, config);
 
-  write(type: string, config, fname: string = "") {
-    const fn = fname || (this.configFiles + "/config." + type + ".json");
-    try {
-      config = Sanitizers[type](config); 
-      fs.writeFileSync(fn, JSON.stringify(config, null, 2));
-
-    } catch(error) {
-      err(this.type, "Couldn't write my " + type + " config file (" + fn + ")");
-    }
-    return config;
+    // but better to much than not enough
+    setAPIConfig();
   }
 
 }

package/server/p1.js

@@ -13,11 +13,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.P1 = void 0;
-const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const powerbase_1 = require("./powerbase");
-const types_2 = require("../duotecno/types");
+const logger_2 = require("../duotecno/logger");
+const api_1 = require("../duotecno/api");
 class P1 extends powerbase_1.PowerBase {
-    constructor(system, dev = false) {
+    constructor(system) {
         super("p1", system);
         // readconfig and init are called by super
     }
@@ -38,7 +39,7 @@ class P1 extends powerbase_1.PowerBase {
     subscribe() {
         return __awaiter(this, void 0, void 0, function* () {
             const kInterval = 5;
-            (0, types_1.log)("p1", "connecting to P1: " + this.config.address);
+            (0, logger_1.log)("p1", "connecting to P1: " + this.config.address);
             if (this.config.address) {
                 this.timer = setInterval(() => __awaiter(this, void 0, void 0, function* () {
                     this.realtimeCounter += kInterval;
@@ -64,9 +65,9 @@ class P1 extends powerbase_1.PowerBase {
     fetchData() {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                (0, types_2.debug)("p1", "fetching from " + this.config.address + "/api/v1/telegram");
-                const res = yield this.get(this.config.address, "/api/v1/telegram");
-                (0, types_2.debug)("p1", "received: " + res);
+                (0, logger_2.debug)("p1", "fetching from " + this.config.address + "/api/v1/telegram");
+                const res = yield (0, api_1.get)(this.config.address, 80, "/api/v1/telegram", undefined);
+                (0, logger_2.debug)("p1", "received: " + res);
                 const result = {};
                 res.split("\r\n").filter(l => (l[0] === '1')).map(L => {
                     // 0-0:1.0.0(220720172521S)
@@ -85,7 +86,7 @@ class P1 extends powerbase_1.PowerBase {
                 return result;
             }
             catch (error) {
-                (0, types_1.err)("p1", "error fetching data: " + JSON.stringify(error));
+                (0, logger_1.err)("p1", "error fetching data: " + JSON.stringify(error));
                 return null;
             }
         });

package/server/p1.ts

@@ -3,9 +3,11 @@
 //
 
 import { System } from "../duotecno/system";
-import { err, log, P1Config } from "../duotecno/types";
+import { P1Config } from "../duotecno/types";
+import { err, log } from "../duotecno/logger";
 import { PowerBase } from "./powerbase";
-import { debug } from "../duotecno/types";
+import { debug } from "../duotecno/logger";
+import { get } from "../duotecno/api";
 
 /* http://192.168.0.214/api/v1/data
 
@@ -93,7 +95,7 @@ export class P1 extends PowerBase {
   timer: NodeJS.Timer;
 
 
-  constructor(system: System, dev = false) {
+  constructor(system: System) {
     super("p1", system);
     
     // readconfig and init are called by super
@@ -147,7 +149,7 @@ export class P1 extends PowerBase {
   async fetchData(): Promise<P1Data> {
     try {
       debug("p1", "fetching from " + this.config.address + "/api/v1/telegram");
-      const res = await this.get(this.config.address, "/api/v1/telegram");
+      const res = await get(this.config.address, 80, "/api/v1/telegram", undefined);
       debug("p1", "received: " + res);
       const result: P1Data = {};
 

package/server/platform.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Platform = void 0;
 const types_1 = require("../duotecno/types");
+const logger_1 = require("../duotecno/logger");
 const system_1 = require("../duotecno/system");
 const smappee_1 = require("./smappee");
 const smartapp_1 = require("./smartapp");
@@ -27,41 +28,47 @@ const door_1 = require("../accessories/door");
 const lock_1 = require("../accessories/lock");
 const p1_1 = require("./p1");
 const shelly_1 = require("./shelly");
+const config_1 = require("../duotecno/config");
+const fs_1 = require("fs");
 class Platform extends base_1.Base {
-    constructor(logger, config, api) {
-        // set debug to true for new config files
+    constructor(logger, pConfig, api) {
         super("homebridge");
         this.accessoryList = [];
         this.ready = false;
         this.startWaiting = 0;
         if (logger.info)
-            (0, types_1.setLogFunction)(logger.info);
-        this.config = Object.assign({}, config);
-        this.config.debug = (config && ("debug" in config)) ? config.debug : false;
+            (0, logger_1.setLogFunction)(logger.info);
+        this.config = Object.assign({}, pConfig);
+        this.config.debug = (pConfig && ("debug" in pConfig)) ? pConfig.debug : false;
         if (this.config.debug)
-            types_1.logSettings["homebridge"] = types_1.LogLevel.debug;
-        (0, types_1.log)("homebridge", "running in " + ((this.config.debug) ? "debug" : "prod") + " mode in directory: " + process.cwd());
-        (0, types_1.log)("homebridge", "config files in " + this.configFiles + "/config.xxx.json");
-        (0, types_1.log)("homebridge", "with config:" + JSON.stringify(config, null, 2));
-        // log("homebridge", "homebridge object:", api);
+            logger_1.logSettings["homebridge"] = logger_1.LogLevel.debug;
+        if (typeof this.config.system.cmasters === "undefined") {
+            (0, logger_1.log)("homebridge", "try doing upgrade from pre v6.2 versions");
+            this.doUpgradeV62();
+        }
+        (0, logger_1.log)("homebridge", "running in " + ((this.config.debug) ? "debug" : "prod") + " mode in directory: " + process.cwd());
+        (0, logger_1.log)("homebridge", "with config:" + JSON.stringify(this.config, null, 2));
+        // save config for other components
+        (0, config_1.setConfig)(this.config);
+        // remember api for later use
         this.homebridgeAPI = api;
         if (this.config.system) {
             try {
-                this.system = new system_1.System(false);
+                this.system = new system_1.System();
                 this.system.openMasters(true);
                 this.system.emitter.on('ready', this.systemReady.bind(this));
                 this.system.emitter.on('update', this.updateState.bind(this));
             }
             catch (err) {
-                (0, types_1.log)("homebridge", err);
+                (0, logger_1.log)("homebridge", err);
                 if (!this.system) {
-                    (0, types_1.log)("homebridge", "platform - Can't run without a System.");
+                    (0, logger_1.log)("homebridge", "platform - Can't run without a System.");
                     return;
                 }
             }
         }
         else {
-            (0, types_1.log)("homebridge", "platform - No System configured -> can't run !!!");
+            (0, logger_1.log)("homebridge", "platform - No System configured -> can't run !!!");
             return;
         }
         // start power managers
@@ -69,23 +76,23 @@ class Platform extends base_1.Base {
         this.startPower("smappee", smappee_1.Smappee);
         this.startPower("p1", p1_1.P1);
         this.startPower("shelly", shelly_1.Shelly);
-        // startup a smartApp if configured -> only on Raspberry's
+        // startup a smartApp if configured
         if (this.config.smartapp) {
             try {
-                this.smartapp = new smartapp_1.SmartApp(this.system, this.power, this, false);
+                this.smartapp = new smartapp_1.SmartApp(this.system, this.power, this);
                 this.smartapp.serve();
             }
             catch (err) {
-                (0, types_1.log)("homebridge", err);
+                (0, logger_1.log)("homebridge", err);
                 if (!this.smartapp) {
-                    (0, types_1.log)("homebridge", "platform - No SmartApp started.");
+                    (0, logger_1.log)("homebridge", "platform - No SmartApp started.");
                 }
             }
         }
         else {
-            (0, types_1.log)("homebridge", "platform - No SmartApp configured.");
+            (0, logger_1.log)("homebridge", "platform - No SmartApp configured.");
         }
-        // startup a SocApp if configured -> for servers
+        // startup a SocApp if configured -> for proxy (not needed)
         if (this.config.socapp) {
             try {
                 // reuse the config file from the smartapp
@@ -93,14 +100,14 @@ class Platform extends base_1.Base {
                 this.smartsoc.serve();
             }
             catch (err) {
-                (0, types_1.log)("homebridge", err);
+                (0, logger_1.log)("homebridge", err);
                 if (!this.smartsoc) {
-                    (0, types_1.log)("homebridge", "platform - No SocApp started.");
+                    (0, logger_1.log)("homebridge", "platform - No SocApp started.");
                 }
             }
         }
         else {
-            (0, types_1.log)("homebridge", "platform - No SocApp configured.");
+            (0, logger_1.log)("homebridge", "platform - No SocApp configured.");
         }
     }
     startPower(type, PowerMgr) {
@@ -110,14 +117,14 @@ class Platform extends base_1.Base {
                 this.power[type] = new PowerMgr(this.system);
             }
             catch (err) {
-                (0, types_1.log)("homebridge", err);
+                (0, logger_1.log)("homebridge", err);
                 if (!this.power[type]) {
-                    (0, types_1.log)("homebridge", "platform - No " + type + " started.");
+                    (0, logger_1.log)("homebridge", "platform - No " + type + " started.");
                 }
             }
         }
         else {
-            (0, types_1.log)("homebridge", "platform - No " + type + " configured.");
+            (0, logger_1.log)("homebridge", "platform - No " + type + " configured.");
         }
     }
     updateState(unit) {
@@ -129,7 +136,7 @@ class Platform extends base_1.Base {
     systemReady() {
         const inConfig = this.system.activeUnitsConfig().length;
         const inSystem = this.system.allActiveUnits().length;
-        (0, types_1.log)("homebridge", "=== SYSTEM READY received update -> addMasters: " + inSystem + " of " + inConfig + " ===");
+        (0, logger_1.log)("homebridge", "=== SYSTEM READY received update -> addMasters: " + inSystem + " of " + inConfig + " ===");
         this.ready = (inSystem == inConfig);
         // trigger status request of all active units in 2 seconds.
         setTimeout(() => __awaiter(this, void 0, void 0, function* () {
@@ -146,45 +153,45 @@ class Platform extends base_1.Base {
         const inSystem = this.system.allActiveUnits().length;
         this.ready = (inSystem == inConfig);
         if (this.ready) {
-            (0, types_1.log)("homebridge", "=== running after timeout of " + this.startWaiting + " secs --> " +
+            (0, logger_1.log)("homebridge", "=== running after timeout of " + this.startWaiting + " secs --> " +
                 inSystem + " == " + inConfig + " units -> " + (inConfig == inSystem) + ", will start in 10 seconds ===");
             setTimeout(() => { this.doAccessories(callback); }, 10 * 1000);
         }
         else if (this.startWaiting > kMaxWaiting) {
             // give up, retry connection to the masters, a manager like "forever" or "pm2" will restart us.
-            (0, types_1.log)("homebridge", "=== giving up after " + kMaxWaiting + " secs -> auto restart system ===");
+            (0, logger_1.log)("homebridge", "=== giving up after " + kMaxWaiting + " secs -> auto restart system ===");
             process.exit(-1);
         }
         else {
             // wait another 5 seconds.
-            (0, types_1.log)("homebridge", "=== waiting >> found " + inSystem + " units out of " + inConfig + " selected after " + this.startWaiting + " sec ===");
+            (0, logger_1.log)("homebridge", "=== waiting >> found " + inSystem + " units out of " + inConfig + " selected after " + this.startWaiting + " sec ===");
             this.startWaiting += 5;
             setTimeout(() => { this.accessories(callback); }, 5000);
         }
     }
     doAccessories(callback) {
-        (0, types_1.log)("homebridge", "platform - accessories() called by Homebridge - System is ready");
+        (0, logger_1.log)("homebridge", "platform - accessories() called by Homebridge - System is ready");
         this.addAccessories()
             .then(list => {
-            (0, types_1.log)("homebridge", "platform - addAccessories returned: " + list.length + " accessories.");
+            (0, logger_1.log)("homebridge", "platform - addAccessories returned: " + list.length + " accessories.");
             callback(list);
         })
             .catch(reason => {
-            (0, types_1.log)("homebridge", "platform - addAccessories errored: " + reason);
+            (0, logger_1.log)("homebridge", "platform - addAccessories errored: " + reason);
             callback([]);
         });
     }
     addAccessories() {
         return __awaiter(this, void 0, void 0, function* () {
             if (!this.system) {
-                (0, types_1.log)("homebridge", "platform - No System -> No accessories");
+                (0, logger_1.log)("homebridge", "platform - No System -> No accessories");
                 this.accessoryList = [];
                 return;
             }
             // clear our list
             this.accessoryList = [];
             this.system.allActiveUnits().forEach(unit => {
-                (0, types_1.log)("homebridge", "adding accessory: " + unit.getDescription());
+                (0, logger_1.log)("homebridge", "adding accessory: " + unit.getDescription());
                 switch (unit.getType()) {
                     case types_1.UnitExtendedType.kDimmer:
                         this.accessoryList.push(new dimmer_1.Dimmer(this.homebridgeAPI, unit));
@@ -217,7 +224,7 @@ class Platform extends base_1.Base {
                         this.accessoryList.push(new temperature_1.Temperature(this.homebridgeAPI, unit));
                         break;
                     default:
-                        (0, types_1.log)("homebridge", "platform - addAccessories: accessory type not yet supported: " + unit.typeName() +
+                        (0, logger_1.log)("homebridge", "platform - addAccessories: accessory type not yet supported: " + unit.typeName() +
                             " (" + unit.getName() + ")");
                         break;
                 }
@@ -225,6 +232,29 @@ class Platform extends base_1.Base {
             return this.accessoryList;
         });
     }
+    doUpgradeV62() {
+        function readFile(type) {
+            const fn = config_1.kConfigFiles + "/config." + type + ".json";
+            try {
+                const configBuf = (0, fs_1.readFileSync)(fn);
+                const configStr = configBuf.toString();
+                return (types_1.Sanitizers[type])(JSON.parse(configStr));
+            }
+            catch (err) {
+                (0, logger_1.log)("system", "Couldn't read my config file (" + fn + ") -- setting to 'false'");
+                return false;
+            }
+        }
+        this.config.system = readFile("system");
+        this.config.smartapp = readFile("smartapp");
+        this.config.scenes = readFile("scenes");
+        this.config.settings = readFile("settings");
+        this.config.smappee = readFile("smappee");
+        this.config.p1 = readFile("p1");
+        this.config.shelly = readFile("shelly");
+        (0, config_1.setConfig)(this.config);
+        (0, logger_1.log)("homebridge", "Upgraded the config file -> NOW: log in and save something...");
+    }
 }
 exports.Platform = Platform;
 //# sourceMappingURL=platform.js.map

package/server/platform.ts

@@ -1,4 +1,5 @@
-import { log, setLogFunction, LogLevel, logSettings, PlatformConfig, UnitExtendedType } from "../duotecno/types";
+import { PlatformConfig, Sanitizers, UnitExtendedType } from "../duotecno/types";
+import { log, setLogFunction, LogLevel, logSettings } from "../duotecno/logger";
 import { API, Logger } from "homebridge";
 import { System } from "../duotecno/system";
 import { Smappee } from "./smappee";
@@ -18,6 +19,8 @@ import { Door } from "../accessories/door";
 import { Lock } from "../accessories/lock";
 import { P1 } from "./p1";
 import { Shelly } from "./shelly";
+import { kConfigFiles, setConfig } from "../duotecno/config";
+import { fstat, readFileSync } from "fs";
 
 
 export class Platform extends Base {
@@ -31,25 +34,31 @@ export class Platform extends Base {
   ready = false;
   startWaiting = 0;
 
-  constructor(logger: Logger, config: PlatformConfig, api: API) {
-    // set debug to true for new config files
+  constructor(logger: Logger, pConfig: PlatformConfig, api: API) {
     super("homebridge");
     if (logger.info) setLogFunction(logger.info);
 
-    this.config = {... config};
-    this.config.debug = (config && ("debug" in config)) ? config.debug : false;
+    this.config = {... pConfig};
+    this.config.debug = (pConfig && ("debug" in pConfig)) ? pConfig.debug : false;
     if (this.config.debug) logSettings["homebridge"] = LogLevel.debug;
 
+    if (typeof this.config.system.cmasters === "undefined") {
+      log("homebridge", "try doing upgrade from pre v6.2 versions");
+      this.doUpgradeV62();
+    }
+
     log("homebridge", "running in " + ((this.config.debug) ? "debug" : "prod") + " mode in directory: " + process.cwd());
-    log("homebridge", "config files in " + this.configFiles + "/config.xxx.json");
-    log("homebridge", "with config:" + JSON.stringify(config, null, 2));
-    // log("homebridge", "homebridge object:", api);
+    log("homebridge", "with config:" + JSON.stringify(this.config, null, 2));
+
+    // save config for other components
+    setConfig(this.config);
 
+    // remember api for later use
     this.homebridgeAPI = api;
 
     if (this.config.system) {
       try {
-        this.system = new System(false);
+        this.system = new System();
         this.system.openMasters(true);
 
         this.system.emitter.on('ready', this.systemReady.bind(this));
@@ -74,10 +83,10 @@ export class Platform extends Base {
     this.startPower("shelly", Shelly);
 
 
-    // startup a smartApp if configured -> only on Raspberry's
+    // startup a smartApp if configured
     if (this.config.smartapp) {
       try {
-        this.smartapp = new SmartApp(this.system, this.power, this, false);
+        this.smartapp = new SmartApp(this.system, this.power, this);
         this.smartapp.serve();
 
       } catch(err) {
@@ -90,7 +99,7 @@ export class Platform extends Base {
       log("homebridge", "platform - No SmartApp configured.");
     }
 
-    // startup a SocApp if configured -> for servers
+    // startup a SocApp if configured -> for proxy (not needed)
     if (this.config.socapp) {
       try {
         // reuse the config file from the smartapp
@@ -249,4 +258,30 @@ export class Platform extends Base {
     return this.accessoryList;
   }
 
+
+  doUpgradeV62() {
+    function readFile(type: string): object | boolean {
+      const fn = kConfigFiles + "/config." + type + ".json";
+      try {
+        const configBuf = readFileSync(fn);
+        const configStr = configBuf.toString();
+        return (Sanitizers[type])(JSON.parse(configStr));
+  
+      } catch(err) {
+        log("system", "Couldn't read my config file (" + fn + ") -- setting to 'false'");
+        return false;
+      }
+    }
+    this.config.system = readFile("system");
+    this.config.smartapp = readFile("smartapp");
+    this.config.scenes = readFile("scenes");
+    this.config.settings = readFile("settings");
+    this.config.smappee = readFile("smappee");
+    this.config.p1 = readFile("p1");
+    this.config.shelly = readFile("shelly");
+    setConfig(this.config);
+    
+    log("homebridge", "Upgraded the config file -> NOW: log in and save something...");
+  }
+
 }