Config and signals refactor

Refactor signals and the config.

• Config has fewer lines, and should be less error-prone.
• Also, move timeouts from the instance to the main file, for a better separation in MVC.

common/config.js

@@ -6,6 +6,7 @@ const packageConfig = require('../package.json').config;
 
 const __configDir = `${os.homedir()}/.config/lektor`;
 const __configFile = `${__configDir}/amadeus.ini`;
+const __configLektord = `${__configDir}/lektor.ini`;
 
 fs.mkdirSync(__configDir, { recursive: true });
 __dir = fs.opendirSync(__configDir);
@@ -14,68 +15,33 @@ __dir.close(err => {
 });
 
 var config = {
-    database: null,
-    host: null,
-    port: null,
-    loglevel: null,
-    loglektord: null,
-    attachmode: null,
-    clientport: null,
+    content: null,
     reload() {
         var fd = fs.openSync(__configFile, 'a');
         fs.close(fd, err => {});
-        var __config = ini.parse(fs.readFileSync(__configFile, 'utf-8'));
+        this.content = ini.parse(fs.readFileSync(__configFile, 'utf-8'));
 
-        __config.database ??= {};
-        __config.lektord ??= {};
-        __config.kurisu ??= {};
-        __config.client ??= {};
-        __config.log ??= {};
+        this.content.database ??= {};
+        this.content.lektord ??= {};
+        this.content.kurisu ??= {};
+        this.content.client ??= {};
+        this.content.log ??= {};
 
-        __config.kurisu.url ??= packageConfig.kurisu;
-        __config.client.port ??= packageConfig.port;
-        __config.log.level ??= 'debug';
-        __config.log.lektord ??= true;
-        __config.database.path ??= '/home/kara/kara.db';
-        __config.lektord.host ??= 'localhost';
-        __config.lektord.port ??= '6600';
-        __config.lektord.attach ??= true;
+        this.content.kurisu.url ??= packageConfig.kurisu;
+        this.content.client.port ??= packageConfig.port;
+        this.content.log.level ??= 'debug';
+        this.content.log.lektord ??= true;
+        this.content.database.path ??= '/home/kara/kara.db';
+        this.content.lektord.host ??= 'localhost';
+        this.content.lektord.port ??= '6600';
+        this.content.lektord.attach ??= true;
 
-        this.clientport = __config.client.port;
-        this.kurisuurl = __config.kurisu.url;
-        this.database = __config.database.path;
-        this.host = __config.lektord.host;
-        this.port = __config.lektord.port;
-        this.attachmode = __config.lektord.attach;
-        this.loglevel = __config.log.level;
-        this.loglektord = __config.log.lektord;
-
-        fs.writeFileSync(__configFile, ini.stringify(__config));
+        fs.writeFileSync(__configFile, ini.stringify(this.content));
 
         this.flush();
     },
     flush() {
-        const __config = {
-            kurisu: {
-                url: this.kurisuurl,
-            },
-            database: {
-                path: this.database,
-            },
-            client: {
-                port: this.clientport,
-            },
-            lektord: {
-                host: this.host,
-                port: this.port,
-                attach: this.attachmode,
-            },
-            log: {
-                level: this.loglevel,
-                lektord: this.loglektord,
-            },
-        };
-        fs.writeFileSync(__configFile, ini.stringify(__config));
+        fs.writeFileSync(__configFile, ini.stringify(this.content));
     },
 };