ws-process 0.3.39 → 0.3.41

package/index.js

@@ -258,6 +258,36 @@ async function decompress(decodedRes) {
   return JSON.parse(uncompressedStrRes);
 }
 
+async function compress(jsonString) {
+  // Convert JSON to Stream
+  const stream = new Blob([jsonString], {
+    type: 'application/json',
+  }).stream();
+
+  // gzip stream
+  const compressedReadableStream = stream.pipeThrough(
+    // eslint-disable-next-line no-undef
+    new CompressionStream('gzip'),
+  );
+
+  // create Response
+  const compressedResponse = await new Response(compressedReadableStream);
+
+  // Get response Blob
+  const blob = await compressedResponse.blob();
+  // Get the ArrayBuffer
+  const buffer = await blob.arrayBuffer();
+
+  // convert ArrayBuffer to base64 encoded string
+  const compressedBase64 = btoa(
+    String.fromCharCode(
+      ...new Uint8Array(buffer),
+    ),
+  );
+
+  return compressedBase64;
+}
+
 async function convertResponseData(inData) {
   let jsonData;
 
@@ -309,7 +339,7 @@ async function convertResponseData(inData) {
         } catch (ex) {
           jsonData = b64decode(itemLocal.dataSplitted.join(''));
           jsonData = await decompress(jsonData);
-          console.log('compression ratio:', inData.splitted.compressionRatio, '=', inData.splitted.compressedSize, '/', inData.splitted.uncompressedSize);
+          console.log('res compression ratio:', inData.splitted.compressionRatio, '=', inData.splitted.compressedSize, '/', inData.splitted.uncompressedSize);
         }
       } else {
         jsonData = itemLocal.dataSplitted.join('');
@@ -325,7 +355,7 @@ async function convertResponseData(inData) {
     } catch (ex) {
       jsonData = b64decode(inData.response);
       jsonData = await decompress(jsonData);
-      console.log('compression ratio:', inData.compressionRatio, '=', inData.compressedSize, '/', inData.uncompressedSize);
+      console.log('res compression ratio:', inData.compressionRatio, '=', inData.compressedSize, '/', inData.uncompressedSize);
     }
   } else {
     jsonData = inData;
@@ -654,7 +684,7 @@ function asyncSend(msg) {
               )
               : false;
             if (hasError) {
-            // reject the promise from reqHandler in runProcess
+              // reject the promise from reqHandler in runProcess
 
               const { callback } = cProcessItem;
               if (callback) {
@@ -689,7 +719,7 @@ function asyncSend(msg) {
       }
 
       local.store.dispatch(getWebSocket()).then(
-        () => {
+        async () => {
           const jsonMSG = tryit(
             () => (typeof msg === 'string' ? JSON.parse(msg) : msg),
             msg,
@@ -726,18 +756,23 @@ function asyncSend(msg) {
             }
           }
 
-          if (['requestodata', 'requestsoap'].includes(jsonMSG.action)) {
-            jsonMSG.compressAsGzip = true;
-          }
+          jsonMSG.compressAsGzip = true;
 
           console.log('%csending message:', 'color:green', jsonMSG);
+
           const wsMSG = JSON.stringify(jsonMSG);
+          const encodedMsg = b64EncodeUnicode(wsMSG);
+          const compressedMsg = await compress(wsMSG);
+          console.log('req compression ratio: ', (compressedMsg.length / encodedMsg.length).toFixed(2), '=', compressedMsg.length, '/', encodedMsg.length);
 
           const frameSize = Math.floor(1024 * 32 * 0.9);
-          const refinedMSG = cutStringByLength(wsMSG, frameSize);
+          const refinedMSG = cutStringByLength(compressedMsg, frameSize);
 
           if (refinedMSG.length === 1) {
-            local.wsProcess.wSocket.send(wsMSG);
+            local.wsProcess.wSocket.send(JSON.stringify({
+              action: jsonMSG.action,
+              body: compressedMsg,
+            }));
           } else {
             try {
               const transaction = Sentry.startInactiveSpan({
@@ -786,10 +821,10 @@ function asyncSend(msg) {
 
             const started = tryit(() => jsonData.started);
             if (started) {
-            /*
-              The web socket has run the target lambda function asynchronously,
-              so we just wait for next message from lambda function
-              */
+              /*
+                The web socket has run the target lambda function asynchronously,
+                so we just wait for next message from lambda function
+                */
 
               const cProcess = getCurrentProcess(getState, started.processID);
               if (cProcess) {
@@ -808,7 +843,7 @@ function asyncSend(msg) {
             console.log('%conmessage(converted):', 'color:red', jsonResponse);
 
             if (!jsonResponse) {
-            // It might be splitted
+              // It might be splitted
 
               return;
             }
@@ -833,11 +868,11 @@ function asyncSend(msg) {
             if (
               hasKeys(jsonResponse, ['message', 'connectionId', 'requestId'])
             ) {
-            /*
-                It's an error when lambda failed by
-                uncaught exceptions,
-                like "forbidden", "internal server error".
-              */
+              /*
+                  It's an error when lambda failed by
+                  uncaught exceptions,
+                  like "forbidden", "internal server error".
+                */
 
               if (local.validateResponse) {
                 local.store.dispatch(local.validateResponse(jsonResponse));
@@ -854,7 +889,7 @@ function asyncSend(msg) {
                 jsonResponse.processID,
               );
               if (!getNextProcessItem(getState, jsonResponse.processID)) {
-              // It is last, then append
+                // It is last, then append
 
                 local.dispatch(
                   addWSRequest({
@@ -1111,9 +1146,7 @@ function runProcess(processID, data) {
           if (reqParameters && prcItem.reqParameters) {
             // If this process item is re-added by ws-process
 
-            reqParameters.subAction = `${
-              reqParameters.subAction
-            }_${getRandomID()}`;
+            reqParameters.subAction = `${reqParameters.subAction}_${getRandomID()}`;
           }
 
           if (reqParameters && reqParameters.url) {
@@ -1352,10 +1385,10 @@ function init({
   local.stage = stage;
   local.wsURL = wsURL;
 
-  local.beforeEachProcess = beforeEachProcess || (() => {});
-  local.afterEachProcess = afterEachProcess || (() => {});
-  local.beforeAllProcesses = beforeAllProcesses || (() => {});
-  local.afterAllProcesses = afterAllProcesses || (() => {});
+  local.beforeEachProcess = beforeEachProcess || (() => { });
+  local.afterEachProcess = afterEachProcess || (() => { });
+  local.beforeAllProcesses = beforeAllProcesses || (() => { });
+  local.afterAllProcesses = afterAllProcesses || (() => { });
   local.validateResponse = validateResponse;
 }
 

package/lib/split-payload.js

@@ -1,4 +1,5 @@
-import { isArray, isNumber, isString } from '@bsgp/lib-core/types';
+// eslint-disable-next-line import/no-unresolved
+import { isArray, isNumber, isString } from '@bsgp/lib-core';
 
 /**
  * This function checks string byte size.
@@ -7,8 +8,8 @@ import { isArray, isNumber, isString } from '@bsgp/lib-core/types';
  * @param {string} string string payload which will be cut into pieces
  * @param {number} size length of each cut pieces
  */
-function cutStringByLength(string, size = 30000) {
-  if (!isString(string)) {
+function cutStringByLength(encodedString, size = 30000) {
+  if (!isString(encodedString)) {
     throw new Error('first parameter should be string on function cutStringByLength');
   }
 
@@ -16,10 +17,6 @@ function cutStringByLength(string, size = 30000) {
     throw new Error('second parameter should be number on function cutStringByLength');
   }
 
-  const encodedString = btoa(
-    encodeURIComponent(string).replace(/%([0-9A-F]{2})/g, (match, p1) => String.fromCharCode(`0x${p1}`)),
-  );
-
   const payloadPieces = [];
   const payloadLength = encodedString.length;
   for (let idx = 0; idx < payloadLength; idx += size) {

package/package.json

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