@iobroker/db-objects-jsonl 4.0.0-alpha.45-20220114-88aaebdb → 4.0.0-alpha.49-20220121-e7aa4308

package/lib/objects/objectsInMemJsonlDB.js

@@ -54,7 +54,9 @@ class ObjectsInMemoryJsonlDB extends ObjectsInMemoryFileDB {
     }
 
     async open() {
-        await this._db.open();
+        if (!(await this._maybeMigrateFileDB())) {
+            await this._db.open();
+        }
 
         // Create an object-like wrapper around the internal Map
         this.dataset = new Proxy(this._db, {
@@ -99,6 +101,82 @@ class ObjectsInMemoryJsonlDB extends ObjectsInMemoryFileDB {
         }
     }
 
+    /**
+     * 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.
+     */
+    async _maybeMigrateFileDB() {
+        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;
+        let bakTimeStamp = 0;
+        try {
+            const stat = fs.statSync(jsonlFileName);
+            if (stat.isFile()) {
+                jsonlTimeStamp = stat.mtime;
+            }
+        } catch {
+            // ignore
+        }
+        try {
+            const stat = fs.statSync(jsonFileName);
+            if (stat.isFile()) {
+                jsonTimeStamp = stat.mtime;
+            }
+        } catch {
+            // ignore
+        }
+        try {
+            const stat = fs.statSync(bakFileName);
+            if (stat.isFile()) {
+                bakTimeStamp = stat.mtime;
+            }
+        } 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) {
+            importFilename = bakFileName;
+        } 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 {
+                // ignore
+            }
+        }
+        if (fs.existsSync(bakFileName)) {
+            try {
+                fs.renameSync(bakFileName, `${bakFileName}.migrated`);
+            } 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
     }
@@ -106,10 +184,10 @@ class ObjectsInMemoryJsonlDB extends ObjectsInMemoryFileDB {
     // 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 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'
+            `${this.getTimeStr(now)}_${this.settings.jsonlDB.fileName}.gz`
         );
         try {
             if (fs.existsSync(backupFileName)) {

package/lib/objects/objectsInMemServerRedis.js

@@ -294,11 +294,22 @@ class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
                         );
                     }
                     handler.sendBulk(responseId, scriptChecksum);
+                } else if (data[1].includes('-- REDLOCK SCRIPT')) {
+                    // redlock scripts are currently not needed for Simulator
+                    this.knownScripts[scriptChecksum] = { redlock: true };
+                    if (this.settings.connection.enhancedLogging) {
+                        this.log.silly(
+                            `${namespaceLog} Register Func LUA Script: ${scriptChecksum} = ${JSON.stringify(
+                                this.knownScripts[scriptChecksum]
+                            )}`
+                        );
+                    }
+                    handler.sendBulk(responseId, scriptChecksum);
                 } else {
-                    handler.sendError(responseId, new Error('Unknown LUA script ' + data[0]));
+                    handler.sendError(responseId, new Error(`Unknown LUA script ${data[1]}`));
                 }
             } else {
-                handler.sendError(responseId, new Error('Unsupported Script command ' + data[0]));
+                handler.sendError(responseId, new Error(`Unsupported Script command ${data[0]}`));
             }
         });
 
@@ -353,8 +364,11 @@ class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
                 const res = objs.rows.map(obj => JSON.stringify(this.dataset[obj.value._id || obj.id]));
 
                 return void handler.sendArray(responseId, res);
+            } else if (this.knownScripts[data[0]].redlock) {
+                // just return a dummy
+                return void handler.sendArray(responseId, [0]);
             } else {
-                handler.sendError(responseId, new Error('Unknown LUA script eval call ' + JSON.stringify(data)));
+                handler.sendError(responseId, new Error(`Unknown LUA script eval call ${JSON.stringify(data)}`));
             }
         });
 
@@ -521,11 +535,17 @@ class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
                     handler.sendBufBulk(responseId, Buffer.from(fileData));
                 }
             } else if (namespace === this.metaNamespace) {
-                const result = this.getMeta(id);
-                if (result === undefined || result === null) {
-                    handler.sendNull(responseId);
+                // special handling for the primaryHost
+                if (id === 'objects.primaryHost') {
+                    // we are the server -> we are primary
+                    handler.sendString(this.settings.hostname);
                 } else {
-                    handler.sendBulk(responseId, result);
+                    const result = this.getMeta(id);
+                    if (result === undefined || result === null) {
+                        handler.sendNull(responseId);
+                    } else {
+                        handler.sendBulk(responseId, result);
+                    }
                 }
             } else {
                 handler.sendError(
@@ -710,15 +730,6 @@ class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
             return this._handleScanOrKeys(handler, data[0], responseId);
         });
 
-        // MULTI/EXEC is never used with return values, thus we just answer with syntactic correct responses
-        handler.on('multi', (data, responseId) => {
-            return void handler.sendString(responseId, 'OK');
-        });
-
-        handler.on('exec', (data, reponseId) => {
-            return void handler.sendArray(reponseId, []);
-        });
-
         // commands for redis SETS, just dummies
         handler.on('sadd', (data, responseId) => {
             return void handler.sendInteger(responseId, 1);
@@ -770,9 +781,22 @@ class ObjectsInMemoryServer extends ObjectsInMemoryJsonlDB {
             }
         });
 
+        // 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 {
+                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] === 'lua-time-limit') {
+            if (data[0] === '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 if (data[0] === 'set' && data[1] === 'lua-time-limit') {
                 // we ignore these type of commands for now, irrelevant
                 handler.sendString(responseId, 'OK');
             } else {

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@iobroker/db-objects-jsonl",
-  "version": "4.0.0-alpha.45-20220114-88aaebdb",
+  "version": "4.0.0-alpha.49-20220121-e7aa4308",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
     "@alcalzone/jsonl-db": "~2.4.1",
-    "@iobroker/db-base": "4.0.0-alpha.45-20220114-88aaebdb",
-    "@iobroker/db-objects-file": "4.0.0-alpha.45-20220114-88aaebdb",
-    "@iobroker/db-objects-redis": "4.0.0-alpha.45-20220114-88aaebdb",
+    "@iobroker/db-base": "4.0.0-alpha.49-20220121-e7aa4308",
+    "@iobroker/db-objects-file": "4.0.0-alpha.49-20220121-e7aa4308",
+    "@iobroker/db-objects-redis": "4.0.0-alpha.49-20220121-e7aa4308",
     "deep-clone": "^3.0.3",
     "fs-extra": "^10.0.0"
   },
@@ -37,5 +37,5 @@
     "lib/",
     "index.js"
   ],
-  "gitHead": "e2fd3e7af91eb83c30f8ae45f71d6e178edc7b28"
+  "gitHead": "f42f117b74d3c4bfac0bc872c087d382ca897b7c"
 }