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

package/README.md

@@ -35,8 +35,7 @@ The simulator supports four different namespaces:
 | punsubscribe      | full       | objects |
 | config      | dummy       | independent |
 | client      | partial       | independent |
-| multi | dummy | independent |
-| exec | dummy | independent |
+| multi/exec | partial | independent |
 | sadd | dummy | independent |
 | srem | dummy | independent |
 | sscan |full | objects, files, sets |
@@ -102,11 +101,9 @@ Mainly a dummy, just sends a positive response if `lua-time-limit` change receiv
 ### client
 Is used to handle `setname` and `getname` requests. `setname` is used to change the logging namespace. On `getname` the server will respond with the current connection name, which has been set via `getname`.
 
-### multi
-Just a dummy, responds with `OK`.
-
-### exec
-Just a dummy, responds with `OK`.
+### multi/exec
+Multi/exec is fully integrated but only works with pipelines and will give a piped response. It will not respond until `exec` is called.
+On `exec` the simulator responds with `OK` (for `multi`), `QUEUED` for every command and the real results as an array for `exec`.
 
 ### sadd
 Just a dummy, always responds with `1`, which means we have added the item to the set.

package/lib/objects/objectsInMemServerRedis.js

@@ -295,18 +295,29 @@ class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
                         );
                     }
                     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]}`));
             }
         });
 
         // Handle Redis "EVALSHA" request
         handler.on('evalsha', (data, responseId) => {
             if (!this.knownScripts[data[0]]) {
-                return void handler.sendError(responseId, new Error('Unknown Script ' + data[0]));
+                return void handler.sendError(responseId, new Error(`Unknown Script ${data[0]}`));
             }
             if (this.knownScripts[data[0]].design) {
                 const scriptDesign = this.knownScripts[data[0]].design;
@@ -354,8 +365,11 @@ class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
                 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)}`));
             }
         });
 
@@ -522,11 +536,17 @@ class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
                     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(
@@ -711,15 +731,6 @@ class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
             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);
@@ -771,9 +782,22 @@ class ObjectsInMemoryServer extends ObjectsInMemoryFileDB {
             }
         });
 
+        // 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,12 +1,12 @@
 {
   "name": "@iobroker/db-objects-file",
-  "version": "4.0.0-alpha.45-20220114-88aaebdb",
+  "version": "4.0.0-alpha.49-20220121-e7aa4308",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@iobroker/db-base": "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-redis": "4.0.0-alpha.49-20220121-e7aa4308",
     "deep-clone": "^3.0.3",
     "fs-extra": "^10.0.0"
   },
@@ -35,5 +35,5 @@
     "lib/",
     "index.js"
   ],
-  "gitHead": "e2fd3e7af91eb83c30f8ae45f71d6e178edc7b28"
+  "gitHead": "f42f117b74d3c4bfac0bc872c087d382ca897b7c"
 }