fix: Auto disconnect when ping timeout

hans00 · Jan 14, 2020 · 130f5cd · 130f5cd
1 parent 888bced
commit 130f5cd
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 5 deletions.
diff --git a/client/base.js b/client/base.js
@@ -14,8 +14,13 @@ const eventId = (str) => str.split('').reduce((sum, char, index) => sum + char.c
 class WSClientBase extends EventEmitter {
   constructor (options = {}) {
     super()
-    this.options = options
-    this.replicator = new Replicator(options.parserOptions)
+    this.options = {
+      parserOptions: options.parserOptions,
+      pingInterval: options.pingInterval || 30000,
+      pingTimeout: options.pingTimeout || 1000,
+      replyTimeout: options.replyTimeout || 5000
+    }
+    this.replicator = new Replicator(this.options.parserOptions)
     this.connectState = 0
     this.internalEvents = ['open', 'close', 'disconnect', 'connect', 'ping', 'pong', 'message', 'binary', 'error']
     this.client = null
@@ -141,7 +146,7 @@ class WSClientBase extends EventEmitter {
         const timeOut = setTimeout(() => {
           reject(new Error('Response timeout.'))
           delete this._event_return[replyId]
-        }, this.options.replyTimeout || 5000)
+        }, this.options.replyTimeout)
         const getData = (payload) => {
           clearTimeout(timeOut)
           delete this._event_return[replyId]

diff --git a/client/browser.js b/client/browser.js
@@ -12,7 +12,7 @@ class WSClient extends Base {
       super.emit('open')
       this._heartbeat = setInterval(() => {
         this.ping()
-      }, options.pingInterval || 30000)
+      }, this.options.pingInterval)
     }
     this.client.onclose = () => {
       super.emit('close')
@@ -35,7 +35,11 @@ class WSClient extends Base {
   }
 
   ping () {
+    const autoTerminate = setTimeout(() => this.client.close(), this.options.pingTimeout)
     this.client.send(Base.getPayload(null, 'ping'))
+    super.once('pong', () => {
+      clearTimeout(autoTerminate)
+    })
   }
 }
 

diff --git a/client/node.js b/client/node.js
@@ -12,7 +12,7 @@ class WSClient extends Base {
       this.connectState = 1
       this._heartbeat = setInterval(() => {
         this.ping()
-      }, options.pingInterval || 30000)
+      }, this.options.pingInterval)
     })
     this.client.on('close', () => {
       this.connectState = -1
@@ -44,7 +44,11 @@ class WSClient extends Base {
   }
 
   ping () {
+    const autoTerminate = setTimeout(() => this.client.terminate(), this.options.pingTimeout)
     this.client.ping(new Date().valueOf())
+    super.once('pong', () => {
+      clearTimeout(autoTerminate)
+    })
   }
 }