ws-process 0.3.27 → 0.3.29

package/index.js

@@ -24,7 +24,24 @@ import reducer, { initialState } from './reducer';
 import 'url-search-params-polyfill';
 import { cutStringByLength, createSplitPayload } from './lib/split-payload';
 
-const local = { processes: {} };
+const local = { 
+  processes: {}, 
+  wsProcess: initialState,  
+};
+
+local.dispatch = (action) => {
+  local.wsProcess = reducer(local.wsProcess, action);
+  if (getRef().current) {
+    switch (action.type) {
+      case storeSplittedData().type:
+      case clearDataSplitted().type:
+        break;
+      default:
+        getRef().current.setState({ wsProcess: local.wsProcess });
+        break;
+    }
+  }
+};
 
 function getType(obj) {
   return Object.prototype.toString.call(obj);
@@ -359,8 +376,13 @@ function handleResponseHandler(res, getState, isLast = true, isFirst = true) {
     res.processID,
   );
   const { resHandler, callback, requestTime } = cProcessItem;
-  console.warn('distance:', new Date() - new Date(requestTime), res.processID, prc.count);
 
+  if(process.env.NODE_ENV === "test"){
+    // pass
+  }else{
+  console.log('%cdistance:', 'color:orange', new Date() - new Date(requestTime), res.processID, prc.count, tryit(()=>res.headers["x-log-id"]));
+  }
+  
   const result = resHandler
     ? local.store.dispatch(
       resHandler({
@@ -480,7 +502,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 = {};
@@ -508,7 +539,12 @@ function asyncSend(msg) {
           },
           validateStatus: () => true,
         });
-        console.log('%csending message:', 'color:green', httpMSG, msg);
+
+        if(process.env.NODE_ENV === "test"){
+          // pass
+        }else{
+          console.log('%csending message:', 'color:green', httpMSG, msg);
+        }
 
         return axios(httpMSG).catch((ex) => {
           console.log('%conmessage(converted):', 'color:red', ex);
@@ -534,7 +570,11 @@ function asyncSend(msg) {
           }
           return data;
         }).then((data) => {
-          console.log('%cHTTP.res:', 'color:red', data);
+          if(process.env.NODE_ENV === "test"){
+            // pass
+          }else{
+            console.log('%cHTTP.res:', 'color:red', data);
+          }
           const processID = tryit(() => data.headers['process-id']) || tryit(() => data.config.headers['bsg-support-process-id']);
 
           const newData = {
@@ -930,7 +970,7 @@ function runProcess(processID, data) {
   // const args = leakArguments(arguments, 1);
 
   return (dispatch, getState) => {
-    console.log('run process ', processID);
+    console.debug('run process ', processID);
     return new Promise((resolve, reject) => {
       const { processes } = local.wsProcess;
 
@@ -946,7 +986,7 @@ function runProcess(processID, data) {
       if (prc.count === prc.items.length) {
         // process finished
 
-        console.log('process finished ', processID);
+        console.debug('process finished ', processID);
 
         // const unfinishedProcesses = Object.keys(processes).filter(subKey => {
         //   if (processes[subKey].count < processes[subKey].items.length) {
@@ -1238,20 +1278,7 @@ function init({
   local.store = store;
   local.stage = stage;
   local.wsURL = wsURL;
-  local.wsProcess = initialState;
-  local.dispatch = (action) => {
-    local.wsProcess = reducer(local.wsProcess, action);
-    if (getRef().current) {
-      switch (action.type) {
-        case storeSplittedData().type:
-        case clearDataSplitted().type:
-          break;
-        default:
-          getRef().current.setState({ wsProcess: local.wsProcess });
-          break;
-      }
-    }
-  };
+  
   local.beforeEachProcess = beforeEachProcess || (() => {});
   local.afterEachProcess = afterEachProcess || (() => {});
   local.beforeAllProcesses = beforeAllProcesses || (() => {});

package/package.json

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