systemlynx 1.12.10 → 1.13.10

package/package.json

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

package/systemlynx/Client/components/ServiceRequestHandler.js

@@ -1,7 +1,7 @@
 "use strict";
 
 const { isNode } = require("../../../utils/ProcessChecker");
-const { convertToReadStream } = require("../components/convertToReadStream");
+const { convertToReadStream } = require("./convertToReadStream");
 const isObject = (value) =>
   typeof value === "object" ? (!value ? false : !Array.isArray(value)) : false;
 const isEmpty = (obj) => Object.getOwnPropertyNames(obj).length === 0;
@@ -63,12 +63,8 @@ module.exports = function ServiceRequestHandler(
     };
 
     const ErrorHandler = (err, errCount, cb) => {
-      if (!err.isAxiosError) throw err;
-      if (!err.response) throw err;
-      if (!err.response.data) throw err;
-
-      if (err.response.data.SystemLynxService) {
-        cb(err.response.data);
+      if (err.SystemLynxService) {
+        cb(err);
       } else if (errCount <= 3) {
         errCount++;
         if (reconnectModule) reconnectModule(() => tryRequest(cb, errCount));

package/systemlynx/HttpClient/HttpClient.js

@@ -7,10 +7,15 @@ module.exports = function createHttpClient() {
   const Client = {};
   Client.request = async ({ method = "get", url, body: data, headers }) => {
     method = method.toLowerCase();
-    const res = await axios({ url, method, headers, data });
-    if (res.status >= 400) {
-      throw res.data;
-    } else return res.data;
+    try {
+      const res = await axios({ url, method, headers, data });
+      return res.data;
+    } catch (error) {
+      if (!error.isAxiosError) throw error;
+      if (!error.response) throw error;
+      if (!error.response.data) throw error;
+      throw error.response.data;
+    }
   };
 
   Client.upload = async ({ url, formData, headers }) => {
@@ -24,12 +29,17 @@ module.exports = function createHttpClient() {
     }
     if (__arguments) form.append("__arguments", JSON.stringify(__arguments));
 
-    const res = await axios.post(url, form, {
-      headers: { ...headers, "Content-Type": "multipart/form-data" },
-    });
-    if (res.status >= 400) {
-      throw res.data;
-    } else return res.data;
+    try {
+      const res = await axios.post(url, form, {
+        headers: { ...headers, "Content-Type": "multipart/form-data" },
+      });
+      return res.data;
+    } catch (error) {
+      if (!error.isAxiosError) throw error;
+      if (!error.response) throw error;
+      if (!error.response.data) throw error;
+      throw error.response.data;
+    }
   };
 
   return Client;