ws-process 0.3.22 → 0.3.26

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,
@@ -436,6 +437,7 @@ function handleResponseHandler(res, getState, isLast = true, isFirst = true) {
 
 function asyncSend(msg) {
   return (dispatch, getState) => {
+    // eslint-disable-next-line consistent-return
     const promise = new Promise((resolve, reject) => {
       if (local.wsProcess.maxConcurrency > 0) {
         if (local.wsProcess.concurrency === local.wsProcess.maxConcurrency) {
@@ -489,43 +491,56 @@ function asyncSend(msg) {
         headers['bsg-support-session'] = user.session;
         headers['bsg-support-user-id'] = user.id;
         headers['bsg-support-system-external-id'] = user.pid;
-        headers['bsg-support-partner-id'] = user.partnerID;
-        headers['bsg-support-system-id'] = user.systemID;
-        headers['x-api-key'] = user.system.usageKey;
+        // headers['bsg-support-partner-id'] = user.partnerID;
+        // headers['bsg-support-system-id'] = user.systemID;
+        headers['x-api-key'] = [user.systemID, user.partnerID].join('@');
         headers['request-datetime'] = cProcessItemRoot.requestTime;
         headers.href = window.location.href;
 
         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(

package/package.json

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