Merge branch 'master' of https://github.com/weave-microservices/weave

Author: kevinries

misc/development/core/simple.js

@@ -1,8 +1,17 @@
 const { createBroker } = require("../../../packages/core/core/lib")
 
-const broker = createBroker()
+const broker = createBroker({
+    logger: {
+        level: 'verbose'
+    }
+})
 
 broker.log.info({ name: 'Kevin' })
 broker.log.error(new Error('asdassds'))
+broker.log.debug('debug')
+broker.log.fatal('fatal')
+broker.log.verbose('verbose')
+broker.log.warn('warn')
+broker.log.info({ node: 123, name: 'sdasdas' }, 'test')
 
 broker.start()

packages/cache/redis/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.4](https://github.com/weave-microservices/weave/compare/@weave-js/redis-cache@0.9.3...@weave-js/redis-cache@0.9.4) (2021-09-09)
+
+**Note:** Version bump only for package @weave-js/redis-cache
+
+
+
+
+
 ## [0.9.3](https://github.com/weave-microservices/weave/compare/@weave-js/redis-cache@0.9.2...@weave-js/redis-cache@0.9.3) (2021-08-30)
 
 **Note:** Version bump only for package @weave-js/redis-cache

packages/cache/redis/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weave-js/redis-cache",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "weave redis transport adapter module",
   "main": "lib/index.js",
   "scripts": {
@@ -23,7 +23,7 @@
     "@weave-js/core": ">=0.9.0"
   },
   "devDependencies": {
-    "@weave-js/core": "^0.9.3",
+    "@weave-js/core": "^0.9.4",
     "eslint": "^7.30.0",
     "eslint-config-fw": "^1.0.3",
     "eslint-loader": "^4.0.2",

packages/core/cli/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.5](https://github.com/weave-microservices/weave/compare/@weave-js/cli@0.9.4...@weave-js/cli@0.9.5) (2021-09-09)
+
+**Note:** Version bump only for package @weave-js/cli
+
+
+
+
+
 ## [0.9.4](https://github.com/weave-microservices/weave/compare/@weave-js/cli@0.9.3...@weave-js/cli@0.9.4) (2021-08-30)
 
 **Note:** Version bump only for package @weave-js/cli

packages/core/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weave-js/cli",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "Weave CLI tool",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@weave-js/core": "^0.9.3",
-    "@weave-js/repl": "^0.9.4",
+    "@weave-js/core": "^0.9.4",
+    "@weave-js/repl": "^0.9.5",
     "@weave-js/utils": "^0.9.1",
     "commander": "^7.2.0",
     "consolidate": "^0.16.0",

packages/core/core/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [0.9.4](https://github.com/fachw3rk/weave/compare/@weave-js/core@0.9.3...@weave-js/core@0.9.4) (2021-09-09)
+
+
+### Features
+
+* Added detection for TTY and an human-readable log output. ([9434a7b](https://github.com/fachw3rk/weave/commit/9434a7b9f5722550e20a1de073a5629f204827f9))
+* Implemented better human readable log output ([72d0faa](https://github.com/fachw3rk/weave/commit/72d0faa744b0e407502d90320bfc81af9e0ae866))
+
+
+
+
+
 ## [0.9.3](https://github.com/fachw3rk/weave/compare/@weave-js/core@0.9.2...@weave-js/core@0.9.3) (2021-08-30)
 
 

packages/core/core/lib/logger/format/asHumanReadable.js

@@ -1,4 +1,4 @@
-const { green, magenta, red, yellow, white, gray } = require('../utils/colorize')
+const { green, magenta, red, yellow, white, gray, cyan } = require('../utils/colorize')
 const os = require('os')
 
 exports.asHumanReadable = ({ levels, options }, originObj, message, number, time) => {
@@ -9,7 +9,8 @@ exports.asHumanReadable = ({ levels, options }, originObj, message, number, time
     error: red,
     warn: yellow,
     info: green,
-    debug: white
+    debug: cyan,
+    verbose: gray
   }
 
   const currentLabel = levels.labels[number]

packages/core/core/lib/runtime/init-transport.js

@@ -2,7 +2,7 @@
  * @typedef {import('../types').TransportAdapter} TransportAdapter
 **/
 
-const { createTransport } = require('../transport/transport-factory')
+const { createTransport } = require('../transport/createTransport')
 const TransportAdapters = require('../transport/adapters')
 
 exports.initTransport = (runtime) => {

…/core/lib/transport/transport-factory.js …re/core/lib/transport/createTransport.jspackages/core/core/lib/transport/transport-factory.js renamed to packages/core/core/lib/transport/createTransport.js packages/core/core/lib/transport/transport-factory.js renamed to packages/core/core/lib/transport/createTransport.js

@@ -153,11 +153,11 @@ exports.createTransport = (runtime, adapter) => {
 
   transport.log = runtime.createLogger('TRANSPORT')
   transport.isConnected = false
+  transport.isDisconnecting = false
   transport.isReady = false
   transport.pending = pending
   transport.resolveConnect = null
   transport.adapterName = adapter.name
-
   transport.statistics = {
     received: {
       packages: 0
@@ -173,9 +173,18 @@ exports.createTransport = (runtime, adapter) => {
       transport.log.info('Connecting to transport adapter...')
 
       const doConnect = (isTryReconnect) => {
-        const errorHandler = error => {
+        let reconnectInProgress = false
+
+        const errorHandler = (error) => {
+          // Skip reconnect, if the adapter is disconnecting or an reconnect is in progress.
+          if (transport.isDisconnecting || reconnectInProgress) {
+            return
+          }
+
           transport.log.warn('Connection failed')
-          transport.log.debug('Error ' + error.message)
+          transport.log.debug(error)
+
+          reconnectInProgress = true
 
           if (!error.skipRetry) {
             setTimeout(() => {
@@ -194,16 +203,22 @@ exports.createTransport = (runtime, adapter) => {
   }
 
   transport.disconnect = () => {
-    runtime.eventBus.broadcastLocal('$transporter.disconnected', { isGracefull: true })
-
+    transport.isDisconnecting = true
     transport.isConnected = false
     transport.isReady = false
 
+    runtime.eventBus.broadcastLocal('$transporter.disconnected', { isGracefull: true })
+
     stopTimers()
 
     const message = transport.createMessage(MessageTypes.MESSAGE_DISCONNECT)
     return transport.send(message)
-      .then(() => adapter.close())
+      .then(() => {
+        adapter.close()
+      })
+      .then(() => {
+        transport.isDisconnecting = false
+      })
   }
 
   transport.setReady = () => {
@@ -334,13 +349,16 @@ exports.createTransport = (runtime, adapter) => {
   transport.response = (target, contextId, data, meta, error) => {
     // Check if data is a stream
     const isStream = utils.isStream(data)
+
+    // Build response payload
     const payload = {
       id: contextId,
       meta,
       data,
       success: error == null
     }
 
+    // If an error is occurs, we attach the an error object to the payload.
     if (error) {
       payload.error = {
         name: error.name,