systemlynx 1.18.12 → 1.19.12

package/package.json

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

package/systemlynx/Client/components/ServiceRequestHandler.js

@@ -10,6 +10,32 @@ const makeQuery = (data) =>
     (query, name) => (query += `${name}=${data[name]}&`),
     "?"
   );
+
+const extractFilesFromArguments = (__arguments) => {
+  let foundFile = null;
+  let fileType = null;
+
+  __arguments.forEach((arg) => {
+    if (isObject(arg)) {
+      if ("file" in arg) {
+        if (foundFile)
+          throw new Error("Only one file or files allowed across arguments.");
+        foundFile = arg.file;
+        fileType = "file";
+        arg.file = "__file__";
+      } else if ("files" in arg) {
+        if (foundFile)
+          throw new Error("Only one file or files allowed across arguments.");
+        foundFile = arg.files;
+        fileType = "files";
+        arg.files = "__files__";
+      }
+    }
+  });
+
+  return { foundFile, fileType };
+};
+
 module.exports = function ServiceRequestHandler(
   httpClient,
   protocol,
@@ -23,14 +49,20 @@ module.exports = function ServiceRequestHandler(
 
     const tryRequest = (cb, errCount = 0) => {
       const { route, port, host } = this.__connectionData();
-      const singleFileURL = `${protocol}${host}:${port}/sf${route}/${fn}`;
-      const multiFileURL = `${protocol}${host}:${port}/mf${route}/${fn}`;
+      const { foundFile, fileType } = extractFilesFromArguments(__arguments);
+
       const defaultURL = `${protocol}${host}:${port}${route}/${fn}`;
-      const { file, files } = __arguments[0] || {};
-      const url = file ? singleFileURL : files ? multiFileURL : defaultURL;
+      const url =
+        fileType === "file"
+          ? `${protocol}${host}:${port}/sf${route}/${fn}`
+          : fileType === "files"
+          ? `${protocol}${host}:${port}/mf${route}/${fn}`
+          : defaultURL;
+
       const defaultHeaders = this.headers();
       const headers = !isEmpty(defaultHeaders) ? defaultHeaders : Service.headers();
-      if (url === defaultURL) {
+
+      if (!foundFile) {
         const query =
           method === "get" && isObject(__arguments[0]) ? makeQuery(__arguments[0]) : "";
         httpClient
@@ -43,13 +75,12 @@ module.exports = function ServiceRequestHandler(
           .then((results) => cb(null, results))
           .catch((err) => ErrorHandler(err, errCount, cb));
       } else {
-        delete __arguments[0].file;
-        delete __arguments[0].files;
-        const formData = {};
-        formData.__arguments = __arguments;
-        if (file) formData.file = isNode ? convertToReadStream(file) : file;
-        if (Array.isArray(files))
-          formData.files = isNode ? files.map(convertToReadStream) : files;
+        const formData = { __arguments };
+        if (fileType === "file")
+          formData.file = isNode ? convertToReadStream(foundFile) : foundFile;
+        if (fileType === "files")
+          formData.files = isNode ? foundFile.map(convertToReadStream) : foundFile;
+
         httpClient
           .upload({
             url,

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

@@ -292,6 +292,9 @@ describe("Service", () => {
       this.save = ({ file, files, message }) => {
         return { file, files, message };
       };
+      this.testOtherParams = (param1, { file, files, message }) => {
+        return { files, message, param1 };
+      };
     });
     await service.startService({
       route,
@@ -311,6 +314,10 @@ describe("Service", () => {
       message: "multi file upload test confirmation",
     });
 
+    const extraParamResponse = await storage.testOtherParams("OtherParamsTest", {
+      files: [TEST_FILE, fs.createReadStream(TEST_FILE)],
+      message: "other params file upload test confirmation",
+    });
     expect(singleFileResponse).to.be.an("object").that.has.all.keys("file", "message");
     expect(singleFileResponse.message).to.be.an("string");
     expect(singleFileResponse.message).to.equal("single file upload test confirmation");
@@ -326,6 +333,21 @@ describe("Service", () => {
     expect(multiFileResponse.files[1]).to.be.an("object");
     expect(multiFileResponse.files[0].originalname).to.equal("test.file.json");
     expect(multiFileResponse.files[1].mimetype).to.equal("application/json");
+
+    expect(extraParamResponse)
+      .to.be.an("object")
+      .that.has.all.keys("files", "message", "param1");
+    expect(extraParamResponse.message).to.be.an("string");
+    expect(extraParamResponse.message).to.equal(
+      "other params file upload test confirmation"
+    );
+    expect(extraParamResponse.param1).to.be.an("string");
+    expect(extraParamResponse.param1).to.equal("OtherParamsTest");
+    expect(extraParamResponse.files).to.be.an("array");
+    expect(extraParamResponse.files[0]).to.be.an("object");
+    expect(extraParamResponse.files[1]).to.be.an("object");
+    expect(extraParamResponse.files[0].originalname).to.equal("test.file.json");
+    expect(extraParamResponse.files[1].mimetype).to.equal("application/json");
   });
 
   it("should maintain service and module level headers on a Client instance", async () => {

package/systemlynx/ServerManager/components/Router.js

@@ -80,11 +80,19 @@ module.exports = function createRouter(server, config) {
     const getArguments = () => {
       const args = body.__arguments || [];
       if (!isEmpty(query) && !args.length) args.push(query);
-      if (isObject(args[0]) && method === "POST")
-        args[0] = { ...args[0], ...(file && { file }), ...(files && { files }) };
       return args;
     };
-    req.arguments = getArguments();
+
+    const args = getArguments();
+
+    args.forEach((arg) => {
+      if (isObject(arg)) {
+        if (arg.file === "__file__") arg.file = file;
+        if (arg.files === "__files__") arg.files = files;
+      }
+    });
+
+    req.arguments = args;
     req.presets = presets;
     res.sendError = sendError;
     res.sendResponse = sendResponse;