homebridge-smartsystem 6.1.7 → 6.2.2

package/duotecno/types.ts

@@ -34,7 +34,7 @@ export enum UnitExtendedType /* extends UnitType */ {
   kGarageDoor = 201, kDoor = 202, kLock = 203, kUnlocker = 204
 };
 
-
+// kPower  == kTemperature name starting with  "<" or ">"
 // kLightbulb  == kSwitch with no "*" or "$" in the name
 // kDoor == kSwitchingMotor with "*" in the name
 // kGarageDoor == kSwitchingMotor with "$" in the name
@@ -43,44 +43,6 @@ export enum UnitExtendedType /* extends UnitType */ {
 // kUnlocker = kMood with $ in the name
 
 
-/////////////
-// 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
-}
-
-// 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)));
-  }
-}
-
 //////////////
 // Duotecno //
 //////////////
@@ -90,9 +52,6 @@ export interface SystemConfig {
   socketserver: string;
   socketport: number;
   mood: string;
-  language: string;
-  stores: boolean;
-  multiple: boolean;
   debug?: boolean;
   cmasters: Array<MasterConfig>;
   cunits: Array<UnitConfig>;
@@ -281,6 +240,7 @@ export interface Switch extends UnitDef {
   type: SwitchType,
   plug: number | string,
   data: string,
+  header: string,
   method: string,
   unit?: Unit;
   status?: number | boolean,
@@ -289,11 +249,13 @@ export interface Switch extends UnitDef {
   nostop: string;
 };
 export const kEmptySwitch: Switch = 
-  { ...kEmptyUnit, plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", nomacro: "N", nostop: "N"} as const;
+  { ...kEmptyUnit, plug: 0, type: SwitchType.kNoType, unitName: "", name: "", data: "", method: "GET", header: "", nomacro: "N", nostop: "N"} as const;
 
 
 export interface SmartAppConfig extends BaseConfig {
   port: number;
+  apiHost: string;
+  apiPort: number;
   switches: Array<Switch>;
 }
 
@@ -350,7 +312,6 @@ export interface HomebridgeConfig {
   password: string;
 };
 
-
 //////////////////
 // SocketServer //
 //////////////////
@@ -399,13 +360,12 @@ export const Sanitizers = {
     if (!config) config = <PlatformConfig>{};
     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 = Sanitizers.system(config.system);
+    
     return config;
   },
 
@@ -418,23 +378,23 @@ export const Sanitizers = {
     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 || [<PlatformConfig>{}];
-    for (let p in config.platforms) this.platform(config.platforms[p]);
+    for (let p in config.platforms) 
+      if (config.platforms[p].platform == "DuotecnoPlatform")
+        config.platforms[p] = 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: SettingsConfig): SettingsConfig {
     if (!config) config = <SettingsConfig>{};
-    config.network = this.networkConfig(config.network);
+    config.network = Sanitizers.networkConfig(config.network);
     return config;
   },
+
   networkConfig: function(config: NetworkConfig): NetworkConfig {
     if (!config) config = <NetworkConfig>{};
     config.ip1 = config.ip1 || kEmptyNetworkConfig.ip1;
@@ -458,8 +418,11 @@ export const Sanitizers = {
     if (!config) config = <SmartAppConfig>{};
     config.port = config.port || 5002;
     config.switches = config.switches || [];
-    config.switches.forEach(sw => this.switchConfig(sw));
+    config.switches = config.switches.map(sw => Sanitizers.switchConfig(sw));
     config.debug = config.debug || false;
+    config.apiHost = config.apiHost || "localhost";
+    config.apiPort = config.apiPort || 8581; 
+
     return config;
   },
 
@@ -467,55 +430,59 @@ export const Sanitizers = {
     if (!config) config = <PowerBaseConfig>{};
 
     config.rules = config.rules || [];
-    config.rules = config.rules.map(sw => this.ruleConfig(sw));
+    config.rules = config.rules.map(sw => Sanitizers.ruleConfig(sw));
 
     config.bindings = config.bindings || [];
-    config.bindings = config.bindings.map(b => this.bindingConfig(b));
+    config.bindings = config.bindings.map(b => Sanitizers.bindingConfig(b));
 
     config.address = config.address || "";
     return config;
   },
 
   smappee: function(config: SmappeeConfig): SmappeeConfig {
-    config = this.powerbase(config);
+    if (!config) config = <SmappeeConfig>{};
 
-    config.uid = config.uid || "--none--";
-    return config;
+    const cfg = <SmappeeConfig> Sanitizers.powerbase(config);
+
+    cfg.uid = config.uid || "--none--";
+    return cfg;
   },
   p1: function(config: P1Config): P1Config {
-    config = this.powerbase(config);
+    config = Sanitizers.powerbase(config);
 
     return config;
   },
   shelly: function(config: ShellyConfig): ShellyConfig {
-    config = this.powerbase(config);
+    config = Sanitizers.powerbase(config);
 
     return config;
   },
 
   switchConfig: function(aSwitch): Switch {
-    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 = <Switch>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 || "";
+      sw.plug = aSwitch.plug || "";
 
-    return aSwitch;
+    return sw;
   },
 
   makeSwitchConfig: function(aSwitch): Switch {
-    return this.switchConfig({ name: aSwitch.name, unitName: aSwitch.unitName,
+    return 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 {
@@ -536,11 +503,11 @@ export const Sanitizers = {
   },
 
   bindingConfig(binding): Binding {
-    binding = this.unitDef({... binding});
+    const b = <Binding>Sanitizers.unitDef({... binding});
 
-    binding.channel = binding.channel || "0";
-    binding.power = binding.power || NaN;
-    return binding;
+    b.channel = binding.channel || "0";
+    b.power = binding.power || NaN;
+    return b;
   },
 
   masterConfig: function(config?: MasterConfig): MasterConfig {
@@ -561,10 +528,7 @@ export const Sanitizers = {
   system: function(config?: SystemConfig): SystemConfig {
     if (!config) config = <SystemConfig>{};
     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
@@ -572,32 +536,14 @@ export const Sanitizers = {
     config.socketport = config.socketport || 9999;
 
     config.cmasters = config.cmasters || [];
-    config.cmasters.forEach(m => this.masterConfig(m));
+    config.cmasters = config.cmasters.map(m => Sanitizers.masterConfig(m));
     
     config.cunits = config.cunits || [];
-    config.cunits.forEach(u => this.unitConfig(u));
+    config.cunits = config.cunits.map(u => Sanitizers.unitConfig(u));
 
     return config;
   },
 
-  ////////////
-  // Groups //
-  group: function(config?: GroupConfig): GroupConfig {
-    if (!config) return kEmptyGroup;
-
-    config.name = config.name || kEmptyGroup.name;
-    config.id = config.id || kEmptyGroup.id;
-    config.order = config.order || kEmptyGroup.order;
-    config.visible = (typeof config.visible === "boolean") ? config.visible : kEmptyGroup.visible;
-    return config;
-  },
-
-  groups: function(config?: Array<GroupConfig>): Array<GroupConfig> {
-    if (!config) return [{... kEmptyGroup}];
-
-    config.forEach(g => Sanitizers["group"](g));
-    return config;
-  },
 
   //////////
   // Node //
@@ -613,18 +559,18 @@ export const Sanitizers = {
   //////////
   // Unit //
   unitDef: function(info: UnitDef) {
-    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?: UnitConfig) {  // unitDef + active + group
     if (!config) { config = <UnitConfig>{}; }
-    this.unitDef(config);
+    config = <UnitConfig>Sanitizers.unitDef(config);
 
     config.active = config.active || 'N';
     config.used = config.used || config.active;
@@ -639,7 +585,7 @@ export const Sanitizers = {
   unitScene: function(config?: UnitScene) {  // unitDef + value 
     // change + create new clean record for writing to config files
     if (!config) { config = <UnitScene>{}; }
-    this.unitDef(config);
+    config = <UnitScene>Sanitizers.unitDef(config);
     if (typeof config.value === "undefined") config.value = 0;
     if (typeof config.value === "string") config.value = parseInt(config.value);
 
@@ -647,7 +593,8 @@ export const Sanitizers = {
              logicalAddress: config.logicalAddress,
              masterAddress: config.masterAddress,
              masterPort: config.masterPort,
-             value: config.value };
+             value: config.value,
+             name: config.name };
   },
 
 
@@ -662,18 +609,18 @@ export const Sanitizers = {
     if (typeof config.order === 'string') { newConfig.order = parseInt(config.order); }
     newConfig.order = config.order || kEmptyScene.order;
 
-    newConfig.trigger = this.unitScene(config.trigger);
+    newConfig.trigger = Sanitizers.unitScene(config.trigger);
 
     config.units = config.units || kEmptyScene.units;
-    newConfig.units = config.units.map(u => this.unitScene(u));
+    newConfig.units = config.units.map(u => Sanitizers.unitScene(u));
 
     return newConfig;
   },
 
   scenes: function(config?: Array<SceneConfig>): Array<SceneConfig> {
-    if (!config) { return [this.sceneConfig()]; }
+    if (!config) { return [Sanitizers.sceneConfig()]; }
 
-    config.forEach(s => this.sceneConfig(s));
+    config = config.map(s => Sanitizers.sceneConfig(s));
     return config;
   },
   
@@ -712,13 +659,6 @@ export const Sanitizers = {
 
 };
 
-// add dev entries for dev configs
-Sanitizers["system-dev"] = Sanitizers["system"];
-Sanitizers["smartapp-dev"] = Sanitizers["smartapp"];
-Sanitizers["smappee-dev"] = Sanitizers["smappee"];
-Sanitizers["p1-dev"] = Sanitizers["p1"];
-Sanitizers["shelly-dev"] = Sanitizers["shelly"];
-
 
 //////////////////////
 // Helper functions //

package/index.spec.js

@@ -3,54 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const platform_1 = require("./server/platform");
 const protocol_1 = require("./duotecno/protocol");
 const types_1 = require("./duotecno/types");
+const logger_1 = require("./duotecno/logger");
 const master_1 = require("./duotecno/master");
-const system_1 = require("./duotecno/system");
-const smappee_1 = require("./server/smappee");
-const p1_1 = require("./server/p1");
-(0, types_1.setLogFunction)(console.log);
-types_1.logSettings["spec"] = types_1.LogLevel.debug;
-(0, types_1.log)("spec", "running in directory: " + process.cwd());
+const fs = require("fs");
+const os = require("os");
+(0, logger_1.setLogFunction)(console.log);
+logger_1.logSettings["spec"] = logger_1.LogLevel.debug;
+let platform;
+(0, logger_1.log)("spec", "running in directory: " + process.cwd());
+const isMac = (os.platform() === "darwin");
+const kConfigFiles = (isMac) ? (__dirname) : (os.homedir() + "/duotecno");
+if (!fs.existsSync(kConfigFiles))
+    fs.mkdirSync(kConfigFiles);
+const fn = kConfigFiles + "/config.json";
+(0, logger_1.log)("spec", "Config in " + fn);
 function adder(plugin, platform, list) {
-    (0, types_1.log)("spec", "************* plugin: " + plugin + ", platform: " + platform);
-    (0, types_1.log)("spec", "************* list: " + JSON.stringify(list));
+    (0, logger_1.log)("spec", "************* plugin: " + plugin + ", platform: " + platform);
+    (0, logger_1.log)("spec", "************* list: " + JSON.stringify(list));
 }
 function tester() {
-    const platform = new platform_1.Platform(console, { debug: false, smappee: true, smartapp: true, socapp: false, system: true,
-        manufacturer: "Duotecno", platform: "ssoc", password: "TesterSpec" }, { registerPlatformAccessories: adder });
     // testing
     let m = new master_1.Master(platform.system, types_1.Sanitizers.masterConfig({ name: "master1", address: "12", port: 21, password: "x", active: true, nodenames: {} }));
     let n = new protocol_1.Node(m, types_1.Sanitizers.nodeInfo({ name: "node1" }));
     let u = new protocol_1.Unit(n, types_1.Sanitizers.unitInfo({ name: "unit|123 $", type: 7 }));
-    (0, types_1.log)("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
+    (0, logger_1.log)("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
     u = new protocol_1.Unit(n, types_1.Sanitizers.unitInfo({ name: "unit|20", type: 1 }));
-    (0, types_1.log)("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
+    (0, logger_1.log)("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
 }
-function alertS(a, b) {
-    (0, types_1.log)("spec", a);
-    if (b)
-        (0, types_1.log)("spec", b);
-}
-let system;
 try {
-    system = new system_1.System(true); // dev
-    system.openMasters(true);
-    try {
-        const smappee = new smappee_1.Smappee(system, true);
-        const p1 = new p1_1.P1(system, true);
-        const platform = new platform_1.Platform(console, { debug: false, smappee: true, smartapp: true, socapp: false, system: true,
-            manufacturer: "Duotecno", platform: "ssoc", password: "TesterSpec" }, { registerPlatformAccessories: adder });
-        //const smartapp = new SmartApp(system, {smappee, p1}, platform, true);
-        //const smartapp = new SocApp(system, "smartapp", console.log, 9999);
-        //smartapp.serve();
-    }
-    catch (err) {
-        (0, types_1.log)("spec", err);
-    }
+    const configBuf = fs.readFileSync(fn);
+    const configStr = configBuf.toString();
+    const config = JSON.parse(configStr);
+    platform = new platform_1.Platform(console, config, { registerPlatformAccessories: adder });
 }
 catch (err) {
-    (0, types_1.log)("spec", err);
-    if (!system) {
-        (0, types_1.log)("spec", "Can't run without a System.");
-    }
+    (0, logger_1.log)("spec", err);
 }
 //# sourceMappingURL=index.spec.js.map

package/index.spec.ts

@@ -1,29 +1,31 @@
 import { Platform } from "./server/platform";
 import { Unit, Node } from "./duotecno/protocol";
-import { log, LogLevel, logSettings, Sanitizers, setLogFunction } from "./duotecno/types";
+import { Sanitizers } from "./duotecno/types";
+import { log, LogLevel, logSettings, setLogFunction } from "./duotecno/logger";
 import { Master } from "./duotecno/master";
-import { System } from "./duotecno/system";
-import { SmartApp } from "./server/smartapp";
-import { Smappee } from "./server/smappee";
 import { API } from "homebridge";
-import { P1 } from "./server/p1";
+import * as fs from "fs";
+import * as os from "os";
 
 setLogFunction(console.log);
 logSettings["spec"] = LogLevel.debug;
 
-
+let platform;
 log("spec", "running in directory: " + process.cwd());
 
+const isMac = (os.platform() === "darwin");
+const kConfigFiles = (isMac) ? (__dirname) : (os.homedir() + "/duotecno");
+if (! fs.existsSync(kConfigFiles)) fs.mkdirSync(kConfigFiles);
+
+const fn = kConfigFiles + "/config.json";
+log("spec", "Config in " + fn);
+
 function adder(plugin: string, platform: string, list: any[]) {
   log("spec", "************* plugin: " + plugin + ", platform: " + platform);
   log("spec", "************* list: " + JSON.stringify(list));
 }
 
 function tester() {
-  const platform = new Platform(console, {debug: false, smappee: true, smartapp: true, socapp: false, system: true, 
-    manufacturer: "Duotecno", platform: "ssoc", password: "TesterSpec"}, <API>{registerPlatformAccessories: adder});
-
-
   // testing
   let m = new Master(platform.system, Sanitizers.masterConfig({name: "master1", address: "12", port: 21, password:"x", active: true, nodenames: {}}));
   let n = new Node(m, Sanitizers.nodeInfo({name: "node1"}));
@@ -32,32 +34,17 @@ function tester() {
   u = new Unit(n, Sanitizers.unitInfo({name: "unit|20", type: 1}));
   log("spec", "Testing names -> getName = " + u.getName() + ", getDisplayname = " + u.getDisplayName() + ", type " + u.type + ", extType = " + u.extendedType + ", getTypeName = " + u.typeName());
 }
-function alertS(a, b) {
-  log("spec", a);
-  if (b) log("spec", b)
-}
 
-let system;
+
+
 try {
-  system = new System(true); // dev
-  system.openMasters(true);      
-
-  try {
-    const smappee = new Smappee(system, true);
-    const p1 = new P1(system, true);
-    const platform = new Platform(console, {debug: false, smappee: true, smartapp: true, socapp: false, system: true, 
-      manufacturer: "Duotecno", platform: "ssoc", password: "TesterSpec"}, <API>{registerPlatformAccessories: adder});
-  
-    //const smartapp = new SmartApp(system, {smappee, p1}, platform, true);
-    //const smartapp = new SocApp(system, "smartapp", console.log, 9999);
-    //smartapp.serve();
-  } catch(err) {
-    log("spec", err);
-}
+  const configBuf = fs.readFileSync(fn);
+  const configStr = configBuf.toString();
+  const config = JSON.parse(configStr);
+
+  platform = new Platform(console, config, <API>{registerPlatformAccessories: adder});
 
 } catch(err) {
   log("spec", err);
-  if (!system) {
-    log("spec", "Can't run without a System.");
-  }
 }
+

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "homebridge-smartsystem",
   "displayname": "Duotecno Bridge",
-  "version": "6.1.7",
+  "version": "6.2.2",
   "description": "SmartServer (Proxy Websockets to TCP sockets, Smappee MQTT, Duotecno IP Nodes, Homekit interface)",
   "main": "index.js",
   "author": "Johan Coppieters",
   "homepage": "http://www.duotecno.be",
   "license": "ISC",
   "scripts": {
-    "start": "DEBUG=* homebridge -D -P '/Users/johan/Library/Mobile Documents/com~apple~CloudDocs/Projects/Duotecno/ssoc'",
+    "start": "DEBUG=* homebridge -D -P '/Users/johan/Development/duotecno/smartsocket'",
     "watch": "npx tsc --build . --watch"
   },
   "engines": {

package/server/base.js

@@ -1,28 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Base = void 0;
-const fs = require("fs");
-const types_1 = require("../duotecno/types");
-const fs_1 = require("fs");
-const os_1 = require("os");
-const isMac = ((0, os_1.platform)() === "darwin");
-const kConfigFiles = (isMac) ? (__dirname + "/..") : ((0, os_1.homedir)() + "/duotecno");
-if (!(0, fs_1.existsSync)(kConfigFiles))
-    (0, fs_1.mkdirSync)(kConfigFiles);
+const logger_1 = require("../duotecno/logger");
+const config_1 = require("../duotecno/config");
 ///////////////
 // Log Class //
 ///////////////
 class Base {
     constructor(type, config) {
-        this.configFiles = kConfigFiles;
         this.type = type || "base";
         if (config)
             this.config = config;
         else
             this.readConfig();
         if (this.debug)
-            types_1.logSettings["system"] = types_1.LogLevel.debug;
-        (0, types_1.debug)("system", "==== read config -> " + JSON.stringify(this.config));
+            logger_1.logSettings["system"] = logger_1.LogLevel.debug;
+        (0, logger_1.debug)("system", "==== read config -> " + JSON.stringify(this.config));
     }
     //////////////////
     // Config stuff //
@@ -34,34 +27,13 @@ class Base {
     writeConfig() {
         this.write(this.type, this.config);
     }
-    read(type, fname = "") {
-        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) {
-            (0, types_1.log)("system", "Couldn't read my config file (" + fn + ") -- Creating empty config.");
-        }
-        // sanitize the config
-        const temp = types_1.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) {
+        return (0, config_1.getSubConfig)(type);
     }
-    write(type, config, fname = "") {
-        const fn = fname || (this.configFiles + "/config." + type + ".json");
-        try {
-            config = types_1.Sanitizers[type](config);
-            fs.writeFileSync(fn, JSON.stringify(config, null, 2));
-        }
-        catch (error) {
-            (0, types_1.err)(this.type, "Couldn't write my " + type + " config file (" + fn + ")");
-        }
-        return config;
+    write(type, config) {
+        (0, config_1.setSubConfig)(type, config);
+        // but better to much than not enough
+        (0, config_1.setAPIConfig)();
     }
 }
 exports.Base = Base;