podasync-ws-only 2.8.1-snapshot.0 → 2.9.0-snapshot.2

package/package.json

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

package/src/network/async.js

@@ -66,16 +66,16 @@
                 CLOSED: 3 // The connection is closed or couldn't be opened.
             },
             logLevel = LogLevel(params.logLevel),
-            isNode = Utility.isNode(),
+            // isNode = Utility.isNode(),
             isSocketOpen = false,
             isDeviceRegister = false,
             isServerRegister = false,
             socketState = socketStateType.CONNECTING,
-            asyncState = '',
+            // asyncState = '',
             registerServerTimeoutId,
             registerDeviceTimeoutId,
             checkIfSocketHasOpennedTimeoutId,
-            asyncReadyTimeoutId,
+            // asyncReadyTimeoutId,
             pushSendDataQueue = [],
             oldPeerId,
             peerId = params.peerId,
@@ -884,14 +884,32 @@
             else if(protocol == "webrtc")
                 webRTCClass.close()
 
-            socketReconnectRetryInterval = setTimeout(function () {
+            let tmpReconnectOnClose = reconnectOnClose;
+            reconnectOnClose = false;
+            retryStep.set(0);
+
+            if(protocol === "websocket")
+                socket.connect();
+            else if(protocol == "webrtc")
+                webRTCClass.connect()
+
+            setTimeout(function () {
                 // retryStep = 4;
-                retryStep.set(4);
-                if(protocol === "websocket")
-                    socket.close();
-                else if(protocol == "webrtc")
-                    webRTCClass.close()
-            }, 2000);
+                retryStep.set(0);
+                reconnectOnClose = tmpReconnectOnClose;
+
+                if(socketState != socketStateType.OPEN){
+                    if(protocol === "websocket")
+                        socket.connect();
+                    else if(protocol == "webrtc")
+                        webRTCClass.connect()
+                }
+
+                // if(protocol === "websocket")
+                //     socket.connect();
+                // else if(protocol == "webrtc")
+                //     webRTCClass.connect()
+            }, 4000);
         };
 
         this.generateUUID = Utility.generateUUID;

package/src/network/webrtc.js

@@ -282,7 +282,11 @@ let handshakingFunctions = {
                 method: "POST",
                 body: JSON.stringify({
                     offer: offer
-                })
+                }),
+                headers: {
+                    "Content-Type": "application/json",
+                    // 'Content-Type': 'application/x-www-form-urlencoded',
+                },
             })
                 .then(function (response) {
                     if(response.ok)
@@ -315,7 +319,11 @@ let handshakingFunctions = {
         return new Promise(promiseHandler);
         function promiseHandler(resolve, reject) {
             fetch(addIceCandidateEndPoint, {
-                method: "GET"
+                method: "GET",
+                headers: {
+                    "Content-Type": "application/json",
+                    // 'Content-Type': 'application/x-www-form-urlencoded',
+                },
             })
                 .then(function (response) {
                     if(response.ok)
@@ -365,7 +373,11 @@ let handshakingFunctions = {
                 body: JSON.stringify({
                     "clientId": variables.clientId,
                     "candidate": candidate
-                })
+                }),
+                headers: {
+                    "Content-Type": "application/json",
+                    // 'Content-Type': 'application/x-www-form-urlencoded',
+                },
             })
                 .then(function (response) {
                     if(response.ok)
@@ -416,11 +428,14 @@ function ping() {
     });
 }
 function removeCallbacks(){
-    variables.peerConnection.onicecandidate = null;
-    variables.dataChannel.onclose = null;
-    variables.dataChannel.onmessage = null;
-    variables.dataChannel.onerror = null;
-    variables.dataChannel.onopen = null;
+    if(variables.peerConnection)
+        variables.peerConnection.onicecandidate = null;
+    if(variables.dataChannel) {
+        variables.dataChannel.onclose = null;
+        variables.dataChannel.onmessage = null;
+        variables.dataChannel.onerror = null;
+        variables.dataChannel.onopen = null;
+    }
 }
 
 function WebRTCClass({