@weave-js/redis-transport 0.10.0 → 0.12.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.12.0](https://github.com/weave-microservices/weave/compare/@weave-js/redis-transport@0.11.1...@weave-js/redis-transport@0.12.0) (2022-03-30)
+
+**Note:** Version bump only for package @weave-js/redis-transport
+
+
+
+
+
+## [0.11.1](https://github.com/weave-microservices/weave/compare/@weave-js/redis-transport@0.11.0...@weave-js/redis-transport@0.11.1) (2022-03-07)
+
+**Note:** Version bump only for package @weave-js/redis-transport
+
+
+
+
+
+# [0.11.0](https://github.com/weave-microservices/weave/compare/@weave-js/redis-transport@0.10.0...@weave-js/redis-transport@0.11.0) (2022-02-19)
+
+**Note:** Version bump only for package @weave-js/redis-transport
+
+
+
+
+
 # [0.10.0](https://github.com/weave-microservices/weave/compare/@weave-js/redis-transport@0.9.4...@weave-js/redis-transport@0.10.0) (2021-10-18)
 
 **Note:** Version bump only for package @weave-js/redis-transport

package/lib/index.js

@@ -1,105 +1,104 @@
 /*
- * Author: Kevin Ries (kevin@fachw3rk.de)
+ * Author: Kevin Ries (kevin.ries@fachwerk.io)
  * -----
  * Copyright 2021 Fachwerk
  */
 
-const redis = require('redis')
-const { defaultsDeep } = require('@weave-js/utils')
-const { TransportAdapters } = require('@weave-js/core')
-const utils = require('@weave-js/utils')
+const redis = require('redis');
+const { defaultsDeep, promiseDelay } = require('@weave-js/utils');
+const { TransportAdapters } = require('@weave-js/core');
 
 const defaultOptions = {
   port: 6379,
   host: '127.0.0.1'
-}
+};
 
-const RedisTransportAdapter = adapterOptions => {
-  let clientSub
-  let clientPub
+const RedisTransportAdapter = (adapterOptions) => {
+  let clientSub;
+  let clientPub;
 
   // Merge options with default options.
-  adapterOptions = defaultsDeep(adapterOptions, defaultOptions)
+  adapterOptions = defaultsDeep(adapterOptions, defaultOptions);
 
   return Object.assign(TransportAdapters.BaseAdapter(adapterOptions), {
     name: 'REDIS',
     connect () {
       return new Promise((resolve, reject) => {
-        clientSub = redis.createClient(adapterOptions)
+        clientSub = redis.createClient(adapterOptions);
 
         clientSub.on('connect', () => {
-          clientPub = redis.createClient(adapterOptions)
+          clientPub = redis.createClient(adapterOptions);
 
-          this.log.info('Redis SUB client connected.')
+          this.log.info('Redis SUB client connected.');
 
           clientPub.on('connect', () => {
             if (this.interruptionCount > 0 && !this.isConnected) {
-              this.bus.emit('adapter.connected', true)
+              this.bus.emit('adapter.connected', true);
             }
-            this.log.info('Redis PUB client connected.')
-            this.isConnected = true
-            resolve()
-          })
+            this.log.info('Redis PUB client connected.');
+            this.isConnected = true;
+            resolve();
+          });
 
           clientPub.on('error', error => {
-            this.log.error('Redis PUB error:', error.message)
-            this.isConnected = false
-            reject(error)
-          })
+            this.log.error('Redis PUB error:', error.message);
+            this.isConnected = false;
+            reject(error);
+          });
 
           clientPub.on('close', () => {
             if (this.isConnected) {
-              this.isConnected = false
-              this.interruptionCount++
-              this.log.warn('Redis PUB disconnected.')
-              this.disconnected()
+              this.isConnected = false;
+              this.interruptionCount++;
+              this.log.warn('Redis PUB disconnected.');
+              this.disconnected();
             }
-          })
-        })
+          });
+        });
 
         clientSub.on('error', error => {
-          this.log.error('Redis PUB error:', error.message)
-          reject(error)
-        })
+          this.log.error('Redis PUB error:', error.message);
+          reject(error);
+        });
 
         clientSub.on('message', (topic, message) => {
-          const type = topic.split('.')[1]
-          this.incomingMessage(type, message)
-        })
+          const type = topic.split('.')[1];
+          this.incomingMessage(type, message);
+        });
 
         clientSub.on('close', () => {
-          this.log.warn('Redis SUB disconnected.')
-        })
+          this.log.warn('Redis SUB disconnected.');
+        });
       })
         .then(() => {
-          this.connected()
-        })
+          this.connected();
+        });
     },
     subscribe (type, nodeId) {
       return new Promise(resolve => {
-        const topic = this.getTopic(type, nodeId)
+        const topic = this.getTopic(type, nodeId);
         clientSub.subscribe(topic, () => {
-          return resolve()
-        })
-      })
+          return resolve();
+        });
+      });
     },
     send (message) {
-      const data = this.serialize(message)
+      const data = this.serialize(message);
       if (this.isConnected) {
-        this.updateStatisticSent(data.length)
-        const topic = this.getTopic(message.type, message.targetNodeId)
-        clientPub.publish(topic, data)
+        this.updateStatisticSent(data.length);
+        const topic = this.getTopic(message.type, message.targetNodeId);
+        clientPub.publish(topic, data);
       }
-      return Promise.resolve()
+      return Promise.resolve();
     },
     close () {
       if (clientPub && clientSub) {
-        clientPub.quit()
-        clientSub.quit()
+        clientPub.quit();
+        clientSub.quit();
       }
-      return utils.promiseDelay(Promise.resolve(), 500)
+      return promiseDelay(Promise.resolve(), 500);
     }
-  })
-}
+  });
+};
 
-module.exports = RedisTransportAdapter
+module.exports = RedisTransportAdapter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weave-js/redis-transport",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "weave redis transport adapter module",
   "main": "lib/index.js",
   "scripts": {
@@ -23,12 +23,7 @@
     "@weave-js/core": ">=0.9.0"
   },
   "devDependencies": {
-    "@weave-js/core": "^0.10.0",
-    "eslint": "^7.30.0",
-    "eslint-config-fw": "^1.0.3",
-    "eslint-loader": "^4.0.2",
-    "istanbul": "^0.4.5",
-    "jest": "^27.0.6"
+    "@weave-js/core": "^0.12.0"
   },
   "jest": {
     "testEnvironment": "node",
@@ -38,8 +33,8 @@
     ]
   },
   "dependencies": {
-    "@weave-js/utils": "^0.9.1",
+    "@weave-js/utils": "^0.11.0",
     "redis": "^3.1.2"
   },
-  "gitHead": "1bb4b387d36d5f09ebdfc541ca677cf2b718dbac"
+  "gitHead": "406e96b1f3017cc1d22de6693f61a2265506c239"
 }

package/test/adapter.test.js

@@ -1,11 +1,11 @@
-const { Weave } = require('@weave-js/core')
-const REDISTransport = require('../lib/index')
+const { Weave } = require('@weave-js/core');
+const REDISTransport = require('../lib/index');
 
 describe('REDIS transport adapter', () => {
-  let broker1
-  let broker2
-  const startedHook1 = jest.fn()
-  const startedHook2 = jest.fn()
+  let broker1;
+  let broker2;
+  const startedHook1 = jest.fn();
+  const startedHook2 = jest.fn();
 
   beforeEach(() => {
     broker1 = Weave({
@@ -18,16 +18,16 @@ describe('REDIS transport adapter', () => {
         adapter: REDISTransport()
       },
       started: startedHook1
-    })
+    });
 
     broker1.createService({
       name: 'testService1',
       actions: {
         hello (context) {
-          return 'Hello from ' + context.nodeId
+          return 'Hello from ' + context.nodeId;
         }
       }
-    })
+    });
 
     broker2 = Weave({
       nodeId: 'node2',
@@ -39,41 +39,41 @@ describe('REDIS transport adapter', () => {
         adapter: REDISTransport()
       },
       started: startedHook2
-    })
+    });
 
     broker2.createService({
       name: 'testService2',
       actions: {
         hello () {
-          return 'Hello from ' + this.broker.nodeId
+          return 'Hello from ' + this.broker.nodeId;
         }
       }
-    })
+    });
 
     return Promise.all([
       broker1.start(),
       broker2.start()
-    ])
-  })
+    ]);
+  });
 
   afterEach(() => {
-    return Promise.all([broker1.stop(), broker2.stop()])
-  })
+    return Promise.all([broker1.stop(), broker2.stop()]);
+  });
 
   it('should connect', () => {
-    expect(startedHook1).toBeCalledTimes(1)
-    expect(startedHook2).toBeCalledTimes(1)
-  })
+    expect(startedHook1).toBeCalledTimes(1);
+    expect(startedHook2).toBeCalledTimes(1);
+  });
 
   it('should get node info', (done) => {
     broker1
       .waitForServices(['testService2'])
       .then(() => {
-        return broker1.call('testService2.hello')
+        return broker1.call('testService2.hello');
       })
       .then(result => {
-        expect(result).toBe('Hello from node2')
-        done()
-      })
-  })
-})
+        expect(result).toBe('Hello from node2');
+        done();
+      });
+  });
+});