ws-process 0.3.35 → 0.3.37

package/index.js

@@ -232,7 +232,32 @@ function b64DecodeUnicode(str) {
   );
 }
 
-function convertResponseData(inData) {
+function b64decode(str) {
+  const binaryString = window.atob(str);
+  const len = binaryString.length;
+  const bytes = new Uint8Array(new ArrayBuffer(len));
+  for (let i = 0; i < len; i += 1) {
+    bytes[i] = binaryString.charCodeAt(i);
+  }
+  return bytes;
+}
+
+async function decompress(decodedRes) {
+  // base64 encoding to Blob
+  const stream = new Blob([decodedRes], {
+    type: 'application/json',
+  }).stream();
+  const compressedReadableStream = stream.pipeThrough(
+    // eslint-disable-next-line no-undef
+    new DecompressionStream('gzip'),
+  );
+  const resp = await new Response(compressedReadableStream);
+  const blob = await resp.blob();
+  const uncompressedStrRes = await blob.text();
+  return JSON.parse(uncompressedStrRes);
+}
+
+async function convertResponseData(inData) {
   let jsonData;
 
   if (inData.splitted) {
@@ -278,7 +303,13 @@ function convertResponseData(inData) {
         };
       }
       if (inData.splitted.isBase64Encoded) {
-        jsonData = b64DecodeUnicode(itemLocal.dataSplitted.join(''));
+        try {
+          jsonData = b64DecodeUnicode(itemLocal.dataSplitted.join(''));
+        } catch (ex) {
+          jsonData = b64decode(itemLocal.dataSplitted.join(''));
+          jsonData = await decompress(jsonData);
+          console.log('compression ratio:', inData.splitted.compressionRatio, '=', inData.splitted.compressedSize, '/', inData.splitted.uncompressedSize);
+        }
       } else {
         jsonData = itemLocal.dataSplitted.join('');
       }
@@ -288,7 +319,13 @@ function convertResponseData(inData) {
       return null;
     }
   } else if (inData.isBase64Encoded) {
-    jsonData = b64DecodeUnicode(inData.response);
+    try {
+      jsonData = b64DecodeUnicode(inData.response);
+    } catch (ex) {
+      jsonData = b64decode(inData.response);
+      jsonData = await decompress(jsonData);
+      console.log('compression ratio:', inData.compressionRatio, '=', inData.compressedSize, '/', inData.uncompressedSize);
+    }
   } else {
     jsonData = inData;
   }
@@ -428,9 +465,12 @@ function handleResponseHandler(res, getState, isLast = true, isFirst = true) {
   }
   if (isValid === null) {
     local.afterEachProcess(prc, local.wsProcess.processes);
-    prc.reject(
-      'Request is determined to be failed, and the process is terminated as your wish',
-    );
+    const errMsg = ['Request is determined to be failed', 'and the process is terminated as your wish'].join(', ');
+    if (tryit(() => prc.options.doNotRejectIfTerminate) === true) {
+      console.warn(errMsg);
+    } else {
+      prc.reject(errMsg);
+    }
     wrapClearWSProcess(res.processID);
     return { terminate: true, cbData };
   }
@@ -711,15 +751,9 @@ function asyncSend(msg) {
             onCloseWebSocket(event, dispatch);
           };
 
-          local.wsProcess.wSocket.onmessage = (event) => {
-          // console.log('%conmessage:', 'color:red', event.data);
-            const jsonData = tryit(() => {
-              const parsedData = JSON.parse(event.data);
-              if (parsedData.isBase64Encoded === true) {
-                return JSON.parse(b64DecodeUnicode(parsedData.response));
-              }
-              return parsedData;
-            }, event.data);
+          local.wsProcess.wSocket.onmessage = async (event) => {
+            // console.log('%conmessage:', 'color:red', event.data);
+            const jsonData = tryit(() => JSON.parse(event.data), event.data);
 
             // console.debug("%conmessage:", "color:red", jsonData);
             /* started has following attributes
@@ -750,7 +784,7 @@ function asyncSend(msg) {
               return;
             }
 
-            const jsonResponse = convertResponseData(jsonData);
+            const jsonResponse = await convertResponseData(jsonData);
             console.log('%conmessage(converted):', 'color:red', jsonResponse);
 
             if (!jsonResponse) {

package/package.json

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