podasync-ws-only 2.9.0-snapshot.6 → 2.9.0-snapshot.7

package/dist/node/network/async.js

@@ -33,7 +33,8 @@
         message: {},
         asyncReady: {},
         stateChange: {},
-        error: {}
+        error: {},
+        msgLogs: {}
       },
       ackCallback = {},
       socket,
@@ -388,6 +389,11 @@
         });
       },
       handleSocketMessage = function (msg) {
+        fireEvent("msgLogs", {
+          msg,
+          direction: "receive",
+          time: new Date().getTime()
+        });
         var ack;
         if (msg.type === asyncMessageType.MESSAGE_ACK_NEEDED || msg.type === asyncMessageType.MESSAGE_SENDER_ACK_NEEDED) {
           ack = function () {
@@ -582,6 +588,11 @@
         }
       },
       pushSendData = function (msg) {
+        fireEvent("msgLogs", {
+          msg,
+          direction: "send",
+          time: new Date().getTime()
+        });
         if (onSendLogging) {
           asyncLogger('Send', msg);
         }
@@ -704,7 +715,7 @@
             peerId: peerId
           });
           socketReconnectRetryInterval && clearTimeout(socketReconnectRetryInterval);
-          socket.close();
+          socket && socket.close();
           break;
         case 'webrtc':
           socketState = socketStateType.CLOSED;
@@ -716,7 +727,7 @@
             peerId: peerId
           });
           socketReconnectRetryInterval && clearTimeout(socketReconnectRetryInterval);
-          webRTCClass.close();
+          webRTCClass && webRTCClass.close();
           break;
       }
     };
@@ -743,7 +754,7 @@
           reconnOnClose.set(false);
           // reconnectOnClose = false;
 
-          socket.close();
+          socket && socket.close();
           break;
         case 'webrtc':
           socketState = socketStateType.CLOSED;
@@ -756,7 +767,7 @@
           });
           reconnOnClose.set(false);
           // reconnectOnClose = false;
-          webRTCClass.close();
+          webRTCClass && webRTCClass.close();
           break;
       }
     };
@@ -775,7 +786,7 @@
         peerId: peerId
       });
       socketReconnectRetryInterval && clearTimeout(socketReconnectRetryInterval);
-      if (protocol === "websocket") socket.close();else if (protocol == "webrtc") webRTCClass.close();
+      if (protocol === "websocket") socket && socket.close();else if (protocol == "webrtc") webRTCClass && webRTCClass.close();
 
       // let tmpReconnectOnClose = reconnectOnClose;
       // reconnectOnClose = false;

package/dist/node/network/webrtc.js

@@ -239,12 +239,14 @@ let dataChannelCallbacks = {
   },
   onmessage: function (event) {
     variables.pingController.resetPingLoop();
-    var messageData = JSON.parse(event.data);
-    console.log("[Async][WebRTC] Receive ", event.data);
-    eventCallback["message"](messageData);
+    decompressResponse(event.data).then(result => {
+      var messageData = JSON.parse(result);
+      console.log("[Async][WebRTC] Receive ", result);
+      eventCallback["message"](messageData);
+    });
   },
   onerror: function (error) {
-    logLevel.debug && console.debug("[Async][Socket.js] dataChannel.onerror happened. EventData:", event);
+    defaultConfig.logLevel.debug && console.debug("[Async][Socket.js] dataChannel.onerror happened. EventData:", event);
     eventCallback["error"](event);
   },
   onclose: function (event) {
@@ -375,9 +377,9 @@ function resetVariables() {
   console.log("resetVariables");
   eventCallback["close"]();
   variables.pingController.stopPingLoop();
-  variables.dataChannel.close();
+  variables.dataChannel && variables.dataChannel.close();
   variables.dataChannel = null;
-  variables.peerConnection.close();
+  variables.peerConnection && variables.peerConnection.close();
   variables.peerConnection = null;
   variables.candidatesQueue = [];
   variables.clientId = null;
@@ -425,4 +427,57 @@ let publicized = {
     resetVariables();
   }
 };
+
+/**
+ * Decompress results
+ */
+function decompress(byteArray, encoding) {
+  const cs = new DecompressionStream(encoding);
+  const writer = cs.writable.getWriter();
+  writer.write(byteArray);
+  writer.close();
+  return new Response(cs.readable).arrayBuffer().then(function (arrayBuffer) {
+    return new TextDecoder().decode(arrayBuffer);
+  });
+}
+async function decompressResponse(compressedData) {
+  return await decompress(_base64UrlToArrayBuffer(compressedData), 'gzip');
+}
+
+//utility
+
+/**
+ * Array buffer to base64Url string
+ * - arrBuff->byte[]->biStr->b64->b64u
+ * @param arrayBuffer
+ * @returns {string}
+ * @private
+ */
+function _arrayBufferToBase64Url(arrayBuffer) {
+  console.log('base64Url from array buffer:', arrayBuffer);
+  let base64Url = window.btoa(String.fromCodePoint(...new Uint8Array(arrayBuffer)));
+  base64Url = base64Url.replaceAll('+', '-');
+  base64Url = base64Url.replaceAll('/', '_');
+  console.log('base64Url:', base64Url);
+  return base64Url;
+}
+
+/**
+ * Base64Url string to array buffer
+ * - b64u->b64->biStr->byte[]->arrBuff
+ * @param base64Url
+ * @returns {ArrayBufferLike}
+ * @private
+ */
+function _base64UrlToArrayBuffer(base64) {
+  console.log('array buffer from base64Url:', base64);
+  const binaryString = window.atob(base64);
+  const length = binaryString.length;
+  const bytes = new Uint8Array(length);
+  for (let i = 0; i < length; i++) {
+    bytes[i] = binaryString.charCodeAt(i);
+  }
+  console.log('array buffer:', bytes.buffer);
+  return bytes.buffer;
+}
 module.exports = WebRTCClass;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podasync-ws-only",
-  "version": "2.9.0-snapshot.6",
+  "version": "2.9.0-snapshot.7",
   "description": "Fanap's POD Async service (DIRANA) - Websocket only",
   "main": "./dist/node/network/async.js",
   "scripts": {

package/src/network/async.js

@@ -40,7 +40,8 @@
                 message: {},
                 asyncReady: {},
                 stateChange: {},
-                error: {}
+                error: {},
+                msgLogs: {}
             },
             ackCallback = {},
             socket,
@@ -203,6 +204,7 @@
                 });
 
                 socket.on('message', function (msg) {
+
                     handleSocketMessage(msg);
                     if (onReceiveLogging) {
                         asyncLogger('Receive', msg);
@@ -435,6 +437,12 @@
             },
 
             handleSocketMessage = function (msg) {
+                fireEvent("msgLogs", {
+                    msg,
+                    direction: "receive",
+                    time: new Date().getTime()
+                });
+
                 var ack;
 
                 if (msg.type === asyncMessageType.MESSAGE_ACK_NEEDED || msg.type === asyncMessageType.MESSAGE_SENDER_ACK_NEEDED) {
@@ -671,6 +679,12 @@
             },
 
             pushSendData = function (msg) {
+                fireEvent("msgLogs", {
+                    msg,
+                    direction: "send",
+                    time: new Date().getTime()
+                });
+
                 if (onSendLogging) {
                     asyncLogger('Send', msg);
                 }
@@ -821,7 +835,7 @@
                     });
 
                     socketReconnectRetryInterval && clearTimeout(socketReconnectRetryInterval);
-                    socket.close();
+                    socket && socket.close();
                     break;
                 case 'webrtc':
                     socketState = socketStateType.CLOSED;
@@ -834,7 +848,7 @@
                     });
 
                     socketReconnectRetryInterval && clearTimeout(socketReconnectRetryInterval);
-                    webRTCClass.close();
+                    webRTCClass && webRTCClass.close();
 
                     break;
             }
@@ -864,7 +878,7 @@
                     reconnOnClose.set(false)
                     // reconnectOnClose = false;
 
-                    socket.close();
+                    socket && socket.close();
                     break;
                 case 'webrtc':
                     socketState = socketStateType.CLOSED;
@@ -877,7 +891,7 @@
                     });
                     reconnOnClose.set(false)
                     // reconnectOnClose = false;
-                    webRTCClass.close();
+                    webRTCClass && webRTCClass.close();
 
                     break;
             }
@@ -901,9 +915,9 @@
 
             socketReconnectRetryInterval && clearTimeout(socketReconnectRetryInterval);
             if(protocol === "websocket")
-                socket.close();
+                socket && socket.close();
             else if(protocol == "webrtc")
-                webRTCClass.close()
+                webRTCClass && webRTCClass.close()
 
             // let tmpReconnectOnClose = reconnectOnClose;
             // reconnectOnClose = false;

package/src/network/webrtc.js

@@ -257,13 +257,15 @@ let dataChannelCallbacks = {
     onmessage: function (event) {
 
         variables.pingController.resetPingLoop();
-        var messageData = JSON.parse(event.data);
-        console.log("[Async][WebRTC] Receive ", event.data);
-        eventCallback["message"](messageData);
+        decompressResponse(event.data).then(result => {
+            var messageData = JSON.parse(result);
+            console.log("[Async][WebRTC] Receive ", result);
+            eventCallback["message"](messageData);
+        });
     },
 
     onerror: function (error) {
-        logLevel.debug && console.debug("[Async][Socket.js] dataChannel.onerror happened. EventData:", event);
+        defaultConfig.logLevel.debug && console.debug("[Async][Socket.js] dataChannel.onerror happened. EventData:", event);
         eventCallback["error"](event);
     },
     onclose: function (event) {
@@ -411,9 +413,9 @@ function resetVariables() {
     console.log("resetVariables");
     eventCallback["close"]();
     variables.pingController.stopPingLoop();
-    variables.dataChannel.close();
+    variables.dataChannel && variables.dataChannel.close();
     variables.dataChannel = null;
-    variables.peerConnection.close();
+    variables.peerConnection && variables.peerConnection.close();
     variables.peerConnection = null;
     variables.candidatesQueue = [];
     variables.clientId = null;
@@ -471,4 +473,61 @@ let publicized = {
     }
 };
 
+
+/**
+ * Decompress results
+ */
+function decompress(byteArray, encoding) {
+    const cs = new DecompressionStream(encoding);
+    const writer = cs.writable.getWriter();
+    writer.write(byteArray);
+    writer.close();
+    return new Response(cs.readable).arrayBuffer().then(function (arrayBuffer) {
+        return new TextDecoder().decode(arrayBuffer);
+    });
+}
+
+async function decompressResponse(compressedData){
+    return await decompress(_base64UrlToArrayBuffer(compressedData), 'gzip');
+}
+
+//utility
+
+/**
+ * Array buffer to base64Url string
+ * - arrBuff->byte[]->biStr->b64->b64u
+ * @param arrayBuffer
+ * @returns {string}
+ * @private
+ */
+function _arrayBufferToBase64Url(arrayBuffer) {
+    console.log('base64Url from array buffer:', arrayBuffer);
+
+    let base64Url = window.btoa(String.fromCodePoint(...new Uint8Array(arrayBuffer)));
+    base64Url = base64Url.replaceAll('+', '-');
+    base64Url = base64Url.replaceAll('/', '_');
+
+    console.log('base64Url:', base64Url);
+    return base64Url;
+}
+
+/**
+ * Base64Url string to array buffer
+ * - b64u->b64->biStr->byte[]->arrBuff
+ * @param base64Url
+ * @returns {ArrayBufferLike}
+ * @private
+ */
+function _base64UrlToArrayBuffer(base64) {
+    console.log('array buffer from base64Url:', base64);
+    const binaryString = window.atob(base64);
+    const length = binaryString.length;
+    const bytes = new Uint8Array(length);
+    for (let i = 0; i < length; i++) {
+        bytes[i] = binaryString.charCodeAt(i);
+    }
+    console.log('array buffer:', bytes.buffer);
+    return bytes.buffer;
+}
+
 module.exports = WebRTCClass;