@weave-js/core 0.10.0 → 0.12.0

package/lib/registry/collections/{node-collection.js → nodeCollection.js}

@@ -1,7 +1,7 @@
 // @ts-check
 
 /*
- * Author: Kevin Ries (kevin@fachw3rk.de)
+ * Author: Kevin Ries (kevin.ries@fachwerk.io)
  * -----
  * Copyright 2021 Fachwerk
  */
@@ -11,88 +11,88 @@
  * @typedef {import('../../types.js').NodeCollection} NodeCollection
 */
 
-const { getIpList, omit } = require('@weave-js/utils')
-const { createNode } = require('../node')
+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
-  const nodes = new Map()
+  const nodeCollection = Object.create(null);
+  const { runtime } = registry;
+  const nodes = new Map();
 
-  nodeCollection.localNode = null
+  nodeCollection.localNode = null;
 
   nodeCollection.createNode = (nodeId) => {
-    return createNode(nodeId)
-  }
+    return createNode(nodeId);
+  };
 
   nodeCollection.add = (id, node) => {
-    nodes.set(id, node)
-  }
+    nodes.set(id, node);
+  };
 
   nodeCollection.has = (id) => {
-    return nodes.has(id)
-  }
+    return nodes.has(id);
+  };
 
   nodeCollection.get = (id) => {
-    return nodes.get(id)
-  }
+    return nodes.get(id);
+  };
 
   nodeCollection.remove = (id) => {
-    return nodes.delete(id)
-  }
+    return nodes.delete(id);
+  };
 
   nodeCollection.list = ({ withServices = true } = {}) => {
-    const result = []
+    const result = [];
     nodes.forEach(node => {
       if (withServices) {
-        result.push(omit(node, ['info']))
+        result.push(omit(node, ['info']));
       } else {
-        result.push(omit(node, ['info', 'services']))
+        result.push(omit(node, ['info', 'services']));
       }
-    })
-    return result
-  }
+    });
+    return result;
+  };
 
   nodeCollection.disconnected = (nodeId, isUnexpected) => {
-    const node = nodes.get(nodeId)
+    const node = nodes.get(nodeId);
     if (node && node.isAvailable) {
-      registry.deregisterServiceByNodeId(node.id)
-      node.disconnected(isUnexpected)
-      runtime.eventBus.broadcastLocal('$node.disconnected', nodeId, isUnexpected)
-      registry.log.warn(`Node '${node.id}'${isUnexpected ? ' unexpectedly' : ''} disconnected.`)
+      registry.deregisterServiceByNodeId(node.id);
+      node.disconnected(isUnexpected);
+      runtime.eventBus.broadcastLocal('$node.disconnected', nodeId, isUnexpected);
+      registry.log.warn(`Node '${node.id}'${isUnexpected ? ' unexpectedly' : ''} disconnected.`);
     }
-  }
+  };
 
   nodeCollection.toArray = () => {
-    const result = []
-    nodes.forEach(node => result.push(node))
-    return result
-  }
+    const result = [];
+    nodes.forEach(node => result.push(node));
+    return result;
+  };
 
   // get Local node information and add it to the collection by
   const addLocalNode = () => {
-    const node = createNode(runtime.options.nodeId)
+    const node = createNode(runtime.options.nodeId);
 
-    node.isLocal = true
-    node.IPList = getIpList()
+    node.isLocal = true;
+    node.IPList = getIpList();
     node.client = {
       type: 'nodejs',
       version: runtime.version,
       langVersion: process.version
-    }
+    };
 
-    node.sequence = 1
-    nodeCollection.add(node.id, node)
-    nodeCollection.localNode = node
+    node.sequence = 1;
+    nodeCollection.add(node.id, node);
+    nodeCollection.localNode = node;
 
-    return node
-  }
+    return node;
+  };
 
-  addLocalNode()
+  addLocalNode();
 
-  return nodeCollection
-}
+  return nodeCollection;
+};

package/lib/registry/collections/{service-collection.js → serviceCollection.js}

@@ -1,7 +1,7 @@
 // @ts-check
 
 /*
- * Author: Kevin Ries (kevin@fachw3rk.de)
+ * Author: Kevin Ries (kevin.ries@fachwerk.io)
  * -----
  * Copyright 2021 Fachwerk
 */
@@ -12,8 +12,8 @@
 */
 
 // const { createEndpointCollection } = require('./endpoint-collection')
-const { omit, remove } = require('@weave-js/utils')
-const { createServiceItem } = require('../service-item')
+const { omit, remove } = require('@weave-js/utils');
+const { createServiceItem } = require('../serviceItem');
 
 /**
  * Service collection factory
@@ -22,10 +22,10 @@ const { createServiceItem } = require('../service-item')
 */
 exports.createServiceCollection = (registry) => {
   /** @type {ServiceCollection} */
-  const serviceCollection = Object.create(null)
-  const { runtime } = registry
-  const services = serviceCollection.services = []
-  const actions = new Map()
+  const serviceCollection = Object.create(null);
+  const { runtime } = registry;
+  const services = serviceCollection.services = [];
+  const actions = new Map();
   // const options = broker.options
 
   // const findServiceByNode = (nodeId, name) => {
@@ -33,65 +33,71 @@ exports.createServiceCollection = (registry) => {
   // }
 
   serviceCollection.add = (node, name, version, settings) => {
-    const item = createServiceItem(node, name, version, settings, node.id === runtime.nodeId)
-    services.push(item)
-    return item
-  }
+    const item = createServiceItem(node, name, version, settings, node.id === runtime.nodeId);
+    services.push(item);
+    return item;
+  };
 
-  serviceCollection.get = (nodeId, name, version) => services.find(svc => svc.equals(name, version, nodeId))
+  serviceCollection.get = (nodeId, name, version) => services.find(svc => svc.equals(name, version, nodeId));
 
   serviceCollection.has = (name, version, nodeId) => {
-    return !!services.find(svc => svc.equals(name, version, nodeId))
-  }
+    return !!services.find(svc => svc.equals(name, version, nodeId));
+  };
 
   serviceCollection.remove = (nodeId, name, version) => {
-    const service = serviceCollection.get(nodeId, name, version)
+    const service = serviceCollection.get(nodeId, name, version);
 
     if (service) {
-      registry.actionCollection.removeByService(service)
-      registry.eventCollection.removeByService(service)
-      remove(services, svc => svc === service)
+      registry.actionCollection.removeByService(service);
+      registry.eventCollection.removeByService(service);
+      remove(services, svc => svc === service);
     }
-  }
+  };
 
   serviceCollection.removeAllByNodeId = (nodeId) => {
     remove(services, service => {
       if (service.node.id === nodeId) {
-        registry.actionCollection.removeByService(service)
-        registry.eventCollection.removeByService(service)
-        return true
+        registry.actionCollection.removeByService(service);
+        registry.eventCollection.removeByService(service);
+        return true;
       }
-      return false
-    })
-  }
+      return false;
+    });
+  };
 
-  serviceCollection.tryFindActionsByActionName = (actionName) => actions.get(actionName)
+  serviceCollection.tryFindActionsByActionName = (actionName) => actions.get(actionName);
 
   serviceCollection.getActionsList = () => {
-    const result = []
+    const result = [];
     actions.forEach((action, key) => {
       const item = {
         name: key,
         count: action.count(),
         hasLocal: action.hasLocal()
-      }
-      result.push(item)
-    })
-    return result
-  }
-
-  serviceCollection.list = ({ localOnly = false, withActions = false, withEvents = false, withNodeService = false, withSettings = false }) => {
-    const result = []
+      };
+      result.push(item);
+    });
+    return result;
+  };
+
+  serviceCollection.list = ({
+    localOnly = false,
+    withActions = false,
+    withEvents = false,
+    withNodeService = false,
+    withSettings = false
+  } = {}) => {
+    const result = [];
     services.forEach((service) => {
       if (/^\$node/.test(service.name) && !withNodeService) {
-        return
+        return;
       }
       if (service.settings && service.settings.$private) {
-        return
+        return;
       }
 
       if (localOnly && !service.isLocal) {
-        return
+        return;
       }
 
       const item = {
@@ -99,39 +105,39 @@ exports.createServiceCollection = (registry) => {
         nodeId: service.node.id,
         version: service.version,
         isAvailable: service.node.isAvailable
-      }
+      };
 
       if (withSettings) {
-        item.settings = service.settings
+        item.settings = service.settings;
       }
 
       if (withActions) {
-        item.actions = {}
+        item.actions = {};
         Object.values(service.actions)
           .forEach(action => {
-            item.actions[action.name] = omit(action, ['handler', 'service'])
-          })
+            item.actions[action.name] = omit(action, ['handler', 'service']);
+          });
       }
 
       if (withEvents) {
-        item.events = {}
+        item.events = {};
         Object.values(service.events)
           .forEach(event => {
-            item.events[event.name] = omit(event, ['service', 'handler'])
-          })
+            item.events[event.name] = omit(event, ['service', 'handler']);
+          });
       }
 
-      result.push(item)
-    })
-    return result
-  }
+      result.push(item);
+    });
+    return result;
+  };
 
   serviceCollection.findEndpointByNodeId = (actionName, nodeId) => {
-    const endpointListItem = serviceCollection.tryFindActionsByActionName(actionName)
+    const endpointListItem = serviceCollection.tryFindActionsByActionName(actionName);
     if (endpointListItem) {
-      return endpointListItem.endpointByNodeId(nodeId)
+      return endpointListItem.endpointByNodeId(nodeId);
     }
-  }
+  };
 
-  return serviceCollection
-}
+  return serviceCollection;
+};

package/lib/registry/eventEndpoint.js

@@ -0,0 +1,26 @@
+/*
+ * Author: Kevin Ries (kevin.ries@fachwerk.io)
+ * -----
+ * Copyright 2021 Fachwerk
+ */
+
+exports.createEventEndpoint = (broker, node, service, event) => {
+  const eventEndpoint = Object.create(null);
+
+  eventEndpoint.node = node;
+  eventEndpoint.service = service;
+  eventEndpoint.action = event;
+  eventEndpoint.isLocal = eventEndpoint.node.id === broker.nodeId;
+  eventEndpoint.state = true;
+  eventEndpoint.name = `${node.id}:${event.name}`;
+
+  eventEndpoint.updateEvent = (newEvent) => {
+    eventEndpoint.action = newEvent;
+  };
+
+  eventEndpoint.isAvailable = () => {
+    return eventEndpoint.state;
+  };
+
+  return eventEndpoint;
+};

package/lib/registry/load-balancer/base.js

@@ -1,7 +1,7 @@
 module.exports = (broker, registry) => {
   return {
     next (/* endpointList,context*/) {
-      broker.handleError(new Error('Method not implemented!'))
+      broker.handleError(new Error('Method not implemented!'));
     }
-  }
-}
+  };
+};

package/lib/registry/load-balancer/index.js

@@ -1,22 +1,22 @@
 const Strategies = {
   Random: require('./random'),
   RoundRobin: require('./round-robin')
-}
+};
 const getByName = name => {
   if (!name) {
-    return null
+    return null;
   }
 
-  const n = Object.keys(Strategies).find(n => n.toLowerCase() === name.toLowerCase())
+  const n = Object.keys(Strategies).find(n => n.toLowerCase() === name.toLowerCase());
   if (n) {
-    return this.Cache[n]
+    return this.Cache[n];
   }
-}
+};
 
 module.exports = {
   resolve (option) {
     if (typeof option === 'string') {
-      return getByName(option)
+      return getByName(option);
     }
   }
-}
+};

package/lib/registry/node.js

@@ -1,5 +1,5 @@
 /*
- * Author: Kevin Ries (kevin@fachw3rk.de)
+ * Author: Kevin Ries (kevin.ries@fachwerk.io)
  * -----
  * Copyright 2021 Fachwerk
  */
@@ -8,7 +8,7 @@
  * @typedef {import('../types.js').Node} Node
 */
 
-const { cpuUsage } = require('@weave-js/utils')
+const { cpuUsage } = require('@weave-js/utils');
 
 /**
  * Node factory
@@ -38,53 +38,53 @@ exports.createNode = (nodeId) => {
     events: null,
     IPList: [],
     update (payload, isReconnected) {
-      const newSequence = payload.sequence || 1
+      const newSequence = payload.sequence || 1;
 
-      this.services = payload.services
-      this.events = payload.events
-      this.client = payload.client || {}
-      this.IPList = payload.IPList || []
-      this.info = payload
+      this.services = payload.services;
+      this.events = payload.events;
+      this.client = payload.client || {};
+      this.IPList = payload.IPList || [];
+      this.info = payload;
 
       if ((newSequence > this.sequence) || isReconnected === true) {
-        this.sequence = newSequence
-        this.offlineTime = null
+        this.sequence = newSequence;
+        this.offlineTime = null;
 
-        return true
+        return true;
       }
-      return false
+      return false;
     },
     updateLocalInfo () {
       cpuUsage().then(result => {
-        const newVal = Math.round(result.avg)
+        const newVal = Math.round(result.avg);
 
         if (this.cpu !== newVal) {
-          this.cpu = Math.round(result.avg)
-          this.cpuSequence++
+          this.cpu = Math.round(result.avg);
+          this.cpuSequence++;
         }
-      })
+      });
     },
     heartbeat (payload) {
       if (!this.isAvailable) {
-        this.isAvailable = true
-        this.offlineTime = null
+        this.isAvailable = true;
+        this.offlineTime = null;
       }
 
       if (payload.cpu !== null) {
-        this.cpu = payload.cpu
-        this.cpuSequence = payload.cpuSequence || 1
+        this.cpu = payload.cpu;
+        this.cpuSequence = payload.cpuSequence || 1;
       }
 
-      this.lastHeartbeatTime = Date.now()
+      this.lastHeartbeatTime = Date.now();
     },
     disconnected (isUnexpected = false) {
       if (this.isAvailable) {
-        this.offlineTime = Date.now()
-        this.sequence++
-        this.isUnexpectedDisconnected = isUnexpected
+        this.offlineTime = Date.now();
+        this.sequence++;
+        this.isUnexpectedDisconnected = isUnexpected;
       }
 
-      this.isAvailable = false
+      this.isAvailable = false;
     }
-  }
-}
+  };
+};