ws-process 0.3.29 → 0.3.31

package/index.js

@@ -1,9 +1,9 @@
+/* eslint-disable import/no-unresolved */
 // 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,9 +24,9 @@ import reducer, { initialState } from './reducer';
 import 'url-search-params-polyfill';
 import { cutStringByLength, createSplitPayload } from './lib/split-payload';
 
-const local = { 
-  processes: {}, 
-  wsProcess: initialState,  
+const local = {
+  processes: {},
+  wsProcess: initialState,
 };
 
 local.dispatch = (action) => {
@@ -51,7 +51,7 @@ function isObject(obj) {
 }
 
 function getRandomID() {
-  return randomize('a', 5);
+  return makeid(5);
 }
 
 function getUSP(url) {
@@ -118,7 +118,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;
@@ -377,12 +377,12 @@ function handleResponseHandler(res, getState, isLast = true, isFirst = true) {
   );
   const { resHandler, callback, requestTime } = cProcessItem;
 
-  if(process.env.NODE_ENV === "test"){
+  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"]));
+  } 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({
@@ -505,11 +505,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('/');
           }
         }
@@ -540,9 +540,9 @@ function asyncSend(msg) {
           validateStatus: () => true,
         });
 
-        if(process.env.NODE_ENV === "test"){
+        if (process.env.NODE_ENV === 'test') {
           // pass
-        }else{
+        } else {
           console.log('%csending message:', 'color:green', httpMSG, msg);
         }
 
@@ -559,6 +559,9 @@ function asyncSend(msg) {
           local.dispatch(updateWSCount(processID));
           reject(ex);
         }).then((data) => {
+          if (data === undefined) {
+            return data;
+          }
           const bodyUrl = tryit(() => data.data.getBodyFromUrl === true && data.data.url);
           if (bodyUrl) {
             return axios({
@@ -570,9 +573,13 @@ function asyncSend(msg) {
           }
           return data;
         }).then((data) => {
-          if(process.env.NODE_ENV === "test"){
+          if (data === undefined) {
+            return data;
+          }
+
+          if (process.env.NODE_ENV === 'test') {
             // pass
-          }else{
+          } else {
             console.log('%cHTTP.res:', 'color:red', data);
           }
           const processID = tryit(() => data.headers['process-id']) || tryit(() => data.config.headers['bsg-support-process-id']);
@@ -613,7 +620,7 @@ function asyncSend(msg) {
                   data: newData,
                 });
               }
-              return;
+              return undefined;
             }
           }
 
@@ -621,10 +628,11 @@ function asyncSend(msg) {
             newData, getState,
           );
           if (terminate === true) {
-            return;
+            return undefined;
           }
 
           resolve(newData);
+          return undefined;
         });
       }
 
@@ -1278,7 +1286,7 @@ function init({
   local.store = store;
   local.stage = stage;
   local.wsURL = wsURL;
-  
+
   local.beforeEachProcess = beforeEachProcess || (() => {});
   local.afterEachProcess = afterEachProcess || (() => {});
   local.beforeAllProcesses = beforeAllProcesses || (() => {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ws-process",
-  "version": "0.3.29",
+  "version": "0.3.31",
   "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",
-    "axios": "0.21.1",
+  "peerDependencies": {
+    "@bsgp/lib-core": "0.2.510",
+    "axios": "1.3.4",
     "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",