systemlynx 1.4.0 → 1.6.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,6 +1,6 @@
 # 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 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 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 import 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 app development:
 
@@ -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 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.
+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,12 +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 **Service.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");
@@ -51,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) {
@@ -77,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) {
@@ -125,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");
@@ -147,7 +147,7 @@ const response = await Orders.find("hello", "world");
 console.log(response);
 ```
 
-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 **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");
@@ -160,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.test.js

@@ -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")
@@ -69,18 +67,11 @@ describe("SystemLynx Objects", () => {
   it("should return a SystemLynx LoadBalancer", () => {
     expect(LoadBalancer)
       .to.be.an("object")
-      .that.has.all.keys(
-        "startService",
-        "Server",
-        "WebSocket",
-        "defaultModule",
-        "ServerModule",
-        "clones"
-      )
+      .that.has.all.keys("startService", "Server", "WebSocket", "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 +97,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.4.0",
+  "version": "1.6.0",
   "description": "",
   "main": "index.js",
   "scripts": {

package/systemlynx/App/App.js

@@ -1,34 +1,27 @@
 "use strict";
 const { isNode } = require("../../utils/ProcessChecker");
-const ServiceFactory = require("../Service/Service");
-const SystemObject = require("./components/SystemObject");
-const Dispatcher = require("../Dispatcher/Dispatcher");
+const SystemLynxService = require("../Service/Service");
+const SystemLynxDispatcher = require("../Dispatcher/Dispatcher");
 const initializeApp = require("./components/initializeApp");
+const SystemContext = require("../utils/SystemContext");
+const System = require("../utils/System");
 
 module.exports = function SystemLynxApp() {
-  const App = Dispatcher();
-  const system = {
-    Services: [],
-    Modules: [],
-    ServerModules: [],
-    configurations: {},
-    App,
-    routing: null,
-  };
-  SystemObject.apply(system, [system]);
-  setTimeout(() => initializeApp(system), 0);
+  const system = new System();
+  const systemContext = SystemContext(system);
+  const App = SystemLynxDispatcher(undefined, systemContext);
+  setTimeout(() => initializeApp(system, App, systemContext), 0);
 
   if (isNode) {
-    system.Service = ServiceFactory();
-    system.Service.defaultModule = SystemObject(system);
+    system.Service = SystemLynxService(systemContext);
 
     App.startService = (options) => {
       system.routing = options;
       return App;
     };
 
-    App.ServerModule = (name, __constructor) => {
-      system.ServerModules.push({
+    App.module = (name, __constructor) => {
+      system.Modules.push({
         name,
         __constructor,
       });
@@ -52,18 +45,9 @@ 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) };
+      system.configurations = { __constructor, module: SystemContext(system) };
     else
       throw Error(
         "[SystemLynx][App][Error]: App.config(...) methods requires a constructor function as its first parameter."

package/systemlynx/App/components/initializeApp.js

@@ -1,7 +1,7 @@
 const loadModules = require("./loadModules");
 const loadServices = require("./loadServices");
 
-module.exports = async function initApp(system) {
+module.exports = async function initApp(system, App, systemContext) {
   let configComplete = false;
   const continuationERROR = () => {
     if (!configComplete)
@@ -16,7 +16,7 @@ module.exports = async function initApp(system) {
   };
 
   try {
-    await loadServices(system);
+    await loadServices(system, App, systemContext);
   } catch (err) {
     throw `[SystemLynx][App][Error]: Initialization Error - failed to load all services`;
   }
@@ -26,8 +26,8 @@ module.exports = async function initApp(system) {
     system.configurations.__constructor.apply(system.configurations.module, [
       () => {
         configComplete = true;
-        loadModules(system);
+        loadModules(system, App);
       },
     ]);
-  } else loadModules(system);
+  } else loadModules(system, App);
 };

package/systemlynx/App/components/loadModules.js

@@ -1,14 +1,8 @@
-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)
+module.exports = async function loadModules(system, App) {
+  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);
+  App.emit("ready", system);
 };

package/systemlynx/App/components/loadServices.js

@@ -1,11 +1,14 @@
-const Client = require("../../Client/Client")();
-module.exports = ({ Services, App }) => {
+const SystemLynxClient = require("../../Client/Client");
+
+module.exports = ({ Services }, App, systemContext) => {
+  const Client = SystemLynxClient(systemContext);
+
   return Promise.all(
-    Services.map(serviceData => {
+    Services.map((serviceData) => {
       const { url, limit, wait, name, onLoad } = serviceData;
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         Client.loadService(url, { limit, wait })
-          .then(service => {
+          .then((service) => {
             serviceData.client = service;
             if (typeof onLoad === "function") {
               onLoad(serviceData.client);
@@ -17,7 +20,7 @@ module.exports = ({ Services, App }) => {
             );
             resolve();
           })
-          .catch(err => {
+          .catch((err) => {
             console.warn(err);
             App.emit("failed_connection", { err, ...serviceData });
             resolve();

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,23 +270,18 @@ describe("App SystemObjects: Initializing Modules,  ServerModules and configurat
             "Services",
             "Service",
             "Modules",
-            "ServerModules",
             "configurations",
-            "App",
-            "routing",
-            "useService",
-            "useModule",
-            "useConfig"
+            "routing"
           );
         resolve();
       })
     );
   });
 
-  it("should be able to use App.config(constructor) to construct a configuartion module", async () => {
+  it("should be able to use App.config(constructor) to construct a configuration module", async () => {
     const App = AppFactory();
 
-    App.ServerModule("mod", function () {
+    App.module("mod", function () {
       this.test = () => {};
       this.test2 = () => {};
     })
@@ -317,8 +310,8 @@ 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", () => {
+describe("SystemContext", () => {
+  it("should be able to use this.useModule and this.useService within modules and Module", () => {
     const App = AppFactory();
     App.module("mod1", function () {
       expect(this)
@@ -339,6 +332,7 @@ describe("SystemObjects", () => {
         const config = this.useConfig();
         expect(mod1.testPassed).to.equal(true);
         expect(config.configPassed).to.equal(true);
+        this.testPassed = true;
       })
       .config(function (next) {
         expect(this)
@@ -348,7 +342,79 @@ 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);
+      })
+      .on("ready", function () {
+        expect(this)
+          .to.be.an("object")
+          .that.respondsTo("useService")
+          .that.respondsTo("useModule")
+          .that.respondsTo("useConfig");
+        const mod2 = this.useModule("mod2");
+        const config = this.useConfig();
+        expect(mod2.testPassed).to.equal(true);
+        expect(config.configPassed).to.equal(true);
       });
     return new Promise((resolve) => App.on("ready", () => resolve()));
   });
+  it("[SystemLynx][App][Client][on] should have access to systemContext during event callbacks.", async () => {
+    const AppBackend = AppFactory();
+    const eventName = "testing-this";
+    const _route = "test-service";
+    const _port = "8900";
+    const _url = `http://localhost:${_port}/${_route}`;
+    AppBackend.module("EventTesterModule", function () {
+      this.sendEvent = () => this.emit(eventName, { testPassed: true });
+
+      //testing local event callback context
+      this.on(eventName, function () {
+        console.log("Aww man... here we go again!", this);
+        expect(this)
+          .to.be.an("object")
+          .that.respondsTo("useService")
+          .that.respondsTo("useModule")
+          .that.respondsTo("useConfig");
+      });
+    });
+    await AppBackend.startService({ route: _route, port: _port });
+
+    const AppClient = AppFactory();
+    const route = "test-service";
+    const port = "8901";
+
+    AppClient.startService({ route, port }).loadService("buAPI", _url);
+    await new Promise((resolve) =>
+      AppClient.on("ready", function () {
+        const { EventTesterModule } = this.useService("buAPI");
+        EventTesterModule.on(eventName, function (data, event) {
+          console.log("Ladies and gentleman... another one!");
+          expect(this)
+            .to.be.an("object")
+            .that.respondsTo("useService")
+            .that.respondsTo("useModule")
+            .that.respondsTo("useConfig");
+          expect(data).to.deep.equal({ testPassed: true });
+          expect(event)
+            .to.be.an("object")
+            .that.has.all.keys("id", "name", "data", "type");
+          expect(event.name).to.equal(eventName);
+          expect(event.data).to.deep.equal({ testPassed: true });
+          expect(event.id).to.be.a("string");
+          expect(event.type).to.equal("WebSocket");
+          resolve();
+        });
+        EventTesterModule.sendEvent(eventName);
+      })
+    );
+  });
 });

package/systemlynx/Client/Client.js

@@ -3,7 +3,7 @@ const loadConnectionData = require("./components/loadConnectionData");
 const SocketDispatcher = require("./components/SocketDispatcher");
 const ClientModule = require("./components/ClientModule");
 
-module.exports = function SystemLynxClient() {
+module.exports = function SystemLynxClient(systemContext) {
   const Client = {};
   Client.loadedServices = {};
 
@@ -12,14 +12,14 @@ module.exports = function SystemLynxClient() {
       return Client.loadedServices[url];
 
     const connData = await loadConnectionData(url, options);
-    const Service = SocketDispatcher(connData.namespace);
+    const Service = SocketDispatcher(connData.namespace, undefined, systemContext);
     Client.loadedServices[url] = Service;
     if (options.name) Client[options.name] = Service;
 
     Service.resetConnection = async (cb) => {
       const { modules, host, port, namespace } = await loadConnectionData(url, options);
 
-      SocketDispatcher.apply(Service, [namespace]);
+      SocketDispatcher.apply(Service, [namespace, undefined, systemContext]);
 
       modules.forEach(({ namespace, route, name }) =>
         Service[name].__setConnection(host, port, route, namespace)
@@ -29,7 +29,13 @@ module.exports = function SystemLynxClient() {
     };
 
     connData.modules.forEach(
-      (mod) => (Service[mod.name] = ClientModule(mod, connData, Service.resetConnection))
+      (mod) =>
+        (Service[mod.name] = ClientModule(
+          mod,
+          connData,
+          Service.resetConnection,
+          systemContext
+        ))
     );
 
     Service.on("disconnect", Service.resetConnection);

package/systemlynx/Client/components/ClientModule.js

@@ -4,14 +4,15 @@ const SocketDispatcher = require("./SocketDispatcher");
 module.exports = function SystemLynxClientModule(
   { methods, namespace, route },
   { port, host },
-  resetConnection
+  resetConnection,
+  systemContext
 ) {
   const events = {};
   const ClientModule = this || {};
 
   ClientModule.__setConnection = (host, port, route, namespace) => {
     ClientModule.__connectionData = () => ({ route, host, port });
-    SocketDispatcher.apply(ClientModule, [namespace, events]);
+    SocketDispatcher.apply(ClientModule, [namespace, events, systemContext]);
   };
 
   ClientModule.__setConnection(host, port, route, namespace);

package/systemlynx/Client/components/SocketDispatcher.js

@@ -2,11 +2,11 @@
 const io = require("socket.io-client");
 const SystemLynxDispatcher = require("../../Dispatcher/Dispatcher");
 
-module.exports = function SocketDispatcher(namespace, events = {}) {
+module.exports = function SocketDispatcher(namespace, events = {}, systemContext) {
   const dispatcher =
     (this || {}).on && (this || {}).emit
       ? this
-      : SystemLynxDispatcher.apply(this, [events]);
+      : SystemLynxDispatcher.apply(this, [events, systemContext]);
   const socket = io.connect(namespace);
   socket.on("dispatch", (event) => dispatcher.emit(event.name, event.data, event));
   socket.on("disconnect", () => {

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,27 +119,32 @@ 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 = this;
-      eventTester.sendEvent = () => eventTester.emit(eventName, { testPassed: true });
+    const route = "test-service";
+    const port = "8980";
+    const url = `http://localhost:${port}/${route}`;
+    const Service = ServiceFactory();
+    const eventTester = Service.module("eventTester", function () {
+      this.sendEvent = () => this.emit(eventName, { testPassed: true });
     });
+    await Service.startService({ route, port });
 
     const Client = ClientFactory();
-    const buAPI = await Client.loadService(url);
 
-    buAPI.eventTester.on(eventName, (data, event) => {
-      console.log("Ladies and gentleman... mission accomplish!");
-      // console.log(data);
-      // console.log(event);
-      expect(data).to.deep.equal({ testPassed: true });
-      expect(event).to.be.an("object").that.has.all.keys("id", "name", "data", "type");
-      expect(event.name).to.equal("testing");
-      expect(event.data).to.deep.equal({ testPassed: true });
-      expect(event.id).to.be.a("string");
-      expect(event.type).to.equal("WebSocket");
+    const buAPI = await Client.loadService(url);
+    setTimeout(() => eventTester.emit(eventName, { testPassed: true }), 500);
+
+    await new Promise((resolve) => {
+      buAPI.eventTester.on(eventName, (data, event) => {
+        console.log("Ladies and gentleman... mission accomplish!");
+        expect(data).to.deep.equal({ testPassed: true });
+        expect(event).to.be.an("object").that.has.all.keys("id", "name", "data", "type");
+        expect(event.name).to.equal(eventName);
+        expect(event.data).to.deep.equal({ testPassed: true });
+        expect(event.id).to.be.a("string");
+        expect(event.type).to.equal("WebSocket");
+        resolve();
+      });
     });
-
-    eventTester.emit(eventName, { testPassed: true });
   });
 
   it("should be able to send REST http requests", async () => {
@@ -149,7 +154,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 +182,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;
@@ -193,8 +198,6 @@ describe("Service", () => {
       route,
       port,
       host,
-      useReturnValues: true,
-      useCallbacks: false,
     });
     const Client = ClientFactory();
     const { AsyncMath } = await Client.loadService(url);

package/systemlynx/Dispatcher/Dispatcher.js

@@ -1,9 +1,12 @@
 "use strict";
-module.exports = function SystemLynxDispatcher(events = {}) {
+module.exports = function SystemLynxDispatcher(events = {}, systemContext) {
   const Dispatcher = this || {};
 
   Dispatcher.emit = (eventName, data, event) => {
-    if (events[eventName]) events[eventName].forEach((callback) => callback(data, event));
+    if (events[eventName])
+      events[eventName].forEach((callback) =>
+        callback.apply(systemContext, [data, event])
+      );
     return Dispatcher;
   };
 

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

@@ -9,18 +9,11 @@ describe("LoadBalancerFactory", () => {
   it("should return a SystemLynx LoadBalancer", () => {
     expect(LoadBalancer)
       .to.be.an("object")
-      .that.has.all.keys(
-        "startService",
-        "Server",
-        "WebSocket",
-        "defaultModule",
-        "ServerModule",
-        "clones"
-      )
+      .that.has.all.keys("startService", "Server", "WebSocket", "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 +53,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

@@ -64,8 +64,8 @@ module.exports = function SystemLynxServerManager() {
     return new Promise((resolve) =>
       server.listen(port, () => {
         console.log(`[SystemLynx][Service]: Listening on ${serviceUrl}`);
-        moduleQueue.forEach(({ name, object, reserved_methods }) =>
-          ServerManager.addModule(name, object, reserved_methods)
+        moduleQueue.forEach(({ name, Module, reserved_methods }) =>
+          ServerManager.addModule(name, Module, reserved_methods)
         );
         moduleQueue.length = 0;
         resolve(ServerManager);
@@ -73,15 +73,15 @@ module.exports = function SystemLynxServerManager() {
     );
   };
 
-  ServerManager.addModule = (name, object, reserved_methods = []) => {
+  ServerManager.addModule = (name, Module, reserved_methods = []) => {
     const { host, route, serviceUrl, staticRouting, useService, useREST, socketPort } =
       serverConfigurations;
 
-    if (!serviceUrl) return moduleQueue.push({ name, object, reserved_methods });
-    const methods = parseMethods(object, ["on", "emit", ...reserved_methods], useREST);
+    if (!serviceUrl) return moduleQueue.push({ name, Module, reserved_methods });
+    const methods = parseMethods(Module, ["on", "emit", ...reserved_methods], useREST);
     const namespace = staticRouting ? name : shortId();
 
-    SocketEmitter.apply(object, [namespace, WebSocket]);
+    SocketEmitter.apply(Module, [namespace, WebSocket]);
 
     if (useService) {
       const path = staticRouting ? `${route}/${name}` : `${shortId()}/${shortId()}`;
@@ -92,7 +92,7 @@ module.exports = function SystemLynxServerManager() {
         name,
         methods,
       });
-      methods.forEach((method) => router.addService(object, path, method, name));
+      methods.forEach((method) => router.addService(Module, path, method, name));
     }
     if (useREST)
       methods.forEach((method) => {
@@ -101,7 +101,7 @@ module.exports = function SystemLynxServerManager() {
           case "put":
           case "post":
           case "delete":
-            router.addREST(object, `${route}/${name}`, method, name);
+            router.addREST(Module, `${route}/${name}`, method, name);
         }
       });
   };

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,13 +31,13 @@ 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 };
 
     const sendError = (error) => {
-      const status = error.status || 500;
-      const message = error.message || "Unexpected error";
+      const status = (error || {}).status || 500;
+      const message = (error || {}).message || "Unexpected error";
       const unhandledMessage = status === 500 ? "Unhandled error" : "Error";
       res.status(status).json({
         ...presets,
@@ -49,20 +49,20 @@ module.exports = function SystemLynxRouter(server, config) {
     };
 
     const sendResponse = (returnValue) => {
-      const status = returnValue.status || 200;
+      const status = (returnValue || {}).status || 200;
       if (status < 400) {
         res.status(status).json({
           ...presets,
           status,
           message:
-            returnValue.message ||
+            (returnValue || {}).message ||
             `[SystemLynx][response]: ${module_name}.${fn}(...) returned successfully`,
           returnValue,
         });
       } 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

@@ -1,33 +1,37 @@
 "use strict";
 const ServerManagerFactory = require("../ServerManager/ServerManager");
-const Dispatcher = require("../Dispatcher/Dispatcher");
+const SystemLynxDispatcher = require("../Dispatcher/Dispatcher");
 
-module.exports = function ServiceFactory({ defaultModule = {} } = {}) {
+module.exports = function ServiceFactory(systemContext = {}) {
   const ServerManager = ServerManagerFactory();
   const { startService, Server, WebSocket } = ServerManager;
-  const Service = { startService, Server, WebSocket, defaultModule };
+  const Service = { startService, Server, WebSocket };
+
+  Service.module = function (name, constructor, reserved_methods = []) {
+    const exclude_methods = reserved_methods.concat(
+      Object.getOwnPropertyNames(systemContext)
+    );
 
-  Service.ServerModule = function (name, constructor, reserved_methods = []) {
     if (typeof constructor === "object" && constructor instanceof Object) {
-      ServerManager.addModule(name, constructor, reserved_methods);
-      return constructor;
+      const Module = SystemLynxDispatcher.apply({ ...constructor, ...systemContext }, [
+        undefined,
+        systemContext,
+      ]);
+      ServerManager.addModule(name, Module, exclude_methods);
+      return Module;
     }
 
     if (typeof constructor === "function") {
       if (constructor.constructor.name === "AsyncFunction")
-        throw `[SystemLynx][ServerModule][Error]: ServerModule(name, constructor) function cannot receive an 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(),
+      const Module = SystemLynxDispatcher.apply(systemContext, [
+        undefined,
+        systemContext,
       ]);
-      ServerManager.addModule(name, ServerModule, exclude_methods);
-      return ServerModule;
+      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")
       .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,22 +110,24 @@ 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: () => {},
     });
 
     expect(mod)
       .to.be.an("Object")
-      .that.has.all.keys("action1", "action2")
+      .that.has.all.keys("action1", "action2", "on", "emit")
       .that.respondsTo("action1")
-      .that.respondsTo("action2");
+      .that.respondsTo("action2")
+      .that.respondsTo("on")
+      .that.respondsTo("emit");
   });
   it("should 'Serve' Service connection data created using an object as the constructor", async () => {
     await Service.startService({ route, port });

package/systemlynx/utils/System.js

@@ -0,0 +1,7 @@
+module.exports = function () {
+  const System = this || {};
+  System.Services = [];
+  System.Modules = [];
+  System.configurations = {};
+  System.routing = null;
+};

package/systemlynx/utils/SystemContext.js

@@ -0,0 +1,10 @@
+"use strict";
+module.exports = function SystemObject(system) {
+  const context = this || {};
+  context.useModule = (modName) =>
+    (system.Modules.find((mod) => mod.name === modName) || {}).module || {};
+  context.useService = (serviceName) =>
+    (system.Services.find((mod) => mod.name === serviceName) || {}).client || {};
+  context.useConfig = () => system.configurations.module || {};
+  return context;
+};

package/systemlynx/App/components/SystemObject.js

@@ -1,9 +0,0 @@
-"use strict";
-module.exports = function SystemObject(system) {
-  const App = this || {};
-  App.useModule = modName => (system.Modules.find(mod => mod.name === modName) || {}).module || {};
-  App.useService = serviceName =>
-    (system.Services.find(mod => mod.name === serviceName) || {}).client || {};
-  App.useConfig = () => system.configurations.module || {};
-  return App;
-};