- due to untrustable close event, we move close event handler to a standalone function, and call it from both close and offline event.

 - bump version

Author: zbryikt

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Logs
 
+## v0.0.16
+
+ - due to untrustable `close` event, we move close event handler to a standalone function, and call it from both close and offline event.
+
+
 ## v0.0.15
 
  - fire `offline` event when offline event received from window.

dist/index.js

@@ -313,22 +313,28 @@
         d._ws = this$._ws;
         return d._installEventListeners();
       });
-      window.addEventListener('offline', function(){
-        this$.fire('offline');
-        return this$.disconnect();
-      });
-      this$._ws.addEventListener('close', function(){
-        this$._ws = null;
-        this$._svl.map(function(d){
+      this$.closeHandler = function(){
+        if (!this._ws) {
+          return;
+        }
+        this._ws = null;
+        this._svl.map(function(d){
           return d._ws = null;
         });
-        if (this$._s !== 2) {
+        if (this._s !== 2) {
           return rej(err(0));
         }
-        this$._status(0);
-        if (this$._ctrl.disconnector) {
-          return this$._ctrl.disconnector.res();
+        this._status(0);
+        this.fire('offline');
+        if (this._ctrl.disconnector) {
+          return this._ctrl.disconnector.res();
         }
+      };
+      window.addEventListener('offline', function(){
+        return this$.disconnect();
+      });
+      this$._ws.addEventListener('close', function(){
+        return this$.closeHandler();
       });
       this$._ws.addEventListener('open', function(){
         if (!this$._ctrl.canceller) {
@@ -407,6 +413,7 @@
       };
     });
     this._ws.close();
+    this.closeHandler();
     return ret;
   };
   ref$.cancel = function(){

dist/index.min.js

@@ -7,7 +7,18 @@
       _connection: null,
       _ws: opt.ws
     });
+    this._ws.addEventListener('offline', function(){
+      if (!(this$._connection && this$._sws)) {
+        return;
+      }
+      this$._connection = null;
+      this$._sws = null;
+      return this$.fire('close');
+    });
     this._ws.addEventListener('close', function(){
+      if (!(this$._connection && this$._sws)) {
+        return;
+      }
       this$._connection = null;
       this$._sws = null;
       return this$.fire('close');