systemlynx 1.12.8 → 1.12.10

package/client.js

@@ -5,7 +5,7 @@ const createDispatcher = require("./systemlynx/Dispatcher/Dispatcher");
 
 const HttpClient = createHttpClient();
 const Client = createClient();
-const Dispatcher = createDispatcher();
+const Dispatcher = new createDispatcher();
 
 module.exports = {
   //Export these pre-created objects for convenient object destructuring

package/index.js

@@ -15,7 +15,7 @@ const LoadBalancer = isNode ? createLoadBalancer() : null;
 const App = createApp();
 const HttpClient = createHttpClient();
 const Client = createClient();
-const Dispatcher = createDispatcher();
+const Dispatcher = new createDispatcher();
 
 module.exports = {
   //Export these pre-created objects for convenient object destructuring

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systemlynx",
-  "version": "1.12.8",
+  "version": "1.12.10",
   "description": "",
   "main": "index.js",
   "browser": {

package/systemlynx/App/components/loadModules.js

@@ -6,5 +6,6 @@ module.exports = async function loadModules(system, App) {
   if (system.routing) {
     system.connectionData = await system.Service.startService(system.routing);
   }
+  system.modules.forEach((mod) => mod.module.emit("ready"));
   App.emit("ready", system);
 };

package/systemlynx/Client/components/ServiceRequestHandler.js

@@ -63,9 +63,11 @@ module.exports = function ServiceRequestHandler(
     };
 
     const ErrorHandler = (err, errCount, cb) => {
-      if (!err.isAxiosError) {
-        throw err;
-      } else if (err.response.data.SystemLynxService) {
+      if (!err.isAxiosError) throw err;
+      if (!err.response) throw err;
+      if (!err.response.data) throw err;
+
+      if (err.response.data.SystemLynxService) {
         cb(err.response.data);
       } else if (errCount <= 3) {
         errCount++;

package/systemlynx/Client/components/SocketDispatcher.js

@@ -7,7 +7,7 @@ module.exports = function SocketDispatcher(namespace, events = {}, systemContext
     (this || {}).on && (this || {}).emit
       ? this
       : createDispatcher.apply(this, [events, systemContext]);
-  const socket = io.connect(namespace);
+  const socket = io.connect(namespace, { reconnection: false });
   socket.on("dispatch", (event) => dispatcher.emit(event.name, event.data, event));
   socket.on("disconnect", () => {
     socket.disconnect();

package/systemlynx/Client/tests/SocketDispatcher.test.js

@@ -11,7 +11,7 @@ SocketServer.listen(port);
 
 describe("SocketDispatcher", () => {
   const eventName = "test-event";
-  const dispatcher = SocketDispatcher(`http://localhost:${port}/${namespace}`);
+  const dispatcher = new SocketDispatcher(`http://localhost:${port}/${namespace}`);
   it("should return an EventDispatcher object with methods on and emit", async () => {
     expect(dispatcher)
       .to.be.an("object")

package/systemlynx/Dispatcher/Dispatcher.js

@@ -1,4 +1,5 @@
-"use strict";
+const throttle = require("../../utils/throttle");
+
 module.exports = function createDispatcher(events = {}, systemContext) {
   const Dispatcher = this || {};
 
@@ -10,12 +11,13 @@ module.exports = function createDispatcher(events = {}, systemContext) {
     return Dispatcher;
   };
 
-  Dispatcher.on = (eventName, callback) => {
+  Dispatcher.on = (eventName, callback, { limit, interval } = {}) => {
     if (typeof callback !== "function") return Dispatcher;
-
+    const name = callback.name;
+    if (typeof interval === "number") callback = throttle(callback, limit, interval);
     if (!events[eventName]) events[eventName] = [];
 
-    if (callback.name) {
+    if (name) {
       //if the function has a name and it already present don't add it
       const i = events[eventName].findIndex((fn) => fn.name === callback.name);
       if (i === -1) events[eventName].push(callback);

package/systemlynx/Dispatcher/Dispatcher.test.js

@@ -2,7 +2,7 @@ const { expect } = require("chai");
 const Dispatcher = require("./Dispatcher");
 
 describe("createDispatcher", () => {
-  const dispatcher = Dispatcher();
+  const dispatcher = new Dispatcher();
   it("should return an EventDispatcher object with methods on and emit", async () => {
     expect(dispatcher)
       .to.be.an("object")

package/systemlynx/ServerManager/ServerManager.js

@@ -146,6 +146,7 @@ module.exports = function createServerManager(customServer, customWebSocketServe
     });
 
     function addMiddleware(middleware) {
+      if (Array.isArray(middleware)) return middleware.map(addMiddleware);
       if (!serverConfigurations.validators[name])
         serverConfigurations.validators[name] = [];
       serverConfigurations.validators[name].push(async function (req, res, next) {

package/systemlynx/ServerManager/components/Router.js

@@ -11,6 +11,7 @@ module.exports = function createRouter(server, config) {
         req.module_name = module_name;
         req.fn = fn;
         req.Module = Module;
+        req.module = Module;
         next();
       },
       setHelpers,
@@ -26,6 +27,7 @@ module.exports = function createRouter(server, config) {
         req.module_name = module_name;
         req.fn = method;
         req.Module = Module;
+        req.module = Module;
         next();
       },
       setHelpers,

package/utils/throttle.js

@@ -0,0 +1,19 @@
+module.exports = function throttleByCount(func, limit = 1, interval) {
+  let callCount = 0;
+  let resetTimer;
+
+  return function (...args) {
+    callCount++;
+
+    if (callCount <= limit) {
+      func.apply(this, args);
+    }
+
+    if (!resetTimer) {
+      resetTimer = setTimeout(() => {
+        callCount = 0;
+        resetTimer = null;
+      }, interval);
+    }
+  };
+};