Updated dependencies

Author: kevinries

package-lock.json

@@ -51,9 +51,9 @@
   },
   "homepage": "https://weave-js.com",
   "devDependencies": {
-    "@sinonjs/fake-timers": "^7.0.5",
-    "concurrently": "^6.1.0",
-    "eslint": "^7.26.0",
+    "@sinonjs/fake-timers": "^7.1.2",
+    "concurrently": "^6.2.0",
+    "eslint": "^7.30.0",
     "eslint-config-fw": "^1.0.3",
     "lerna": "^4.0.0"
   },

package.json

@@ -20,15 +20,15 @@
   },
   "license": "MIT",
   "peerDependencies": {
-    "@weave-js/core": ">=0.8.0"
+    "@weave-js/core": ">=0.9.0-beta.12"
   },
   "devDependencies": {
     "@weave-js/core": "^0.9.0-beta.12",
-    "eslint": "^7.17.0",
+    "eslint": "^7.30.0",
     "eslint-config-fw": "^1.0.3",
     "eslint-loader": "^4.0.2",
     "istanbul": "^0.4.5",
-    "jest": "^26.6.3"
+    "jest": "^27.0.6"
   },
   "jest": {
     "testEnvironment": "node",
@@ -39,6 +39,6 @@
   },
   "dependencies": {
     "@weave-js/utils": "^0.9.0-beta.2",
-    "ioredis": "^4.17.3"
+    "ioredis": "^4.27.6"
   }
 }

packages/cache/redis/package.json

@@ -10,7 +10,6 @@ const path = require('path')
 const glob = require('glob')
 const { isFunction } = require('@weave-js/utils')
 const Middlewares = require('../middlewares')
-const { generateUUID } = require('./uuid-factory')
 
 /**
  *  Creates a new Weave Broker instance
@@ -30,7 +29,6 @@ exports.createBrokerInstance = (runtime) => {
     log,
     services,
     transport,
-    handleError,
     metrics
   } = runtime
 
@@ -60,7 +58,7 @@ exports.createBrokerInstance = (runtime) => {
     contextFactory,
     log,
     createLogger: runtime.createLogger,
-    getUUID: () => generateUUID(runtime),
+    getUUID: () => runtime.generateUUID(),
     health: runtime.health,
     registry,
     getNextActionEndpoint (actionName, options = {}) {
@@ -123,7 +121,7 @@ exports.createBrokerInstance = (runtime) => {
       } catch (error) {
         log.error(error, 'Unable to start all services')
         clearInterval(options.waitForServiceInterval)
-        handleError(error)
+        throw error
       }
 
       runtime.state.isStarted = true

packages/core/weave-core/lib/broker/index.js

@@ -8,18 +8,20 @@ const EventEmitter = require('eventemitter2')
 const { getDefaultOptions } = require('./broker/default-options')
 const { defaultsDeep, uuid } = require('@weave-js/utils')
 const { initLogger } = require('./logger/init-logger')
-const { initMiddlewareHandler } = require('./broker/init-middleware-manager')
+const { initMiddlewareHandler } = require('./runtime/init-middleware-manager')
 const { initRegistry } = require('./registry')
-const { initContextFactory } = require('./broker/init-context-factory')
-const { initEventbus } = require('./broker/init-eventbus')
-const { initValidator } = require('./broker/init-validator')
+const { initContextFactory } = require('./runtime/init-context-factory')
+const { initEventbus } = require('./runtime/init-eventbus')
+const { initValidator } = require('./runtime/init-validator')
 const { initTransport } = require('./transport/init-transport')
 const { initCache } = require('./cache/init-cache')
-const { initActionInvoker } = require('./broker/init-action-invoker')
-const { initServiceManager } = require('./broker/init-service-manager')
+const { initActionInvoker } = require('./runtime/init-action-invoker')
+const { initServiceManager } = require('./runtime/init-service-manager')
 const { initMetrics } = require('./metrics/init-metrics')
 const { initTracer } = require('./tracing/init-tracing')
-const { initHealth } = require('./broker/init-health')
+const { initHealth } = require('./runtime/init-health')
+const { initUUIDFactory } = require('./runtime/init-uuid-factory')
+
 const { createBrokerInstance } = require('./broker')
 const { version } = require('../package.json')
 
@@ -32,7 +34,8 @@ const errorHandler = ({ options }, error) => {
   throw error
 }
 
-const fatalErrorHandler = ({ options, log }, message, error, killProcess = true) => {
+const fatalErrorHandler = (runtime, message, error, killProcess = true) => {
+  const { options, log } = runtime
   if (options.logger.enabled) {
     log.fatal(error, message)
   } else {
@@ -48,7 +51,7 @@ const fatalErrorHandler = ({ options, log }, message, error, killProcess = true)
  * Build runtime object
  * @param {BrokerOptions} options Broker options
  * @return {Runtime} Runtime
- */
+*/
 const buildRuntime = (options) => {
   /**
    * Event bus
@@ -74,6 +77,7 @@ const buildRuntime = (options) => {
   }
 
   initLogger(runtime)
+  initUUIDFactory(runtime)
   initMiddlewareHandler(runtime)
   initRegistry(runtime)
   initContextFactory(runtime)
@@ -86,7 +90,7 @@ const buildRuntime = (options) => {
   initMetrics(runtime)
   initTracer(runtime)
   initHealth(runtime)
-
+  
   return runtime
 }
 

packages/core/weave-core/lib/index.js

@@ -15,10 +15,12 @@ exports.initLogger = (runtime) => {
       ...additional
     }
 
+    // custom logger generator function 
     if (typeof runtime.options.logger === 'function') {
       return runtime.options.logger(bindings, runtime.options.level)
     }
 
+    // merge log options
     const loggerOptions = defaultsDeep(runtime.options.logger, {
       base: {
         ...bindings

packages/core/weave-core/lib/logger/init-logger.js

@@ -38,6 +38,7 @@ exports.asJsonString = (runtime, originObj, message, number, time) => {
   }
 
   const notHasOwnProperty = originObj.hasOwnProperty === undefined
+
   let value
   for (const key in originObj) {
     value = originObj[key]

packages/core/weave-core/lib/logger/tools.js

@@ -42,7 +42,6 @@ exports.createEndpointList = (runtime, name, groupName) => {
     } else {
       const randomInt = (min, max) => Math.floor(Math.random() * (max - min + 1) + min)
       return endpointList[randomInt(0, endpointList.length - 1)]
-
       // todo: implement random load balancer
     }
   }

packages/core/weave-core/lib/registry/collections/endpoint-collection.js

@@ -5,18 +5,38 @@
  * -----
  * Copyright 2020 Fachwerk
 */
+
+/**
+ * @typedef {import('../../types.js').Registry} Registry
+ * @typedef {import('../../types.js').EventCollection} EventCollection
+ * @typedef {import('../../types.js').Service} Service
+ * @typedef {import('../../types.js').Node} Node
+ * @typedef {import('../../types.js').EndpointCollection} EndpointCollection
+*/
+
 const { omit, match } = require('@weave-js/utils')
 const { createEndpointList } = require('./endpoint-collection')
 
 const broadcastEvents = ['broadcast', 'localBroadcast']
-
+/**
+ * Create event collection
+ * @param {Registry} registry Registy reference
+ * @return {EventCollection} Event collection
+ */
 exports.createEventCollection = (registry) => {
   const eventCollection = Object.create(null)
   const { runtime } = registry
   const events = [] // todo: refactor to js Map
   const getAllEventsByEventName = (eventName) => events.filter(list => match(eventName, list.name))
 
-  eventCollection.add = (node, service, event) => {
+/**
+ * Add node to collection
+ * @param {Node} node Node
+ * @param {Service} service Service
+ * @param {any} event Event
+ * @return {EndpointCollection} Endpoint collection
+*/
+eventCollection.add = (node, service, event) => {
     const groupName = event.group || service.name
     let endpointList = eventCollection.get(event.name, groupName)
     if (!endpointList) {

packages/core/weave-core/lib/registry/collections/event-collection.js

@@ -6,9 +6,18 @@
  * Copyright 2020 Fachwerk
  */
 
+/**
+ * @typedef {import('../../types.js').Registry} Registry
+ * @typedef {import('../../types.js').NodeCollection} NodeCollection
+*/
+
 const { getIpList, omit } = require('@weave-js/utils')
 const { createNode } = require('../node')
-
+/**
+ * Create node collection
+ * @param {Registry} registry Registry reference
+ * @return {NodeCollection} Node collection
+ */
 exports.createNodeCollection = (registry) => {
   const nodeCollection = Object.create(null)
   const { runtime } = registry