@mimik/rediser 1.4.7 → 1.4.10

package/.eslintrc

@@ -11,8 +11,9 @@
   },
   "extends": "airbnb",
   "rules": {
-    "import/no-extraneous-dependencies": ["error", {"devDependencies": true}],
-    "brace-style": [1, "stroustrup", {"allowSingleLine": true}],
+    "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
+    "import/no-unresolved": ["error", { "amd": true, "commonjs": true, "caseSensitiveStrict": true }],
+    "brace-style": [1, "stroustrup", { "allowSingleLine": true }],
     "no-confusing-arrow": [0], // arrow isnt confusing
     "max-len": [1, 180, { "ignoreComments": true }],
     "linebreak-style": 0,
@@ -22,12 +23,11 @@
     "@mimik/document-env/validate-document-env": 2,
     "@mimik/dependencies/case-sensitive": 2,
     "@mimik/dependencies/no-cycles": 2,
-    "@mimik/dependencies/no-unresolved": 2,
     "@mimik/dependencies/require-json-ext": 2
   },
   "settings":{
     "react": {
-      "version": "latest"
+      "version": "detect"
     }
   },
   "globals": {

package/index.js

@@ -8,8 +8,6 @@ const Promise = require('bluebird');
  * const redis = require('@mimik/rediser');
  */
 
-Promise.promisifyAll(redis.RedisClient.prototype);
-
 const type = 'redis';
 const correlationId = `${type}-cache-start@0/${new Date().toISOString()}`;
 
@@ -37,6 +35,28 @@ module.exports = (set, config) => {
       display = false;
       return null;
     }
+    let interval;
+    const disconnectHandler = () => {
+      state = DISCONNECTED;
+      if (!interval) {
+        interval = setInterval(() => {
+          if (state !== CONNECTED) {
+            if (display) {
+              logger.error('fatal error: Timeout in connecting to cache', {
+                type, error: state, timeout: redisSettings.connectTimeout,
+              }, correlationId);
+            }
+            display = false;
+            logger.flushAndExit(1);
+          }
+          else {
+            clearInterval(interval);
+            interval = null;
+          }
+        }, config.redisSettings.connectTimeout * 1000); // convert in seconds
+      }
+    };
+
     if (display) {
       if (isProd(config.nodeEnvironment)) {
         const redisSettingsClone = { ...redisSettings };
@@ -46,21 +66,21 @@ module.exports = (set, config) => {
       }
       else logger.info('creating a cache connection', { type, settings: redisSettings }, correlationId);
     }
-    display = false;
     const client = redis.createClient(redisSettings.url, redisSettings.options);
+    client.connect();
 
     client.on('error', (err) => {
       state = err;
     });
-    client.on('reconnecting', () => {
-      state = DISCONNECTED;
-    });
+    client.on('reconnecting', disconnectHandler);
     client.on('ready', () => {
       state = CONNECTED;
+      if (interval) {
+        clearInterval(interval);
+        interval = null;
+      }
     });
-    client.on('end', () => {
-      state = DISCONNECTED;
-    });
+    client.on('end', () => disconnectHandler);
 
     return client;
   };
@@ -83,7 +103,7 @@ module.exports = (set, config) => {
     if (set !== 'on') return Promise.resolve(null);
     const interval = setInterval(() => {
       if (state !== CONNECTED) {
-        logger.error('fatal error: Timeout in connecting to database', {
+        logger.error('fatal error: Timeout in connecting to cache', {
           type, error: state, timeout: redisSettings.connectTimeout,
         }, correlationId);
         logger.flushAndExit(1);
@@ -92,7 +112,7 @@ module.exports = (set, config) => {
 
     return Promise.delay(VALIDATION_CHECK).then(() => {
       if (state !== DISCONNECTED && state !== CONNECTED) {
-        const error = new Error(`connection not established: ${state}`);
+        const error = new Error(`cache connection not established: ${state}`);
 
         logger.error('cache connection error', { type, error }, correlationId);
         throw error;

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@mimik/rediser",
-  "version": "1.4.7",
+  "version": "1.4.10",
   "description": "Helper for setting up redis using redis for mimik microservices",
   "main": "index.js",
   "scripts": {
-    "lint": "gulp lint",
-    "docs": "gulp docs",
-    "test": "exit 0",
-    "prepublishOnly": "gulp docs; gulp lint; npm run test",
-    "commit-ready": "gulp docs; gulp lint; npm run test",
+    "lint": "eslint --ignore-path .gitignore .",
+    "docs": "jsdoc2md index.js > README.md",
+    "test": "echo \"Error: no test specified\" && exit 0",
+    "test-ci": "echo \"Error: no test specified\" && exit 0",
+    "prepublishOnly": "npm run docs && npm run lint && npm run test-ci",
+    "commit-ready": "npm run docs && npm run lint && npm run test-ci",
     "prepare": "husky install"
   },
   "husky": {
@@ -22,32 +23,27 @@
     "microservice"
   ],
   "author": "mimik technology inc <support@mimik.com> (https://developer.mimik.com/)",
-  "license": "Apache-2.0",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://bitbucket.org/mimiktech/rediser"
   },
   "dependencies": {
-    "@mimik/lib-filters": "^1.4.3",
-    "@mimik/sumologic-winston-logger": "^1.6.6",
+    "@mimik/lib-filters": "^1.4.4",
+    "@mimik/sumologic-winston-logger": "^1.6.8",
     "bluebird": "3.7.2",
-    "redis": "3.1.2"
+    "redis": "4.1.0"
   },
   "devDependencies": {
-    "@mimik/eslint-plugin-dependencies": "^2.4.1",
-    "@mimik/eslint-plugin-document-env": "^1.0.1",
-    "eslint": "8.5.0",
-    "eslint-config-airbnb": "18.2.1",
-    "eslint-plugin-import": "2.25.3",
+    "@mimik/eslint-plugin-dependencies": "^2.4.3",
+    "@mimik/eslint-plugin-document-env": "^1.0.3",
+    "eslint": "8.15.0",
+    "eslint-config-airbnb": "19.0.4",
+    "eslint-plugin-import": "2.26.0",
     "eslint-plugin-jsx-a11y": "6.5.1",
-    "eslint-plugin-react": "7.28.0",
-    "eslint-plugin-react-hooks": "4.3.0",
-    "fancy-log": "1.3.3",
-    "gulp": "4.0.2",
-    "gulp-eslint": "6.0.0",
-    "gulp-git": "2.10.1",
-    "gulp-rename": "2.0.0",
-    "husky": "7.0.4",
-    "jsdoc-to-markdown": "7.1.0"
+    "eslint-plugin-react": "7.29.4",
+    "eslint-plugin-react-hooks": "4.5.0",
+    "husky": "8.0.1",
+    "jsdoc-to-markdown": "7.1.1"
   }
 }

package/Gulpfile.js

@@ -1,33 +0,0 @@
-/* eslint-disable import/no-extraneous-dependencies */
-const fs = require('fs');
-const log = require('fancy-log');
-const gulp = require('gulp');
-const eslint = require('gulp-eslint');
-const git = require('gulp-git');
-const jsdoc2md = require('jsdoc-to-markdown');
-
-const files = [
-  'index.js',
-  'Gulpfile.js',
-  'test/**.js',
-  'lib/**.js',
-];
-
-const createDocs = (done) => {
-  jsdoc2md.render({ files: 'index.js' })
-    .then((output) => fs.writeFileSync('README.md', output))
-    .catch((err) => log.error('docs creation failed:', err.message))
-    .finally(() => done());
-};
-
-const lint = () => gulp.src(files)
-  .pipe(eslint({}))
-  .pipe(eslint.format());
-
-const add = () => gulp.src('README.md')
-  .pipe(git.add({ quiet: true }));
-
-const docs = gulp.series(createDocs, add);
-
-gulp.task('docs', docs);
-gulp.task('lint', lint);