@mimik/configuration 5.0.4 → 5.0.6

package/README.md

@@ -132,6 +132,12 @@ When `on` is used for `TOPIC_SET` the following environment variables are used f
 | SNS_AWS_SECRET_ACCESS_KEY | secret access key for AWS SNS |  |
 | SNS_AWS_REGION | region where the topic is | ----noRegion---- |
 
+When a database is involved
+| Env variable name | Description | Default | Comments |
+| DATABASE_CONNECTION_TIMEOUT | the time to connect to the database before error is generated | 30 | in seconds
+| DATABASE_VALIDATION_CHECK | the delay before checking for connection | 1000 | in ms
+| DATABASE_RECONNECTION_OFFSET | offset for the time to reconnect to the database before error is generated | 5 | in seconds
+
 When `mongodb` is used the following environment variables are used for the configuration:
 
 | Env variable name | Description | Default | Comments |
@@ -140,8 +146,6 @@ When `mongodb` is used the following environment variables are used for the conf
 | DATABASE_IP | ip address of the database | localhost |
 | DATABASE_USER | user to access the database | null | if missing no user/password will be used
 | DATABASE_PASSWORD | password to access the database | null | if missing no user/password will be used
-| DATABASE_CONNECTION_TIMEOUT | the time to connect to the database before error is generated | 30 | in seconds
-| DATABASE_RECONNECTION_OFFSET | offset for the time to reconnect to the database before error is generated | 5 | in seconds
 | MONGO_USE_SRV | to use srv connection url set to `yes` | `no` |
 | MONGO_AUTH_DATABASE | the auth database where users exists | |
 | MONGO_MAX_POOL_SIZE | the minimum number of connections in the connection pool | 5 |
@@ -195,9 +199,12 @@ When `redis` is used the following environement variables are used for the confi
 
 | Env variable name | Description | Default | Comments |
 | ----------------- | ----------- | ------- | -------- |
-| CACHE_IP | domain of the redis server to use | localhost:6379 |
-| CACHE_PASSWORD | password if the redis service is protected (requirepass in redis.conf) | null |
-| CACHE_CONNECTION_TIMEOUT | time the server will wait at start to connect to the cache | 20 | in seconds
+| CACHE_IP | domain of the redis server to use with port | localhost:6379 |
+| CACHE_USER | redis user if the redis service is auth protected | null |
+| CACHE_PASSWORD | redis password for the user if the redis service is auth protected | null |
+| CACHE_CONNECTION_TIMEOUT | time the server will wait at start to connect to the cache | 30 | in seconds
+| CACHE_VALIDATION_CHECK | the delay before checking for connection | 1000 | in ms
+| CACHE_RECONNECTION_OFFSET | offset for the time to reconnect to the database before error is generated | 5 | in seconds
 | CACHE_REQUEST_TTL | request time to live in cache | 10 | in seconds
 | CACHE_API_ID_TTL | API request time to live for main resource | 20 | in seconds
 | CACHE_API_OPTION_TTL | API request time to live for option | 5 | in seconds
@@ -205,8 +212,8 @@ When `redis` is used the following environement variables are used for the confi
 | REDIS_RECONNECT_INTERVAL | time to wait before retry | 500 | in milliseconds
 | REDIS_REQUEST_MAX_MEMORY | maximum memory size of the request cache | 10 | in megabytes
 | REDIS_REQUEST_MAX_MEMORY_POLICY | eviction policy of the request cache | allkeys-lru |
-| REDIS_SOCKET_KEEPALIVE | keep alive for long running connections | yes |
-| REDIS_ENABLE_OFFLINE_QUEUE | queuing event when not connected | yes |
+| REDIS_SOCKET_KEEPALIVE | keep long running connections alive for x seconds | 5000 | in seconds
+| REDIS_DISABLE_OFFLINE_QUEUE | queuing event when not connected | no |
 
 **Requires**: <code>module:@mimik/sumologic-winston-logger</code>  
 

package/index.js

@@ -35,8 +35,9 @@ const {
   DEFAULT_CLOUD_PROVIDER,
   DEFAULT_CUSTOMER_CODE,
   DEFAULT_CACHE_IP,
-  DEFAULT_CACHE_PASSWORD,
   DEFAULT_CACHE_CONNECTION_TIMEOUT,
+  DEFAULT_CACHE_RECONNECTION_OFFSET,
+  DEFAULT_CACHE_VALIDATION_CHECK,
   DEFAULT_CACHE_REQUEST_TTL,
   DEFAULT_CACHE_API_ID_TTL,
   DEFAULT_CACHE_API_OPTION_TTL,
@@ -45,7 +46,7 @@ const {
   DEFAULT_REDIS_REQUEST_MAX_MEMORY,
   DEFAULT_REDIS_REQUEST_MAX_MEMORY_POLICY,
   DEFAULT_REDIS_SOCKET_KEEPALIVE,
-  DEFAULT_REDIS_ENABLE_OFFLINE_QUEUE,
+  DEFAULT_REDIS_DISABLE_OFFLINE_QUEUE,
   DEFAULT_AWS_REGION,
   DEFAULT_AWS_LOCAL_PROPERTIES,
   DEFAULT_DYNAMODB_LOCAL_URL,
@@ -66,6 +67,7 @@ const {
   DEFAULT_DATABASE_PASSWORD,
   DEFAULT_DATABASE_CONNECTION_TIMEOUT,
   DEFAULT_DATABASE_RECONNECTION_OFFSET,
+  DEFAULT_DATABASE_VALIDATION_CHECK,
   DEFAULT_ENCRYPTION_SET,
   DEFAULT_KMS_PROVIDER,
   DEFAULT_LOG_LEVEL,
@@ -101,35 +103,42 @@ const isMSTSet = process.env.MST_SET !== SET_OFF;
 
 const setupRedis = () => {
   const domain = process.env.CACHE_IP || DEFAULT_CACHE_IP;
-  const password = process.env.CACHE_PASSWORD || DEFAULT_CACHE_PASSWORD;
+  const username = process.env.CACHE_USER;
+  const password = process.env.CACHE_PASSWORD;
   const reconnectTries = parseInt(process.env.REDIS_RECONNECT_TRIES, 10) || DEFAULT_REDIS_RECONNECT_TRIES;
   const reconnectInterval = parseInt(process.env.REDIS_RECONNECT_INTERVAL, 10) || DEFAULT_REDIS_RECONNECT_INTERVAL;
-  let url = `${REDIS_BASE_URL}${domain}`;
+  let url = REDIS_BASE_URL;
+  if (username && password) url += `${username}:${password}@`;
+  url += domain;
 
-  if (password) url = `${url}?password=${password}`;
   return {
     domain,
+    username,
     password,
     connectTimeout: parseInt(process.env.CACHE_CONNECTION_TIMEOUT, 10) || DEFAULT_CACHE_CONNECTION_TIMEOUT,
+    validationCheck: parseInt(process.env.CACHE_VALIDATION_CHECK, 10) || DEFAULT_CACHE_VALIDATION_CHECK,
+    reconnectOffset: parseInt(process.env.CACHE_RECONNECTION_OFFSET, 10) || DEFAULT_CACHE_RECONNECTION_OFFSET,
     url,
     options: {
-      maxMemory: process.env.REDIS_REQUEST_MAX_MEMORY || DEFAULT_REDIS_REQUEST_MAX_MEMORY,
-      maxMemoryPolicy: process.env.REDIS_REQUEST_MAX_MEMORY_POLICY || DEFAULT_REDIS_REQUEST_MAX_MEMORY_POLICY,
-      socket_keepalive: process.env.REDIS_SOCKET_KEEPALIVE || DEFAULT_REDIS_SOCKET_KEEPALIVE,
-      enable_offline_queue: process.env.REDIS_ENABLE_OFFLINE_QUEUE || DEFAULT_REDIS_ENABLE_OFFLINE_QUEUE,
-      retry_strategy: function retryStrategy(opts) {
-        if (opts.timesConnected > 0 && opts.attempt < reconnectTries) {
-          return reconnectInterval;
-        }
-        if (opts.error && opts.error.code === 'ECONNREFUSED') {
-          if (display) {
-            logger.error('Fatal error: Could not connect to cache', { type: 'redis', error: opts.error.code }, `redis-cache-start@0/${new Date().toISOString()}`);
-            logger.flushAndExit(1);
+      socket: {
+        keepAlive: process.env.REDIS_SOCKET_KEEPALIVE || DEFAULT_REDIS_SOCKET_KEEPALIVE,
+        reconnectStrategy: function retryStrategy(opts) {
+          if (opts.timesConnected > 0 && opts.attempt < reconnectTries) {
+            return reconnectInterval;
           }
-          display = false;
-        }
-        return undefined;
+          if (opts.error && opts.error.code === 'ECONNREFUSED') {
+            if (display) {
+              logger.error('Fatal error: Could not connect to cache', { type: 'redis', error: opts.error.code }, `redis-cache-start@0/${new Date().toISOString()}`);
+              logger.flushAndExit(1);
+            }
+            display = false;
+          }
+          return undefined;
+        },
+        disableOfflineQueue: (process.env.REDIS_DISABLE_OFFLINE_QUEUE === 'yes') || DEFAULT_REDIS_DISABLE_OFFLINE_QUEUE,
       },
+      maxMemory: process.env.REDIS_REQUEST_MAX_MEMORY || DEFAULT_REDIS_REQUEST_MAX_MEMORY,
+      maxMemoryPolicy: process.env.REDIS_REQUEST_MAX_MEMORY_POLICY || DEFAULT_REDIS_REQUEST_MAX_MEMORY_POLICY,
     },
     retryStrategyOptions: {
       reconnectTries,
@@ -147,6 +156,9 @@ const setupRedis = () => {
 
 const setupDynamo = (dbOpts) => {
   const dbConfig = {
+    connectTimeout: parseInt(process.env.DATABASE_CONNECTION_TIMEOUT, 10) || DEFAULT_DATABASE_CONNECTION_TIMEOUT,
+    validationCheck: parseInt(process.env.DATABASE_VALIDATION_CHECK, 10) || DEFAULT_DATABASE_VALIDATION_CHECK,
+    reconnectOffset: parseInt(process.env.DATABASE_RECONNECTION_OFFSET, 10) || DEFAULT_DATABASE_RECONNECTION_OFFSET,
     region: process.env.DYNAMODB_AWS_REGION || DEFAULT_AWS_REGION,
     url: process.env.DYNAMODB_LOCAL_URL || DEFAULT_DYNAMODB_LOCAL_URL,
     throughput: {
@@ -215,6 +227,7 @@ const setupMongo = (dbOpts) => {
     user,
     password,
     connectTimeout: parseInt(process.env.DATABASE_CONNECTION_TIMEOUT, 10) || DEFAULT_DATABASE_CONNECTION_TIMEOUT,
+    validationCheck: parseInt(process.env.DATABASE_VALIDATION_CHECK, 10) || DEFAULT_DATABASE_VALIDATION_CHECK,
     reconnectOffset: parseInt(process.env.DATABASE_RECONNECTION_OFFSET, 10) || DEFAULT_DATABASE_RECONNECTION_OFFSET,
     replicat: !!process.env.MONGO_REPLICAT_SET,
     stringOptions: qs,
@@ -566,6 +579,12 @@ configuration.locationProvider = setupLocationProvider();
  * | SNS_AWS_SECRET_ACCESS_KEY | secret access key for AWS SNS |  |
  * | SNS_AWS_REGION | region where the topic is | ----noRegion---- |
  *
+ * When a database is involved
+ * | Env variable name | Description | Default | Comments |
+ * | DATABASE_CONNECTION_TIMEOUT | the time to connect to the database before error is generated | 30 | in seconds
+ * | DATABASE_VALIDATION_CHECK | the delay before checking for connection | 1000 | in ms
+ * | DATABASE_RECONNECTION_OFFSET | offset for the time to reconnect to the database before error is generated | 5 | in seconds
+ *
  * When `mongodb` is used the following environment variables are used for the configuration:
  *
  * | Env variable name | Description | Default | Comments |
@@ -574,8 +593,6 @@ configuration.locationProvider = setupLocationProvider();
  * | DATABASE_IP | ip address of the database | localhost |
  * | DATABASE_USER | user to access the database | null | if missing no user/password will be used
  * | DATABASE_PASSWORD | password to access the database | null | if missing no user/password will be used
- * | DATABASE_CONNECTION_TIMEOUT | the time to connect to the database before error is generated | 30 | in seconds
- * | DATABASE_RECONNECTION_OFFSET | offset for the time to reconnect to the database before error is generated | 5 | in seconds
  * | MONGO_USE_SRV | to use srv connection url set to `yes` | `no` |
  * | MONGO_AUTH_DATABASE | the auth database where users exists | |
  * | MONGO_MAX_POOL_SIZE | the minimum number of connections in the connection pool | 5 |
@@ -629,9 +646,12 @@ configuration.locationProvider = setupLocationProvider();
  *
  * | Env variable name | Description | Default | Comments |
  * | ----------------- | ----------- | ------- | -------- |
- * | CACHE_IP | domain of the redis server to use | localhost:6379 |
- * | CACHE_PASSWORD | password if the redis service is protected (requirepass in redis.conf) | null |
- * | CACHE_CONNECTION_TIMEOUT | time the server will wait at start to connect to the cache | 20 | in seconds
+ * | CACHE_IP | domain of the redis server to use with port | localhost:6379 |
+ * | CACHE_USER | redis user if the redis service is auth protected | null |
+ * | CACHE_PASSWORD | redis password for the user if the redis service is auth protected | null |
+ * | CACHE_CONNECTION_TIMEOUT | time the server will wait at start to connect to the cache | 30 | in seconds
+ * | CACHE_VALIDATION_CHECK | the delay before checking for connection | 1000 | in ms
+ * | CACHE_RECONNECTION_OFFSET | offset for the time to reconnect to the database before error is generated | 5 | in seconds
  * | CACHE_REQUEST_TTL | request time to live in cache | 10 | in seconds
  * | CACHE_API_ID_TTL | API request time to live for main resource | 20 | in seconds
  * | CACHE_API_OPTION_TTL | API request time to live for option | 5 | in seconds
@@ -639,8 +659,8 @@ configuration.locationProvider = setupLocationProvider();
  * | REDIS_RECONNECT_INTERVAL | time to wait before retry | 500 | in milliseconds
  * | REDIS_REQUEST_MAX_MEMORY | maximum memory size of the request cache | 10 | in megabytes
  * | REDIS_REQUEST_MAX_MEMORY_POLICY | eviction policy of the request cache | allkeys-lru |
- * | REDIS_SOCKET_KEEPALIVE | keep alive for long running connections | yes |
- * | REDIS_ENABLE_OFFLINE_QUEUE | queuing event when not connected | yes |
+ * | REDIS_SOCKET_KEEPALIVE | keep long running connections alive for x seconds | 5000 | in seconds
+ * | REDIS_DISABLE_OFFLINE_QUEUE | queuing event when not connected | no |
  */
 const setConfig = (pack, options) => {
   process.env.SERVER_VERSION = pack.version;

package/lib/common.js

@@ -21,8 +21,9 @@ const DEFAULT_CLOUD_PROVIDER = 'noCloud';
 const DEFAULT_CUSTOMER_CODE = '';
 
 const DEFAULT_CACHE_IP = 'localhost:6379';
-const DEFAULT_CACHE_PASSWORD = null;
-const DEFAULT_CACHE_CONNECTION_TIMEOUT = 20; // in seconds
+const DEFAULT_CACHE_CONNECTION_TIMEOUT = 30; // in seconds
+const DEFAULT_CACHE_RECONNECTION_OFFSET = 5; // in seconds
+const DEFAULT_CACHE_VALIDATION_CHECK = 1000; // in ms
 const DEFAULT_CACHE_REQUEST_TTL = 10; // in seconds
 const DEFAULT_CACHE_API_ID_TTL = 20; // in seconds
 const DEFAULT_CACHE_API_OPTION_TTL = 5; // in seconds
@@ -31,8 +32,8 @@ const DEFAULT_REDIS_RECONNECT_TRIES = 100;
 const DEFAULT_REDIS_RECONNECT_INTERVAL = 500; // in ms
 const DEFAULT_REDIS_REQUEST_MAX_MEMORY = '10mb';
 const DEFAULT_REDIS_REQUEST_MAX_MEMORY_POLICY = 'allkeys-lru';
-const DEFAULT_REDIS_SOCKET_KEEPALIVE = true;
-const DEFAULT_REDIS_ENABLE_OFFLINE_QUEUE = true;
+const DEFAULT_REDIS_SOCKET_KEEPALIVE = 5000;
+const DEFAULT_REDIS_DISABLE_OFFLINE_QUEUE = false;
 
 const DEFAULT_AWS_REGION = '---noRegion--';
 const DEFAULT_AWS_LOCAL_PROPERTIES = '169.254.169.254'; // to access properties of the instance on AWS
@@ -57,6 +58,7 @@ const DEFAULT_DATABASE_USER = null;
 const DEFAULT_DATABASE_PASSWORD = null;
 const DEFAULT_DATABASE_CONNECTION_TIMEOUT = 30; // in seconds
 const DEFAULT_DATABASE_RECONNECTION_OFFSET = 5; // in seconds
+const DEFAULT_DATABASE_VALIDATION_CHECK = 1000; // in ms
 
 const DEFAULT_ENCRYPTION_SET = SET_OFF;
 const DEFAULT_KMS_PROVIDER = 'local';
@@ -115,8 +117,9 @@ module.exports = {
   DEFAULT_LOCATION_PROVIDER,
   DEFAULT_CLOUD_PROVIDER,
   DEFAULT_CACHE_IP,
-  DEFAULT_CACHE_PASSWORD,
   DEFAULT_CACHE_CONNECTION_TIMEOUT,
+  DEFAULT_CACHE_RECONNECTION_OFFSET,
+  DEFAULT_CACHE_VALIDATION_CHECK,
   DEFAULT_CACHE_REQUEST_TTL,
   DEFAULT_CACHE_API_ID_TTL,
   DEFAULT_CACHE_API_OPTION_TTL,
@@ -125,7 +128,7 @@ module.exports = {
   DEFAULT_REDIS_REQUEST_MAX_MEMORY,
   DEFAULT_REDIS_REQUEST_MAX_MEMORY_POLICY,
   DEFAULT_REDIS_SOCKET_KEEPALIVE,
-  DEFAULT_REDIS_ENABLE_OFFLINE_QUEUE,
+  DEFAULT_REDIS_DISABLE_OFFLINE_QUEUE,
   DEFAULT_AWS_REGION,
   DEFAULT_AWS_LOCAL_PROPERTIES,
   DEFAULT_DYNAMODB_LOCAL_URL,
@@ -146,6 +149,7 @@ module.exports = {
   DEFAULT_DATABASE_PASSWORD,
   DEFAULT_DATABASE_CONNECTION_TIMEOUT,
   DEFAULT_DATABASE_RECONNECTION_OFFSET,
+  DEFAULT_DATABASE_VALIDATION_CHECK,
   DEFAULT_ENCRYPTION_SET,
   DEFAULT_KMS_PROVIDER,
   DEFAULT_LOG_LEVEL,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimik/configuration",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "description": "Common configuration for mimik services",
   "main": "index.js",
   "scripts": {
@@ -30,8 +30,8 @@
     "url": "https://bitbucket.org/mimiktech/configuration"
   },
   "dependencies": {
-    "@mimik/request-helper": "^1.7.8",
-    "@mimik/sumologic-winston-logger": "^1.6.15",
+    "@mimik/request-helper": "^1.7.9",
+    "@mimik/sumologic-winston-logger": "^1.6.19",
     "@mimik/user-filters": "1.3.6",
     "ip": "2.0.0",
     "lodash": "4.17.21",
@@ -40,11 +40,11 @@
   "devDependencies": {
     "@mimik/eslint-plugin-dependencies": "^2.4.5",
     "@mimik/eslint-plugin-document-env": "^1.0.5",
-    "eslint": "8.39.0",
+    "eslint": "8.48.0",
     "eslint-config-airbnb": "19.0.4",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.28.1",
     "eslint-plugin-jsx-a11y": "6.7.1",
-    "eslint-plugin-react": "7.32.2",
+    "eslint-plugin-react": "7.33.2",
     "eslint-plugin-react-hooks": "4.6.0",
     "husky": "8.0.3",
     "jsdoc-to-markdown": "8.0.0"