systemlynx 1.7.0 → 1.7.2

package/index.test.js

@@ -39,7 +39,9 @@ describe("SystemLynx Objects", () => {
         "startService",
         "loadService",
         "onLoad",
-        "config"
+        "config",
+        "server",
+        "WebSocket"
       )
       .that.respondsTo("module")
       .that.respondsTo("on")
@@ -69,10 +71,8 @@ describe("SystemLynx Objects", () => {
   it("should return a SystemLynx LoadBalancer", () => {
     expect(LoadBalancer)
       .to.be.an("object")
-      .that.has.all.keys("startService", "Server", "WebSocket", "clones", "module")
+      .that.has.all.keys("startService", "server", "WebSocket", "clones", "module")
       .that.respondsTo("startService")
-      .that.respondsTo("Server")
-      .that.respondsTo("WebSocket")
       .that.respondsTo("module");
     expect(LoadBalancer.clones)
       .to.be.an("object")
@@ -89,18 +89,12 @@ describe("SystemLynx Objects", () => {
   it("should return a SystemLynx ServerManager instance", () => {
     expect(ServerManager)
       .to.be.an("Object")
-      .that.has.all.keys(["startService", "addModule", "Server", "WebSocket"])
+      .that.has.all.keys(["startService", "addModule", "server", "WebSocket"])
       .that.respondsTo("startService")
-      .that.respondsTo("addModule")
-      .that.respondsTo("Server")
-      .that.respondsTo("WebSocket");
+      .that.respondsTo("addModule");
   });
 
   it("should return a new instance of a Service", () => {
-    expect(Service)
-      .to.be.an("object")
-      .that.respondsTo("startService")
-      .that.respondsTo("Server")
-      .that.respondsTo("WebSocket");
+    expect(Service).to.be.an("object").that.respondsTo("startService");
   });
 });

package/package.json

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

package/systemlynx/App/App.js

@@ -30,6 +30,8 @@ module.exports = function SystemLynxApp() {
       system.modules.push({ name, __constructor });
       return App;
     };
+    App.server = system.Service.server;
+    App.WebSocket = system.Service.WebSocket;
   }
 
   App.loadService = (name, url) => {

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

@@ -17,7 +17,9 @@ describe("SystemLynxApp()", () => {
         "startService",
         "loadService",
         "onLoad",
-        "config"
+        "config",
+        "server",
+        "WebSocket"
       )
       .that.respondsTo("module")
       .that.respondsTo("on")

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

@@ -9,10 +9,8 @@ describe("LoadBalancer()", () => {
   it("should return a SystemLynx LoadBalancer", () => {
     expect(LoadBalancer)
       .to.be.an("object")
-      .that.has.all.keys("startService", "Server", "WebSocket", "module", "clones")
+      .that.has.all.keys("startService", "server", "WebSocket", "module", "clones")
       .that.respondsTo("startService")
-      .that.respondsTo("Server")
-      .that.respondsTo("WebSocket")
       .that.respondsTo("module");
     expect(LoadBalancer.clones)
       .to.be.an("object")

package/systemlynx/ServerManager/ServerManager.js

@@ -24,7 +24,7 @@ module.exports = function SystemLynxServerManager() {
   const moduleQueue = [];
   const modules = [];
 
-  const ServerManager = { Server: () => server, WebSocket: () => WebSocket };
+  const ServerManager = { server, WebSocket };
 
   ServerManager.startService = (options) => {
     let { route, host = "localhost", port, socketPort, staticRouting } = options;

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

@@ -8,11 +8,9 @@ describe("SystemLynxServerManager function", () => {
 
     expect(ServerManager)
       .to.be.an("Object")
-      .that.has.all.keys(["startService", "addModule", "Server", "WebSocket"])
+      .that.has.all.keys(["startService", "addModule", "server", "WebSocket"])
       .that.respondsTo("startService")
-      .that.respondsTo("addModule")
-      .that.respondsTo("Server")
-      .that.respondsTo("WebSocket");
+      .that.respondsTo("addModule");
   });
 });
 describe("ServerManager", () => {

package/systemlynx/Service/Service.js

@@ -4,8 +4,8 @@ const SystemLynxDispatcher = require("../Dispatcher/Dispatcher");
 
 module.exports = function SystemLynxService(systemContext = {}) {
   const ServerManager = SystemLynxServerManager();
-  const { startService, Server, WebSocket } = ServerManager;
-  const Service = { startService, Server, WebSocket };
+  const { startService, server, WebSocket } = ServerManager;
+  const Service = { startService, server, WebSocket };
 
   Service.module = function (name, constructor, reserved_methods = []) {
     const exclude_methods = reserved_methods.concat(
@@ -29,7 +29,7 @@ module.exports = function SystemLynxService(systemContext = {}) {
         undefined,
         systemContext,
       ]);
-      constructor.apply(Module, [ServerManager.Server(), ServerManager.WebSocket()]);
+      constructor.apply(Module, [server, WebSocket]);
       ServerManager.addModule(name, Module, exclude_methods);
       return Module;
     }

package/systemlynx/Service/Service.test.js

@@ -7,11 +7,9 @@ describe("SystemLynxService", () => {
     const Service = SystemLynxService();
     expect(Service)
       .to.be.an("object")
-      .that.has.all.keys("startService", "module", "Server", "WebSocket")
+      .that.has.all.keys("startService", "module", "server", "WebSocket")
       .that.respondsTo("startService")
-      .that.respondsTo("module")
-      .that.respondsTo("Server")
-      .that.respondsTo("WebSocket");
+      .that.respondsTo("module");
   });
 });