Merge branch 'release/1.0.5'

Author: thetutlage

CHANGELOG.md

@@ -1,3 +1,8 @@
+<a name="1.0.5"></a>
+## [1.0.5](https://github.com/adonisjs/adonis-websocket-client/compare/v1.0.4...v1.0.5) (2018-03-16)
+
+
+
 <a name="1.0.4"></a>
 ## [1.0.4](https://github.com/adonisjs/adonis-websocket-client/compare/v1.0.0...v1.0.4) (2018-03-16)
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@adonisjs/websocket-client",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Websocket client for AdonisJs",
   "main": "dist/Ws.es.js",
   "module": "dist/Ws.es.js",

package.json

@@ -263,40 +263,20 @@ export default class Connection extends Emitter {
    * @private
    */
   _onClose (event) {
-    this.ws = null
     clearInterval(this._pingTimer)
-    this._pingTimer = null
 
-    /**
-     * Terminate completely
-     */
-    if (!this.shouldReconnect) {
-      this._subscriptionsIterator((subscription) => subscription.terminate())
-      this
-        .emit('close', this)
-        .then(() => {
-          this.clearListeners()
-        })
-        .catch(() => {
-          this.clearListeners()
-        })
-      return
-    }
+    this.ws = null
+    this._pingTimer = null
 
-    /**
-     * Keep subscriptions in pending state
-     */
-    this._subscriptionsIterator((subscription) => subscription.reconnecting())
+    this._subscriptionsIterator((subscription) => subscription.terminate())
 
-    /**
-     * Emit close and then reconnect
-     */
     this
       .emit('close', this)
       .then(() => {
-        this._reconnect()
-      }).catch(() => {
-        this._reconnect()
+        this.shouldReconnect ? this._reconnect() : this.clearListeners()
+      })
+      .catch(() => {
+        this.shouldReconnect ? this._reconnect() : this.clearListeners()
       })
   }
 
@@ -611,7 +591,6 @@ export default class Connection extends Emitter {
      * Sending join request to the server, the subscription will
      * be considered ready, once server acknowledges it
      */
-    console.log('this._connectionState', this._connectionState)
     if (this._connectionState === 'open') {
       this.sendPacket(wsp.joinPacket(topic))
     }

src/Connection/index.js

@@ -211,19 +211,6 @@ export default class Socket {
     this.state = 'error'
   }
 
-  /**
-   * Connection is trying to reconnect with the server,
-   * so we have to move subscription to pending state
-   *
-   * @method reconnecting
-   *
-   * @return {void}
-   */
-  reconnecting () {
-    this.state = 'pending'
-    this.emitter.emit('close', this)
-  }
-
   /**
    * Sends the request on server to close the subscription, we
    * have to wait for acknowledgment too