systemlynx 1.3.0 → 1.5.0

package/API.md

@@ -10,8 +10,7 @@ Welcome to the docs! Following is a list of the objects used and created when de
 - [**startService(options)**](https://github.com/Odion100/SystemLynx/blob/tasksjs2.0/API.md#appstartserviceoptions) 
 - [**loadService(name, url)**](https://github.com/Odion100/SystemLynx/blob/tasksjs2.0/API.md#apploadserviceurl) 
 - [**onLoad(callback)**](https://github.com/Odion100/SystemLynx/tasksjs2.0/API.md#apponloadcallback) 
-- [**ServerModule(name, constructor [,reserved_methods])**]() 
-- [**Module(name, constructor)**](https://github.com/Odion100/SystemLynx/tasksjs2.0/API.md#appmodulename-constructor) 
+- [**module(name, constructor [,reserved_methods])**]() 
 - [**config(constructor)**](https://github.com/Odion100/SystemLynx/tasksjs2.0/API.md#appconfigconstructor) 
 - [**on(event, callback)**]() 
 - [**emit(event, payload)**]()
@@ -29,7 +28,7 @@ Welcome to the docs! Following is a list of the objects used and created when de
    <summary><b><a href="https://github.com/Odion100/SystemLynx/tasksjs2.0/API.md#service">Service</a></b></summary>
     
 - [**startService(options)**]() 
-- [**ServerModule(name, constructor [,options])**]() 
+- [**module(name, constructor [,options])**]() 
 - [**Server()**]() 
 - [**WebSocket()**]()
 
@@ -39,7 +38,7 @@ Welcome to the docs! Following is a list of the objects used and created when de
    <summary><b><a href="https://github.com/Odion100/SystemLynx/tasksjs2.0/API.md#service">LoadBalancer</a></b></summary>
     
 - [**startService(options)**]() 
-- [**ServerModule(name, constructor [,options])**]() 
+- [**module(name, constructor [,options])**]() 
 - [**Server()**]() 
 - [**WebSocket()**]() 
 - [**clones**]()
@@ -61,7 +60,7 @@ Welcome to the docs! Following is a list of the objects used and created when de
 </details>
 
 <details>
-   <summary><b><a href="https://github.com/Odion100/SystemLynx/tasksjs2.0/API.md">ServerModule</a></b></summary>
+   <summary><b><a href="https://github.com/Odion100/SystemLynx/tasksjs2.0/API.md">module</a></b></summary>
     
 - [**[created_method]([args...] [,callback])**]() 
 - [**on(name, constructor [,options])**]() 
@@ -79,9 +78,9 @@ Welcome to the docs! Following is a list of the objects used and created when de
 const { App } = require("systemlynx");
 ```
 
-## App.ServerModule(name, constructor [,reserved_methods])
+## App.module(name, constructor [,reserved_methods])
 
-Use **App.ServerModule(name, constructor)** function to create or pass an object that can be loaded by a SystemLynx Client.
+Use **App.module(name, constructor)** function to create or pass an object that can be loaded by a SystemLynx Client.
 
 - **_name_** (string) - name assigned to the module or object
 - **_constructor_** (object/function) -
@@ -92,7 +91,7 @@ Use **App.ServerModule(name, constructor)** function to create or pass an object
 
 ## App.onLoad(callback)
 
-## App.Module(name, constructor)
+## App.module(name, constructor)
 
 ## App.config(constructor)
 
@@ -116,15 +115,15 @@ const { Service } = require("systemlynx");
 
 The Service object has the following methods:
 
-- **_Service.ServerModule(name, constructor [,reserved_methods])_** - Used to create or pass an object that is hosted by the Service.
+- **_Service.module(name, constructor [,reserved_methods])_** - Used to create or pass an object that is hosted by the Service.
 - **_Service.startService(options)_** - Used
 - **_Service.Server()_** - Returns the expressJS app instance used to handle routing to the _Services_.
 - **_Service.WebSocket()_** - Returns socket.io WebSocket instance used to emit events from the _Services_.
 
-## Service.ServerModule(name, constructor [,reserved_methods])
+## Service.module(name, constructor [,reserved_methods])
 
 - **Name** - String -
-  Use the `Service.ServerModule(name, constructor, [,options])` method to register an object to be hosted by a _SystemLynx Service_. This will allows you to load an instance of that object onto a client application, and call any methods on that object remotely.
+  Use the `Service.module(name, constructor, [,options])` method to register an object to be hosted by a _SystemLynx Service_. This will allows you to load an instance of that object onto a client application, and call any methods on that object remotely.
 
 ```javascript
 const { Service } = require("systemlynx");

package/README.md

@@ -1,8 +1,8 @@
-# SystemLynx ![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg) ![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg) ![JS 100%](https://img.shields.io/badge/JavaScript-100%25-green)
+# SystemLynx JS ![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg) ![PRs Welcome](https://img.shields.io/badge/PRs-welcome-blue.svg) ![JS 100%](https://img.shields.io/badge/JavaScript-100%25-green)
 
-SystemLynx is a framework for developing modular web APIs. It's a wrapper on top of ExpressJS and Socket.io. With SystemLynx, instead of creating a server with many endpoints, you can simply export objects from the server to the client application. Basically any objects added to a SystemLynx Service can be loaded and used by a SystemLynx Client.
+SystemLynx is a framework for developing modular web APIs in NodeJS. It's a wrapper on top of ExpressJS and Socket.io. With SystemLynx, instead of developing a server with endpoints, you can simply export objects from a server into a client application. Basically any objects hosted by a SystemLynx Service can be loaded and used by a SystemLynx Client.
 
-SystemLynx comes with the following objects that are used for web API development:
+SystemLynx comes with the following objects that are used for web app development:
 
 ```javascript
 const { App, Service, Client, LoadBalancer } = require("systemlynx");
@@ -20,9 +20,9 @@ Find the full [API Documentation](https://github.com/Odion100/SystemLynx/blob/ta
 
 # Quick Start
 
-## Service.ServerModule(name, constructor [,options])
+## Service.module(name, constructor [,options])
 
-Use the `Service.ServerModule(name, constructor/object)` method to register an object to be hosted by a **SystemLynx Service**. This will allows you to load an instance of that object onto a client application, and call any methods on that object remotely.
+Use the `Service.module(name, constructor/object)` method to add an object to be hosted by a **SystemLynx Service**. This will allows you to load an instance of that object into a client application, and call any methods on that object remotely.
 
 ```javascript
 const { Service } = require("systemlynx");
@@ -34,13 +34,12 @@ Users.add = function (data) {
   return { message: "You have successfully called the Users.add method" };
 };
 
-Service.ServerModule("Users", Users);
+Service.module("Users", Users);
 ```
 
-In the code above we assigned an object to the variable `Users` and gave it an add method. The `Service.ServerModule(name, constructor/object)` function takes the name assigned to the object as the first argument and the object itself as the second argument.
+In the code above we assigned an object to the variable `Users` and gave it an add method. The `Service.module(name, constructor/object)` function takes the name assigned to the object as the first argument and the object itself as the second argument.
 
-Alternatively, you can use a constructor function instead of an object as the second argument. In the example below we create another **ServerModule** called
-"Orders". This time we use a constructor function as the second argument of the to **ServerModule** function. The `this` value is the initial instance of the **ServerModule** object. Every method added to the `this` value will be accessible when the object is loaded by a **SystemLynx Client**. Note: **ServerModule** methods can be synchronous or asynchronous functions.
+Alternatively, you can use a constructor function instead of an object as the second argument. In the example below we create another **Module** called "Orders". This time we use a constructor function as the second argument of the to **Service.module** function. The `this` value is the initial instance of the **Module** object. Every method added to the `this` value will be accessible when the object is loaded by a **SystemLynx Client**. Note: **Module** methods can be synchronous or asynchronous functions.
 
 ```javascript
 const { Service } = require("systemlynx");
@@ -52,9 +51,9 @@ Users.add = function (data) {
   return { message: "You have successfully called the Users.add method" };
 };
 
-Service.ServerModule("Users", Users);
+Service.module("Users", Users);
 
-Service.ServerModule("Orders", function () {
+Service.module("Orders", function () {
   const Orders = this;
 
   Orders.find = async function (arg1, arg2) {
@@ -78,9 +77,9 @@ Users.add = function (data) {
   return { message: "You have successfully called the Users.add method" };
 };
 
-Service.ServerModule("Users", Users);
+Service.module("Users", Users);
 
-Service.ServerModule("Orders", function () {
+Service.module("Orders", function () {
   const Orders = this;
 
   Orders.find = function (arg1, arg2) {
@@ -126,7 +125,7 @@ console.log(response);
 
 ## Sending and Receiving Websocket Events
 
-We can also receive WebSocket events emitted from the remote objects we've loaded using the `Client.loadService(url)` function. In the example below we're using the `Users.on(event_name, callback)` method to listen for events coming from the "Users" **ServerModule**.
+We can also receive WebSocket events emitted from the remote objects we've loaded using the `Client.loadService(url)` function. In the example below we're using the `Users.on(event_name, callback)` method to listen for events coming from the "Users" **Module**.
 
 ```javascript
 const { Client } = require("systemlynx");
@@ -148,7 +147,7 @@ const response = await Orders.find("hello", "world");
 console.log(response);
 ```
 
-Now let's go to our server application and call the `this.emit(event_name, data)` method to emit a websocket event that can be received by its corresponding Clients. Below, notice that we've added `this.emit("new_user", { message:"new_user event test" })` at the end of the `Users.add` method, so the `new_user` event will be emitted every time this method is called. The `this` value of a **ServerModule** method will always be scoped to the **ServerModule** itself.
+Now let's go to our server application and call the `Users.emit(event_name, data)` method to emit a websocket event that can be received by its corresponding Clients. Below, notice that we've added `this.emit("new_user", { message:"new_user event test" })` at the end of the `Users.add` method, so the `new_user` event will be emitted every time this method is called. The `this` value of a **Module** method will always be scoped to the **Module** itself.
 
 ```javascript
 const { Service } = require("systemlynx");
@@ -161,9 +160,9 @@ Users.add = function (data) {
   this.emit("new_user", { message: "new_user event test" });
 };
 
-Service.ServerModule("Users", Users);
+Service.module("Users", Users);
 
-Service.ServerModule("Orders", function () {
+Service.module("Orders", function () {
   const Orders = this;
 
   Orders.find = function (arg1, arg2) {

package/index.js

@@ -1,21 +1,21 @@
 //These are all the abstractions that make up SystemLynx
 const { isNode } = require("./utils/ProcessChecker");
-const AppFactory = require("./systemlynx/App/App");
-const LoadBalancerFactory = require("./systemlynx/LoadBalancer/LoadBalancer");
-const ServiceFactory = require("./systemlynx/Service/Service");
-const ServerManagerFactory = require("./systemlynx/ServerManager/ServerManager");
-const ClientFactory = require("./systemlynx/Client/Client");
-const HttpClientFactory = require("./systemlynx/HttpClient/HttpClient");
-const DispatcherFactory = require("./systemlynx/Dispatcher/Dispatcher");
+const SystemLynxApp = require("./systemlynx/App/App");
+const SystemLynxLoadBalancer = require("./systemlynx/LoadBalancer/LoadBalancer");
+const SystemLynxService = require("./systemlynx/Service/Service");
+const SystemLynxServerManager = require("./systemlynx/ServerManager/ServerManager");
+const SystemLynxClient = require("./systemlynx/Client/Client");
+const SystemLynxHttpClient = require("./systemlynx/HttpClient/HttpClient");
+const SystemLynxDispatcher = require("./systemlynx/Dispatcher/Dispatcher");
 
-const ServerManager = isNode ? ServerManagerFactory() : null;
-const Service = isNode ? ServiceFactory() : null;
-const LoadBalancer = isNode ? LoadBalancerFactory() : null;
+const ServerManager = isNode ? SystemLynxServerManager() : null;
+const Service = isNode ? SystemLynxService() : null;
+const LoadBalancer = isNode ? SystemLynxLoadBalancer() : null;
 
-const App = AppFactory();
-const HttpClient = HttpClientFactory();
-const Client = ClientFactory();
-const Dispatcher = DispatcherFactory();
+const App = SystemLynxApp();
+const HttpClient = SystemLynxHttpClient();
+const Client = SystemLynxClient();
+const Dispatcher = SystemLynxDispatcher();
 
 module.exports = {
   //Export these pre-created objects for convenient object destructuring
@@ -30,11 +30,11 @@ module.exports = {
   //export all modules themselves
   //all these modules export factory functions
   //to ensure non-singleton behavior
-  AppFactory,
-  LoadBalancerFactory,
-  ServiceFactory,
-  ClientFactory,
-  HttpClientFactory,
-  ServerManagerFactory,
-  DispatcherFactory,
+  SystemLynxApp,
+  SystemLynxLoadBalancer,
+  SystemLynxService,
+  SystemLynxClient,
+  SystemLynxHttpClient,
+  SystemLynxServerManager,
+  SystemLynxDispatcher,
 };

package/index.test.js

@@ -6,22 +6,22 @@ const {
   Client,
   Service,
   ServerManager,
-  AppFactory,
-  LoadBalancerFactory,
-  ServiceFactory,
-  ClientFactory,
-  HttpClientFactory,
-  ServerManagerFactory,
+  SystemLynxApp,
+  SystemLynxLoadBalancer,
+  SystemLynxService,
+  SystemLynxClient,
+  SystemLynxHttpClient,
+  SystemLynxServerManager,
 } = require("./index");
 
-describe("SystemLynx Factory functions", () => {
-  it("should return a factory functions for each SystemLynx abstraction", () => {
-    expect(AppFactory).to.be.a("function");
-    expect(LoadBalancerFactory).to.be.a("function");
-    expect(ServiceFactory).to.be.a("function");
-    expect(ClientFactory).to.be.a("function");
-    expect(HttpClientFactory).to.be.a("function");
-    expect(ServerManagerFactory).to.be.a("function");
+describe("SystemLynxSystemLynx  functions", () => {
+  it("should return aSystemLynx  functions for each SystemLynx abstraction", () => {
+    expect(SystemLynxApp).to.be.a("function");
+    expect(SystemLynxLoadBalancer).to.be.a("function");
+    expect(SystemLynxService).to.be.a("function");
+    expect(SystemLynxClient).to.be.a("function");
+    expect(SystemLynxHttpClient).to.be.a("function");
+    expect(SystemLynxServerManager).to.be.a("function");
   });
 
   it("should return an instance of each SystemLynx abstraction", () => {});
@@ -33,7 +33,6 @@ describe("SystemLynx Objects", () => {
       .to.be.an("object")
       .that.has.all.keys(
         "module",
-        "ServerModule",
         "on",
         "emit",
         "startService",
@@ -42,7 +41,6 @@ describe("SystemLynx Objects", () => {
         "config"
       )
       .that.respondsTo("module")
-      .that.respondsTo("ServerModule")
       .that.respondsTo("on")
       .that.respondsTo("emit")
       .that.respondsTo("startService")
@@ -74,13 +72,13 @@ describe("SystemLynx Objects", () => {
         "Server",
         "WebSocket",
         "defaultModule",
-        "ServerModule",
-        "clones"
+        "clones",
+        "module"
       )
       .that.respondsTo("startService")
       .that.respondsTo("Server")
       .that.respondsTo("WebSocket")
-      .that.respondsTo("ServerModule");
+      .that.respondsTo("module");
     expect(LoadBalancer.clones)
       .to.be.an("object")
       .that.has.all.keys("on", "emit", "clones", "register", "dispatch", "assignDispatch")
@@ -106,15 +104,7 @@ describe("SystemLynx Objects", () => {
   it("should return a new instance of a Service", () => {
     expect(Service)
       .to.be.an("object")
-      .that.has.all.keys(
-        "startService",
-        "ServerModule",
-        "Server",
-        "WebSocket",
-        "defaultModule"
-      )
       .that.respondsTo("startService")
-      .that.respondsTo("ServerModule")
       .that.respondsTo("Server")
       .that.respondsTo("WebSocket");
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "systemlynx",
-  "version": "1.3.0",
+  "version": "1.5.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/systemlynx/App/App.js

@@ -4,32 +4,27 @@ const ServiceFactory = require("../Service/Service");
 const SystemObject = require("./components/SystemObject");
 const Dispatcher = require("../Dispatcher/Dispatcher");
 const initializeApp = require("./components/initializeApp");
-const URL = require("url");
 
 module.exports = function SystemLynxApp() {
-  const App = Dispatcher();
-  const system = {
-    Services: [],
-    Modules: [],
-    ServerModules: [],
-    configurations: {},
-    App,
-    routing: null,
-  };
-  SystemObject.apply(system, [system]);
+  const { on, emit } = Dispatcher();
+  const App = { emit };
+  const system = { Services: [], Modules: [], configurations: {}, App, routing: null };
+  const systemObject = SystemObject(system);
   setTimeout(() => initializeApp(system), 0);
 
+  App.on = (name, callback) => on(name, callback.bind(systemObject));
+
   if (isNode) {
     system.Service = ServiceFactory();
-    system.Service.defaultModule = SystemObject(system);
+    system.Service.defaultModule = systemObject;
 
     App.startService = (options) => {
       system.routing = options;
       return App;
     };
 
-    App.ServerModule = (name, __constructor) => {
-      system.ServerModules.push({
+    App.module = (name, __constructor) => {
+      system.Modules.push({
         name,
         __constructor,
       });
@@ -53,21 +48,12 @@ module.exports = function SystemLynxApp() {
     return App;
   };
 
-  App.module = (name, __constructor) => {
-    system.Modules.push({
-      name,
-      __constructor,
-      module: SystemObject(system),
-    });
-    return App;
-  };
-
   App.config = (__constructor) => {
     if (typeof __constructor === "function")
       system.configurations = { __constructor, module: SystemObject(system) };
     else
       throw Error(
-        "App.config methods requires a constructor function as it first parameter."
+        "[SystemLynx][App][Error]: App.config(...) methods requires a constructor function as its first parameter."
       );
     return App;
   };

package/systemlynx/App/components/initializeApp.js

@@ -18,7 +18,7 @@ module.exports = async function initApp(system) {
   try {
     await loadServices(system);
   } catch (err) {
-    throw `(AppERROR): Initialization Error - failed to load all services`;
+    throw `[SystemLynx][App][Error]: Initialization Error - failed to load all services`;
   }
 
   if (typeof system.configurations.__constructor === "function") {
@@ -27,7 +27,7 @@ module.exports = async function initApp(system) {
       () => {
         configComplete = true;
         loadModules(system);
-      }
+      },
     ]);
   } else loadModules(system);
 };

package/systemlynx/App/components/loadModules.js

@@ -1,14 +1,10 @@
 const Dispatcher = require("../../Dispatcher/Dispatcher");
 
 module.exports = async function loadModules(system) {
-  system.Modules.forEach((mod) => {
-    Dispatcher.apply(mod.module);
-    mod.__constructor.apply(mod.module);
-  });
-
-  system.ServerModules.forEach(({ name, __constructor }) =>
-    system.Service.ServerModule(name, __constructor)
+  system.Modules.forEach(
+    (mod) => (mod.module = system.Service.module(mod.name, mod.__constructor))
   );
+
   if (system.routing) await system.Service.startService(system.routing);
   system.App.emit("ready", system);
 };

package/systemlynx/App/tests/App.test.js

@@ -11,7 +11,6 @@ describe("App Factory", () => {
       .to.be.an("object")
       .that.has.all.keys(
         "module",
-        "ServerModule",
         "on",
         "emit",
         "startService",
@@ -20,7 +19,6 @@ describe("App Factory", () => {
         "config"
       )
       .that.respondsTo("module")
-      .that.respondsTo("ServerModule")
       .that.respondsTo("on")
       .that.respondsTo("emit")
       .that.respondsTo("startService")
@@ -35,7 +33,7 @@ describe("App: Loading Services", () => {
     const route = "test-service";
     const port = "8503";
 
-    Service.ServerModule("mod", function () {
+    Service.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     });
@@ -68,7 +66,7 @@ describe("App: Loading Services", () => {
     const port = "8422";
     const url = `http://localhost:${port}/${route}`;
 
-    Service.ServerModule("mod", function () {
+    Service.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     });
@@ -95,7 +93,7 @@ describe("App: Loading Services", () => {
     const route = "test-service";
     const port = "8423";
     const url = `http://localhost:${port}/${route}`;
-    Service.ServerModule("mod", function () {
+    Service.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     });
@@ -131,7 +129,7 @@ describe("App: Loading Services", () => {
     const port = "8442";
     const url = `http://localhost:${port}/${route}`;
 
-    Service.ServerModule("mod", function () {
+    Service.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     });
@@ -156,7 +154,7 @@ describe("App: Loading Services", () => {
   });
 });
 
-describe("App SystemObjects: Initializing Modules,  ServerModules and configurations", () => {
+describe("App SystemObjects: Initializing Modules,  Modules and configurations", () => {
   it("should be able to use App.module to initialize a module", async () => {
     const App = AppFactory();
     return new Promise((resolve) =>
@@ -208,18 +206,18 @@ describe("App SystemObjects: Initializing Modules,  ServerModules and configurat
       .that.is.an("array").that.is.empty;
     expect(connData.serviceUrl).to.equal(url);
   });
-  it("should be able to use App.ServerModule to add a hosted ServerModule to the Service", async () => {
+  it("should be able to use App.module to add a hosted Module to the Service", async () => {
     const App = AppFactory();
     const route = "test-service";
     const port = "8494";
     const url = `http://localhost:${port}/${route}`;
     await new Promise((resolve) =>
       App.startService({ route, port })
-        .ServerModule("mod", function () {
+        .module("mod", function () {
           this.test = () => {};
           this.test2 = () => {};
         })
-        .ServerModule("mod2", function () {
+        .module("mod2", function () {
           this.test = () => {};
           this.test2 = () => {};
         })
@@ -256,7 +254,7 @@ describe("App SystemObjects: Initializing Modules,  ServerModules and configurat
   it('should be able to use App.on("ready", callback) fire a callback when App initialization is complete', async () => {
     const App = AppFactory();
 
-    App.ServerModule("mod", function () {
+    App.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     }).module("mod", function () {
@@ -272,13 +270,9 @@ describe("App SystemObjects: Initializing Modules,  ServerModules and configurat
             "Services",
             "Service",
             "Modules",
-            "ServerModules",
             "configurations",
             "App",
-            "routing",
-            "useService",
-            "useModule",
-            "useConfig"
+            "routing"
           );
         resolve();
       })
@@ -288,7 +282,7 @@ describe("App SystemObjects: Initializing Modules,  ServerModules and configurat
   it("should be able to use App.config(constructor) to construct a configuartion module", async () => {
     const App = AppFactory();
 
-    App.ServerModule("mod", function () {
+    App.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     })
@@ -318,7 +312,7 @@ describe("App SystemObjects: Initializing Modules,  ServerModules and configurat
 });
 
 describe("SystemObjects", () => {
-  it("should be able to use this.useModule and this.useService within modules and ServerModule", () => {
+  it("should be able to use this.useModule and this.useService within modules and Module", () => {
     const App = AppFactory();
     App.module("mod1", function () {
       expect(this)
@@ -348,6 +342,17 @@ describe("SystemObjects", () => {
           .that.respondsTo("useConfig");
         this.configPassed = true;
         next();
+      })
+      .on("ready", function () {
+        expect(this)
+          .to.be.an("object")
+          .that.respondsTo("useService")
+          .that.respondsTo("useModule")
+          .that.respondsTo("useConfig");
+        const mod1 = this.useModule("mod1");
+        const config = this.useConfig();
+        expect(mod1.testPassed).to.equal(true);
+        expect(config.configPassed).to.equal(true);
       });
     return new Promise((resolve) => App.on("ready", () => resolve()));
   });

package/systemlynx/Client/components/ServiceRequestHandler.js

@@ -49,7 +49,7 @@ module.exports = function ServiceRequestHandler(method, fn, resetConnection) {
         console.log(err);
         errCount++;
         resetConnection(() => tryRequest(cb, errCount));
-      } else throw Error(`(SystemLynxServiceError): Invalid route:${err}`);
+      } else throw Error(`[SystemLynx][Service][Error]: Invalid route:${err}`);
     };
 
     return new Promise((resolve, reject) =>

package/systemlynx/Client/components/loadConnectionData.js

@@ -11,7 +11,7 @@ module.exports = function loadConnectionData(url, { limit = 10, wait = 150 } = {
         if (errors.length < limit)
           setTimeout(() => getData(resolve), errors.length * wait);
         else
-          throw `SystemLynx loadConnectionData() Error: url:${url}, attempts:${errors.length}`;
+          throw `[SystemLynx][Client][Error]: Failed to load Service @${url} after ${errors.length} attempts.`;
       } else resolve(results);
     });
   });

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

@@ -17,7 +17,7 @@ describe("Client Factory", () => {
 });
 describe("Client", () => {
   it("should be able to use Client.loadService(url, options) to return a promise that resolve into a backend service", async () => {
-    Service.ServerModule(
+    Service.module(
       "orders",
       function () {
         this.action1 = (data) => ({ SERVICE_TEST_PASSED: true, ...data, action1: true });
@@ -73,7 +73,7 @@ describe("Client", () => {
 });
 
 describe("Service", () => {
-  it("should be able to call methods from the frontend client to the backend ServerModule", async () => {
+  it("should be able to call methods from the frontend client to the backend Module", async () => {
     const Client = ClientFactory();
     const buAPI = await Client.loadService(url);
 
@@ -88,7 +88,7 @@ describe("Service", () => {
       action2: true,
     });
   });
-  it("should be able to send multiple arguments to the backend ServerModule", async () => {
+  it("should be able to send multiple arguments to the backend Module", async () => {
     const Client = ClientFactory();
     const buAPI = await Client.loadService(url);
     const arg1 = 4,
@@ -119,7 +119,7 @@ describe("Service", () => {
 
   it("should be able to receive events emitted from the backend Client", async () => {
     const eventName = "testing";
-    const eventTester = Service.ServerModule("eventTester", function () {
+    const eventTester = Service.module("eventTester", function () {
       const eventTester = this;
       eventTester.sendEvent = () => eventTester.emit(eventName, { testPassed: true });
     });
@@ -149,7 +149,7 @@ describe("Service", () => {
     const port = "8492";
     const url = `http://localhost:${port}/${route}`;
     const useREST = true;
-    Service.ServerModule("restTester", function () {
+    Service.module("restTester", function () {
       this.get = (data) => ({ REST_TEST_PASSED: true, getResponse: true, ...data });
       this.put = () => ({ REST_TEST_PASSED: true, putResponse: true });
       this.post = () => ({ REST_TEST_PASSED: true, postResponse: true });
@@ -177,13 +177,13 @@ describe("Service", () => {
     });
   });
 
-  it("should be able to use 'useReturnValue' configuration option to enable synchronous return values from ServerModule methods", async () => {
+  it("should be able to use 'useReturnValue' configuration option to enable synchronous return values from Module methods", async () => {
     const service = ServiceFactory();
     const route = "sync/test";
     const port = 4920;
     const host = "localhost";
     const url = `http://localhost:${port}/${route}`;
-    service.ServerModule("AsyncMath", function () {
+    service.module("AsyncMath", function () {
       this.max = Math.max;
       this.min = Math.min;
       this.round = Math.round;

package/systemlynx/Dispatcher/Dispatcher.js

@@ -10,7 +10,7 @@ module.exports = function SystemLynxDispatcher(events = {}) {
   Dispatcher.on = (eventName, callback) => {
     if (typeof callback !== "function")
       throw Error(
-        "SystemLynxDispatcher Error: object.on(eventName, callback) invalid parameters"
+        "[SystemLynx][EventHandler][Error]: EventHandler.on(eventName, callback) received invalid parameters"
       );
     if (!events[eventName]) events[eventName] = [];
     events[eventName].push(callback);

package/systemlynx/LoadBalancer/LoadBalancer.js

@@ -2,6 +2,6 @@ const Service = require("../Service/Service");
 const CloneManager = require("./components/CloneManager");
 module.exports = function LoadBalancer() {
   const LoadBalancer = Service();
-  const clones = LoadBalancer.ServerModule("clones", CloneManager);
+  const clones = LoadBalancer.module("clones", CloneManager);
   return { ...LoadBalancer, clones };
 };

package/systemlynx/LoadBalancer/tests/LoadBalancer.test.js

@@ -14,13 +14,13 @@ describe("LoadBalancerFactory", () => {
         "Server",
         "WebSocket",
         "defaultModule",
-        "ServerModule",
+        "module",
         "clones"
       )
       .that.respondsTo("startService")
       .that.respondsTo("Server")
       .that.respondsTo("WebSocket")
-      .that.respondsTo("ServerModule");
+      .that.respondsTo("module");
     expect(LoadBalancer.clones)
       .to.be.an("object")
       .that.has.all.keys("on", "emit", "clones", "register", "dispatch", "assignDispatch")
@@ -60,7 +60,7 @@ describe("LoadBalancer", () => {
       .to.has.a.lengthOf(1);
   });
 });
-describe("LoadBalancer.clones (ServerModule)", () => {
+describe("LoadBalancer.clones (Module)", () => {
   const test_service1 = {
     route: "test-service1",
     port: 5393,

package/systemlynx/ServerManager/ServerManager.js

@@ -63,7 +63,7 @@ module.exports = function SystemLynxServerManager() {
 
     return new Promise((resolve) =>
       server.listen(port, () => {
-        console.log(`(SystemLynxService): ${route} --> Listening on ${host}:${port}`);
+        console.log(`[SystemLynx][Service]: Listening on ${serviceUrl}`);
         moduleQueue.forEach(({ name, object, reserved_methods }) =>
           ServerManager.addModule(name, object, reserved_methods)
         );

package/systemlynx/ServerManager/components/Router.js

@@ -4,26 +4,26 @@ const isEmpty = (obj) => Object.getOwnPropertyNames(obj).length === 0;
 const isPromise = (p) => typeof p === "object" && typeof p.then === "function";
 
 module.exports = function SystemLynxRouter(server, config) {
-  const addService = (ServerModule, route, { fn, method }, module_name) => {
+  const addService = (Module, route, { fn, method }, module_name) => {
     server[method](
       [`/${route}/${fn}`, `/sf/${route}/${fn}`, `/mf/${route}/${fn}`],
       (req, res, next) => {
         req.module_name = module_name;
         req.fn = fn;
-        req.ServerModule = ServerModule;
+        req.Module = Module;
         next();
       },
       routeHandler
     );
   };
 
-  const addREST = (ServerModule, route, { method }, module_name) => {
+  const addREST = (Module, route, { method }, module_name) => {
     server[method](
       [`/${route}`],
       (req, res, next) => {
         req.module_name = module_name;
         req.fn = method;
-        req.ServerModule = ServerModule;
+        req.Module = Module;
         next();
       },
       routeHandler
@@ -31,7 +31,7 @@ module.exports = function SystemLynxRouter(server, config) {
   };
 
   const routeHandler = (req, res) => {
-    const { query, file, files, body, fn, ServerModule, module_name, method } = req;
+    const { query, file, files, body, fn, Module, module_name, method } = req;
     const { serviceUrl } = config();
     const presets = { serviceUrl, module_name, fn };
 
@@ -62,7 +62,7 @@ module.exports = function SystemLynxRouter(server, config) {
       } else sendError(returnValue);
     };
 
-    if (typeof ServerModule[fn] !== "function")
+    if (typeof Module[fn] !== "function")
       return sendResponse({
         message: `[SystemLynx][error]:${module_name}.${fn} method not found`,
         status: 404,
@@ -73,7 +73,7 @@ module.exports = function SystemLynxRouter(server, config) {
       if (!isEmpty(query) && !args.length) args.push(query);
       if (isObject(args[0]) && method === "PUT") args[0] = { ...args[0], file, files };
 
-      const results = ServerModule[fn].apply(ServerModule, args);
+      const results = Module[fn].apply(Module, args);
 
       if (isPromise(results)) {
         results.then(sendResponse).catch(sendError);

package/systemlynx/ServerManager/tests/ServerManager.test.js

@@ -16,7 +16,7 @@ describe("SystemLynxServerManager function", () => {
   });
 });
 describe("ServerManager", () => {
-  it("should be able use ServerManager.startService to start a server that will accept requests for ServerModule Connection Data on the given route", async () => {
+  it("should be able use ServerManager.startService to start a server that will accept requests for Module Connection Data on the given route", async () => {
     const ServerManager = SystemLynxServerManager();
     const route = "/testService";
     const port = 4400;
@@ -157,7 +157,7 @@ describe("ServerManager.startService(ServerConfiguration)", () => {
     });
   });
 
-  it("should be able to use the staticRouting=true property to create static routes to the ServerModules", async () => {
+  it("should be able to use the staticRouting=true property to create static routes to the Modules", async () => {
     const ServerManager = SystemLynxServerManager();
     const route = "/testAPI";
     const port = 2233;

package/systemlynx/Service/Service.js

@@ -7,7 +7,7 @@ module.exports = function ServiceFactory({ defaultModule = {} } = {}) {
   const { startService, Server, WebSocket } = ServerManager;
   const Service = { startService, Server, WebSocket, defaultModule };
 
-  Service.ServerModule = function (name, constructor, reserved_methods = []) {
+  Service.module = function (name, constructor, reserved_methods = []) {
     if (typeof constructor === "object" && constructor instanceof Object) {
       ServerManager.addModule(name, constructor, reserved_methods);
       return constructor;
@@ -15,13 +15,16 @@ module.exports = function ServiceFactory({ defaultModule = {} } = {}) {
 
     if (typeof constructor === "function") {
       if (constructor.constructor.name === "AsyncFunction")
-        throw `(ServerModule Error): ServerModule(name, constructor) function requires a non-async function as the constructor`;
+        throw `[SystemLynx][Module][Error]: Module(name, constructor) function cannot receive an async function as the constructor`;
 
-      const ServerModule = Dispatcher.apply({ ...Service.defaultModule });
-      const exclude_methods = [...reserved_methods, ...Object.getOwnPropertyNames(ServerModule)];
-      constructor.apply(ServerModule, [ServerManager.Server(), ServerManager.WebSocket()]);
-      ServerManager.addModule(name, ServerModule, exclude_methods);
-      return ServerModule;
+      const Module = Dispatcher.apply({ ...Service.defaultModule });
+      const exclude_methods = [
+        ...reserved_methods,
+        ...Object.getOwnPropertyNames(Module),
+      ];
+      constructor.apply(Module, [ServerManager.Server(), ServerManager.WebSocket()]);
+      ServerManager.addModule(name, Module, exclude_methods);
+      return Module;
     }
   };
   return Service;

package/systemlynx/Service/Service.test.js

@@ -7,15 +7,9 @@ describe("SystemLynxService", () => {
     const Service = ServiceFactory();
     expect(Service)
       .to.be.an("object")
-      .that.has.all.keys(
-        "startService",
-        "ServerModule",
-        "Server",
-        "WebSocket",
-        "defaultModule"
-      )
+      .that.has.all.keys("startService", "module", "Server", "WebSocket", "defaultModule")
       .that.respondsTo("startService")
-      .that.respondsTo("ServerModule")
+      .that.respondsTo("module")
       .that.respondsTo("Server")
       .that.respondsTo("WebSocket");
   });
@@ -54,14 +48,14 @@ describe("Service factory", () => {
   it("should throw an Error if Service.startService(options) is called twice", () => {});
 });
 
-describe("Service.ServerModule(constructor)", () => {
+describe("Service.module(constructor)", () => {
   const Service = ServiceFactory();
   const port = 6542;
   const route = "test/service";
   const url = `http://localhost:${port}/${route}`;
 
   it("should be able to return a Service instance constructed using the 'this' value in the constructor function", () => {
-    const mod = Service.ServerModule("mod", function () {
+    const mod = Service.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     });
@@ -116,13 +110,13 @@ describe("Service.ServerModule(constructor)", () => {
   });
 });
 
-describe("Service.ServerModule(object)", () => {
+describe("Service.module(object)", () => {
   const Service = ServiceFactory();
   const port = 6543;
   const route = "test/service2";
   const url = `http://localhost:${port}/${route}`;
   it("should be able to return a Service instance created using an object as the constructor", () => {
-    const mod = Service.ServerModule("mod", {
+    const mod = Service.module("mod", {
       action1: () => {},
       action2: () => {},
     });