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

package/{lib → build/lib}/redisHandler.js

@@ -1,12 +1,18 @@
-const Resp = require('respjs');
-const { EventEmitter } = require('events');
-const { QUEUED_STR_BUF, OK_STR_BUF } = require('./constants');
-
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.RedisHandler = void 0;
+// @ts-expect-error no types
+const respjs_1 = __importDefault(require("respjs"));
+const events_1 = require("events");
+const constants_1 = require("./constants");
 /**
  * Class to handle a redis connection and provide events to react on for
  * all incoming Redis commands
  */
-class RedisHandler extends EventEmitter {
+class RedisHandler extends events_1.EventEmitter {
     /**
      * Initialize and register all data handlers to send out events on new commands
      * @param socket Network Socket/Connection
@@ -14,7 +20,6 @@ class RedisHandler extends EventEmitter {
      */
     constructor(socket, options) {
         super();
-
         options = options || {};
         this.options = options;
         this.log = options.log || console;
@@ -23,59 +28,48 @@ class RedisHandler extends EventEmitter {
             this.logScope += ' ';
         }
         this.socket = socket;
-
         this.socketId = `${this.logScope + socket.remoteAddress}:${socket.remotePort}`;
         this.initialized = false;
         this.stop = false;
-
         this.activeMultiCalls = [];
         this.writeQueue = [];
-
         this.handleBuffers = false;
         const respOptions = {};
         if (options.handleAsBuffers) {
             this.handleBuffers = true;
             respOptions.bufBulk = true;
         }
-        this.resp = new Resp(respOptions);
-
-        this.resp.on('error', err => {
+        this.resp = new respjs_1.default(respOptions);
+        this.resp.on('error', (err) => {
             this.log.error(`${this.socketId} (Init=${this.initialized}) Redis error:${err}`);
             if (this.initialized) {
                 this.sendError(null, new Error(`PARSER ERROR ${err}`)); // TODO
-            } else {
+            }
+            else {
                 this.close();
             }
         });
-
-        this.resp.on('data', data => this._handleCommand(data));
-
+        this.resp.on('data', (data) => this._handleCommand(data));
         socket.on('data', data => {
             if (this.options.enhancedLogging) {
-                this.log.silly(
-                    `${this.socketId} New Redis request: ${
-                        data.length > 1024
-                            ? `${data
-                                  .toString()
-                                  .replace(/[\r\n]+/g, '')
-                                  .substring(0, 100)} -- ${data.length} bytes`
-                            : data.toString().replace(/[\r\n]+/g, '')
-                    }`
-                );
+                this.log.silly(`${this.socketId} New Redis request: ${data.length > 1024
+                    ? `${data
+                        .toString()
+                        .replace(/[\r\n]+/g, '')
+                        .substring(0, 100)} -- ${data.length} bytes`
+                    : data.toString().replace(/[\r\n]+/g, '')}`);
             }
             this.resp.write(data);
         });
-
         socket.on('error', err => {
             if (!this.stop) {
-                this.log.debug(`${this.socketId} Redis Socket error: ${err}`);
+                this.log.debug(`${this.socketId} Redis Socket error: ${err.stack}`);
             }
             if (this.socket) {
                 this.socket.destroy();
             }
         });
     }
-
     /**
      * Handle one incoming command, assign responseId and emit event to be handled
      * @param data Array RESP data
@@ -98,20 +92,13 @@ class RedisHandler extends EventEmitter {
                 }
             }
         }
-
         const t = process.hrtime();
         const responseId = t[0] * 1e3 + t[1] / 1e6;
-
         if (this.options.enhancedLogging) {
-            this.log.silly(
-                `${this.socketId} Parser result: id=${responseId}, command=${command}, data=${
-                    JSON.stringify(data).length > 1024
-                        ? `${JSON.stringify(data).substring(0, 100)} -- ${JSON.stringify(data).length} bytes`
-                        : JSON.stringify(data)
-                }`
-            );
+            this.log.silly(`${this.socketId} Parser result: id=${responseId}, command=${command}, data=${JSON.stringify(data).length > 1024
+                ? `${JSON.stringify(data).substring(0, 100)} -- ${JSON.stringify(data).length} bytes`
+                : JSON.stringify(data)}`);
         }
-
         if (command === 'multi') {
             if (this.activeMultiCalls.length && !this.activeMultiCalls[0].execCalled) {
                 // should never happen
@@ -120,34 +107,31 @@ class RedisHandler extends EventEmitter {
             this._handleMulti();
             return;
         }
-
         // multi active and exec not called yet
         if (this.activeMultiCalls.length && !this.activeMultiCalls[0].execCalled && command !== 'exec') {
             // store all response ids so we know which need to be in the multi call
             this.activeMultiCalls[0].responseIds.push(responseId);
             // add it for the correct order will be overwritten with correct response
             this.activeMultiCalls[0].responseMap.set(responseId, null);
-        } else {
+        }
+        else {
             // multi response ids should not be pushed - we will answer combined
             this.writeQueue.push({ id: responseId, data: false });
         }
-
         if (command === 'exec') {
             this._handleExec(responseId);
             return;
         }
-
         if (command === 'info') {
             this.initialized = true;
         }
-
         if (this.listenerCount(command) !== 0) {
             setImmediate(() => this.emit(command, data, responseId));
-        } else {
+        }
+        else {
             this.sendError(responseId, new Error(`${command} NOT SUPPORTED`));
         }
     }
-
     /**
      * Check if the response to a certain command can be send out directly or
      * if it needs to wait till earlier responses are ready
@@ -157,7 +141,6 @@ class RedisHandler extends EventEmitter {
      */
     _sendQueued(responseId, data) {
         let idx = 0;
-
         while (this.writeQueue.length && idx < this.writeQueue.length) {
             // we found the queue entry that matches with the responseId, so store the data so be sent out
             if (this.writeQueue[idx].id === responseId) {
@@ -173,34 +156,28 @@ class RedisHandler extends EventEmitter {
             if (idx === 0 && this.writeQueue[idx].data !== false) {
                 const response = this.writeQueue.shift();
                 if (this.options.enhancedLogging) {
-                    this.log.silly(
-                        `${this.socketId} Redis response (${response.id}): ${
-                            response.data.length > 1024
-                                ? `${data.length} bytes`
-                                : response.data.toString().replace(/[\r\n]+/g, '')
-                        }`
-                    );
+                    this.log.silly(`${this.socketId} Redis response (${response.id}): ${response.data.length > 1024
+                        ? `${data.length} bytes`
+                        : response.data.toString().replace(/[\r\n]+/g, '')}`);
                 }
-
                 this._write(response.data);
                 // We sended out first queue entry but no further response is ready
                 // and we do not need to check the whole queue, so we are done here
                 if (this.writeQueue.length && this.writeQueue[idx].data === false) {
                     break;
                 }
-            } else {
+            }
+            else {
                 // we have not found the response on the current index, try next one
                 idx++;
             }
         }
-
         if (idx > 0) {
             if (this.options.enhancedLogging) {
                 this.log.silly(`${this.socketId} Redis response (${responseId}): Response queued`);
             }
         }
     }
-
     /**
      * Really write out a response to the network connection
      * @param data Buffer to send out
@@ -209,7 +186,6 @@ class RedisHandler extends EventEmitter {
     _write(data) {
         this.socket.write(data);
     }
-
     /**
      * Guard to make sure a response is valid to be sent out
      * @param responseId ID of the response
@@ -228,12 +204,10 @@ class RedisHandler extends EventEmitter {
         }
         if (!data) {
             this.log.warn(`${this.socketId} Not able to write ${JSON.stringify(data)}`);
-            data = Resp.encodeError(new Error(`INVALID RESPONSE: ${JSON.stringify(data)}`));
+            data = respjs_1.default.encodeError(new Error(`INVALID RESPONSE: ${JSON.stringify(data)}`));
         }
-
         setImmediate(() => this._sendQueued(responseId, data));
     }
-
     /**
      * Close network connection
      */
@@ -242,165 +216,150 @@ class RedisHandler extends EventEmitter {
         this.stop = true;
         this.socket.end();
     }
-
     /**
      * Return if socket/handler active or closed
-     * @returns {boolean} is Handler/Connection active (not closed)
+     * @returns is Handler/Connection active (not closed)
      */
     isActive() {
         return !this.stop;
     }
-
     /**
      * Encode RESP's Null value to RESP buffer and send out
      * @param responseId ID of the response
      */
     sendNull(responseId) {
-        for (const i in this.activeMultiCalls) {
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeNull());
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeNull());
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeNull());
+        this.sendResponse(responseId, respjs_1.default.encodeNull());
     }
-
     /**
      * Encode RESP's Null Array value to RESP buffer and send out
      * @param responseId ID of the response
      */
     sendNullArray(responseId) {
-        for (const i in this.activeMultiCalls) {
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeNullArray());
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeNullArray());
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeNullArray());
+        this.sendResponse(responseId, respjs_1.default.encodeNullArray());
     }
-
     /**
      * Encode string to RESP buffer and send out
      * @param responseId ID od the response
      * @param str String to encode
      */
     sendString(responseId, str) {
-        for (const i in this.activeMultiCalls) {
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeString(str));
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeString(str));
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeString(str));
+        this.sendResponse(responseId, respjs_1.default.encodeString(str));
     }
-
     /**
      * Encode error object to RESP buffer and send out
      * @param responseId ID of the response
      * @param error Error object with error details to send out
      */
     sendError(responseId, error) {
-        this.log.warn(`${this.socketId} Error from InMemDB: ${error}`);
-
-        for (const i in this.activeMultiCalls) {
+        this.log.warn(`${this.socketId} Error from InMemDB: ${error.stack}`);
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeError(error));
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeError(error));
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeError(error));
+        this.sendResponse(responseId, respjs_1.default.encodeError(error));
     }
-
     /**
      * Encode integer to RESP buffer and send out
      * @param responseId ID of the response
      * @param num Integer to send out
      */
     sendInteger(responseId, num) {
-        for (const i in this.activeMultiCalls) {
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeInteger(num));
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeInteger(num));
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeInteger(num));
+        this.sendResponse(responseId, respjs_1.default.encodeInteger(num));
     }
-
     /**
      * Encode RESP's bulk string to RESP buffer and send out
      * @param responseId ID of the response
      * @param str String to send out
      */
     sendBulk(responseId, str) {
-        for (const i in this.activeMultiCalls) {
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeBulk(str));
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeBulk(str));
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeBulk(str));
+        this.sendResponse(responseId, respjs_1.default.encodeBulk(str));
     }
-
     /**
      * Encode RESP's bulk buffer to RESP buffer.
      * @param responseId ID of the response
      * @param buf Buffer to send out
      */
     sendBufBulk(responseId, buf) {
-        for (const i in this.activeMultiCalls) {
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeBufBulk(buf));
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeBufBulk(buf));
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeBufBulk(buf));
+        this.sendResponse(responseId, respjs_1.default.encodeBufBulk(buf));
     }
-
     /**
      * Encode an Array depending on the type of the elements
      * @param arr Array to encode
-     * @returns {Array} Array with Buffers with encoded values
+     * @returns Array with Buffers with encoded values
      */
     encodeRespArray(arr) {
-        for (let i = 0; i < arr.length; i++) {
-            if (Array.isArray(arr[i])) {
-                arr[i] = this.encodeRespArray(arr[i]);
-            } else if (Buffer.isBuffer(arr[i])) {
-                arr[i] = Resp.encodeBufBulk(arr[i]);
-            } else if (arr[i] === null) {
-                arr[i] = Resp.encodeNull();
-            } else if (typeof arr[i] === 'number') {
-                arr[i] = Resp.encodeInteger(arr[i]);
-            } else {
-                arr[i] = Resp.encodeBulk(arr[i]);
+        const returnArr = new Array(arr.length);
+        arr.forEach((value, i) => {
+            if (Array.isArray(value)) {
+                returnArr[i] = this.encodeRespArray(value);
             }
-        }
-        return arr;
+            else if (Buffer.isBuffer(value)) {
+                returnArr[i] = respjs_1.default.encodeBufBulk(value);
+            }
+            else if (value === null) {
+                returnArr[i] = respjs_1.default.encodeNull();
+            }
+            else if (typeof value === 'number') {
+                returnArr[i] = respjs_1.default.encodeInteger(value);
+            }
+            else {
+                returnArr[i] = respjs_1.default.encodeBulk(value);
+            }
+        });
+        return returnArr;
     }
-
     /**
      * Encode a array values to buffers and send out
-     * @param {number} responseId ID of the response
-     * @param {any[]} arr Array to send out
+     * @param responseId ID of the response
+     * @param arr Array to send out
      */
     sendArray(responseId, arr) {
-        for (const i in this.activeMultiCalls) {
+        for (let i = 0; i < this.activeMultiCalls.length; i++) {
             if (this.activeMultiCalls[i].responseIds.includes(responseId)) {
-                this._handleMultiResponse(responseId, i, Resp.encodeArray(this.encodeRespArray(arr)));
+                this._handleMultiResponse(responseId, i, respjs_1.default.encodeArray(this.encodeRespArray(arr)));
                 return;
             }
         }
-
-        this.sendResponse(responseId, Resp.encodeArray(this.encodeRespArray(arr)));
+        this.sendResponse(responseId, respjs_1.default.encodeArray(this.encodeRespArray(arr)));
     }
-
     /**
      * Handles a 'multi' command
      *
@@ -414,7 +373,6 @@ class RedisHandler extends EventEmitter {
             responseMap: new Map()
         });
     }
-
     /**
      * Handles an 'exec' command
      *
@@ -426,52 +384,42 @@ class RedisHandler extends EventEmitter {
             this.sendError(responseId, new Error('EXEC without MULTI'));
             return;
         }
-
         this.activeMultiCalls[0].execId = responseId;
         this.activeMultiCalls[0].execCalled = true;
-
         // maybe we have all fullfilled yet
         if (this.activeMultiCalls[0].responseCount === this.activeMultiCalls[0].responseIds.length) {
             const multiRespObj = this.activeMultiCalls.shift();
             this._sendExecResponse(multiRespObj);
         }
     }
-
     /**
      * Builds up the exec response and sends it
-     * @param {Record<string, any>} multiObj the multi object to send out
+     * @param multiObj the multi object to send out
      *
      * @private
      */
     _sendExecResponse(multiObj) {
         // collect all 'QUEUED' answers
-        const queuedStrArr = new Array(multiObj.responseCount).fill(QUEUED_STR_BUF);
-
-        this._sendQueued(
-            multiObj.execId,
-            Buffer.concat([OK_STR_BUF, ...queuedStrArr, Resp.encodeArray(Array.from(multiObj.responseMap.values()))])
-        );
+        const queuedStrArr = new Array(multiObj.responseCount).fill(constants_1.QUEUED_STR_BUF);
+        this._sendQueued(multiObj.execId, Buffer.concat([constants_1.OK_STR_BUF, ...queuedStrArr, respjs_1.default.encodeArray(Array.from(multiObj.responseMap.values()))]));
     }
-
     /**
      * Handles a multi response
      *
-     * @param {number} responseId ID of the response
-     * @param {number} index index of the multi call
-     * @param {Buffer} buf buffer to include in response
+     * @param responseId ID of the response
+     * @param index index of the multi call
+     * @param buf buffer to include in response
      * @private
      */
     _handleMultiResponse(responseId, index, buf) {
         this.activeMultiCalls[index].responseMap.set(responseId, buf);
         this.activeMultiCalls[index].responseCount++;
-        if (
-            this.activeMultiCalls[index].execCalled &&
-            this.activeMultiCalls[index].responseCount === this.activeMultiCalls[index].responseIds.length
-        ) {
+        if (this.activeMultiCalls[index].execCalled &&
+            this.activeMultiCalls[index].responseCount === this.activeMultiCalls[index].responseIds.length) {
             const multiRespObj = this.activeMultiCalls.splice(index, 1)[0];
             this._sendExecResponse(multiRespObj);
         }
     }
 }
-
-module.exports = RedisHandler;
+exports.RedisHandler = RedisHandler;
+//# sourceMappingURL=redisHandler.js.map

package/build/lib/redisHandler.js.map

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

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@iobroker/db-base",
-  "version": "4.0.21",
+  "version": "4.1.0-alpha.0-20220819-74ceeddc",
   "engines": {
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@iobroker/js-controller-common": "4.0.21",
+    "@iobroker/js-controller-common": "4.1.0-alpha.0-20220819-74ceeddc",
     "deep-clone": "^3.0.3",
-    "fs-extra": "^10.0.0",
+    "fs-extra": "^10.1.0",
     "respjs": "^4.2.0"
   },
   "keywords": [
@@ -25,15 +25,31 @@
     "type": "git",
     "url": "https://github.com/ioBroker/ioBroker.js-controller/packages/db-base"
   },
-  "scripts": {},
-  "main": "index.js",
+  "scripts": {
+    "build": "tsc -b tsconfig.build.json"
+  },
+  "main": "build/index.js",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "exports": {
+    ".": "./build/index.js",
+    "./package.json": "./package.json",
+    "./inMemFileDB": "./build/lib/inMemFileDB.js"
+  },
+  "types": "build/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "inMemFileDB": [
+        "build/lib/inMemFileDB"
+      ]
+    }
+  },
   "files": [
-    "lib/",
-    "index.js"
+    "build/lib/",
+    "build/index.js",
+    "build/index.d.ts"
   ],
-  "gitHead": "4749d256d312623ae7621e7ae47d44580b3aa8c1"
+  "gitHead": "febfe24ecb050ec02f848cc869d84aa30d69c615"
 }

package/index.js

@@ -1,5 +0,0 @@
-module.exports = {
-    inMemoryFileDB: require('./lib/inMemFileDB.js'),
-    redisHandler: require('./lib/redisHandler.js'),
-    tools: require('./lib/tools.js')
-};

package/lib/constants.js

@@ -1,6 +0,0 @@
-const Resp = require('respjs');
-
-module.exports = {
-    QUEUED_STR_BUF: Resp.encodeString('QUEUED'),
-    OK_STR_BUF: Resp.encodeString('OK')
-};

package/lib/tools.js

@@ -1,21 +0,0 @@
-const { tools } = require('@iobroker/js-controller-common');
-
-module.exports = tools;
-const controllerDir = tools.getControllerDir() || __dirname;
-module.exports.getControllerDir = () => controllerDir;
-
-/**
- * Checks if the given callback is a function and if so calls it with the given error and parameter immediately, else a resolved or rejected Promise is returned. Redis-Error "Connection is closed." is converted into ERROR_DB_CLOSED
- *
- * @param {((error: Error | null | undefined, ...args: any[]) => void) | null | undefined} callback - callback function to be executed
- * @param {Error | string | null | undefined} error - error which will be used by the callback function. If callback is not a function and
- * error is given, a rejected Promise is returned. If error is given but it is not an instance of Error, it is converted into one.
- * @param {...any} args - as many arguments as needed, which will be returned by the callback function or by the Promise
- * @returns {Promise<any>} - if Promise is resolved with multiple arguments, an array is returned
- */
-module.exports.maybeCallbackWithRedisError = (callback, error, ...args) => {
-    if (error instanceof Error && error.message.includes('Connection is closed')) {
-        error.message = module.exports.ERRORS.ERROR_DB_CLOSED;
-    }
-    return module.exports.maybeCallbackWithError(callback, error, ...args);
-};