@weave-js/core 0.9.2 → 0.11.0

package/lib/registry/registry.js

@@ -2,7 +2,7 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
 */
 
 /**
@@ -21,11 +21,11 @@
 const { safeCopy } = require('@weave-js/utils')
 
 // own packages
-const { createNodeCollection } = require('./collections/node-collection')
-const { createServiceCollection } = require('./collections/service-collection')
-const { createActionCollection } = require('./collections/action-collection')
-const { createEventCollection } = require('./collections/event-collection')
-const { createActionEndpoint } = require('./action-endpoint')
+const { createNodeCollection } = require('./collections/nodeCollection')
+const { createServiceCollection } = require('./collections/serviceCollection')
+const { createActionCollection } = require('./collections/actionCollection')
+const { createEventCollection } = require('./collections/eventCollection')
+const { createActionEndpoint } = require('./actionEndpoint')
 const { createNode } = require('./node')
 const { WeaveServiceNotFoundError, WeaveServiceNotAvailableError } = require('../errors')
 
@@ -47,24 +47,12 @@ exports.createRegistry = (runtime) => {
     log: runtime.createLogger('REGISTRY'),
     /**
    * Initialize the registry
-   * @param {Broker} runtime Broker instance
+   * @param {Runtime} runtime Runtime
    * @param {MiddlewareHandler} middlewareHandler Middleware handler
    * @param {ServiceChangedDelegate} serviceChanged Service changed delegate
    * @returns {void}
    */
     init (runtime) {
-      /**
-       * @type {Broker}
-      */
-
-      /**
-       * @type {MiddlewareHandler}
-      */
-
-      /**
-       * @type {ServiceChangedDelegate}
-      */
-
       // init collections
       this.nodeCollection = createNodeCollection(this)
       this.serviceCollection = createServiceCollection(this)
@@ -141,7 +129,6 @@ exports.createRegistry = (runtime) => {
         }
 
         if (oldActions) {
-          // this.deregisterAction()
           Object.keys(oldActions).forEach(actionName => {
             if (!service.actions[actionName]) {
               this.actionCollection.remove(actionName, node)
@@ -201,7 +188,7 @@ exports.createRegistry = (runtime) => {
         if (node.isLocal) {
           action.handler = middlewareHandler.wrapHandler('localAction', action.handler, action)// this.onRegisterLocalAction(action)
         } else {
-          action.handler = middlewareHandler.wrapHandler('remoteAction', runtime.transport.request.bind(runtime.transport), action)// this.onRegisterRemoteAction(action)
+          action.handler = middlewareHandler.wrapHandler('remoteAction', runtime.transport.sendRequest.bind(runtime.transport), action)// this.onRegisterRemoteAction(action)
         }
 
         this.actionCollection.add(node, service, action)
@@ -369,9 +356,9 @@ exports.createRegistry = (runtime) => {
       }
 
       // todo: Handle multiple nodes with the same ID.
-      const updateNesesary = node.update(payload, isReconnected)
+      const updateNecessary = node.update(payload, isReconnected)
 
-      if (updateNesesary && node.services) {
+      if (updateNecessary && node.services) {
         this.registerRemoteServices(node, node.services)
       }
 

package/lib/registry/service/service.js

@@ -9,7 +9,7 @@ const { WeaveError } = require('../../errors')
 const { parseAction } = require('./parseAction')
 const { parseEvent } = require('./parseEvent')
 const { reduceMixins } = require('./reduceMixins')
-const { createEventEndpoint } = require('../event-endpoint')
+const { createEventEndpoint } = require('../eventEndpoint')
 /**
  * Service factory
  * @param {Runtime} runtime Broker instance
@@ -133,7 +133,7 @@ exports.createServiceFromSchema = (runtime, schema) => {
           context = runtime.contextFactory.create(endpoint, data, options || {})
         }
 
-        return wrappedAction(context)
+        return wrappedAction(context, { service, runtime, errors: {}})
       }
     })
   }

package/lib/registry/{service-item.js → serviceItem.js}

@@ -1,7 +1,7 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
  */
 'use strict'
 

package/lib/runtime/{init-action-invoker.js → initActionInvoker.js}

@@ -1,4 +1,4 @@
-const { WeaveError } = require('../errors')
+const errors = require('../errors')
 
 exports.initActionInvoker = (runtime) => {
   const { registry, contextFactory, log, handleError } = runtime
@@ -36,7 +36,7 @@ exports.initActionInvoker = (runtime) => {
       log.debug({ action: context.action.name, nodeId, requestId: context.requestId }, 'Call action on remote node.')
     }
 
-    const p = action.handler(context, endpoint.service, runtime)
+    const p = action.handler(context, { service: context.action.service, runtime, errors })
     p.context = context
 
     return p
@@ -51,7 +51,7 @@ exports.initActionInvoker = (runtime) => {
     if (Array.isArray(actions)) {
       return Promise.all(actions.map(item => call(item.actionName, item.params, item.options)))
     } else {
-      return Promise.reject(new WeaveError('Actions need to be an Array'))
+      return Promise.reject(new errors.WeaveError('Actions need to be an Array'))
     }
   }
 

package/lib/runtime/{init-context-factory.js → initContextFactory.js}

@@ -1,7 +1,7 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
  */
 'use strict'
 
@@ -12,7 +12,7 @@ const { createContext } = require('../broker/context')
  * @typedef {import('../types').Context} Context
  * @typedef {import('../types').Endpoint} Endpoint
  * @typedef {import('../types').ActionOptions} ActionOptions
- */
+*/
 
 /**
  * Init context factory.

package/lib/runtime/{init-eventbus.js → initEventbus.js}

@@ -15,7 +15,11 @@ exports.initEventbus = (runtime) => {
       options = {}
     }
 
-    const promises = []
+    // Emit local events
+    if (/^\$/.test(eventName)) {
+      bus.emit(eventName, payload)
+    }
+
     // todo: create an event context object
     const context = contextFactory.create(null, payload, options)
 
@@ -23,23 +27,20 @@ exports.initEventbus = (runtime) => {
     context.eventName = eventName
     context.eventGroups = options.groups
 
-    // Emit system events
-    if (/^\$/.test(eventName)) {
-      bus.emit(eventName, payload)
-    }
-
     const endpoints = registry.eventCollection.getBalancedEndpoints(eventName, options.groups)
     const groupedEndpoints = {}
+    const promises = []
 
     endpoints.map(([endpoint, groupName]) => {
       if (endpoint) {
         if (endpoint.node.id === brokerOptions.nodeId) {
           // Local event. Call handler
+          context.setEndpoint(endpoint)
           promises.push(endpoint.action.handler(context))
         } else {
           const e = groupedEndpoints[endpoint.node.id]
           if (e) {
-            e.push(groupName)
+            e.groups.push(groupName)
           } else {
             groupedEndpoints[endpoint.node.id] = {
               endpoint,
@@ -50,7 +51,7 @@ exports.initEventbus = (runtime) => {
       }
     })
 
-    // send remote events
+    // Send remote events
     if (runtime.transport) {
       Object.values(groupedEndpoints)
         .forEach(groupedEndpoint => {
@@ -69,7 +70,7 @@ exports.initEventbus = (runtime) => {
   * @param {String} eventName Name of the event
   * @param {any} payload Payload
   * @param {*} [options=null] Options
-  * @returns {void}
+  * @returns {Promise<any>} Promise
   */
   const broadcastLocal = (eventName, payload, options) => {
     // If the given group is no array - wrap it.
@@ -96,7 +97,7 @@ exports.initEventbus = (runtime) => {
   * @param {String} eventName Name of the event
   * @param {any} payload Payload
   * @param {*} [options=null] Groups
-  * @returns {void}
+  * @returns {Promise<any>} Promise
   */
   const broadcast = (eventName, payload, options) => {
     if (Array.isArray(options)) {

package/lib/runtime/{init-metrics.js → initMetrics.js}

@@ -1,4 +1,5 @@
 const { isPlainObject, isFunction } = require('@weave-js/utils')
+const { WeaveError } = require('../errors')
 const { registerCommonMetrics, updateCommonMetrics } = require('../metrics/common')
 const MetricTypes = require('../metrics/types')
 
@@ -32,7 +33,7 @@ exports.initMetrics = (runtime) => {
           // Load adapters
           if (metricOptions.adapters) {
             if (!Array.isArray(metricOptions.adapters)) {
-              runtime.handleError(new Error('Metic adapter needs to be an Array'))
+              runtime.handleError(new WeaveError('Metic adapter needs to be an Array.'))
             }
 
             this.adapters = metricOptions.adapters.map(adapter => {
@@ -50,21 +51,21 @@ exports.initMetrics = (runtime) => {
         },
         register (obj) {
           if (!isPlainObject(obj)) {
-            runtime.handleError(new Error('Param needs to be an object.'))
+            runtime.handleError(new WeaveError('Param needs to be an object.'))
           }
 
           if (!obj.type) {
-            runtime.handleError(new Error('Type is missing.'))
+            runtime.handleError(new WeaveError('Type is missing.'))
           }
 
           if (!obj.name) {
-            runtime.handleError(new Error('Name is missing.'))
+            runtime.handleError(new WeaveError('Name is missing.'))
           }
 
           const createMetricType = MetricTypes.resolve(obj.type)
 
           if (!createMetricType) {
-            runtime.handleError(new Error('Unknown metric type.'))
+            runtime.handleError(new WeaveError('Unknown metric type.'))
           }
 
           const type = createMetricType(this, obj)
@@ -81,7 +82,7 @@ exports.initMetrics = (runtime) => {
           const item = this.storage.get(name)
 
           if (!item) {
-            runtime.handleError(new Error('Item not found.'))
+            runtime.handleError(new WeaveError('Item not found.'))
           }
 
           item.increment(labels, value, timestamp)
@@ -94,7 +95,7 @@ exports.initMetrics = (runtime) => {
           const item = this.storage.get(name)
 
           if (!item) {
-            runtime.handleError(new Error('Item not found.'))
+            runtime.handleError(new WeaveError('Item not found.'))
           }
 
           item.decrement(labels, value, timestamp)
@@ -107,7 +108,7 @@ exports.initMetrics = (runtime) => {
           const item = this.storage.get(name)
 
           if (!isFunction(item.set)) {
-            runtime.handleError(new Error('Invalid metric type'))
+            runtime.handleError(new WeaveError('Invalid metric type'))
           }
 
           item.set(value, labels, timestamp)
@@ -137,12 +138,12 @@ exports.initMetrics = (runtime) => {
           const item = this.storage.get(name)
 
           if (!item) {
-            runtime.handleError(new Error('Item not found.'))
+            runtime.handleError(new WeaveError('Item not found.'))
           }
 
           return item
         },
-        list (options = {}) {
+        list (/* options = {} */) {
           const results = []
 
           this.storage.forEach(metric => {

package/lib/runtime/{init-middleware-manager.js → initMiddlewareManager.js}

@@ -1,7 +1,7 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
  */
 
 exports.initMiddlewareHandler = (runtime) => {

package/lib/runtime/{init-registry.js → initRegistry.js}

@@ -2,7 +2,7 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
 */
 /**
  * @typedef {import('../types').Runtime} Runtime

package/lib/runtime/{init-tracing.js → initTracing.js}

@@ -9,6 +9,8 @@ exports.initTracer = (runtime) => {
 
   Object.defineProperty(runtime, 'tracer', {
     value: {
+      runtime,
+      options,
       log,
       async stop () {
         if (collectors.length > 0) {
@@ -55,7 +57,6 @@ exports.initTracer = (runtime) => {
       collectors = options.collectors
         .map(entry => {
           const initCollector = resolveCollector(runtime, entry, this)
-          // collector.init(this)
           initCollector.init(runtime)
           return initCollector
         })

package/lib/runtime/{init-transport.js → initTransport.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) => {

package/lib/runtime/{init-validator.js → initValidator.js}

@@ -1,7 +1,7 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
 */
 
 /**

package/lib/tracing/collectors/base.js

@@ -1,26 +1,25 @@
-const { isObject } = require('@weave-js/utils')
-const { WeaveError } = require('../../errors')
+const { isObject, pick } = require('@weave-js/utils')
 
-exports.createBaseTracingCollector = (options) => {
+exports.createBaseTracingCollector = (runtime) => {
   const baseTracingCollector = Object.create(null)
 
-  baseTracingCollector.options = options
+  baseTracingCollector.options = runtime.tracer.options
 
-  baseTracingCollector.init = (runtime, tracer) => {
+  baseTracingCollector.init = (runtime) => {
     baseTracingCollector.runtime = runtime
-    baseTracingCollector.tracer = tracer
+    baseTracingCollector.tracer = runtime.tracer
   }
 
   baseTracingCollector.startedSpan = () => {
-    throw new WeaveError('not implemented.')
+    // throw new WeaveError('not implemented.')
   }
 
   baseTracingCollector.finishedSpan = () => {
-    throw new WeaveError('not implemented.')
+    // throw new WeaveError('not implemented.')
   }
 
   baseTracingCollector.stop = () => {
-    throw new WeaveError('not implemented.')
+    // throw new WeaveError('not implemented.')
   }
 
   baseTracingCollector.flattenTags = (obj, convertToString = false, path = '') => {
@@ -42,18 +41,11 @@ exports.createBaseTracingCollector = (options) => {
     }, {})
   }
 
-  baseTracingCollector.getErrorFields = (error, ...fields) => {
-    if (!error) {
+  baseTracingCollector.getErrorFields = (err, fields) => {
+    if (!err) {
       return null
     }
-
-    const picked = {}
-
-    for (const field of fields) {
-      picked[field] = error[field]
-    }
-
-    return picked
+    return pick(err, fields)
   }
 
   return baseTracingCollector

package/lib/tracing/collectors/event.js

@@ -13,7 +13,7 @@ const mergeDefaultOptions = (options) => {
 module.exports = (options) => (runtime, tracer) => {
   options = mergeDefaultOptions(options)
 
-  const exporter = createBaseTracingCollector(options)
+  const exporter = createBaseTracingCollector(runtime)
 
   exporter.init(runtime, tracer)
 
@@ -28,7 +28,7 @@ module.exports = (options) => (runtime, tracer) => {
         const newSpan = Object.assign({}, span)
 
         if (newSpan.error) {
-          newSpan.error = exporter.getErrorFields(newSpan.error)
+          newSpan.error = exporter.getErrorFields(newSpan.error, exporter.options.errors.fields)
         }
 
         return newSpan

package/lib/tracing/collectors/index.js

@@ -11,14 +11,14 @@ const getByName = name => {
   return collectors[n]
 }
 
-exports.resolveCollector = (runtime, collector, tracer) => {
+exports.resolveCollector = (runtime, collector) => {
   let CollectorClass
   if (typeof collector === 'string') {
     CollectorClass = getByName(collector)
   }
 
   if (isFunction(collector)) {
-    return collector(runtime, tracer)
+    return collector(runtime)
   }
 
   if (typeof collector === 'object') {

package/lib/tracing/span.js

@@ -3,8 +3,8 @@ const hrTime = require('./time')
 exports.createSpan = (tracer, name, options) => {
   const span = Object.assign({}, {
     name,
-    id: options.id || tracer.broker.getUUID(),
-    traceId: options.traceId || tracer.broker.getUUID(),
+    id: options.id || tracer.runtime.generateUUID(),
+    traceId: options.traceId || tracer.runtime.generateUUID(),
     parentId: options.parentId,
     type: options.type,
     sampled: options.sampled || tracer.shouldSample(),
@@ -12,10 +12,12 @@ exports.createSpan = (tracer, name, options) => {
     tags: {}
   })
 
-  span.service = {
-    name: options.service.name,
-    version: options.service.version,
-    fullyQualifiedName: options.service.fullyQualifiedName
+  if (options.service) {
+    span.service = {
+      name: options.service.name,
+      version: options.service.version,
+      fullyQualifiedName: options.service.fullyQualifiedName
+    }
   }
 
   span.addTags = (tags) => {

package/lib/transport/InboundTransformStream.js

@@ -0,0 +1,75 @@
+const { Transform } = require('stream')
+
+const pushWithBackpressure = (stream, chunks, encoding, callback = null, $index = 0) => {
+  if (!(stream instanceof Transform)) {
+    throw new TypeError('Argument "stream" must be an instance of Duplex')
+  }
+
+  chunks = [].concat(chunks).filter(x => x !== undefined)
+
+  if (typeof encoding === 'function') {
+    callback = encoding
+    encoding = undefined
+  }
+
+  if ($index >= chunks.length) {
+    if (typeof callback === 'function') {
+      callback()
+    }
+    return stream
+  } else if (!stream.push(chunks[$index], ...([encoding].filter(Boolean)))) {
+    stream.emit('backpressure', {
+      sender: stream.sender,
+      requestId: stream.requestId
+    })
+
+    const pipedStreams = [].concat(
+      (stream._readableState || {}).pipes || stream
+    ).filter(Boolean)
+
+    let listenerCalled = false
+
+    const drainListener = () => {
+      stream.emit('resume_backpressure', {
+        sender: stream.sender,
+        requestId: stream.requestId
+      })
+
+      if (listenerCalled) {
+        return
+      }
+
+      listenerCalled = true
+
+      for (const stream of pipedStreams) {
+        stream.removeListener('drain', drainListener)
+      }
+
+      pushWithBackpressure(stream, chunks, encoding, callback, $index + 1)
+    }
+
+    for (const stream of pipedStreams) {
+      stream.once('drain', drainListener)
+    }
+
+    return stream
+  }
+  return pushWithBackpressure(stream, chunks, encoding, callback, $index + 1)
+}
+class InboundTransformStream extends Transform {
+  constructor (sender, requestId, options) {
+    super(options)
+    this.sender = sender
+    this.requestId = requestId
+  }
+
+  _transform (chunk, encoding, callback) {
+    pushWithBackpressure(this, chunk, encoding, callback)
+  }
+
+  _flush (callback) {
+    return callback()
+  }
+}
+
+module.exports = { InboundTransformStream }

package/lib/transport/adapters/{adapter-base.js → adapteBase.js}

@@ -1,11 +1,26 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
  */
 
 const EventEmitter = require('events').EventEmitter
 
+/**
+ * @typedef {Object} AdapterBase
+ * @property {string} name Name
+ * @property {EventEmitter} bus Event bus.
+ * @property {function():Promise<any>} afterInit After init callback.
+ * @property {boolean} isConnected Is connected state.
+ * @property {number} interruptCounter Interruption counter.
+ * @property {number} repeatAttemptCounter Repeat attempt counter
+ * @property {function(Object, Object, Object):Promise<any>} init Repeat attempt counter
+*/
+
+/**
+ * Create a adapter base object.
+ * @returns {AdapterBase} Adapter base object
+*/
 const createTransportBase = () => {
   let prefix = 'weave'
 

package/lib/transport/adapters/adapters.js

@@ -4,6 +4,6 @@
  * Copyright 2019 Fachwerk
  */
 
-exports.BaseAdapter = require('./adapter-base')
+exports.BaseAdapter = require('./adapteBase')
 exports.Dummy = require('./dummy')
 exports.TCP = require('./tcp')

package/lib/transport/adapters/dummy/index.js

@@ -1,10 +1,10 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
  */
 
-const TransportBase = require('../adapter-base')
+const TransportBase = require('../adapteBase')
 const EventEmitter = require('eventemitter2').EventEmitter2
 
 // create a global eventbus to pass messages between weave service brokers.
@@ -18,7 +18,7 @@ const DummyTransportAdapter = (adapterOptions) => {
 
   return Object.assign(TransportBase(adapterOptions), {
     name: 'Dummy',
-    connect (isTryReconnect = false) {
+    connect () {
       this.bus.emit('$adapter.connected', false)
       this.log.info('Dummy transport client connected.')
       return Promise.resolve()

package/lib/transport/adapters/index.js

@@ -1,7 +1,7 @@
 /*
  * Author: Kevin Ries (kevin@fachw3rk.de)
  * -----
- * Copyright 2020 Fachwerk
+ * Copyright 2021 Fachwerk
  */
 
 const { WeaveBrokerOptionsError } = require('../../errors')