@universis/janitor 1.4.1 → 1.6.0

package/README.md

@@ -295,3 +295,51 @@ app.use('/api', passport.authenticate('bearer', {session: false}), validateScope
 ```
 
 A `403 - Access denied due to authorization scopes` error will be thrown if the user does not have access to the resource.
+
+## RemoteAddressValidator
+
+`RemoteAddressValidator` is a configurable application service for validating access to service endpoints based on remote address provided by OAuth2 token.
+
+Register service under application services:
+
+```json
+{
+    "services": [
+        {
+            "serviceType": "@universis/janitor#RemoteAddressValidator"
+        }
+    ]
+}
+```
+
+`RemoteAddressValidator` validates the remote address of the request with the remote address provided by the OAuth2 token. If the addresses do not match, a `403 - Access denied due to remote address` error will be thrown. Token remote address is provided by the `remoteAddress` claim in the token payload. It can be configured in the OAuth2 server configuration and may have a different name. This name may be configured in the `settings/universis/janitor/remoteAddress` configuration e.g.
+
+```json
+{
+    "settings": {
+        "universis": {
+            "janitor": {
+                "remoteAddress": {
+                    "claim": "ipAddress"
+                }
+            }
+        }
+    }
+}
+```
+
+where `claim` is the name of the remote address claim in the token payload.
+
+**Important Note**: If api server is served by a proxy, the remote address may be different from the client address. In this case, the proxy should be configured to forward the client address to the server. This scenario should be configured in application settings under `settings/universis/api/` section e.g.
+
+```json
+{
+    "settings": {
+        "universis": {
+            "api": {
+                "proxyAddressForwarding": true
+            }
+        }
+    }
+}
+``` 

package/dist/OAuth2ClientService.d.ts

@@ -0,0 +1,98 @@
+import { ApplicationService, ApplicationBase } from '@themost/common';
+import { DataContext } from '@themost/data';
+
+export declare interface OAuth2MethodOptions {
+    access_token: string;
+}
+
+export declare interface OAuth2AuthorizeUser {
+    client_id?: string;
+    client_secret?: string;
+    username: string;
+    password: string;
+    grant_type: string;
+    scope?: string;
+}
+
+export declare interface OAuth2ServiceSettings {
+    unattendedExecutionAccount?: string;
+    client_id: string;
+    client_secret?: string;
+    server_uri: string;
+    userinfo_uri?: string;
+    introspect_uri?: string;
+    admin_uri?: string;
+    well_known_configuration_uri?: string;
+    adminAccount: {
+        username: string;
+        password: string;
+        client_id: string;
+        client_secret?: string;
+        scope?: string;
+    }
+}
+
+export declare interface OAuth2UserProfile {
+    sub: string;
+    name: string;
+    preferred_username: string;
+    given_name: string;
+    family_name: string;
+    email: string;
+}
+
+export declare interface GenericUser {
+     id?: any; 
+     additionalType?: string; 
+     alternateName?: string; 
+     description?: string; 
+     givenName?: string; 
+     familyName?: string; 
+     image?: string; 
+     name?: string; 
+     url?: string; 
+     dateCreated?: Date; 
+     dateModified?: Date; 
+     createdBy?: any; 
+     modifiedBy?: any; 
+     lockoutTime?: Date; 
+     logonCount?: number; 
+     enabled?: boolean; 
+     lastLogon?: Date; 
+     userCredentials?: {
+         userPassword?: string;
+         userActivated?: boolean;
+         temporary?: boolean;
+     }
+}
+
+export declare interface OAuth2User {
+    id?: any; 
+    username?: string; 
+    email?: string; 
+    enabled?: boolean;
+    emailVerified?: boolean;
+    firstName?: string; 
+    lastName?: string; 
+    credentials?: {
+        algorithm?: string,
+        temporary?: boolean,
+        type?: string,
+        value?: string
+    }
+}
+
+export declare class OAuth2ClientService extends ApplicationService {
+    get settings(): OAuth2ServiceSettings;
+    constructor(app: ApplicationBase)
+    getUserInfo(context: DataContext, token: string): Promise<OAuth2UserProfile>;
+    getTokenInfo(context: DataContext, token: string): Promise<any>;
+    getContextTokenInfo(context: DataContext): Promise<any>;
+    authorize(authorizeUser: OAuth2AuthorizeUser): Promise<{ access_token?: string, refresh_token?: string}>;
+    getUser(username: string, options: OAuth2MethodOptions): Promise<any>;
+    getUserById(user_id: any, options: OAuth2MethodOptions): Promise<any>;
+    getUserByEmail(email: string, options: OAuth2MethodOptions): Promise<any>;
+    updateUser(user: GenericUser | any, options: OAuth2MethodOptions): Promise<any>;
+    createUser(user: GenericUser | any, options: OAuth2MethodOptions): Promise<any>;
+    deleteUser(user: { id: any }, options: OAuth2MethodOptions): Promise<any>; 
+}

package/dist/OAuth2ClientService.js

@@ -0,0 +1,251 @@
+"use strict";Object.defineProperty(exports, "__esModule", { value: true });exports.OAuth2ClientService = void 0;var _superagent = require("superagent");
+var _url = require("url");
+var _common = require("@themost/common");
+
+function responseHander(resolve, reject) {
+  return function (err, response) {
+    if (err) {
+      /**
+       * @type {import('superagent').Response}
+       */
+      const response = err.response;
+      if (response && response.headers['content-type'] === 'application/json') {
+        // get body
+        const clientError = response.body;
+        const error = new _common.HttpError(response.status);
+        return reject(Object.assign(error, {
+          clientError
+        }));
+      }
+      return reject(err);
+    }
+    if (response.status === 204 && response.headers['content-type'] === 'application/json') {
+      return resolve(null);
+    }
+    return resolve(response.body);
+  };
+}
+
+/**
+ * @class
+ */
+class OAuth2ClientService extends _common.ApplicationService {
+  /**
+   * @param {import('@themost/express').ExpressDataApplication} app
+   */
+  constructor(app) {
+    super(app);
+    /**
+     * @name OAuth2ClientService#settings
+     * @type {{server_uri:string,token_uri?:string}}
+     */
+    Object.defineProperty(this, 'settings', {
+      writable: false,
+      value: app.getConfiguration().getSourceAt('settings/auth'),
+      enumerable: false,
+      configurable: false
+    });
+  }
+
+  /**
+   * Gets keycloak server root
+   * @returns {string}
+   */
+  getServer() {
+    return this.settings.server_uri;
+  }
+
+  /**
+   * Gets keycloak server root
+   * @returns {string}
+   */
+  getAdminRoot() {
+    return this.settings.admin_uri;
+  }
+
+  // noinspection JSUnusedGlobalSymbols
+  /**
+   * Gets user's profile by calling OAuth2 server profile endpoint
+   * @param {ExpressDataContext} context
+   * @param {string} token
+   */
+  getUserInfo(token) {
+    return new Promise((resolve, reject) => {
+      const userinfo_uri = this.settings.userinfo_uri ? new _url.URL(this.settings.userinfo_uri, this.getServer()) : new _url.URL('me', this.getServer());
+      return new _superagent.Request('GET', userinfo_uri).
+      set({
+        'Authorization': `Bearer ${token}`,
+        'Accept': 'application/json'
+      }).
+      query({
+        'access_token': token
+      }).end(responseHander(resolve, reject));
+    });
+  }
+
+  // noinspection JSUnusedGlobalSymbols
+  /**
+   * Gets the token info of the current context
+   * @param {ExpressDataContext} context
+   */
+  getContextTokenInfo(context) {
+    if (context.user == null) {
+      return Promise.reject(new Error('Context user may not be null'));
+    }
+    if (context.user.authenticationType !== 'Bearer') {
+      return Promise.reject(new Error('Invalid context authentication type'));
+    }
+    if (context.user.authenticationToken == null) {
+      return Promise.reject(new Error('Context authentication data may not be null'));
+    }
+    return this.getTokenInfo(context, context.user.authenticationToken);
+  }
+  /**
+   * Gets token info by calling OAuth2 server endpoint
+   * @param {ExpressDataContext} _context
+   * @param {string} token
+   */
+  getTokenInfo(_context, token) {
+    return new Promise((resolve, reject) => {
+      const introspection_uri = this.settings.introspection_uri ? new _url.URL(this.settings.introspection_uri, this.getServer()) : new _url.URL('tokeninfo', this.getServer());
+      return new _superagent.Request('POST', introspection_uri).
+      auth(this.settings.client_id, this.settings.client_secret).
+      set('Accept', 'application/json').
+      type('form').
+      send({
+        'token_type_hint': 'access_token',
+        'token': token
+      }).end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * @param {AuthorizeUser} authorizeUser
+   */
+  authorize(authorizeUser) {
+    const tokenURL = this.settings.token_uri ? new _url.URL(this.settings.token_uri) : new _url.URL('authorize', this.getServer());
+    return new Promise((resolve, reject) => {
+      return new _superagent.Request('POST', tokenURL).
+      type('form').
+      send(authorizeUser).end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * Gets a user by name
+   * @param {*} user_id 
+   * @param {AdminMethodOptions} options 
+   */
+  getUserById(user_id, options) {
+    return new Promise((resolve, reject) => {
+      return new _superagent.Request('GET', new _url.URL(`users/${user_id}`, this.getAdminRoot())).
+      set('Authorization', `Bearer ${options.access_token}`).
+      end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * Gets a user by name
+   * @param {string} username 
+   * @param {AdminMethodOptions} options 
+   */
+  getUser(username, options) {
+    return new Promise((resolve, reject) => {
+      return new _superagent.Request('GET', new _url.URL('users', this.getAdminRoot())).
+      set('Authorization', `Bearer ${options.access_token}`).
+      query({
+        '$filter': `name eq '${username}'`
+      }).
+      end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * Gets a user by email address
+   * @param {string} email 
+   * @param {AdminMethodOptions} options 
+   */
+  getUserByEmail(email, options) {
+    return new Promise((resolve, reject) => {
+      return new _superagent.Request('GET', new _url.URL('users', this.getAdminRoot())).
+      set('Authorization', `Bearer ${options.access_token}`).
+      query({
+        '$filter': `alternateName eq '${email}'`
+      }).
+      end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * Updates an existing user
+   * @param {*} user 
+   * @param {AdminMethodOptions} options 
+   */
+  updateUser(user, options) {
+    return new Promise((resolve, reject) => {
+      if (user.id == null) {
+        return reject(new _common.DataError('E_IDENTIFIER', 'User may not be empty at this context.', null, 'User', 'id'));
+      }
+      const request = new _superagent.Request('PUT', new _url.URL(`users/${user.id}`, this.getAdminRoot()));
+      return request.set('Authorization', `Bearer ${options.access_token}`).
+      set('Content-Type', 'application/json').
+      send(user).
+      end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * Creates a new user
+   * @param {*} user 
+   * @param {AdminMethodOptions} options 
+   */
+  createUser(user, options) {
+    return new Promise((resolve, reject) => {
+      const request = new _superagent.Request('POST', new _url.URL('users', this.getAdminRoot()));
+      return request.set('Authorization', `Bearer ${options.access_token}`).
+      set('Content-Type', 'application/json').
+      send(Object.assign({}, user, {
+        $state: 1 // for create
+      })).
+      end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * Deletes a user
+   * @param {{id: any}} user 
+   * @param {AdminMethodOptions} options 
+   */
+  deleteUser(user, options) {
+    return new Promise((resolve, reject) => {
+      if (user.id == null) {
+        return reject(new _common.DataError('E_IDENTIFIER', 'User may not be empty at this context.', null, 'User', 'id'));
+      }
+      const request = new _superagent.Request('DELETE', new _url.URL(`users/${user.id}`, this.getAdminRoot()));
+      return request.set('Authorization', `Bearer ${options.access_token}`).
+      end(responseHander(resolve, reject));
+    });
+  }
+
+  /**
+   * @param {boolean=} force 
+   * @returns {*}
+   */
+  getWellKnownConfiguration(force) {
+    if (force) {
+      this.well_known_configuration = null;
+    }
+    if (this.well_known_configuration) {
+      return Promise.resolve(this.well_known_configuration);
+    }
+    return new Promise((resolve, reject) => {
+      const well_known_configuration_uri = this.settings.well_known_configuration_uri ? new _url.URL(this.settings.well_known_configuration_uri, this.getServer()) : new _url.URL('.well-known/openid-configuration', this.getServer());
+      return new _superagent.Request('GET', well_known_configuration_uri).
+      end(responseHander(resolve, reject));
+    }).then((configuration) => {
+      this.well_known_configuration = configuration;
+      return configuration;
+    });
+  }
+}exports.OAuth2ClientService = OAuth2ClientService;
+//# sourceMappingURL=OAuth2ClientService.js.map

package/dist/OAuth2ClientService.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"OAuth2ClientService.js","names":["_superagent","require","_url","_common","responseHander","resolve","reject","err","response","headers","clientError","body","error","HttpError","status","Object","assign","OAuth2ClientService","ApplicationService","constructor","app","defineProperty","writable","value","getConfiguration","getSourceAt","enumerable","configurable","getServer","settings","server_uri","getAdminRoot","admin_uri","getUserInfo","token","Promise","userinfo_uri","URL","Request","set","query","end","getContextTokenInfo","context","user","Error","authenticationType","authenticationToken","getTokenInfo","_context","introspection_uri","auth","client_id","client_secret","type","send","authorize","authorizeUser","tokenURL","token_uri","getUserById","user_id","options","access_token","getUser","username","getUserByEmail","email","updateUser","id","DataError","request","createUser","$state","deleteUser","getWellKnownConfiguration","force","well_known_configuration","well_known_configuration_uri","then","configuration","exports"],"sources":["../src/OAuth2ClientService.js"],"sourcesContent":["import {Request} from 'superagent'\nimport {URL} from 'url';\nimport {ApplicationService, DataError, HttpError} from '@themost/common';\n\nfunction responseHander(resolve, reject) {\n    return function (err, response) {\n        if (err) {\n            /**\n             * @type {import('superagent').Response}\n             */\n            const response = err.response\n            if (response && response.headers['content-type'] === 'application/json') {\n                // get body\n                const clientError = response.body;\n                const error = new HttpError(response.status);\n                return reject(Object.assign(error, {\n                    clientError\n                }));\n            }\n            return reject(err);\n        }\n        if (response.status === 204 && response.headers['content-type'] === 'application/json') {\n            return resolve(null);\n        }\n        return resolve(response.body);\n    };\n}\n\n/**\n * @class\n */\nclass OAuth2ClientService extends ApplicationService {\n    /**\n     * @param {import('@themost/express').ExpressDataApplication} app\n     */\n    constructor(app) {\n        super(app);\n        /**\n         * @name OAuth2ClientService#settings\n         * @type {{server_uri:string,token_uri?:string}}\n         */\n         Object.defineProperty(this, 'settings', {\n            writable: false,\n            value: app.getConfiguration().getSourceAt('settings/auth'),\n            enumerable: false,\n            configurable: false\n        });\n    }\n\n    /**\n     * Gets keycloak server root\n     * @returns {string}\n     */\n     getServer() {\n        return this.settings.server_uri;\n    }\n\n    /**\n     * Gets keycloak server root\n     * @returns {string}\n     */\n     getAdminRoot() {\n        return this.settings.admin_uri;\n    }\n\n    // noinspection JSUnusedGlobalSymbols\n    /**\n     * Gets user's profile by calling OAuth2 server profile endpoint\n     * @param {ExpressDataContext} context\n     * @param {string} token\n     */\n    getUserInfo(token) {\n        return new Promise((resolve, reject) => {\n            const userinfo_uri = this.settings.userinfo_uri ? new URL(this.settings.userinfo_uri, this.getServer()) : new URL('me', this.getServer());\n            return new Request('GET', userinfo_uri)\n                .set({\n                    'Authorization': `Bearer ${token}`,\n                    'Accept': 'application/json'\n                })\n                .query({\n                    'access_token':token\n                }).end(responseHander(resolve, reject));\n        });\n    }\n\n    // noinspection JSUnusedGlobalSymbols\n    /**\n     * Gets the token info of the current context\n     * @param {ExpressDataContext} context\n     */\n    getContextTokenInfo(context) {\n        if (context.user == null) {\n            return Promise.reject(new Error('Context user may not be null'));\n        }\n        if (context.user.authenticationType !== 'Bearer') {\n            return Promise.reject(new Error('Invalid context authentication type'));\n        }\n        if (context.user.authenticationToken == null) {\n            return Promise.reject(new Error('Context authentication data may not be null'));\n        }\n        return this.getTokenInfo(context, context.user.authenticationToken);\n    }\n    /**\n     * Gets token info by calling OAuth2 server endpoint\n     * @param {ExpressDataContext} _context\n     * @param {string} token\n     */\n    getTokenInfo(_context, token) {\n        return new Promise((resolve, reject) => {\n            const introspection_uri = this.settings.introspection_uri ? new URL(this.settings.introspection_uri, this.getServer()) : new URL('tokeninfo', this.getServer());\n            return new Request('POST', introspection_uri)\n                .auth(this.settings.client_id, this.settings.client_secret)\n                .set('Accept', 'application/json')\n                .type('form')\n                .send({\n                    'token_type_hint': 'access_token',\n                    'token': token,\n                }).end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * @param {AuthorizeUser} authorizeUser\n     */\n     authorize(authorizeUser) {\n        const tokenURL = this.settings.token_uri ? new URL(this.settings.token_uri) : new URL('authorize', this.getServer());\n        return new Promise((resolve, reject)=> {\n            return new Request('POST', tokenURL)\n                .type('form')\n                .send(authorizeUser).end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * Gets a user by name\n     * @param {*} user_id \n     * @param {AdminMethodOptions} options \n     */\n     getUserById(user_id, options) {\n        return new Promise((resolve, reject) => {\n            return new Request('GET', new URL(`users/${user_id}`, this.getAdminRoot()))\n                .set('Authorization', `Bearer ${options.access_token}`)\n                .end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * Gets a user by name\n     * @param {string} username \n     * @param {AdminMethodOptions} options \n     */\n    getUser(username, options) {\n        return new Promise((resolve, reject)=> {\n            return new Request('GET', new URL('users', this.getAdminRoot()))\n                .set('Authorization', `Bearer ${options.access_token}`)\n                .query({\n                    '$filter': `name eq '${username}'`\n                })\n                .end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * Gets a user by email address\n     * @param {string} email \n     * @param {AdminMethodOptions} options \n     */\n     getUserByEmail(email, options) {\n        return new Promise((resolve, reject)=> {\n            return new Request('GET', new URL('users', this.getAdminRoot()))\n                .set('Authorization', `Bearer ${options.access_token}`)\n                .query({\n                    '$filter': `alternateName eq '${email}'`\n                })\n                .end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * Updates an existing user\n     * @param {*} user \n     * @param {AdminMethodOptions} options \n     */\n     updateUser(user, options) {\n        return new Promise((resolve, reject)=> {\n            if (user.id == null) {\n                return reject(new DataError('E_IDENTIFIER', 'User may not be empty at this context.', null, 'User', 'id'));\n            }\n            const request = new Request('PUT', new URL(`users/${user.id}`, this.getAdminRoot()));\n            return request.set('Authorization', `Bearer ${options.access_token}`)\n                .set('Content-Type', 'application/json')\n                .send(user)\n                .end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * Creates a new user\n     * @param {*} user \n     * @param {AdminMethodOptions} options \n     */\n     createUser(user, options) {\n        return new Promise((resolve, reject)=> {\n            const request = new Request('POST', new URL('users', this.getAdminRoot()));\n            return request.set('Authorization', `Bearer ${options.access_token}`)\n                .set('Content-Type', 'application/json')\n                .send(Object.assign({}, user, {\n                    $state: 1 // for create\n                }))\n                .end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * Deletes a user\n     * @param {{id: any}} user \n     * @param {AdminMethodOptions} options \n     */\n     deleteUser(user, options) {\n        return new Promise((resolve, reject)=> {\n            if (user.id == null) {\n                return reject(new DataError('E_IDENTIFIER', 'User may not be empty at this context.', null, 'User', 'id'));\n            }\n            const request = new Request('DELETE', new URL(`users/${user.id}`, this.getAdminRoot()));\n            return request.set('Authorization', `Bearer ${options.access_token}`)\n                .end(responseHander(resolve, reject));\n        });\n    }\n\n    /**\n     * @param {boolean=} force \n     * @returns {*}\n     */\n    getWellKnownConfiguration(force) {\n        if (force) {\n            this.well_known_configuration = null;\n        }\n        if (this.well_known_configuration) {\n            return Promise.resolve(this.well_known_configuration);\n        }\n        return new Promise((resolve, reject) => {\n            const well_known_configuration_uri = this.settings.well_known_configuration_uri ? new URL(this.settings.well_known_configuration_uri, this.getServer()) : new URL('.well-known/openid-configuration', this.getServer());\n            return new Request('GET', well_known_configuration_uri)\n                .end(responseHander(resolve, reject));\n        }).then((configuration) => {\n            this.well_known_configuration = configuration;\n            return configuration;\n        });\n    }\n}\n\nexport {\n    OAuth2ClientService\n}\n\n"],"mappings":"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"}

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/dist/RemoteAddressValidator.d.ts

@@ -0,0 +1,10 @@
+import { ApplicationService } from '@themost/common';
+import { Request } from 'express';
+
+export declare class RemoteAddressValidator extends ApplicationService {
+    
+    constructor(app: ApplicationService);
+    validateRemoteAddress(request: Request): Promise<boolean>;
+    getRemoteAddress(request: Request): string;
+
+}