ws-process 0.3.23 → 0.3.27

package/index.js

@@ -3,6 +3,7 @@ import { tryit } from 'ui5-lib-rc';
 import randomize from 'randomatic';
 import axios from 'axios';
 import { cloneDeep } from 'lodash';
+import { defined } from '@bsgp/lib-core';
 import { ref, Loading, getRef } from './Loading-esm';
 import {
   storeSplittedData,
@@ -499,65 +500,81 @@ function asyncSend(msg) {
         const httpMSG = removeUndefinedKeys({
           url,
           method: msg.method,
-          params: msg.params,
-          data: msg.data,
+          params: defined(msg.params, msg.method === 'GET' ? msg.body : undefined),
+          data: defined(msg.data, msg.method !== 'GET' ? msg.body : undefined),
           headers: {
             ...msg.headers,
             ...headers,
           },
           validateStatus: () => true,
         });
-        console.log('%csending message:', 'color:green', httpMSG);
+        console.log('%csending message:', 'color:green', httpMSG, msg);
 
         return axios(httpMSG).catch((ex) => {
           console.log('%conmessage(converted):', 'color:red', ex);
-
+          const processID = ex.config.headers['bsg-support-process-id'];
           const cProcessItem = getCurrentProcessItem(
             getState,
-            msg.processID,
+            processID,
           );
           if (local.validateResponse) {
             tryit(() => local.store.dispatch(local.validateResponse(ex, cProcessItem)));
           }
-          local.dispatch(updateWSCount(msg.processID));
+          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,
+            headers: data.headers,
             statusCode: data.status,
           };
           const cProcessItem = getCurrentProcessItem(
             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(
@@ -774,31 +791,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.23",
+  "version": "0.3.27",
   "description": "Process Management for Web Socket Client",
   "main": "index.js",
   "scripts": {