ws-process 0.3.28 → 0.3.30

package/index.js

@@ -1,9 +1,8 @@
 // ws-process.js
-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 {
+  defined, clone, makeid, tryit,
+} from '@bsgp/lib-core';
 import { ref, Loading, getRef } from './Loading-esm';
 import {
   storeSplittedData,
@@ -24,7 +23,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);
@@ -34,7 +50,7 @@ function isObject(obj) {
 }
 
 function getRandomID() {
-  return randomize('a', 5);
+  return makeid(5);
 }
 
 function getUSP(url) {
@@ -101,7 +117,7 @@ function startBatchProcess(processID) {
   return (dispatch, getState) => new Promise((resolve, reject) => {
     dispatch(getWebSocket())
       .then(() => {
-        const jsonMSG = cloneDeep(local.wsProcess.processes[processID]);
+        const jsonMSG = clone(local.wsProcess.processes[processID]);
         jsonMSG.action = 'batchprocess';
 
         const user = getState().user.currentUser;
@@ -359,7 +375,12 @@ 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(
@@ -483,11 +504,11 @@ function asyncSend(msg) {
 
           const currentState = getState();
           const {
-            AltDomain: altDomain
-          } = tryit(() => currentState["api-Configuration"].merged.ui.result) || {};
-          if(altDomain){
+            AltDomain: altDomain,
+          } = tryit(() => currentState['api-Configuration'].merged.ui.result) || {};
+          if (altDomain) {
             url = [altDomain, msg.url.replace(/^\/{0,}/, '')].join('/');
-          }else{
+          } else {
             url = ['https://api.bsg.support', msg.url.replace(/^\/{0,}/, '')].join('/');
           }
         }
@@ -517,7 +538,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);
@@ -543,7 +569,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 = {
@@ -939,7 +969,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;
 
@@ -955,7 +985,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) {
@@ -1247,20 +1277,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.28",
+  "version": "0.3.30",
   "description": "Process Management for Web Socket Client",
   "main": "index.js",
   "scripts": {
@@ -23,12 +23,10 @@
     "url": "https://github.com/bsgp/ws-process/issues"
   },
   "homepage": "https://github.com/bsgp/ws-process#readme",
-  "dependencies": {
-    "@bsgp/lib-core": "^0.2.195",
+  "peerDependencies": {
+    "@bsgp/lib-core": "0.2.510",
     "axios": "0.21.1",
     "immer": "3.1.3",
-    "lodash": "4.17.19",
-    "randomatic": "3.1.1",
     "react": "16.8.6",
     "react-dom": "16.8.6",
     "ui5-lib-rc": "0.8.3",