@universis/janitor 1.4.1 → 1.5.0

package/dist/RedisClientStore.js

@@ -1,6 +1,6 @@
 "use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.RedisClientStore = void 0;var _common = require("@themost/common");
 var _rateLimitRedis = _interopRequireDefault(require("rate-limit-redis"));
-var _redis = require("redis");
+var _ioredis = require("ioredis");
 require("@themost/promise-sequence");function _interopRequireDefault(obj) {return obj && obj.__esModule ? obj : { default: obj };}function _defineProperty(obj, key, value) {key = _toPropertyKey(key);if (key in obj) {Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true });} else {obj[key] = value;}return obj;}function _toPropertyKey(arg) {var key = _toPrimitive(arg, "string");return typeof key === "symbol" ? key : String(key);}function _toPrimitive(input, hint) {if (typeof input !== "object" || input === null) return input;var prim = input[Symbol.toPrimitive];if (prim !== undefined) {var res = prim.call(input, hint || "default");if (typeof res !== "object") return res;throw new TypeError("@@toPrimitive must return a primitive value.");}return (hint === "string" ? String : Number)(input);}
 
 let superLoadIncrementScript;
@@ -46,16 +46,15 @@ class RedisClientStore extends _rateLimitRedis.default {
        */
       sendCommand: function () {
         const args = Array.from(arguments);
+        const [command] = args.splice(0, 1);
         const self = this;
-        if (args[0] === 'SCRIPT') {
+        if (command === 'SCRIPT') {
           const connectOptions = service.getApplication().getConfiguration().getSourceAt('settings/redis/options') || {
             host: '127.0.0.1',
             port: 6379
           };
-          const client = (0, _redis.createClient)(connectOptions);
-          return client.connect().then(() => {
-            return client.sendCommand(args);
-          }).catch((error) => {
+          const client = new _ioredis.Redis(connectOptions);
+          return client.call(command, args).catch((error) => {
             if (error instanceof TypeError && error.message === 'Invalid argument type') {
               _common.TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
             }
@@ -73,45 +72,30 @@ class RedisClientStore extends _rateLimitRedis.default {
             host: '127.0.0.1',
             port: 6379
           };
-          self.client = (0, _redis.createClient)(connectOptions);
-          // handle socket close error
-          self.client.on('error', (err) => {
-            _common.TraceUtils.error('An error occurred while using redis client as speed limit service client store.');
-            _common.TraceUtils.error(err);
-            // handle socket close error
-            if (err.message === 'Socket closed unexpectedly') {
-              _common.TraceUtils.info('Socket closed unexpectedly. Disconnecting...');
-              // delete increment script sha
-              self.incrementScriptSha = null;
-              // quit client
-              self.client.disconnect();
-            }
-          });
+          self.client = new _ioredis.Redis(connectOptions);
         }
         if (self.client.isOpen) {
-          return self.client.sendCommand(args).catch((error) => {
+          return self.client.call(command, args).catch((error) => {
             if (error instanceof TypeError && error.message === 'Invalid argument type') {
               _common.TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
             }
             return Promise.reject(error);
           });
         }
-        return self.client.connect().then(() => {
-          // send load script commands once
-          return (() => {
-            if (self.incrementScriptSha == null) {
-              return this.postInit();
+        // send load script commands once
+        return (() => {
+          if (self.incrementScriptSha == null) {
+            return this.postInit();
+          }
+          return Promise.resolve();
+        })().then(() => {
+          // send command 
+          args[0] = self.incrementScriptSha;
+          return self.client.call(command, args).catch((error) => {
+            if (error instanceof TypeError && error.message === 'Invalid argument type') {
+              _common.TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
             }
-            return Promise.resolve();
-          })().then(() => {
-            // send command 
-            args[1] = self.incrementScriptSha;
-            return self.client.sendCommand(args).catch((error) => {
-              if (error instanceof TypeError && error.message === 'Invalid argument type') {
-                _common.TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
-              }
-              return Promise.reject(error);
-            });
+            return Promise.reject(error);
           });
         });
       }

package/dist/RedisClientStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"RedisClientStore.js","names":["_common","require","_rateLimitRedis","_interopRequireDefault","_redis","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","superLoadIncrementScript","superLoadGetScript","noLoadGetScript","noLoadIncrementScript","RedisStore","prototype","loadIncrementScript","name","loadGetScript","RedisClientStore","constructor","service","options","sendCommand","args","Array","from","arguments","self","connectOptions","getApplication","getConfiguration","getSourceAt","host","port","client","createClient","connect","then","catch","error","message","TraceUtils","warn","JSON","stringify","Promise","reject","finally","isOpen","disconnect","errDisconnect","on","err","info","incrementScriptSha","postInit","resolve","init","debug","getScriptSha","sequence","exports"],"sources":["../src/RedisClientStore.js"],"sourcesContent":["import { TraceUtils } from '@themost/common';\nimport RedisStore from 'rate-limit-redis';\nimport { createClient } from 'redis';\nimport '@themost/promise-sequence';\n\nlet superLoadIncrementScript;\nlet superLoadGetScript;\n\nfunction noLoadGetScript() {\n    //\n}\n\nfunction noLoadIncrementScript() {\n    //\n}\n\nif (RedisStore.prototype.loadIncrementScript.name === 'loadIncrementScript') {\n    // get super method for future use\n    superLoadIncrementScript = RedisStore.prototype.loadIncrementScript;\n    RedisStore.prototype.loadIncrementScript = noLoadIncrementScript;\n}\n\nif (RedisStore.prototype.loadGetScript.name === 'loadGetScript') {\n    // get super method\n    superLoadGetScript = RedisStore.prototype.loadGetScript;\n    RedisStore.prototype.loadGetScript = noLoadGetScript;\n}\n\nclass RedisClientStore extends RedisStore {\n\n    /**\n     * @type {import('redis').RedisClientType}\n     */\n    client;\n\n    /**\n     * \n     * @param {import('@themost/common').ApplicationService} service\n     * @param {{windowMs: number}} options\n     */\n    constructor(service, options) {\n        super({\n            /**\n             * @param {...string} args\n             * @returns {Promise<*>}\n             */\n            sendCommand: function () {\n                const args = Array.from(arguments);\n                const self = this;\n                if (args[0] === 'SCRIPT') {\n                    const connectOptions = service.getApplication().getConfiguration().getSourceAt('settings/redis/options') || {\n                        host: '127.0.0.1',\n                        port: 6379\n                    };\n                    const client = createClient(connectOptions);\n                    return client.connect().then(() => {\n                        return client.sendCommand(args);\n                    }).catch((error) => {\n                        if (error instanceof TypeError && error.message === 'Invalid argument type') {\n                            TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));\n                        }\n                        return Promise.reject(error);\n                    }).finally(() => {\n                        if (client.isOpen) {\n                            client.disconnect().catch((errDisconnect) => {\n                                TraceUtils.error(errDisconnect);\n                            });\n                        }\n                    });\n                }\n                if (self.client == null) {\n                    const connectOptions = service.getApplication().getConfiguration().getSourceAt('settings/redis/options') || {\n                        host: '127.0.0.1',\n                        port: 6379\n                    };\n                    self.client = createClient(connectOptions);\n                    // handle socket close error\n                    self.client.on('error', (err) => {\n                        TraceUtils.error('An error occurred while using redis client as speed limit service client store.');\n                        TraceUtils.error(err);\n                        // handle socket close error\n                        if (err.message === 'Socket closed unexpectedly') {\n                            TraceUtils.info('Socket closed unexpectedly. Disconnecting...');\n                            // delete increment script sha\n                            self.incrementScriptSha = null;\n                            // quit client\n                            self.client.disconnect();\n                        }\n                    });\n                }\n                if (self.client.isOpen) {\n                    return self.client.sendCommand(args).catch((error) => {\n                        if (error instanceof TypeError && error.message === 'Invalid argument type') {\n                            TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));\n                        }\n                        return Promise.reject(error);\n                    });\n                }\n                return self.client.connect().then(() => {\n                    // send load script commands once\n                    return (() => {\n                        if (self.incrementScriptSha == null) {\n                            return this.postInit();\n                        }\n                        return Promise.resolve();\n                    })().then(() => {\n                        // send command \n                        args[1] = self.incrementScriptSha;\n                        return self.client.sendCommand(args).catch((error) => {\n                            if (error instanceof TypeError && error.message === 'Invalid argument type') {\n                                TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));\n                            }\n                            return Promise.reject(error);\n                        });\n                    });\n                });\n            }\n        });\n        this.init(options);\n        TraceUtils.debug('RedisClientStore: Starting up and loading increment and get scripts.');\n        void this.postInit().then(() => {\n            TraceUtils.debug('RedisClientStore: Successfully loaded increment and get scripts.');\n        }).catch((err) => {\n            TraceUtils.error('RedisClientStore: Failed to load increment and get scripts.');\n            TraceUtils.error(err);\n        });\n    }\n    async postInit() {\n        const [incrementScriptSha, getScriptSha] = await Promise.sequence([\n            () => superLoadIncrementScript.call(this),\n            () => superLoadGetScript.call(this)\n        ]);\n        this.incrementScriptSha = incrementScriptSha;\n        this.getScriptSha = getScriptSha;\n    }\n\n}\n\nexport {\n    RedisClientStore\n}"],"mappings":"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"}
+{"version":3,"file":"RedisClientStore.js","names":["_common","require","_rateLimitRedis","_interopRequireDefault","_ioredis","obj","__esModule","default","_defineProperty","key","value","_toPropertyKey","Object","defineProperty","enumerable","configurable","writable","arg","_toPrimitive","String","input","hint","prim","Symbol","toPrimitive","undefined","res","call","TypeError","Number","superLoadIncrementScript","superLoadGetScript","noLoadGetScript","noLoadIncrementScript","RedisStore","prototype","loadIncrementScript","name","loadGetScript","RedisClientStore","constructor","service","options","sendCommand","args","Array","from","arguments","command","splice","self","connectOptions","getApplication","getConfiguration","getSourceAt","host","port","client","Redis","catch","error","message","TraceUtils","warn","JSON","stringify","Promise","reject","finally","isOpen","disconnect","errDisconnect","incrementScriptSha","postInit","resolve","then","init","debug","err","getScriptSha","sequence","exports"],"sources":["../src/RedisClientStore.js"],"sourcesContent":["import { TraceUtils } from '@themost/common';\nimport RedisStore from 'rate-limit-redis';\nimport { Redis } from 'ioredis';\nimport '@themost/promise-sequence';\n\nlet superLoadIncrementScript;\nlet superLoadGetScript;\n\nfunction noLoadGetScript() {\n    //\n}\n\nfunction noLoadIncrementScript() {\n    //\n}\n\nif (RedisStore.prototype.loadIncrementScript.name === 'loadIncrementScript') {\n    // get super method for future use\n    superLoadIncrementScript = RedisStore.prototype.loadIncrementScript;\n    RedisStore.prototype.loadIncrementScript = noLoadIncrementScript;\n}\n\nif (RedisStore.prototype.loadGetScript.name === 'loadGetScript') {\n    // get super method\n    superLoadGetScript = RedisStore.prototype.loadGetScript;\n    RedisStore.prototype.loadGetScript = noLoadGetScript;\n}\n\nclass RedisClientStore extends RedisStore {\n\n    /**\n     * @type {import('redis').RedisClientType}\n     */\n    client;\n\n    /**\n     * \n     * @param {import('@themost/common').ApplicationService} service\n     * @param {{windowMs: number}} options\n     */\n    constructor(service, options) {\n        super({\n            /**\n             * @param {...string} args\n             * @returns {Promise<*>}\n             */\n            sendCommand: function () {\n                const args = Array.from(arguments);\n                const [command] = args.splice(0, 1);\n                const self = this;\n                if (command === 'SCRIPT') {\n                    const connectOptions = service.getApplication().getConfiguration().getSourceAt('settings/redis/options') || {\n                        host: '127.0.0.1',\n                        port: 6379\n                    };\n                    const client = new Redis(connectOptions);\n                    return client.call(command, args).catch((error) => {\n                        if (error instanceof TypeError && error.message === 'Invalid argument type') {\n                            TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));\n                        }\n                        return Promise.reject(error);\n                    }).finally(() => {\n                        if (client.isOpen) {\n                            client.disconnect().catch((errDisconnect) => {\n                                TraceUtils.error(errDisconnect);\n                            });\n                        }\n                    });\n                }\n                if (self.client == null) {\n                    const connectOptions = service.getApplication().getConfiguration().getSourceAt('settings/redis/options') || {\n                        host: '127.0.0.1',\n                        port: 6379\n                    };\n                    self.client = new Redis(connectOptions);\n                }\n                if (self.client.isOpen) {\n                    return self.client.call(command, args).catch((error) => {\n                        if (error instanceof TypeError && error.message === 'Invalid argument type') {\n                            TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));\n                        }\n                        return Promise.reject(error);\n                    });\n                }\n                // send load script commands once\n                return (() => {\n                    if (self.incrementScriptSha == null) {\n                        return this.postInit();\n                    }\n                    return Promise.resolve();\n                })().then(() => {\n                    // send command \n                    args[0] = self.incrementScriptSha;\n                    return self.client.call(command, args).catch((error) => {\n                        if (error instanceof TypeError && error.message === 'Invalid argument type') {\n                            TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));\n                        }\n                        return Promise.reject(error);\n                    });\n                });\n            }\n        });\n        this.init(options);\n        TraceUtils.debug('RedisClientStore: Starting up and loading increment and get scripts.');\n        void this.postInit().then(() => {\n            TraceUtils.debug('RedisClientStore: Successfully loaded increment and get scripts.');\n        }).catch((err) => {\n            TraceUtils.error('RedisClientStore: Failed to load increment and get scripts.');\n            TraceUtils.error(err);\n        });\n    }\n    async postInit() {\n        const [incrementScriptSha, getScriptSha] = await Promise.sequence([\n            () => superLoadIncrementScript.call(this),\n            () => superLoadGetScript.call(this)\n        ]);\n        this.incrementScriptSha = incrementScriptSha;\n        this.getScriptSha = getScriptSha;\n    }\n\n}\n\nexport {\n    RedisClientStore\n}"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universis/janitor",
-  "version": "1.4.1",
+  "version": "1.5.0",
   "description": "Universis api plugin for rate limiting requests",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,8 +31,8 @@
   "dependencies": {
     "express-rate-limit": "^7.1.1",
     "express-slow-down": "^1.6.0",
-    "rate-limit-redis": "^4.2.0",
-    "redis": "^4.6.10"
+    "ioredis": "^5.3.2",
+    "rate-limit-redis": "^4.2.0"
   },
   "peerDependencies": {
     "@themost/common": "^2",
@@ -50,6 +50,7 @@
     "@babel/register": "^7.21.0",
     "@rollup/plugin-babel": "^6.0.3",
     "@types/express": "^4.17.6",
+    "@types/ioredis": "^5.0.0",
     "@types/jasmine": "^3.5.10",
     "dotenv": "^8.2.0",
     "eslint": "^8.39.0",

package/src/RedisClientStore.js

@@ -1,6 +1,6 @@
 import { TraceUtils } from '@themost/common';
 import RedisStore from 'rate-limit-redis';
-import { createClient } from 'redis';
+import { Redis } from 'ioredis';
 import '@themost/promise-sequence';
 
 let superLoadIncrementScript;
@@ -46,16 +46,15 @@ class RedisClientStore extends RedisStore {
              */
             sendCommand: function () {
                 const args = Array.from(arguments);
+                const [command] = args.splice(0, 1);
                 const self = this;
-                if (args[0] === 'SCRIPT') {
+                if (command === 'SCRIPT') {
                     const connectOptions = service.getApplication().getConfiguration().getSourceAt('settings/redis/options') || {
                         host: '127.0.0.1',
                         port: 6379
                     };
-                    const client = createClient(connectOptions);
-                    return client.connect().then(() => {
-                        return client.sendCommand(args);
-                    }).catch((error) => {
+                    const client = new Redis(connectOptions);
+                    return client.call(command, args).catch((error) => {
                         if (error instanceof TypeError && error.message === 'Invalid argument type') {
                             TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
                         }
@@ -73,45 +72,30 @@ class RedisClientStore extends RedisStore {
                         host: '127.0.0.1',
                         port: 6379
                     };
-                    self.client = createClient(connectOptions);
-                    // handle socket close error
-                    self.client.on('error', (err) => {
-                        TraceUtils.error('An error occurred while using redis client as speed limit service client store.');
-                        TraceUtils.error(err);
-                        // handle socket close error
-                        if (err.message === 'Socket closed unexpectedly') {
-                            TraceUtils.info('Socket closed unexpectedly. Disconnecting...');
-                            // delete increment script sha
-                            self.incrementScriptSha = null;
-                            // quit client
-                            self.client.disconnect();
-                        }
-                    });
+                    self.client = new Redis(connectOptions);
                 }
                 if (self.client.isOpen) {
-                    return self.client.sendCommand(args).catch((error) => {
+                    return self.client.call(command, args).catch((error) => {
                         if (error instanceof TypeError && error.message === 'Invalid argument type') {
                             TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
                         }
                         return Promise.reject(error);
                     });
                 }
-                return self.client.connect().then(() => {
-                    // send load script commands once
-                    return (() => {
-                        if (self.incrementScriptSha == null) {
-                            return this.postInit();
+                // send load script commands once
+                return (() => {
+                    if (self.incrementScriptSha == null) {
+                        return this.postInit();
+                    }
+                    return Promise.resolve();
+                })().then(() => {
+                    // send command 
+                    args[0] = self.incrementScriptSha;
+                    return self.client.call(command, args).catch((error) => {
+                        if (error instanceof TypeError && error.message === 'Invalid argument type') {
+                            TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
                         }
-                        return Promise.resolve();
-                    })().then(() => {
-                        // send command 
-                        args[1] = self.incrementScriptSha;
-                        return self.client.sendCommand(args).catch((error) => {
-                            if (error instanceof TypeError && error.message === 'Invalid argument type') {
-                                TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
-                            }
-                            return Promise.reject(error);
-                        });
+                        return Promise.reject(error);
                     });
                 });
             }