podasync-ws-only 2.9.0-snapshot.3 → 2.9.0-snapshot.5

package/dist/node/network/async.js

@@ -100,8 +100,8 @@
     // }
 
     const reconnOnClose = {
-      value: 4,
-      oldValue: 4,
+      value: false,
+      oldValue: null,
       get() {
         return reconnOnClose.value;
       },
@@ -194,10 +194,10 @@
           }
         });
         socket.on('close', function (event) {
-          console.log("on.close", reconnOnClose.get(), reconnOnClose.getOld());
           isSocketOpen = false;
           isDeviceRegister = false;
           oldPeerId = peerId;
+          socketState = socketStateType.CLOSED;
 
           // socketState = socketStateType.CLOSED;
           //
@@ -220,7 +220,6 @@
               }
             }
             logLevel.debug && console.debug("[Async][async.js] on socket close, retryStep:", retryStep.get());
-            socketState = socketStateType.CLOSED;
             fireEvent('stateChange', {
               socketState: socketState,
               timeUntilReconnect: 1000 * retryStep.get(),
@@ -780,7 +779,7 @@
 
       // let tmpReconnectOnClose = reconnectOnClose;
       // reconnectOnClose = false;
-      reconnOnClose.setOld(reconnOnClose.get());
+      if (reconnOnClose.getOld() == null) reconnOnClose.setOld(reconnOnClose.get());
       reconnOnClose.set(false);
       retryStep.set(0);
       if (protocol === "websocket") socket.connect();else if (protocol == "webrtc") webRTCClass.connect();

package/dist/node/network/socket.js

@@ -54,7 +54,7 @@
               config.timeoutIds.third = setTimeout(() => {
                 logLevel.debug && console.debug("[Async][Socket.js] Force closing socket.");
                 onCloseHandler(null);
-                socket.close();
+                if (socket) socket.close();
               }, 2000);
             }, 2000);
           }, 8000);
@@ -77,7 +77,6 @@
       },
       connect = function () {
         try {
-          console.log("socket.connect()");
           if (socket && socket.readyState == 1) {
             return;
           }
@@ -205,7 +204,7 @@
     };
     this.close = function () {
       logLevel.debug && console.debug("[Async][Socket.js] Closing socket by call to this.close");
-      socket.close();
+      if (socket) socket.close();
       onCloseHandler(null);
       socketWatchTimeout && clearTimeout(socketWatchTimeout);
     };

package/dist/node/network/webrtc.js

@@ -239,9 +239,11 @@ 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);
@@ -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.3",
+  "version": "2.9.0-snapshot.5",
   "description": "Fanap's POD Async service (DIRANA) - Websocket only",
   "main": "./dist/node/network/async.js",
   "scripts": {

package/src/network/async.js

@@ -106,8 +106,8 @@
         // }
 
         const reconnOnClose = {
-            value: 4,
-            oldValue: 4,
+            value: false,
+            oldValue: null,
             get() {
                 return reconnOnClose.value;
             },
@@ -213,6 +213,7 @@
                     isSocketOpen = false;
                     isDeviceRegister = false;
                     oldPeerId = peerId;
+                    socketState = socketStateType.CLOSED;
 
                     // socketState = socketStateType.CLOSED;
                     //
@@ -239,7 +240,6 @@
 
                         logLevel.debug && console.debug("[Async][async.js] on socket close, retryStep:", retryStep.get());
 
-                        socketState = socketStateType.CLOSED;
                         fireEvent('stateChange', {
                             socketState: socketState,
                             timeUntilReconnect: 1000 * retryStep.get(),
@@ -907,7 +907,9 @@
 
             // let tmpReconnectOnClose = reconnectOnClose;
             // reconnectOnClose = false;
-            reconnOnClose.setOld(reconnOnClose.get())
+            if(reconnOnClose.getOld() == null)
+                reconnOnClose.setOld(reconnOnClose.get());
+
             reconnOnClose.set(false);
             retryStep.set(0);
 

package/src/network/socket.js

@@ -56,7 +56,8 @@
               config.timeoutIds.third = setTimeout(()=>{
                 logLevel.debug && console.debug("[Async][Socket.js] Force closing socket.");
                 onCloseHandler(null);
-                socket.close();
+                if(socket)
+                  socket.close();
               }, 2000);
             }, 2000);
           }, 8000);
@@ -224,7 +225,8 @@
 
     this.close = function() {
       logLevel.debug && console.debug("[Async][Socket.js] Closing socket by call to this.close");
-      socket.close();
+      if(socket)
+        socket.close();
       onCloseHandler(null);
       socketWatchTimeout && clearTimeout(socketWatchTimeout);
     }

package/src/network/webrtc.js

@@ -255,11 +255,12 @@ 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) {
@@ -471,4 +472,72 @@ 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;