@universis/janitor 1.1.0 → 1.3.0

package/dist/RedisClientStore.js

@@ -1,9 +1,10 @@
 "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");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);}
+var _redis = require("redis");
+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);}
 
-const superLoadIncrementScript = _rateLimitRedis.default.prototype.loadIncrementScript;
-const superLoadGetScript = _rateLimitRedis.default.prototype.loadGetScript;
+let superLoadIncrementScript;
+let superLoadGetScript;
 
 function noLoadGetScript() {
 
@@ -13,11 +14,15 @@ function noLoadIncrementScript() {
 
   //
 }
-if (superLoadIncrementScript != noLoadIncrementScript) {
+if (_rateLimitRedis.default.prototype.loadIncrementScript.name === 'loadIncrementScript') {
+  // get super method for future use
+  superLoadIncrementScript = _rateLimitRedis.default.prototype.loadIncrementScript;
   _rateLimitRedis.default.prototype.loadIncrementScript = noLoadIncrementScript;
 }
 
-if (superLoadGetScript != noLoadGetScript) {
+if (_rateLimitRedis.default.prototype.loadGetScript.name === 'loadGetScript') {
+  // get super method
+  superLoadGetScript = _rateLimitRedis.default.prototype.loadGetScript;
   _rateLimitRedis.default.prototype.loadGetScript = noLoadGetScript;
 }
 
@@ -52,7 +57,9 @@ class RedisClientStore extends _rateLimitRedis.default {
           return client.connect().then(() => {
             return client.sendCommand(args);
           }).catch((error) => {
-            _common.TraceUtils.error(error);
+            if (error instanceof TypeError && error.message === 'Invalid argument type') {
+              _common.TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
+            }
             return Promise.reject(error);
           }).finally(() => {
             if (client.isOpen) {
@@ -72,26 +79,50 @@ class RedisClientStore extends _rateLimitRedis.default {
           self.client = (0, _redis.createClient)(connectOptions);
         }
         if (self.client.isOpen) {
-          return self.client.sendCommand(args);
+          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);
+          });
         }
         _common.TraceUtils.debug('RedisClientStore: Opening redis store client for sending commands');
         return self.client.connect().then(() => {
           // send load script commands once
-          return Promise.all([
-          superLoadIncrementScript.call(self),
-          superLoadGetScript.call(self)]).
-          then((results) => {
-            self.incrementScriptSha = results[0];
-            self.getScriptSha = results[1];
+          return (() => {
+            if (self.incrementScriptSha == null) {
+              return this.postInit();
+            }
+            return Promise.resolve();
+          })().then(() => {
             // send command 
             args[1] = self.incrementScriptSha;
-            return self.client.sendCommand(args);
+            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);
+            });
           });
         });
       }
     }); /**
      * @type {import('redis').RedisClientType}
-     */_defineProperty(this, "client", void 0);this.init(options);
+     */_defineProperty(this, "client", void 0);this.init(options);_common.TraceUtils.debug('RedisClientStore: Starting up and loading increment and get scripts.');
+    void this.postInit().then(() => {
+      _common.TraceUtils.debug('RedisClientStore: Successfully loaded increment and get scripts.');
+    }).catch((err) => {
+      _common.TraceUtils.error('RedisClientStore: Failed to load increment and get scripts.');
+      _common.TraceUtils.error(err);
+    });
+  }
+  async postInit() {
+    const [incrementScriptSha, getScriptSha] = await Promise.sequence([
+    () => superLoadIncrementScript.call(this),
+    () => superLoadGetScript.call(this)]);
+
+    this.incrementScriptSha = incrementScriptSha;
+    this.getScriptSha = getScriptSha;
   }
 
 }exports.RedisClientStore = RedisClientStore;

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","RedisStore","prototype","loadIncrementScript","superLoadGetScript","loadGetScript","noLoadGetScript","noLoadIncrementScript","RedisClientStore","constructor","service","options","sendCommand","args","Array","from","arguments","self","TraceUtils","debug","connectOptions","getApplication","getConfiguration","getSourceAt","host","port","client","createClient","connect","then","catch","error","Promise","reject","finally","isOpen","disconnect","errDisconnect","all","results","incrementScriptSha","getScriptSha","init","exports"],"sources":["../src/RedisClientStore.js"],"sourcesContent":["import { TraceUtils } from '@themost/common';\nimport RedisStore from 'rate-limit-redis';\nimport { createClient } from 'redis';\n\nconst superLoadIncrementScript = RedisStore.prototype.loadIncrementScript;\nconst superLoadGetScript = RedisStore.prototype.loadGetScript;\n\nfunction noLoadGetScript() {\n    //\n}\n\nfunction noLoadIncrementScript() {\n    //\n}\n\nif (superLoadIncrementScript != noLoadIncrementScript) {\n    RedisStore.prototype.loadIncrementScript = noLoadIncrementScript;\n}\n\nif (superLoadGetScript != noLoadGetScript) {\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                    TraceUtils.debug('RedisClientStore: Creating new client for sending script command');\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                        TraceUtils.error(error);\n                        return Promise.reject(error);\n                    }).finally(() => {\n                        if (client.isOpen) {\n                            TraceUtils.debug('RedisClientStore: Closing client of sending script command');\n                            client.disconnect().catch((errDisconnect) => {\n                                TraceUtils.error(errDisconnect);\n                            });\n                        }\n                    });\n                }\n                if (self.client == null) {\n                    TraceUtils.debug('RedisClientStore: Creating store client for sending commands');\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                }\n                if (self.client.isOpen) {\n                    return self.client.sendCommand(args);\n                }\n                TraceUtils.debug('RedisClientStore: Opening redis store client for sending commands');\n                return self.client.connect().then(() => {\n                    // send load script commands once\n                    return Promise.all([\n                        superLoadIncrementScript.call(self),\n                        superLoadGetScript.call(self)\n                    ]).then((results) => {\n                        self.incrementScriptSha = results[0];\n                        self.getScriptSha = results[1];\n                        // send command \n                        args[1] = self.incrementScriptSha;\n                        return self.client.sendCommand(args);\n                    });\n                });\n            }\n        });\n        this.init(options)\n        \n    }\n\n}\n\nexport {\n    RedisClientStore\n}"],"mappings":"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"}
+{"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","TraceUtils","debug","connectOptions","getApplication","getConfiguration","getSourceAt","host","port","client","createClient","connect","then","catch","error","message","warn","JSON","stringify","Promise","reject","finally","isOpen","disconnect","errDisconnect","incrementScriptSha","postInit","resolve","init","err","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                    TraceUtils.debug('RedisClientStore: Creating new client for sending script command');\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                            TraceUtils.debug('RedisClientStore: Closing client of sending script command');\n                            client.disconnect().catch((errDisconnect) => {\n                                TraceUtils.error(errDisconnect);\n                            });\n                        }\n                    });\n                }\n                if (self.client == null) {\n                    TraceUtils.debug('RedisClientStore: Creating store client for sending commands');\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                }\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                TraceUtils.debug('RedisClientStore: Opening redis store client for sending commands');\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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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@universis/janitor",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "Universis api plugin for rate limiting requests",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -31,7 +31,7 @@
   "dependencies": {
     "express-rate-limit": "^7.1.1",
     "express-slow-down": "^1.6.0",
-    "rate-limit-redis": "^4.1.2",
+    "rate-limit-redis": "^4.2.0",
     "redis": "^4.6.10"
   },
   "peerDependencies": {

package/src/RedisClientStore.js

@@ -1,9 +1,10 @@
 import { TraceUtils } from '@themost/common';
 import RedisStore from 'rate-limit-redis';
 import { createClient } from 'redis';
+import '@themost/promise-sequence';
 
-const superLoadIncrementScript = RedisStore.prototype.loadIncrementScript;
-const superLoadGetScript = RedisStore.prototype.loadGetScript;
+let superLoadIncrementScript;
+let superLoadGetScript;
 
 function noLoadGetScript() {
     //
@@ -13,11 +14,15 @@ function noLoadIncrementScript() {
     //
 }
 
-if (superLoadIncrementScript != noLoadIncrementScript) {
+if (RedisStore.prototype.loadIncrementScript.name === 'loadIncrementScript') {
+    // get super method for future use
+    superLoadIncrementScript = RedisStore.prototype.loadIncrementScript;
     RedisStore.prototype.loadIncrementScript = noLoadIncrementScript;
 }
 
-if (superLoadGetScript != noLoadGetScript) {
+if (RedisStore.prototype.loadGetScript.name === 'loadGetScript') {
+    // get super method
+    superLoadGetScript = RedisStore.prototype.loadGetScript;
     RedisStore.prototype.loadGetScript = noLoadGetScript;
 }
 
@@ -52,7 +57,9 @@ class RedisClientStore extends RedisStore {
                     return client.connect().then(() => {
                         return client.sendCommand(args);
                     }).catch((error) => {
-                        TraceUtils.error(error);
+                        if (error instanceof TypeError && error.message === 'Invalid argument type') {
+                            TraceUtils.warn('RedisClientStore: Invalid argument type: ' + JSON.stringify(args));
+                        }
                         return Promise.reject(error);
                     }).finally(() => {
                         if (client.isOpen) {
@@ -72,26 +79,50 @@ class RedisClientStore extends RedisStore {
                     self.client = createClient(connectOptions);
                 }
                 if (self.client.isOpen) {
-                    return self.client.sendCommand(args);
+                    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);
+                    });
                 }
                 TraceUtils.debug('RedisClientStore: Opening redis store client for sending commands');
                 return self.client.connect().then(() => {
                     // send load script commands once
-                    return Promise.all([
-                        superLoadIncrementScript.call(self),
-                        superLoadGetScript.call(self)
-                    ]).then((results) => {
-                        self.incrementScriptSha = results[0];
-                        self.getScriptSha = results[1];
+                    return (() => {
+                        if (self.incrementScriptSha == null) {
+                            return this.postInit();
+                        }
+                        return Promise.resolve();
+                    })().then(() => {
                         // send command 
                         args[1] = self.incrementScriptSha;
-                        return self.client.sendCommand(args);
+                        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);
+                        });
                     });
                 });
             }
         });
-        this.init(options)
-        
+        this.init(options);
+        TraceUtils.debug('RedisClientStore: Starting up and loading increment and get scripts.');
+        void this.postInit().then(() => {
+            TraceUtils.debug('RedisClientStore: Successfully loaded increment and get scripts.');
+        }).catch((err) => {
+            TraceUtils.error('RedisClientStore: Failed to load increment and get scripts.');
+            TraceUtils.error(err);
+        });
+    }
+    async postInit() {
+        const [incrementScriptSha, getScriptSha] = await Promise.sequence([
+            () => superLoadIncrementScript.call(this),
+            () => superLoadGetScript.call(this)
+        ]);
+        this.incrementScriptSha = incrementScriptSha;
+        this.getScriptSha = getScriptSha;
     }
 
 }