systemlynx 1.9.5 → 1.10.5

package/package.json

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

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

@@ -63,13 +63,17 @@ describe("App: Loading Services", () => {
               "$clearEvent",
               "resetConnection",
               "disconnect",
+              "headers",
+              "setHeaders",
               "mod"
             )
             .that.respondsTo("emit")
             .that.respondsTo("on")
             .that.respondsTo("$clearEvent")
             .that.respondsTo("resetConnection")
-            .that.respondsTo("disconnect");
+            .that.respondsTo("disconnect")
+            .that.respondsTo("headers")
+            .that.respondsTo("setHeaders");
           resolve();
         }
       );
@@ -100,13 +104,17 @@ describe("App: Loading Services", () => {
             "$clearEvent",
             "resetConnection",
             "disconnect",
+            "headers",
+            "setHeaders",
             "mod"
           )
           .that.respondsTo("emit")
           .that.respondsTo("$clearEvent")
           .that.respondsTo("on")
           .that.respondsTo("resetConnection")
-          .that.respondsTo("disconnect");
+          .that.respondsTo("disconnect")
+          .that.respondsTo("headers")
+          .that.respondsTo("setHeaders");
         resolve();
       });
     });
@@ -136,12 +144,16 @@ describe("App: Loading Services", () => {
               "$clearEvent",
               "resetConnection",
               "disconnect",
+              "headers",
+              "setHeaders",
               "mod"
             )
             .that.respondsTo("emit")
             .that.respondsTo("$clearEvent")
             .that.respondsTo("on")
-            .that.respondsTo("resetConnection");
+            .that.respondsTo("resetConnection")
+            .that.respondsTo("headers")
+            .that.respondsTo("setHeaders");
         })
         .on("service_loaded:test", (test) => {
           expect(test)
@@ -152,12 +164,16 @@ describe("App: Loading Services", () => {
               "$clearEvent",
               "resetConnection",
               "disconnect",
+              "headers",
+              "setHeaders",
               "mod"
             )
             .that.respondsTo("emit")
             .that.respondsTo("$clearEvent")
             .that.respondsTo("on")
-            .that.respondsTo("resetConnection");
+            .that.respondsTo("resetConnection")
+            .that.respondsTo("headers")
+            .that.respondsTo("setHeaders");
           resolve();
         });
     });
@@ -189,12 +205,16 @@ describe("App: Loading Services", () => {
               "$clearEvent",
               "resetConnection",
               "disconnect",
+              "headers",
+              "setHeaders",
               "mod"
             )
             .that.respondsTo("emit")
             .that.respondsTo("$clearEvent")
             .that.respondsTo("on")
-            .that.respondsTo("resetConnection");
+            .that.respondsTo("resetConnection")
+            .that.respondsTo("headers")
+            .that.respondsTo("setHeaders");
           resolve();
         })
         .on("ready", resolve);

package/systemlynx/Client/Client.js

@@ -1,32 +1,35 @@
 "use strict";
 const loadConnectionData = require("./components/loadConnectionData");
 const SocketDispatcher = require("./components/SocketDispatcher");
+const HeaderSetter = require("./components/HeaderSetter");
 const ClientModule = require("./components/ClientModule");
 const HttpClient = require("../HttpClient/HttpClient");
 
 module.exports = function createClient(httpClient = HttpClient(), systemContext) {
   const Client = {};
-  Client.loadedServices = {};
+  Client.cachedServices = {};
 
   Client.loadService = async (url, options = {}) => {
-    if (Client.loadedServices[url] && !options.forceReload)
-      return Client.loadedServices[url];
+    if (Client.cachedServices[url] && !options.forceReload)
+      return Client.cachedServices[url];
 
     const connData = await loadConnectionData(httpClient, url, options);
     const Service = Client.createService(connData);
-    Client.loadedServices[url] = Service;
+    Client.cachedServices[url] = Service;
     await new Promise((resolve) => Service.on("connect", resolve));
     return Service;
   };
 
   Client.createService = (connData) => {
     const events = {};
-    if (Client.loadedServices[connData.serviceUrl])
-      return Client.loadedServices[connData.serviceUrl];
 
-    const Service = new SocketDispatcher(connData.namespace, events, systemContext);
+    if (Client.cachedServices[connData.serviceUrl])
+      return Client.cachedServices[connData.serviceUrl];
 
-    Client.loadedServices[connData.serviceUrl] = Service;
+    const Service = {};
+    SocketDispatcher.apply(Service, [connData.namespace, events, systemContext]);
+    HeaderSetter.apply(Service);
+    Client.cachedServices[connData.serviceUrl] = Service;
 
     Service.resetConnection = async (cb) => {
       const { modules, host, port, namespace } = await loadConnectionData(
@@ -52,7 +55,7 @@ module.exports = function createClient(httpClient = HttpClient(), systemContext)
           httpClient,
           mod,
           connData,
-          Service.resetConnection,
+          Service,
           systemContext
         ))
     );

package/systemlynx/Client/components/ClientModule.js

@@ -1,4 +1,5 @@
 "use strict";
+const headerSetter = require("./HeaderSetter");
 const ServiceRequestHandler = require("./ServiceRequestHandler");
 const SocketDispatcher = require("./SocketDispatcher");
 const getProtocol = (url) => url.match(/^(\w+):\/\//)[0];
@@ -7,11 +8,11 @@ module.exports = function SystemLynxClientModule(
   httpClient,
   { methods, namespace, route, connectionData, name },
   { port, host, serviceUrl },
-  reconnectService,
+  Service,
   systemContext
 ) {
   const events = {};
-  const ClientModule = {};
+  const ClientModule = headerSetter.apply({});
 
   ClientModule.__setConnection = (host, port, route, namespace) => {
     ClientModule.__connectionData = () => ({ route, host, port });
@@ -35,7 +36,7 @@ module.exports = function SystemLynxClientModule(
       protocol,
       method,
       fn,
-      reconnectService,
+      Service,
       connectionData && reconnectModule,
     ]);
   });

package/systemlynx/Client/components/HeaderSetter.js

@@ -0,0 +1,9 @@
+module.exports = function headerSetter(headers = {}) {
+  this.setHeaders = (options) => {
+    Object.assign(headers, options);
+    return this;
+  };
+
+  this.headers = () => headers;
+  return this;
+};

package/systemlynx/Client/components/ServiceRequestHandler.js

@@ -1,7 +1,7 @@
 "use strict";
 const isObject = (value) =>
   typeof value === "object" ? (!value ? false : !Array.isArray(value)) : false;
-
+const isEmpty = (obj) => Object.getOwnPropertyNames(obj).length === 0;
 const makeQuery = (data) =>
   Object.getOwnPropertyNames(data).reduce(
     (query, name) => (query += `${name}=${data[name]}&`),
@@ -12,7 +12,7 @@ module.exports = function ServiceRequestHandler(
   protocol,
   method,
   fn,
-  reconnectService,
+  Service,
   reconnectModule
 ) {
   const ClientModule = this;
@@ -26,7 +26,8 @@ module.exports = function ServiceRequestHandler(
       const defaultURL = `${protocol}${host}:${port}${route}/${fn}`;
       const { file, files } = __arguments[0] || {};
       const url = file ? singleFileURL : files ? multiFileURL : defaultURL;
-
+      const defaultHeaders = ClientModule.headers();
+      const headers = !isEmpty(defaultHeaders) ? defaultHeaders : Service.headers();
       if (url === defaultURL)
         httpClient
           .request({
@@ -37,6 +38,7 @@ module.exports = function ServiceRequestHandler(
             }`,
             method,
             body: { __arguments },
+            headers,
           })
           .then((results) => cb(null, results))
           .catch((err) => ErrorHandler(err, errCount, cb));
@@ -46,6 +48,7 @@ module.exports = function ServiceRequestHandler(
             url,
             method,
             formData: { ...__arguments[0], __arguments },
+            headers,
           })
           .then((results) => cb(null, results))
           .catch((err) => ErrorHandler(err, errCount, cb));
@@ -58,7 +61,7 @@ module.exports = function ServiceRequestHandler(
         console.log(err);
         errCount++;
         if (reconnectModule) reconnectModule(() => tryRequest(cb, errCount));
-        else reconnectService(() => tryRequest(cb, errCount));
+        else Service.reconnectService(() => tryRequest(cb, errCount));
       } else console.error(Error(`[SystemLynx][Service][Error]: Invalid route:${err}`));
     };
 

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

@@ -47,13 +47,17 @@ describe("Client", () => {
         "$clearEvent",
         "resetConnection",
         "disconnect",
+        "headers",
+        "setHeaders",
         "orders"
       )
       .that.respondsTo("emit")
       .that.respondsTo("$clearEvent")
       .that.respondsTo("on")
       .that.respondsTo("resetConnection")
-      .that.respondsTo("disconnect");
+      .that.respondsTo("disconnect")
+      .that.respondsTo("headers")
+      .that.respondsTo("setHeaders");
 
     expect(buAPI.orders)
       .to.be.an("object")
@@ -62,6 +66,8 @@ describe("Client", () => {
         "on",
         "$clearEvent",
         "disconnect",
+        "headers",
+        "setHeaders",
         "__setConnection",
         "__connectionData",
         "action1",
@@ -73,6 +79,8 @@ describe("Client", () => {
       .that.respondsTo("$clearEvent")
       .that.respondsTo("on")
       .that.respondsTo("emit")
+      .that.respondsTo("headers")
+      .that.respondsTo("setHeaders")
       .that.respondsTo("$clearEvent")
       .that.respondsTo("__setConnection")
       .that.respondsTo("__connectionData")
@@ -219,4 +227,35 @@ describe("Service", () => {
     const results3 = await AsyncMath.round(10.2);
     expect(results3).to.equal(10);
   });
+  it("should maintain service and module level headers on a Client instance", async () => {
+    const service = createService();
+    const route = "setHeaders/test";
+    const port = 4999;
+    const host = "localhost";
+    const url = `http://localhost:${port}/${route}`;
+    service.module("Test", function () {
+      this.getHeaders = function () {
+        return this.req.headers.origin;
+      };
+    });
+    service.module("Test2", function () {
+      this.getHeaders = function () {
+        return this.req.headers.origin;
+      };
+    });
+
+    await service.startService({ route, port, host });
+
+    const Client = createClient();
+    const myService = await Client.loadService(url);
+    myService.setHeaders({ Origin: `http://localhost:${port}` });
+    myService.Test.setHeaders({ Origin: `http://localhost:${port + 1}` });
+
+    //because a module level headers were set for Test then I expect what was set
+    // for The Test2 module I expect the Service level header to be applied
+    const results = await myService.Test.getHeaders();
+    expect(results).to.equal(`http://localhost:${port + 1}`);
+    const results2 = await myService.Test2.getHeaders();
+    expect(results2).to.equal(`http://localhost:${port}`);
+  });
 });

package/systemlynx/HttpClient/HttpClient.js

@@ -1,12 +1,13 @@
 "use strict";
-const httpClient = require("request");
+const request = require("request");
 const json = true;
 
-module.exports = function createClient() {
+module.exports = function createHttpClient() {
   const Client = this || {};
-  Client.request = ({ method, url, body }, cb) => {
+
+  Client.request = ({ method, url, body, headers }, cb) => {
     const tryRequest = (callback) => {
-      httpClient({ method, url, body, json }, (err, res, body) => {
+      request({ method, url, body, json, headers }, (err, res, body) => {
         if (err) callback(err);
         else if (res.statusCode >= 400) callback(body);
         else callback(null, body, res);
@@ -22,9 +23,9 @@ module.exports = function createClient() {
       );
   };
 
-  Client.upload = ({ url, formData }, cb) => {
+  Client.upload = ({ url, formData, headers }, cb) => {
     const tryRequest = (callback) => {
-      httpClient.post({ url, formData, json }, (err, res, body) => {
+      request.post({ url, formData, json, headers }, (err, res, body) => {
         if (err) callback(err);
         else if (res.statusCode >= 400) callback(body);
         else callback(null, body, res);