not-node 4.0.13 → 4.0.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "4.0.13",
+  "version": "4.0.15",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {

package/src/init/rateLimiter.js

@@ -1,5 +1,6 @@
 const emit = require('./additional').run;
 const log = require('not-log')(module, 'RateLimiter');
+const {partCopyObj} = require('../common');
 
 const DEFAULT_OPTIONS = {
   keyPrefix: 'rateLimiterMiddleware',
@@ -7,6 +8,8 @@ const DEFAULT_OPTIONS = {
   duration: 1
 };
 
+const DEFAULT_CLIENT = 'ioredis';
+
 module.exports = class InitRateLimiter{
 
   static createMiddleware({rateLimiter}){
@@ -29,18 +32,20 @@ module.exports = class InitRateLimiter{
   }
 
 
-  getOptions({config}){
+  static getOptions({config}){
+    const opts = partCopyObj(config.get('modules.rateLimiter', {}), Object.keys(DEFAULT_OPTIONS));
     return {
       ...DEFAULT_OPTIONS,
-      ...config.get('modules.rateLimiter', {})
+      ...opts
     };
   }
 
   static createRateLimiter({master, config}){
     const {RateLimiterRedis} = require('rate-limiter-flexible');
+    const storeClient = config.get('modules.rateLimiter.client', DEFAULT_CLIENT);
     return new RateLimiterRedis({
-      storeClient:  master.getEnv('db.redis'),
-      ...this.getOptions({master, config})
+      storeClient:  master.getEnv(`db.${storeClient}`),
+      ...InitRateLimiter.getOptions({master, config})
     });
   }
 };

package/src/init/sessions/redis.js

@@ -1,17 +1,20 @@
 const log = require('not-log')(module, 'not-node//init');
 const ADDS = require('../additional');
 
+const DEFAULT_CLIENT = 'ioredis';
+
 module.exports = class InitSessionsRedis{
   async run({config, options, master}) {
     log.info('Setting up user sessions handler(redis)...');
     await ADDS.run('sessions.pre', {config, options, master});
     const expressSession = require('express-session');
-    const redisClient = master.getEnv('db.redis');
+    const storeClient = config.get('session.client', DEFAULT_CLIENT);
+    const redisClient = master.getEnv(`db.${storeClient}`);
     const redisStore = require('connect-redis')(expressSession);
     master.getServer().use(expressSession({
-      secret:             config.get('session:secret'),
-      key:                config.get('session:key'),
-      cookie:             config.get('session:cookie'),
+      secret:             config.get('session.secret'),
+      key:                config.get('session.key'),
+      cookie:             config.get('session.cookie'),
       resave:             false,
       saveUninitialized:  true,
       store: new redisStore({