@weave-js/core 0.14.1 → 0.15.1

package/lib/broker/defaultOptions.js

@@ -58,7 +58,7 @@ exports.getDefaultOptions = () => {
         handleBackpressure: true
       }
     },
-    errorHandler: null,
+    errorHandler: undefined,
     loadInternalMiddlewares: true,
     metrics: {
       enabled: false,

package/lib/errorHandler.js

@@ -8,7 +8,7 @@ exports.errorHandler = ({ options }, error) => {
 exports.fatalErrorHandler = (runtime, message, error, killProcess = true) => {
   const { options, log } = runtime;
   if (options.logger.enabled) {
-    log.fatal(error, message);
+    log.fatal({ error }, message);
   } else {
     console.error(message, error);
   }

package/lib/middlewares/context-tracker/index.js

@@ -7,7 +7,7 @@ module.exports = (runtime) => {
       context.service._trackedContexts.push(context);
     } else {
       // remote actions
-      context.service._trackedContexts.push(context);
+      runtime.state.trackedContexts.push(context);
     }
   }
 
@@ -19,9 +19,9 @@ module.exports = (runtime) => {
         context.service._trackedContexts.splice(index, 1);
       }
     } else {
-      const index = context.service._trackedContexts.indexOf(context);
+      const index = runtime.state.trackedContexts.indexOf(context);
       if (index !== -1) {
-        context.service._trackedContexts.splice(index, 1);
+        runtime.state.trackedContexts.splice(index, 1);
       }
     }
   }

package/lib/registry/collections/serviceCollection.js

@@ -85,14 +85,18 @@ exports.createServiceCollection = (registry) => {
     withActions = false,
     withEvents = false,
     withNodeService = false,
-    withSettings = false
+    withSettings = false,
+    withPrivate = false
   } = {}) => {
     const result = [];
     services.forEach((service) => {
       if (/^\$node/.test(service.name) && !withNodeService) {
         return;
       }
-      if (service.settings && service.settings.$private) {
+
+      const isPrivate = service.settings && service.settings.$private;
+
+      if (isPrivate && withPrivate === false) {
         return;
       }
 
@@ -104,7 +108,8 @@ exports.createServiceCollection = (registry) => {
         name: service.name,
         nodeId: service.node.id,
         version: service.version,
-        isAvailable: service.node.isAvailable
+        isAvailable: service.node.isAvailable,
+        isPrivate
       };
 
       if (withSettings) {

package/lib/transport/messageHandlers.js

@@ -431,11 +431,12 @@ module.exports = (runtime, transport) => {
       // todo: check protocol version
       // todo: check node ID conflict
 
-      // if (payload.sender === runtime.nodeId) {
-      //   if (type === MessageTypes.MESSAGE_INFO && payload.instanceId !== runtime.state.instanceId) {
-      //     return runtime.fatalError('Weave broker has detected a node ID conflict. "nodeId" of broker needs to be unique. Broker will be stopped.')
-      //   }
-      // }
+      if (payload.sender === runtime.nodeId) {
+        if (type === MessageTypes.MESSAGE_INFO && payload.instanceId !== runtime.state.instanceId) {
+          runtime.fatalError(`Weave broker has detected a node ID conflict. "nodeId" of broker needs to be unique, but there is an broker with node ID "${runtime.nodeId}". Broker will be stopped.`);
+          return false;
+        }
+      }
 
       switch (type) {
       case MessageTypes.MESSAGE_DISCOVERY:

package/lib/types.js

@@ -626,6 +626,7 @@ const { EventEmitter2: EventEmitter } = require('eventemitter2');
  * @property {boolean} [withEvents=false] Include events in result.
  * @property {boolean} [withNodeService=false] Include node service.
  * @property {boolean} [withSettings=false] Include service settings.
+ * @property {boolean} [withPrivate=false] Include private services.
 */
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weave-js/core",
-  "version": "0.14.1",
+  "version": "0.15.1",
   "description": "The core package of weave",
   "keywords": [
     "Weave",