podasync-ws-only 2.7.8 → 2.7.10-snapshot.1

package/README.md

@@ -7,7 +7,7 @@
 First you have to require PodAsync in your project.
 
 ```javascript
-var Async = require('podasync');
+var Async = require('podasync-ws-only');
 ```
 
 To be able to connect to async server, you should set some parameters. `Websockets`protocol is currently supported.

package/package.json

@@ -1,10 +1,14 @@
 {
   "name": "podasync-ws-only",
-  "version": "2.7.8",
+  "version": "2.7.10-snapshot.1",
   "description": "Fanap's POD Async service (DIRANA) - Websocket only",
   "main": "./src/network/async.js",
   "scripts": {
-    "test": "mocha --reporter spec --exit"
+    "test": "mocha --reporter spec --exit",
+    "publish:snapshot": "npm run version:snapshot && npm publish --tag snapshot",
+    "version:snapshot": "npm version prerelease --preid snapshot",
+    "publish:release": "npm run version:release && npm publish",
+    "version:release": "npm version 2.7.8"
   },
   "repository": {
     "type": "git",

package/src/network/async.js

@@ -13,15 +13,17 @@
          *******************************************************/
 
         var PodSocketClass,
-            PodUtility;
-
+            PodUtility,
+            LogLevel
         if (typeof(require) !== 'undefined' && typeof(exports) !== 'undefined') {
             PodSocketClass = require('./socket.js');
             PodUtility = require('../utility/utility.js');
+            LogLevel = require('../utility/logger.js');
         }
         else {
             PodSocketClass = POD.Socket;
             PodUtility = POD.AsyncUtility;
+            LogLevel = POD.LogLevel;
         }
 
         var Utility = new PodUtility();
@@ -60,6 +62,7 @@
                 CLOSING: 2, // The connection is in the process of closing.
                 CLOSED: 3 // The connection is closed or couldn't be opened.
             },
+            logLevel = LogLevel(params.logLevel),
             isNode = Utility.isNode(),
             isSocketOpen = false,
             isDeviceRegister = false,
@@ -122,7 +125,8 @@
                     socketAddress: params.socketAddress,
                     wsConnectionWaitTime: params.wsConnectionWaitTime,
                     connectionCheckTimeout: params.connectionCheckTimeout,
-                    connectionCheckTimeoutThreshold: params.connectionCheckTimeoutThreshold
+                    connectionCheckTimeoutThreshold: params.connectionCheckTimeoutThreshold,
+                    logLevel: logLevel
                 });
 
                 checkIfSocketHasOpennedTimeoutId = setTimeout(function () {
@@ -356,9 +360,12 @@
 
                 if (peerId !== undefined) {
                     content.refresh = true;
+                    content.renew = false;
+
                 }
                 else {
                     content.renew = true;
+                    content.refresh = false;
                 }
 
                 pushSendData({
@@ -527,7 +534,7 @@
             },
 
             fireEvent = function (eventName, param, ack) {
-                try {
+                // try {
                     if (ack) {
                         for (var id in eventCallbacks[eventName]) {
                             eventCallbacks[eventName][id](param, ack);
@@ -538,14 +545,14 @@
                             eventCallbacks[eventName][id](param);
                         }
                     }
-                }
-                catch (e) {
-                    fireEvent('error', {
-                        errorCode: 999,
-                        errorMessage: 'Unknown ERROR!',
-                        errorEvent: e
-                    });
-                }
+                // }
+                // catch (e) {
+                //     fireEvent('error', {
+                //         errorCode: 999,
+                //         errorMessage: 'Unknown ERROR!',
+                //         errorEvent: e
+                //     });
+                // }
             };
 
         /*******************************************************

package/src/network/socket.js

@@ -22,12 +22,45 @@
       eventCallback = {},
       socket,
       waitForSocketToConnectTimeoutId,
-      forceCloseSocket = false,
-      forceCloseSocketTimeout,
       socketRealTimeStatusInterval,
-      sendPingTimeout,
+      //sendPingTimeout,
       socketCloseTimeout,
-      forceCloseTimeout;
+      forceCloseTimeout,
+      logLevel = params.logLevel,
+      pingController = new PingManager({waitTime: connectionCheckTimeout});
+
+
+    function PingManager(params) {
+      const config = {
+        normalWaitTime: params.waitTime,
+
+        lastRequestTimeoutId: null,
+        lastReceivedMessageTime: 0,
+      }
+
+      return {
+        setPingTimeout() {
+          config.lastRequestTimeoutId = setInterval(()=>{
+            ping();
+            //this.watchForPingResponse();
+          }, config.normalWaitTime)
+        },
+        resetPingLoop() {
+          this.updateLastReceivedMessageTime();
+          this.stopPingLoop();
+          this.setPingTimeout();
+          // this.retries = 0;
+        },
+        stopPingLoop(){
+          // config.retries = 0;
+          clearInterval(config.lastRequestTimeoutId);
+          // clearTimeout(config.responseTimeoutId)
+        },
+        updateLastReceivedMessageTime() {
+          config.lastReceivedMessageTime = new Date().getTime();
+        },
+      }
+    }
 
     /*******************************************************
      *            P R I V A T E   M E T H O D S            *
@@ -59,59 +92,26 @@
 
           socket.onopen = function(event) {
             waitForSocketToConnect(function() {
+              pingController.resetPingLoop();
               eventCallback["open"]();
             });
           }
 
           socket.onmessage = function(event) {
+            pingController.resetPingLoop();
+
             var messageData = JSON.parse(event.data);
             eventCallback["message"](messageData);
-
-            /**
-             * To avoid manually closing socket's connection
-             */
-            forceCloseSocket = false;
-
-            socketCloseTimeout && clearTimeout(socketCloseTimeout);
-            forceCloseTimeout && clearTimeout(forceCloseTimeout);
-
-            socketCloseTimeout = setTimeout(function() {
-              /**
-               * If message's type is not 5, socket won't get any acknowledge packet,therefore
-               * you may think that connection has been closed and you would force socket
-               * to close, but before that you should make sure that connection is actually closed!
-               * for that, you must send a ping message and if that message don't get any
-               * responses too, you are allowed to manually kill socket connection.
-               */
-              ping();
-
-              /**
-               * We set forceCloseSocket as true so that if your ping's response don't make it
-               * you close your socket
-               */
-              forceCloseSocket = true;
-
-              /**
-               * If type of messages are not 5, you won't get ant ACK packets
-               * for that being said, we send a ping message to be sure of
-               * socket connection's state. The ping message should have an
-               * ACK, if not, you're allowed to close your socket after
-               * 4 * [connectionCheckTimeout] seconds
-               */
-              forceCloseTimeout = setTimeout(function() {
-                if (forceCloseSocket) {
-                  socket.close();
-                }
-              }, connectionCheckTimeout);
-
-            }, connectionCheckTimeout * 1.5);
           }
 
           socket.onclose = function(event) {
+            pingController.stopPingLoop();
+            logLevel.debug && console.debug("[Async][Socket.js] socket.onclose happened. EventData:", event);
             onCloseHandler(event);
           }
 
           socket.onerror = function(event) {
+            logLevel.debug && console.debug("[Async][Socket.js] socket.onerror happened. EventData:", event);
             eventCallback["error"](event);
           }
         } catch (error) {
@@ -124,9 +124,7 @@
       },
 
       onCloseHandler = function(event) {
-        sendPingTimeout && clearTimeout(sendPingTimeout);
-        socketCloseTimeout && clearTimeout(socketCloseTimeout);
-        forceCloseTimeout && clearTimeout(forceCloseTimeout);
+        pingController.stopPingLoop();
         eventCallback["close"](event);
       },
 
@@ -161,11 +159,6 @@
           data.trackerId = params.trackerId;
         }
 
-        sendPingTimeout && clearTimeout(sendPingTimeout);
-        sendPingTimeout = setTimeout(function() {
-          ping();
-        }, connectionCheckTimeout);
-
         try {
           if (params.content) {
             data.content = JSON.stringify(params.content);
@@ -198,9 +191,7 @@
     }
 
     this.close = function() {
-      sendPingTimeout && clearTimeout(sendPingTimeout);
-      socketCloseTimeout && clearTimeout(socketCloseTimeout);
-      forceCloseTimeout && clearTimeout(forceCloseTimeout);
+      logLevel.debug && console.debug("[Async][Socket.js] Closing socket by call to this.close");
       socket.close();
     }
 

package/src/utility/logger.js

@@ -0,0 +1,34 @@
+function LogLevel(logLevel){
+    let ll = logLevel || 2;
+    switch (ll) {
+        case 1:
+            return {
+                error: true,
+                debug: false,
+                info: false,
+            }
+        case 2:
+            return {
+                error: true,
+                debug: true,
+                info: false,
+            }
+        case 3:
+            return {
+                error: true,
+                debug: true,
+                info: true,
+            }
+    }
+}
+
+
+if (typeof module !== 'undefined' && typeof module.exports != 'undefined') {
+    module.exports = LogLevel;
+}
+else {
+    if (!window.POD) {
+        window.POD = {};
+    }
+    window.POD.LogLevel = LogLevel;
+}