ws-process 0.3.25 → 0.3.28

package/index.js

@@ -480,7 +480,16 @@ function asyncSend(msg) {
           //       return 'api-dev';
           //   }
           // });
-          url = ['https://api.bsg.support', msg.url.replace(/^\/{0,}/, '')].join('/');
+
+          const currentState = getState();
+          const {
+            AltDomain: altDomain
+          } = tryit(() => currentState["api-Configuration"].merged.ui.result) || {};
+          if(altDomain){
+            url = [altDomain, msg.url.replace(/^\/{0,}/, '')].join('/');
+          }else{
+            url = ['https://api.bsg.support', msg.url.replace(/^\/{0,}/, '')].join('/');
+          }
         }
         const user = getState().user.currentUser;
         const headers = {};
@@ -522,9 +531,21 @@ function asyncSend(msg) {
           }
           local.dispatch(updateWSCount(processID));
           reject(ex);
+        }).then((data) => {
+          const bodyUrl = tryit(() => data.data.getBodyFromUrl === true && data.data.url);
+          if (bodyUrl) {
+            return axios({
+              url: bodyUrl,
+            }).then((bodyData) => ({
+              ...data,
+              data: bodyData.data,
+            }));
+          }
+          return data;
         }).then((data) => {
           console.log('%cHTTP.res:', 'color:red', data);
-          const { 'process-id': processID } = data.headers;
+          const processID = tryit(() => data.headers['process-id']) || tryit(() => data.config.headers['bsg-support-process-id']);
+
           const newData = {
             processID,
             body: data.data,
@@ -535,31 +556,34 @@ function asyncSend(msg) {
             getState,
             processID,
           );
-          const hasError = local.validateResponse
-            ? local.store.dispatch(
-              local.validateResponse(newData, cProcessItem),
-            )
-            : false;
-          if (hasError) {
+
+          if ([undefined, true].includes(cProcessItem.doValidateResponse)) {
+            const hasError = local.validateResponse
+              ? local.store.dispatch(
+                local.validateResponse(newData, cProcessItem),
+              )
+              : false;
+            if (hasError) {
             // reject the promise from reqHandler in runProcess
 
-            const { callback } = cProcessItem;
-            if (callback) {
-              if (callback.afterFailed) {
-                callback.afterFailed(newData);
+              const { callback } = cProcessItem;
+              if (callback) {
+                if (callback.afterFailed) {
+                  callback.afterFailed(newData);
+                }
+                if (callback.always) {
+                  callback.always();
+                }
               }
-              if (callback.always) {
-                callback.always();
+              if (cProcessItem.reject) {
+                cProcessItem.reject({
+                  errorOccurred: true,
+                  processID,
+                  data: newData,
+                });
               }
+              return;
             }
-            if (cProcessItem.reject) {
-              cProcessItem.reject({
-                errorOccurred: true,
-                processID,
-                data: newData,
-              });
-            }
-            return;
           }
 
           const { terminate } = handleResponseHandler(
@@ -776,31 +800,33 @@ function asyncSend(msg) {
               jsonResponse.processID,
             );
 
-            const hasError = local.validateResponse
-              ? local.store.dispatch(
-                local.validateResponse(jsonResponse, cProcessItem),
-              )
-              : false;
-            if (hasError) {
-            // reject the promise from reqHandler in runProcess
-
-              const { callback } = cProcessItem;
-              if (callback) {
-                if (callback.afterFailed) {
-                  callback.afterFailed(jsonResponse);
+            if ([undefined, true].includes(cProcessItem.doValidateResponse)) {
+              const hasError = local.validateResponse
+                ? local.store.dispatch(
+                  local.validateResponse(jsonResponse, cProcessItem),
+                )
+                : false;
+              if (hasError) {
+                // reject the promise from reqHandler in runProcess
+
+                const { callback } = cProcessItem;
+                if (callback) {
+                  if (callback.afterFailed) {
+                    callback.afterFailed(jsonResponse);
+                  }
+                  if (callback.always) {
+                    callback.always();
+                  }
                 }
-                if (callback.always) {
-                  callback.always();
+                if (cProcessItem.reject) {
+                  cProcessItem.reject({
+                    errorOccurred: true,
+                    processID: cProcessItem.processID,
+                    data: jsonResponse,
+                  });
                 }
+                return;
               }
-              if (cProcessItem.reject) {
-                cProcessItem.reject({
-                  errorOccurred: true,
-                  processID: cProcessItem.processID,
-                  data: jsonResponse,
-                });
-              }
-              return;
             }
 
             const thisCount = tryit(() => jsonResponse.body.d.results.length);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws-process",
-  "version": "0.3.25",
+  "version": "0.3.28",
   "description": "Process Management for Web Socket Client",
   "main": "index.js",
   "scripts": {