@iobroker/db-states-jsonl 4.0.21 → 4.1.0-alpha.0-20220819-74ceeddc

package/build/index.d.ts

@@ -0,0 +1,4 @@
+export const Client: typeof import("@iobroker/db-states-redis").Client;
+export const Server: typeof import("./lib/states/statesInMemServerClass.js");
+export function getDefaultPort(_host: any): number;
+//# sourceMappingURL=index.d.ts.map

package/{index.js → build/index.js}

@@ -1,3 +1,4 @@
+"use strict";
 module.exports = {
     Client: require('@iobroker/db-states-redis').Client,
     Server: require('./lib/states/statesInMemServerClass.js'),
@@ -5,3 +6,4 @@ module.exports = {
         return 9000;
     }
 };
+//# sourceMappingURL=index.js.map

package/build/lib/states/statesInMemJsonlDB.d.ts

@@ -0,0 +1,21 @@
+export = StatesInMemoryJsonlDB;
+declare const StatesInMemoryJsonlDB_base: typeof import("@iobroker/db-states-file/build/lib/states/statesInMemFileDB");
+/**
+ * This class inherits InMemoryFileDB class and adds all relevant logic for states
+ * including the available methods for use by js-controller directly
+ **/
+declare class StatesInMemoryJsonlDB extends StatesInMemoryJsonlDB_base {
+    constructor(settings: any);
+    /** @type {JsonlDB<any>} */
+    _db: JsonlDB<any>;
+    _backupInterval: NodeJS.Timer | undefined;
+    /**
+     * Checks if an existing file DB should be migrated to JSONL
+     * @returns {Promise<boolean>} true if the file DB was migrated. false if not.
+     * If this returns true, the jsonl DB was opened and doesn't need to be opened again.
+     */
+    _maybeMigrateFileDB(): Promise<boolean>;
+    saveBackup(): Promise<void>;
+}
+import { JsonlDB } from "@alcalzone/jsonl-db";
+//# sourceMappingURL=statesInMemJsonlDB.d.ts.map

package/build/lib/states/statesInMemJsonlDB.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statesInMemJsonlDB.d.ts","sourceRoot":"","sources":["../../../src/lib/states/statesInMemJsonlDB.js"],"names":[],"mappings":";;AA0GA;;;IAGI;AACJ;IACI,2BAgBC;IAFG,2BAA2B;IAC3B,KADW,QAAQ,GAAG,CAAC,CACiE;IA6CpF,0CAE+B;IAIvC;;;;OAIG;IACH,uBAHa,QAAQ,OAAO,CAAC,CAwE5B;IAOD,4BA2BC;CAYJ"}

package/{lib → build/lib}/states/statesInMemJsonlDB.js

@@ -6,21 +6,17 @@
  *      MIT License
  *
  */
-
 /** @module StatesInMemoryFileDB */
-
 /* jshint -W097 */
 /* jshint strict:false */
 /* jslint node: true */
 'use strict';
-
-const StatesInMemoryFileDB = require('@iobroker/db-states-file').StatesInMemoryFileDB;
+const { StatesInMemoryFileDB } = require('@iobroker/db-states-file');
 const { JsonlDB } = require('@alcalzone/jsonl-db');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
 const { tools } = require('@iobroker/js-controller-common');
-
 // settings = {
 //    change:    function (id, state) {},
 //    connected: function (nameOfServer) {},
@@ -41,7 +37,61 @@ const { tools } = require('@iobroker/js-controller-common');
 //    host: localhost
 // };
 //
-
+/**
+ * Normalizes options for the JsonlDB
+ * @param {Record<string, any> | undefined} conf The jsonlOptions options from iobroker.json
+ * @returns {import("@alcalzone/jsonl-db").JsonlDBOptions<any>}
+ */
+function normalizeJsonlOptions(conf = {}) {
+    /** @type {import("@alcalzone/jsonl-db").JsonlDBOptions<any>} */
+    const ret = {
+        autoCompress: {
+            sizeFactor: 10,
+            sizeFactorMinimumSize: 50000
+        },
+        ignoreReadErrors: true,
+        throttleFS: {
+            intervalMs: 60000,
+            maxBufferedCommands: 2000
+        },
+        lockfile: {
+            // 5 retries starting at 250ms add up to just above 2s,
+            // so the DB has 3 more seconds to load all data if it wants to stay within the 5s connectionTimeout
+            retries: 5,
+            retryMinTimeoutMs: 250,
+            // This makes sure the DB stays locked for maximum 2s even if the process crashes
+            staleMs: 2000
+        }
+    };
+    // Be really careful what we allow here. Incorrect settings may cause problems in production.
+    if (tools.isObject(conf.autoCompress)) {
+        const ac = conf.autoCompress;
+        // Letting the DB grow more than 100x is risky
+        if (typeof ac.sizeFactor === 'number' && ac.sizeFactor >= 2 && ac.sizeFactor <= 100) {
+            ret.autoCompress.sizeFactor = ac.sizeFactor;
+        }
+        // Also we should definitely compress once the DB has reached 200k lines or it might grow too big
+        if (typeof ac.sizeFactorMinimumSize === 'number' &&
+            ac.sizeFactorMinimumSize >= 0 &&
+            ac.sizeFactorMinimumSize <= 200000) {
+            ret.autoCompress.sizeFactorMinimumSize = ac.sizeFactorMinimumSize;
+        }
+    }
+    if (tools.isObject(conf.throttleFS)) {
+        const thr = conf.throttleFS;
+        // Don't write more often than every second and write at least once every hour
+        if (typeof thr.intervalMs === 'number' && thr.intervalMs >= 1000 && thr.intervalMs <= 3600000) {
+            ret.throttleFS.intervalMs = thr.intervalMs;
+        }
+        // Don't keep too much in memory - 100k changes are more than enough
+        if (typeof thr.maxBufferedCommands === 'number' &&
+            thr.maxBufferedCommands >= 0 &&
+            thr.maxBufferedCommands <= 100000) {
+            ret.throttleFS.maxBufferedCommands = thr.maxBufferedCommands;
+        }
+    }
+    return ret;
+}
 /**
  * This class inherits InMemoryFileDB class and adds all relevant logic for states
  * including the available methods for use by js-controller directly
@@ -54,41 +104,18 @@ class StatesInMemoryJsonlDB extends StatesInMemoryFileDB {
             fileName: 'states.json',
             backupDirName: 'backup-objects'
         };
-
-        /** @type {import("@alcalzone/jsonl-db").JsonlDBOptions<any>} */
-        const jsonlOptions = settings.connection.jsonlOptions || {
-            autoCompress: {
-                sizeFactor: 10,
-                sizeFactorMinimumSize: 50000
-            },
-            ignoreReadErrors: true,
-            throttleFS: {
-                intervalMs: 60000,
-                maxBufferedCommands: 2000
-            },
-            lockfile: {
-                // 5 retries starting at 250ms add up to just above 2s,
-                // so the DB has 3 more seconds to load all data if it wants to stay within the 5s connectionTimeout
-                retries: 5,
-                retryMinTimeoutMs: 250,
-                // This makes sure the DB stays locked for maximum 2s even if the process crashes
-                staleMs: 2000
-            }
-        };
+        const jsonlOptions = normalizeJsonlOptions(settings.connection.jsonlOptions);
         settings.jsonlDB = {
             fileName: 'states.jsonl'
         };
         super(settings);
-
         /** @type {JsonlDB<any>} */
         this._db = new JsonlDB(path.join(this.dataDir, settings.jsonlDB.fileName), jsonlOptions);
     }
-
     async open() {
         if (!(await this._maybeMigrateFileDB())) {
             await this._db.open();
         }
-
         // Create an object-like wrapper around the internal Map
         this.dataset = new Proxy(this._db, {
             /** @param {any} prop */
@@ -124,14 +151,12 @@ class StatesInMemoryJsonlDB extends StatesInMemoryFileDB {
                 };
             }
         });
-
         if (this.settings.backup && this.settings.backup.period && !this.settings.backup.disabled) {
             this._backupInterval = setInterval(() => {
                 this.saveBackup();
             }, this.settings.backup.period);
         }
     }
-
     /**
      * Checks if an existing file DB should be migrated to JSONL
      * @returns {Promise<boolean>} true if the file DB was migrated. false if not.
@@ -141,7 +166,6 @@ class StatesInMemoryJsonlDB extends StatesInMemoryFileDB {
         const jsonlFileName = path.join(this.dataDir, this.settings.jsonlDB.fileName);
         const jsonFileName = path.join(this.dataDir, this.settings.fileDB.fileName);
         const bakFileName = path.join(this.dataDir, this.settings.fileDB.fileName + '.bak');
-
         // Check the timestamps of each file, defaulting to 0 if they don't exist
         let jsonlTimeStamp = 0;
         let jsonTimeStamp = 0;
@@ -151,7 +175,8 @@ class StatesInMemoryJsonlDB extends StatesInMemoryFileDB {
             if (stat.isFile()) {
                 jsonlTimeStamp = stat.mtime;
             }
-        } catch {
+        }
+        catch {
             // ignore
         }
         try {
@@ -159,7 +184,8 @@ class StatesInMemoryJsonlDB extends StatesInMemoryFileDB {
             if (stat.isFile()) {
                 jsonTimeStamp = stat.mtime;
             }
-        } catch {
+        }
+        catch {
             // ignore
         }
         try {
@@ -167,84 +193,76 @@ class StatesInMemoryJsonlDB extends StatesInMemoryFileDB {
             if (stat.isFile()) {
                 bakTimeStamp = stat.mtime;
             }
-        } catch {
+        }
+        catch {
             // ignore
         }
-
         // Figure out which file needs to be imported
         /** @type {string} */
         let importFilename;
         if (jsonTimeStamp > 0 && jsonTimeStamp >= bakTimeStamp && jsonTimeStamp >= jsonlTimeStamp) {
             importFilename = jsonFileName;
-        } else if (bakTimeStamp > 0 && bakTimeStamp >= jsonTimeStamp && bakTimeStamp >= jsonlTimeStamp) {
+        }
+        else if (bakTimeStamp > 0 && bakTimeStamp >= jsonTimeStamp && bakTimeStamp >= jsonlTimeStamp) {
             importFilename = bakFileName;
-        } else {
+        }
+        else {
             // None of the File DB files are newer than the JSONL file
             // There is nothing to restore, we're done
             return false;
         }
-
         await this._db.open();
         this._db.clear();
         await this._db.importJson(importFilename);
-
         // And rename the existing files to avoid redoing the work next time
         if (fs.existsSync(jsonFileName)) {
             try {
                 fs.renameSync(jsonFileName, `${jsonFileName}.migrated`);
-            } catch {
+            }
+            catch {
                 // ignore
             }
         }
         if (fs.existsSync(bakFileName)) {
             try {
                 fs.renameSync(bakFileName, `${bakFileName}.migrated`);
-            } catch {
+            }
+            catch {
                 // ignore
             }
         }
-
         // Signal to the caller that the DB is already open
         return true;
     }
-
     async saveState() {
         // Nothing to do, the DB saves behind the scenes
     }
-
     // Is regularly called and stores a compressed backup of the DB
     async saveBackup() {
         const now = Date.now();
         const tmpBackupFileName = path.join(os.tmpdir(), `${this.getTimeStr(now)}_${this.settings.jsonlDB.fileName}`);
-        const backupFileName = path.join(
-            this.backupDir,
-            `${this.getTimeStr(now)}_${this.settings.jsonlDB.fileName}.gz`
-        );
-
+        const backupFileName = path.join(this.backupDir, `${this.getTimeStr(now)}_${this.settings.jsonlDB.fileName}.gz`);
         if (!this._db.isOpen) {
             this.log.warn(`${this.namespace} Cannot save backup ${backupFileName}: DB is closed`);
             return;
         }
-
         try {
             if (fs.existsSync(backupFileName)) {
                 return;
             }
-
             // Create a DB dump
             await this._db.dump(tmpBackupFileName);
             // and zip it
             await tools.compressFileGZip(tmpBackupFileName, backupFileName, { deleteInput: true });
             // figure out if older files need to be deleted
             this.deleteOldBackupFiles(this.settings.jsonlDB.fileName);
-        } catch (e) {
+        }
+        catch (e) {
             this.log.error(`${this.namespace} Cannot save backup ${backupFileName}: ${e.message}`);
         }
     }
-
     async destroy() {
         await super.destroy();
-
         if (this._backupInterval) {
             clearInterval(this._backupInterval);
         }
@@ -253,5 +271,5 @@ class StatesInMemoryJsonlDB extends StatesInMemoryFileDB {
         }
     }
 }
-
 module.exports = StatesInMemoryJsonlDB;
+//# sourceMappingURL=statesInMemJsonlDB.js.map

package/build/lib/states/statesInMemJsonlDB.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statesInMemJsonlDB.js","sourceRoot":"","sources":["../../../src/lib/states/statesInMemJsonlDB.js"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,mCAAmC;AAEnC,kBAAkB;AAClB,yBAAyB;AACzB,uBAAuB;AACvB,YAAY,CAAC;AAEb,MAAM,EAAE,oBAAoB,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AACrE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,qBAAqB,CAAC,CAAC;AACnD,MAAM,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAC7B,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;AACzB,MAAM,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,gCAAgC,CAAC,CAAC;AAE5D,eAAe;AACf,yCAAyC;AACzC,4CAA4C;AAC5C,eAAe;AACf,sCAAsC;AACtC,sCAAsC;AACtC,sCAAsC;AACtC,sCAAsC;AACtC,qCAAqC;AACrC,QAAQ;AACR,mBAAmB;AACnB,qCAAqC;AACrC,QAAQ;AACR,0BAA0B;AAC1B,yBAAyB;AACzB,+CAA+C;AAC/C,iBAAiB;AACjB,qBAAqB;AACrB,KAAK;AACL,EAAE;AAEF;;;;GAIG;AACH,SAAS,qBAAqB,CAAC,IAAI,GAAG,EAAE;IACpC,gEAAgE;IAChE,MAAM,GAAG,GAAG;QACR,YAAY,EAAE;YACV,UAAU,EAAE,EAAE;YACd,qBAAqB,EAAE,KAAK;SAC/B;QACD,gBAAgB,EAAE,IAAI;QACtB,UAAU,EAAE;YACR,UAAU,EAAE,KAAK;YACjB,mBAAmB,EAAE,IAAI;SAC5B;QACD,QAAQ,EAAE;YACN,uDAAuD;YACvD,oGAAoG;YACpG,OAAO,EAAE,CAAC;YACV,iBAAiB,EAAE,GAAG;YACtB,iFAAiF;YACjF,OAAO,EAAE,IAAI;SAChB;KACJ,CAAC;IAEF,6FAA6F;IAC7F,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;QACnC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC;QAC7B,8CAA8C;QAC9C,IAAI,OAAO,EAAE,CAAC,UAAU,KAAK,QAAQ,IAAI,EAAE,CAAC,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC,UAAU,IAAI,GAAG,EAAE;YACjF,GAAG,CAAC,YAAY,CAAC,UAAU,GAAG,EAAE,CAAC,UAAU,CAAC;SAC/C;QACD,iGAAiG;QACjG,IACI,OAAO,EAAE,CAAC,qBAAqB,KAAK,QAAQ;YAC5C,EAAE,CAAC,qBAAqB,IAAI,CAAC;YAC7B,EAAE,CAAC,qBAAqB,IAAI,MAAM,EACpC;YACE,GAAG,CAAC,YAAY,CAAC,qBAAqB,GAAG,EAAE,CAAC,qBAAqB,CAAC;SACrE;KACJ;IACD,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE;QACjC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC;QAC5B,8EAA8E;QAC9E,IAAI,OAAO,GAAG,CAAC,UAAU,KAAK,QAAQ,IAAI,GAAG,CAAC,UAAU,IAAI,IAAI,IAAI,GAAG,CAAC,UAAU,IAAI,OAAO,EAAE;YAC3F,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC;SAC9C;QACD,oEAAoE;QACpE,IACI,OAAO,GAAG,CAAC,mBAAmB,KAAK,QAAQ;YAC3C,GAAG,CAAC,mBAAmB,IAAI,CAAC;YAC5B,GAAG,CAAC,mBAAmB,IAAI,MAAM,EACnC;YACE,GAAG,CAAC,UAAU,CAAC,mBAAmB,GAAG,GAAG,CAAC,mBAAmB,CAAC;SAChE;KACJ;IAED,OAAO,GAAG,CAAC;AACf,CAAC;AAED;;;IAGI;AACJ,MAAM,qBAAsB,SAAQ,oBAAoB;IACpD,YAAY,QAAQ;QAChB,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;QAC1B,kBAAkB;QAClB,QAAQ,CAAC,MAAM,GAAG;YACd,QAAQ,EAAE,aAAa;YACvB,aAAa,EAAE,gBAAgB;SAClC,CAAC;QAEF,MAAM,YAAY,GAAG,qBAAqB,CAAC,QAAQ,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;QAC7E,QAAQ,CAAC,OAAO,GAAG;YACf,QAAQ,EAAE,cAAc;SAC3B,CAAC;QACF,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEhB,2BAA2B;QAC3B,IAAI,CAAC,GAAG,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC,CAAC;IAC7F,CAAC;IAED,KAAK,CAAC,IAAI;QACN,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC,EAAE;YACrC,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;SACzB;QAED,wDAAwD;QACxD,IAAI,CAAC,OAAO,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE;YAC/B,wBAAwB;YACxB,GAAG,CAAC,MAAM,EAAE,IAAI;gBACZ,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YACD,wBAAwB;YACxB,GAAG,CAAC,MAAM,EAAE,IAAI;gBACZ,OAAO,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC5B,CAAC;YACD,wBAAwB;YACxB,GAAG,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK;gBACnB,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;gBACxB,OAAO,IAAI,CAAC;YAChB,CAAC;YACD,wBAAwB;YACxB,cAAc,CAAC,MAAM,EAAE,IAAI;gBACvB,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YAC/B,CAAC;YACD,OAAO,CAAC,MAAM;gBACV,OAAO,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YAC9B,CAAC;YACD,wBAAwB;YACxB,wBAAwB,CAAC,MAAM,EAAE,IAAI;gBACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;oBACnB,OAAO,SAAS,CAAC;iBACpB;gBACD,OAAO;oBACH,YAAY,EAAE,IAAI;oBAClB,UAAU,EAAE,IAAI;oBAChB,QAAQ,EAAE,IAAI;oBACd,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC;iBAC1B,CAAC;YACN,CAAC;SACJ,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE;YACvF,IAAI,CAAC,eAAe,GAAG,WAAW,CAAC,GAAG,EAAE;gBACpC,IAAI,CAAC,UAAU,EAAE,CAAC;YACtB,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;SACnC;IACL,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,mBAAmB;QACrB,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QAC9E,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC5E,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,CAAC;QAEpF,yEAAyE;QACzE,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,IAAI,aAAa,GAAG,CAAC,CAAC;QACtB,IAAI,YAAY,GAAG,CAAC,CAAC;QACrB,IAAI;YACA,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC;YACxC,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;gBACf,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC;aAC/B;SACJ;QAAC,MAAM;YACJ,SAAS;SACZ;QACD,IAAI;YACA,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;YACvC,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;gBACf,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC;aAC9B;SACJ;QAAC,MAAM;YACJ,SAAS;SACZ;QACD,IAAI;YACA,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;gBACf,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC;aAC7B;SACJ;QAAC,MAAM;YACJ,SAAS;SACZ;QAED,6CAA6C;QAC7C,qBAAqB;QACrB,IAAI,cAAc,CAAC;QACnB,IAAI,aAAa,GAAG,CAAC,IAAI,aAAa,IAAI,YAAY,IAAI,aAAa,IAAI,cAAc,EAAE;YACvF,cAAc,GAAG,YAAY,CAAC;SACjC;aAAM,IAAI,YAAY,GAAG,CAAC,IAAI,YAAY,IAAI,aAAa,IAAI,YAAY,IAAI,cAAc,EAAE;YAC5F,cAAc,GAAG,WAAW,CAAC;SAChC;aAAM;YACH,0DAA0D;YAC1D,0CAA0C;YAC1C,OAAO,KAAK,CAAC;SAChB;QAED,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACjB,MAAM,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAE1C,oEAAoE;QACpE,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YAC7B,IAAI;gBACA,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,GAAG,YAAY,WAAW,CAAC,CAAC;aAC3D;YAAC,MAAM;gBACJ,SAAS;aACZ;SACJ;QACD,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;YAC5B,IAAI;gBACA,EAAE,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,WAAW,WAAW,CAAC,CAAC;aACzD;YAAC,MAAM;gBACJ,SAAS;aACZ;SACJ;QAED,mDAAmD;QACnD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,SAAS;QACX,gDAAgD;IACpD,CAAC;IAED,+DAA+D;IAC/D,KAAK,CAAC,UAAU;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC9G,MAAM,cAAc,GAAG,IAAI,CAAC,IAAI,CAC5B,IAAI,CAAC,SAAS,EACd,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,KAAK,CACjE,CAAC;QAEF,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;YAClB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,SAAS,uBAAuB,cAAc,gBAAgB,CAAC,CAAC;YACtF,OAAO;SACV;QAED,IAAI;YACA,IAAI,EAAE,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE;gBAC/B,OAAO;aACV;YAED,mBAAmB;YACnB,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACvC,aAAa;YACb,MAAM,KAAK,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,cAAc,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC;YACvF,+CAA+C;YAC/C,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;SAC7D;QAAC,OAAO,CAAC,EAAE;YACR,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,uBAAuB,cAAc,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;SAC1F;IACL,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;QAEtB,IAAI,IAAI,CAAC,eAAe,EAAE;YACtB,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;SACvC;QACD,IAAI,IAAI,CAAC,GAAG,EAAE;YACV,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;SAC1B;IACL,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,qBAAqB,CAAC"}

package/build/lib/states/statesInMemServerClass.d.ts

@@ -0,0 +1,9 @@
+export = StatesInMemoryServerClass;
+declare class StatesInMemoryServerClass extends StatesInRedisClient {
+    constructor(settings: any);
+    statesServer: StatesInMemServer;
+}
+import StatesInRedisClient_1 = require("@iobroker/db-states-redis/build/lib/states/statesInRedisClient");
+import StatesInRedisClient = StatesInRedisClient_1.Client;
+import StatesInMemServer = require("./statesInMemServerRedis");
+//# sourceMappingURL=statesInMemServerClass.d.ts.map

package/build/lib/states/statesInMemServerClass.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statesInMemServerClass.d.ts","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerClass.js"],"names":[],"mappings":";AAmBA;IACI,2BAcC;IADG,gCAAyD;CAWhE;;mDA5BgE,MAAM"}

package/{lib → build/lib}/states/statesInMemServerClass.js

@@ -6,22 +6,17 @@
  *      MIT License
  *
  */
-
 /** @module statesInMemory */
-
 /* jshint -W097 */
 /* jshint strict:false */
 /* jslint node: true */
 'use strict';
-
 const StatesInRedisClient = require('@iobroker/db-states-redis').Client;
 const StatesInMemServer = require('./statesInMemServerRedis');
-
 class StatesInMemoryServerClass extends StatesInRedisClient {
     constructor(settings) {
         settings.autoConnect = false; // delay Client connection to when we need it
         super(settings);
-
         const serverSettings = {
             namespace: settings.namespace ? `${settings.namespace}-Server` : 'Server',
             connection: settings.connection,
@@ -33,15 +28,13 @@ class StatesInMemoryServerClass extends StatesInRedisClient {
         };
         this.statesServer = new StatesInMemServer(serverSettings);
     }
-
     async destroy() {
         await super.destroy(); // destroy client first
         await this.statesServer.destroy(); // server afterwards too
     }
-
     getStatus() {
         return this.statesServer.getStatus(); // return Status as Server
     }
 }
-
 module.exports = StatesInMemoryServerClass;
+//# sourceMappingURL=statesInMemServerClass.js.map

package/build/lib/states/statesInMemServerClass.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statesInMemServerClass.js","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerClass.js"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,6BAA6B;AAE7B,kBAAkB;AAClB,yBAAyB;AACzB,uBAAuB;AACvB,YAAY,CAAC;AAEb,MAAM,mBAAmB,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAAC,MAAM,CAAC;AACxE,MAAM,iBAAiB,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAC;AAE9D,MAAM,yBAA0B,SAAQ,mBAAmB;IACvD,YAAY,QAAQ;QAChB,QAAQ,CAAC,WAAW,GAAG,KAAK,CAAC,CAAC,6CAA6C;QAC3E,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEhB,MAAM,cAAc,GAAG;YACnB,SAAS,EAAE,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,QAAQ;YACzE,UAAU,EAAE,QAAQ,CAAC,UAAU;YAC/B,MAAM,EAAE,QAAQ,CAAC,MAAM;YACvB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;YAC3B,SAAS,EAAE,GAAG,EAAE;gBACZ,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,mDAAmD;YACzE,CAAC;SACJ,CAAC;QACF,IAAI,CAAC,YAAY,GAAG,IAAI,iBAAiB,CAAC,cAAc,CAAC,CAAC;IAC9D,CAAC;IAED,KAAK,CAAC,OAAO;QACT,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,uBAAuB;QAC9C,MAAM,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC,CAAC,wBAAwB;IAC/D,CAAC;IAED,SAAS;QACL,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,EAAE,CAAC,CAAC,0BAA0B;IACpE,CAAC;CACJ;AAED,MAAM,CAAC,OAAO,GAAG,yBAAyB,CAAC"}

package/build/lib/states/statesInMemServerRedis.d.ts

@@ -0,0 +1,67 @@
+/// <reference types="node" />
+export = StatesInMemoryServer;
+/**
+ * This class inherits statesInMemoryFileDB class and adds socket.io communication layer
+ * to access the methods via socket.io
+ **/
+declare class StatesInMemoryServer extends StatesInMemoryJsonlDB {
+    /**
+     * Constructor
+     * @param settings State and InMem-DB settings
+     */
+    constructor(settings: any);
+    serverConnections: {};
+    namespaceStates: string;
+    namespaceMsg: string;
+    namespaceLog: string;
+    namespaceSession: string;
+    namespaceMsgLen: number;
+    namespaceLogLen: number;
+    metaNamespace: string;
+    metaNamespaceLen: number;
+    /**
+     * Separate Namespace from ID and return both
+     * @param idWithNamespace ID or Array of IDs containing a redis namespace and the real ID
+     * @returns {{namespace: (string), id: string}} Object with namespace and the
+     *                                                      ID/Array of IDs without the namespace
+     * @private
+     */
+    private _normalizeId;
+    /**
+     * Publish a subscribed value to one of the redis connections in redis format
+     * @param client Instance of RedisHandler
+     * @param type Type of subscribed key
+     * @param id Subscribed ID
+     * @param obj Object to publish
+     * @returns {number} Publish counter 0 or 1 depending if send out or not
+     */
+    publishToClients(client: any, type: any, id: any, obj: any): number;
+    /**
+     * Register all event listeners for Handler and implement the relevant logic
+     * @param handler RedisHandler instance
+     * @private
+     */
+    private _socketEvents;
+    /**
+     * Return connected RedisHandlers/Connections
+     * @returns {{}|*}
+     */
+    getClients(): {} | any;
+    /**
+     * Initialize RedisHandler for a new network connection
+     * @param socket Network socket
+     * @private
+     */
+    private _initSocket;
+    /**
+     * Initialize Redis Server
+     * @param settings Settings object
+     * @private
+     * @return {Promise<void>}
+     */
+    private _initRedisServer;
+    server: net.Server | undefined;
+}
+import StatesInMemoryJsonlDB = require("./statesInMemJsonlDB");
+import net = require("net");
+//# sourceMappingURL=statesInMemServerRedis.d.ts.map

package/build/lib/states/statesInMemServerRedis.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"statesInMemServerRedis.d.ts","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerRedis.js"],"names":[],"mappings":";;AA0CA;;;IAGI;AACJ;IACI;;;OAGG;IACH,2BAoCC;IAjCG,sBAA2B;IAC3B,wBAAmE;IACnE,qBAAsE;IACtE,qBAA+D;IAC/D,yBAA2E;IAE3E,wBAA+C;IAC/C,wBAA+C;IAE/C,sBAAkE;IAClE,yBAAiD;IAyBrD;;;;;;OAMG;IACH,qBAsBC;IAED;;;;;;;OAOG;IACH,6DAFa,MAAM,CAkClB;IAED;;;;OAIG;IACH,sBA6SC;IAED;;;OAGG;IACH,cAFa,EAAE,MAAE,CAIhB;IA2BD;;;;OAIG;IACH,oBAoBC;IAED;;;;;OAKG;IACH,yBAyBC;IAnBW,+BAAgC;CAoB/C"}

package/{lib → build/lib}/states/statesInMemServerRedis.js

@@ -6,19 +6,15 @@
  *      MIT License
  *
  */
-
 /** @module statesInMemory */
-
 /* jshint -W097 */
 /* jshint strict:false */
 /* jslint node: true */
 'use strict';
 const net = require('net');
 const { inspect } = require('util');
-
-const RedisHandler = require('@iobroker/db-base').redisHandler;
+const { RedisHandler } = require('@iobroker/db-base');
 const StatesInMemoryJsonlDB = require('./statesInMemJsonlDB');
-
 // settings = {
 //    change:    function (id, state) {},
 //    connected: function (nameOfServer) {},
@@ -39,7 +35,6 @@ const StatesInMemoryJsonlDB = require('./statesInMemJsonlDB');
 //    host: localhost
 // };
 //
-
 /**
  * This class inherits statesInMemoryFileDB class and adds socket.io communication layer
  * to access the methods via socket.io
@@ -51,7 +46,6 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
      */
     constructor(settings) {
         super(settings);
-
         this.serverConnections = {};
         this.namespaceStates = (this.settings.redisNamespace || 'io') + '.';
         this.namespaceMsg = (this.settings.namespaceMsg || 'messagebox') + '.';
@@ -63,30 +57,21 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
         //this.namespaceSessionlen = this.namespaceSession.length;
         this.metaNamespace = (this.settings.metaNamespace || 'meta') + '.';
         this.metaNamespaceLen = this.metaNamespace.length;
-
         this.open()
             .then(() => {
-                return this._initRedisServer(this.settings.connection);
-            })
+            return this._initRedisServer(this.settings.connection);
+        })
             .then(() => {
-                this.log.debug(
-                    `${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${
-                        this.settings.port || 9000
-                    }`
-                );
-
-                if (typeof this.settings.connected === 'function') {
-                    setImmediate(() => this.settings.connected());
-                }
-            })
+            this.log.debug(`${this.namespace} ${settings.secure ? 'Secure ' : ''} Redis inMem-states listening on port ${this.settings.port || 9000}`);
+            if (typeof this.settings.connected === 'function') {
+                setImmediate(() => this.settings.connected());
+            }
+        })
             .catch(e => {
-                this.log.error(
-                    `${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`
-                );
-                process.exit(24); // todo: replace it with exitcode
-            });
+            this.log.error(`${this.namespace} Cannot start inMem-states on port ${this.settings.port || 9000}: ${e.message}`);
+            process.exit(24); // todo: replace it with exitcode
+        });
     }
-
     /**
      * Separate Namespace from ID and return both
      * @param idWithNamespace ID or Array of IDs containing a redis namespace and the real ID
@@ -105,7 +90,8 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                 ns = namespace; // we ignore the pot. case from arrays with different namespaces
             });
             id = ids;
-        } else {
+        }
+        else {
             id = idWithNamespace;
             const pointIdx = idWithNamespace.indexOf('.');
             if (pointIdx !== -1) {
@@ -117,7 +103,6 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
         }
         return { id: id, namespace: ns };
     }
-
     /**
      * Publish a subscribed value to one of the redis connections in redis format
      * @param client Instance of RedisHandler
@@ -131,25 +116,24 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             return 0;
         }
         const s = client._subscribe[type];
-
         const found = s.find(sub => sub.regex.test(id));
-
         if (found) {
             if (type === 'meta') {
                 this.log.silly(`${this.namespace} Redis Publish Meta ${id}=${obj}`);
                 const sendPattern = this.metaNamespace + found.pattern;
                 const sendId = this.metaNamespace + id;
                 client.sendArray(null, ['pmessage', sendPattern, sendId, obj]);
-            } else {
+            }
+            else {
                 let objString;
                 try {
                     objString = JSON.stringify(obj);
-                } catch (e) {
+                }
+                catch (e) {
                     // mainly catch circular structures - thus log object with inspect
                     this.log.error(`${this.namespace} Error on publishing state: ${id}=${inspect(obj)}: ${e.message}`);
                     return 0;
                 }
-
                 this.log.silly(`${this.namespace} Redis Publish State ${id}=${objString}`);
                 const sendPattern = (type === 'state' ? '' : this.namespaceStates) + found.pattern;
                 const sendId = (type === 'state' ? '' : this.namespaceStates) + id;
@@ -159,7 +143,6 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
         }
         return 0;
     }
-
     /**
      * Register all event listeners for Handler and implement the relevant logic
      * @param handler RedisHandler instance
@@ -168,7 +151,6 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
     _socketEvents(handler) {
         let connectionName = null;
         let namespaceLog = this.namespace;
-
         // Handle Redis "INFO" request
         handler.on('info', (_data, responseId) => {
             let infoString = '# Server\r\n';
@@ -181,19 +163,15 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             infoString += '# CPU\r\n';
             infoString += '# Cluster\r\n';
             infoString += '# Keyspace\r\n';
-            infoString += `db0:keys=${Object.keys(this.dataset).length},expires=${
-                Object.keys(this.stateExpires).length + Object.keys(this.sessionExpires).length
-            },avg_ttl=98633637897`;
+            infoString += `db0:keys=${Object.keys(this.dataset).length},expires=${Object.keys(this.stateExpires).length + Object.keys(this.sessionExpires).length},avg_ttl=98633637897`;
             handler.sendBulk(responseId, infoString);
         });
-
         // Handle Redis "QUIT" request
         handler.on('quit', (_data, responseId) => {
             this.log.silly(`${namespaceLog} Redis QUIT received, close connection`);
             handler.sendString(responseId, 'OK');
             handler.close();
         });
-
         // Handle Redis "PUBLISH" request
         handler.on('publish', (data, responseId) => {
             const { id, namespace } = this._normalizeId(data[0]);
@@ -204,30 +182,26 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             const publishCount = this.publishAll(namespace.substr(0, namespace.length - 1), id, JSON.parse(data[1]));
             handler.sendInteger(responseId, publishCount);
         });
-
         // Handle Redis "MGET" request for state namespace
         handler.on('mget', (data, responseId) => {
             if (!data || !data[0]) {
                 return void handler.sendArray(responseId, []);
             }
             const { id, namespace } = this._normalizeId(data);
-
             if (namespace === this.namespaceStates) {
                 try {
                     const states = this._getStates(id);
                     const result = states.map(el => (el ? JSON.stringify(el) : null));
                     handler.sendArray(responseId, result);
-                } catch (err) {
+                }
+                catch (err) {
                     handler.sendError(responseId, new Error(`ERROR _getStates: ${err.message}`));
                 }
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`MGET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`MGET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "GET" request for state and session namespace
         handler.on('get', (data, responseId) => {
             const { id, namespace } = this._normalizeId(data[0]);
@@ -235,35 +209,38 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                 const result = this._getState(id);
                 if (!result) {
                     handler.sendNull(responseId);
-                } else {
+                }
+                else {
                     if (Buffer.isBuffer(result)) {
                         handler.sendBufBulk(responseId, result);
-                    } else {
+                    }
+                    else {
                         handler.sendBulk(responseId, JSON.stringify(result));
                     }
                 }
-            } else if (namespace === this.namespaceSession) {
+            }
+            else if (namespace === this.namespaceSession) {
                 const result = this._getSession(id);
                 if (result === undefined || result === null) {
                     handler.sendNull(responseId);
-                } else {
+                }
+                else {
                     handler.sendBulk(responseId, JSON.stringify(result));
                 }
-            } else if (namespace === this.metaNamespace) {
+            }
+            else if (namespace === this.metaNamespace) {
                 const result = this.getMeta(id);
                 if (result === undefined || result === null) {
                     handler.sendNull(responseId);
-                } else {
+                }
+                else {
                     handler.sendBulk(responseId, result);
                 }
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`GET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`GET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "SET" request for state namespace
         handler.on('set', (data, responseId) => {
             const { id, namespace } = this._normalizeId(data[0]);
@@ -272,27 +249,27 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                     let state;
                     try {
                         state = JSON.parse(data[1].toString('utf-8'));
-                    } catch {
+                    }
+                    catch {
                         // No JSON, so handle as binary data and set as Buffer
                         this._setBinaryState(id, data[1]);
                         return void handler.sendString(responseId, 'OK');
                     }
                     this._setStateDirect(id, state);
                     handler.sendString(responseId, 'OK');
-                } catch (err) {
+                }
+                catch (err) {
                     handler.sendError(responseId, new Error(`ERROR setState id=${id}: ${err.message}`));
                 }
-            } else if (namespace === this.metaNamespace) {
+            }
+            else if (namespace === this.metaNamespace) {
                 this.setMeta(id, data[1].toString('utf-8'));
                 handler.sendString(responseId, 'OK');
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`SET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`SET-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "SETEX" request for state and session namespace
         handler.on('setex', (data, responseId) => {
             const { id, namespace } = this._normalizeId(data[0]);
@@ -301,62 +278,55 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                     let state;
                     try {
                         state = JSON.parse(data[2].toString('utf-8'));
-                    } catch {
+                    }
+                    catch {
                         // No JSON, so handle as binary data and set as Buffer
                         state = data[2];
                     }
                     const expire = parseInt(data[1].toString('utf-8'), 10);
                     if (isNaN(expire)) {
-                        return void handler.sendError(
-                            responseId,
-                            new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`)
-                        );
+                        return void handler.sendError(responseId, new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`));
                     }
                     this._setStateDirect(id, state, expire);
                     handler.sendString(responseId, 'OK');
-                } catch (err) {
+                }
+                catch (err) {
                     handler.sendError(responseId, new Error(`ERROR setStateEx id=${id}: ${err.message}`));
                 }
-            } else if (namespace === this.namespaceSession) {
+            }
+            else if (namespace === this.namespaceSession) {
                 try {
                     const state = JSON.parse(data[2].toString('utf-8'));
                     const expire = parseInt(data[1].toString('utf-8'), 10);
                     if (isNaN(expire)) {
-                        return void handler.sendError(
-                            responseId,
-                            new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`)
-                        );
+                        return void handler.sendError(responseId, new Error(`ERROR parsing expire value ${data[1].toString('utf-8')}`));
                     }
                     this._setSession(id, expire, state);
                     handler.sendString(responseId, 'OK');
-                } catch (err) {
+                }
+                catch (err) {
                     handler.sendError(responseId, new Error(`ERROR _setSession ${id}: ${err.message}`));
                 }
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`SETEX-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`SETEX-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "DEL" request for state and session namespace
         handler.on('del', (data, responseId) => {
             const { id, namespace } = this._normalizeId(data[0]);
             if (namespace === this.namespaceStates) {
                 this._delState(id);
                 handler.sendInteger(responseId, 1);
-            } else if (namespace === this.namespaceSession) {
+            }
+            else if (namespace === this.namespaceSession) {
                 this._destroySession(id);
                 handler.sendInteger(responseId, 1);
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`DEL-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`DEL-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "KEYS" request for state namespace
         handler.on('keys', (data, responseId) => {
             if (!data || !data.length) {
@@ -372,98 +342,97 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                 const keys = this._getKeys(pattern);
                 const result = keys.map(id => this.namespaceStates + id);
                 handler.sendArray(responseId, result);
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`KEYS-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`KEYS-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "PSUBSCRIBE" request for state, log and session namespace
         handler.on('psubscribe', (data, responseId) => {
             const { id, namespace } = this._normalizeId(data[0]);
             if (namespace === this.namespaceMsg) {
                 this._subscribeMessageForClient(handler, id.substr(this.namespaceMsgLen));
                 handler.sendArray(responseId, ['psubscribe', data[0], 1]);
-            } else if (namespace === this.namespaceLog) {
+            }
+            else if (namespace === this.namespaceLog) {
                 this._subscribeLogForClient(handler, id.substr(this.namespaceLogLen));
                 handler.sendArray(responseId, ['psubscribe', data[0], 1]);
-            } else if (namespace === this.namespaceStates) {
+            }
+            else if (namespace === this.namespaceStates) {
                 this._subscribeForClient(handler, id);
                 handler.sendArray(responseId, ['psubscribe', data[0], 1]);
-            } else if (namespace === this.metaNamespace) {
+            }
+            else if (namespace === this.metaNamespace) {
                 this._subscribeMeta(handler, id);
                 handler.sendArray(responseId, ['psubscribe', data[0], 1]);
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`PSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`PSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "UNSUBSCRIBE" request for state, log and session namespace
         handler.on('punsubscribe', (data, responseId) => {
             const { id, namespace } = this._normalizeId(data[0]);
             if (namespace === this.namespaceMsg) {
                 this._unsubscribeMessageForClient(handler, id.substr(this.namespaceMsgLen));
                 handler.sendArray(responseId, ['punsubscribe', data[0], 1]);
-            } else if (namespace === this.namespaceLog) {
+            }
+            else if (namespace === this.namespaceLog) {
                 this._unsubscribeLogForClient(handler, id.substr(this.namespaceLogLen));
                 handler.sendArray(responseId, ['punsubscribe', data[0], 1]);
-            } else if (namespace === this.namespaceStates) {
+            }
+            else if (namespace === this.namespaceStates) {
                 this._unsubscribeForClient(handler, id);
                 handler.sendArray(responseId, ['punsubscribe', data[0], 1]);
-            } else {
-                handler.sendError(
-                    responseId,
-                    new Error(`PUNSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`)
-                );
+            }
+            else {
+                handler.sendError(responseId, new Error(`PUNSUBSCRIBE-UNSUPPORTED for namespace ${namespace}: Data=${JSON.stringify(data)}`));
             }
         });
-
         // Handle Redis "SUBSCRIBE" ... currently mainly ignored
         handler.on('subscribe', (data, responseId) => {
             if (data[0].startsWith('__keyevent@')) {
                 // we ignore these type of events because we publish expires anyway directly
                 handler.sendArray(responseId, ['subscribe', data[0], 1]);
-            } else {
+            }
+            else {
                 handler.sendError(responseId, new Error(`SUBSCRIBE-UNSUPPORTED for ${data[0]}`));
             }
         });
-
         // Handle Redis "CONFIG" ... currently mainly ignored
         handler.on('config', (data, responseId) => {
-            if (data[0] === 'set' && data[1] === 'notify-keyspace-events') {
+            if (typeof data[0] === 'string' &&
+                data[0].toLowerCase() === 'set' &&
+                data[1] === 'notify-keyspace-events') {
                 // we ignore these type of commands for now, should only be to subscribe to keyspace events
                 handler.sendString(responseId, 'OK');
-            } else {
+            }
+            else {
                 handler.sendError(responseId, new Error(`CONFIG-UNSUPPORTED for ${JSON.stringify(data)}`));
             }
         });
-
         // handle client SETNAME/GETNAME
         handler.on('client', (data, responseId) => {
             if (data[0] === 'setname' && typeof data[1] === 'string') {
                 connectionName = data[1];
                 namespaceLog = connectionName;
                 handler.sendString(responseId, 'OK');
-            } else if (data[0] === 'getname') {
+            }
+            else if (data[0] === 'getname') {
                 if (connectionName && typeof connectionName === 'string') {
                     handler.sendString(responseId, connectionName);
-                } else {
+                }
+                else {
                     // redis sends null if no name defined
                     handler.sendNull(responseId);
                 }
-            } else {
+            }
+            else {
                 handler.sendError(responseId, new Error(`CLIENT-UNSUPPORTED for ${JSON.stringify(data)}`));
             }
         });
-
         handler.on('error', err => this.log.warn(`${namespaceLog} Redis states: ${err}`));
     }
-
     /**
      * Return connected RedisHandlers/Connections
      * @returns {{}|*}
@@ -471,7 +440,6 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
     getClients() {
         return this.serverConnections;
     }
-
     /**
      * Destructor of the class. Called by shutting down.
      */
@@ -481,14 +449,14 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
                 this.serverConnections[s].close();
                 delete this.serverConnections[s];
             }
-
             await new Promise(resolve => {
                 if (!this.server) {
                     return void resolve();
                 }
                 try {
                     this.server.close(() => resolve());
-                } catch (e) {
+                }
+                catch (e) {
                     console.log(e.message);
                     resolve();
                 }
@@ -496,7 +464,6 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
         }
         await super.destroy();
     }
-
     /**
      * Initialize RedisHandler for a new network connection
      * @param socket Network socket
@@ -505,7 +472,6 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
     _initSocket(socket) {
         this.settings.connection.enhancedLogging &&
             this.log.silly(`${this.namespace} Handling new Redis States connection`);
-
         const options = {
             log: this.log,
             logScope: this.namespace + ' States',
@@ -514,16 +480,13 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
         };
         const handler = new RedisHandler(socket, options);
         this._socketEvents(handler);
-
         this.serverConnections[socket.remoteAddress + ':' + socket.remotePort] = handler;
-
         socket.on('close', () => {
             if (this.serverConnections[socket.remoteAddress + ':' + socket.remotePort]) {
                 delete this.serverConnections[socket.remoteAddress + ':' + socket.remotePort];
             }
         });
     }
-
     /**
      * Initialize Redis Server
      * @param settings Settings object
@@ -537,25 +500,15 @@ class StatesInMemoryServer extends StatesInMemoryJsonlDB {
             }
             try {
                 this.server = net.createServer();
-                this.server.on('error', err =>
-                    this.log.info(
-                        `${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${
-                            settings.port || 9001
-                        }: ${err}`
-                    )
-                );
+                this.server.on('error', err => this.log.info(`${this.namespace} ${settings.secure ? 'Secure ' : ''} Error inMem-objects listening on port ${settings.port || 9001}: ${err}`));
                 this.server.on('connection', socket => this._initSocket(socket));
-
-                this.server.listen(
-                    settings.port || 9000,
-                    settings.host === 'localhost' ? '127.0.0.1' : settings.host ? settings.host : undefined,
-                    () => resolve()
-                );
-            } catch (err) {
+                this.server.listen(settings.port || 9000, settings.host === 'localhost' ? '127.0.0.1' : settings.host ? settings.host : undefined, () => resolve());
+            }
+            catch (err) {
                 reject(err);
             }
         });
     }
 }
-
 module.exports = StatesInMemoryServer;
+//# sourceMappingURL=statesInMemServerRedis.js.map

package/build/lib/states/statesInMemServerRedis.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"statesInMemServerRedis.js","sourceRoot":"","sources":["../../../src/lib/states/statesInMemServerRedis.js"],"names":[],"mappings":"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"}

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@iobroker/db-states-jsonl",
-  "version": "4.0.21",
+  "version": "4.1.0-alpha.0-20220819-74ceeddc",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
     "@alcalzone/jsonl-db": "~2.5.1",
-    "@iobroker/db-base": "4.0.21",
-    "@iobroker/db-states-file": "4.0.21",
-    "@iobroker/db-states-redis": "4.0.21"
+    "@iobroker/db-base": "4.1.0-alpha.0-20220819-74ceeddc",
+    "@iobroker/db-states-file": "4.1.0-alpha.0-20220819-74ceeddc",
+    "@iobroker/db-states-redis": "4.1.0-alpha.0-20220819-74ceeddc"
   },
   "keywords": [
     "ioBroker",
@@ -25,15 +25,19 @@
     "type": "git",
     "url": "https://github.com/ioBroker/ioBroker.js-controller/packages/db-states-jsonl"
   },
-  "scripts": {},
-  "main": "index.js",
+  "scripts": {
+    "build": "tsc -b tsconfig.build.json"
+  },
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
   "files": [
-    "lib/",
-    "index.js"
+    "build/lib/",
+    "build/index.js",
+    "build/index.d.ts"
   ],
-  "gitHead": "4749d256d312623ae7621e7ae47d44580b3aa8c1"
+  "gitHead": "febfe24ecb050ec02f848cc869d84aa30d69c615"
 }