homebridge-smartsystem 6.0.6 → 6.0.7

package/package.json

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

package/server/base.js

@@ -4,11 +4,17 @@ exports.Base = void 0;
 const fs = require("fs");
 const protocol_1 = require("../duotecno/protocol");
 const types_1 = require("../duotecno/types");
+const fs_1 = require("fs");
+const os_1 = require("os");
+const kConfigFiles = (0, os_1.homedir)() + "/homebridge";
+if (!(0, fs_1.existsSync)(kConfigFiles))
+    (0, fs_1.mkdirSync)(kConfigFiles);
 ///////////////
 // Log Class //
 ///////////////
 class Base {
     constructor(type, logger, config) {
+        this.configFiles = kConfigFiles;
         this.type = type || "base";
         this.logger = console.log; // logger || console.log;
         if (config)
@@ -43,7 +49,7 @@ class Base {
         this.write(this.type, this.config);
     }
     read(type, fname = "") {
-        const fn = fname || ("~/.homebridge/config." + type + ".json");
+        const fn = fname || (this.configFiles + "/config." + type + ".json");
         let config = null;
         try {
             const configBuf = fs.readFileSync(fn);
@@ -61,7 +67,7 @@ class Base {
         return temp;
     }
     write(type, config, fname = "") {
-        const fn = fname || ("~/.homebridge/config." + type + ".json");
+        const fn = fname || (this.configFiles + "/config." + type + ".json");
         try {
             config = types_1.Sanitizers[type](config);
             fs.writeFileSync(fn, JSON.stringify(config, null, 2));

package/server/base.ts

@@ -3,6 +3,13 @@ import { Protocol } from "../duotecno/protocol";
 import { LogFunction, now, Sanitizers } from "../duotecno/types";
 
 
+import { existsSync, mkdirSync } from "fs";
+import { homedir } from "os";
+
+const kConfigFiles = homedir() + "/homebridge";
+if (! existsSync(kConfigFiles)) mkdirSync(kConfigFiles);
+
+
 ///////////////
 // Log Class //
 ///////////////
@@ -12,6 +19,7 @@ export class Base {
   debug: boolean;
   logger: LogFunction;
   config: any;
+  configFiles = kConfigFiles;
 
   constructor(type: string, logger?: LogFunction, config?) {
     this.type = type || "base";
@@ -57,7 +65,7 @@ export class Base {
 
 
   read(type: string, fname: string = "") {
-    const fn = fname || ("~/.homebridge/config." + type + ".json");
+    const fn = fname || (this.configFiles + "/config." + type + ".json");
     let config = null;
 
     try {
@@ -78,7 +86,7 @@ export class Base {
   }
 
   write(type: string, config, fname: string = "") {
-    const fn = fname || ("~/.homebridge/config." + type + ".json");
+    const fn = fname || (this.configFiles + "/config." + type + ".json");
     try {
       config = Sanitizers[type](config); 
       fs.writeFileSync(fn, JSON.stringify(config, null, 2));

package/server/platform.js

@@ -25,9 +25,6 @@ const base_1 = require("./base");
 const socapp_1 = require("./socapp");
 const door_1 = require("../accessories/door");
 const lock_1 = require("../accessories/lock");
-const fs_1 = require("fs");
-if (!(0, fs_1.existsSync)("~/homebridge"))
-    (0, fs_1.mkdirSync)("~/homebridge");
 class Platform extends base_1.Base {
     constructor(log, config, api) {
         // set debug to true for new config files
@@ -38,6 +35,7 @@ class Platform extends base_1.Base {
         this.config = Object.assign({}, config);
         this.config.debug = (config && ("debug" in config)) ? config.debug : false;
         this.log("running in " + ((this.config.debug) ? "debug" : "prod") + " mode in directory: " + process.cwd());
+        this.log("config files in " + this.configFiles + "/config.xxx.json");
         this.log("with config:" + JSON.stringify(config, null, 2));
         // this.log("homebridge object:", api);
         this.homebridgeAPI = api;

package/server/platform.ts

@@ -1,4 +1,4 @@
-import { LogFunction, PlatformConfig, UnitExtendedType } from "../duotecno/types";
+import { PlatformConfig, UnitExtendedType } from "../duotecno/types";
 import { API, Logger } from "homebridge";
 import { System } from "../duotecno/system";
 import { Smappee } from "./smappee";
@@ -16,11 +16,8 @@ import { Accessory } from "../accessories/accessory";
 import { SocApp } from "./socapp";
 import { Door } from "../accessories/door";
 import { Lock } from "../accessories/lock";
-import { existsSync, mkdirSync } from "fs";
 
 
-if (! existsSync("~/homebridge")) mkdirSync("~/homebridge");
-
 export class Platform extends Base {
   homebridgeAPI: API;
   config: PlatformConfig;
@@ -40,6 +37,7 @@ export class Platform extends Base {
     this.config.debug = (config && ("debug" in config)) ? config.debug : false;
 
     this.log("running in " + ((this.config.debug) ? "debug" : "prod") + " mode in directory: " + process.cwd());
+    this.log("config files in " + this.configFiles + "/config.xxx.json");
     this.log("with config:" + JSON.stringify(config, null, 2));
     // this.log("homebridge object:", api);