Change some triggers for events 'error', 'ended' (#267)

* Change some triggers for events 'error', 'ended'

* Fire events when stop() called

Author: starwarfan

src/sdk/conference/channel.js

@@ -48,6 +48,7 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
     // Timer for PeerConnection disconnected. Will stop connection after timer.
     this._disconnectTimer = null;
     this._ended = false;
+    this._stopped = false;
   }
 
   /**
@@ -407,24 +408,30 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
   }
 
   _unpublish() {
-    this._signaling.sendSignalingMessage('unpublish', {id: this._internalId})
-        .catch((e) => {
-          Logger.warning('MCU returns negative ack for unpublishing, ' + e);
-        });
-    if (this._pc && this._pc.signalingState !== 'closed') {
-      this._pc.close();
+    if (!this._stopped) {
+      this._stopped = true;
+      this._signaling.sendSignalingMessage('unpublish', {id: this._internalId})
+          .catch((e) => {
+            Logger.warning('MCU returns negative ack for unpublishing, ' + e);
+          });
+      if (this._pc && this._pc.signalingState !== 'closed') {
+        this._pc.close();
+      }
     }
   }
 
   _unsubscribe() {
-    this._signaling.sendSignalingMessage('unsubscribe', {
-      id: this._internalId,
-    })
-        .catch((e) => {
-          Logger.warning('MCU returns negative ack for unsubscribing, ' + e);
-        });
-    if (this._pc && this._pc.signalingState !== 'closed') {
-      this._pc.close();
+    if (!this._stopped) {
+      this._stopped = true;
+      this._signaling.sendSignalingMessage('unsubscribe', {
+        id: this._internalId,
+      })
+          .catch((e) => {
+            Logger.warning('MCU returns negative ack for unsubscribing, ' + e);
+          });
+      if (this._pc && this._pc.signalingState !== 'closed') {
+        this._pc.close();
+      }
     }
   }
 
@@ -528,10 +535,23 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
     if (event.currentTarget.iceConnectionState === 'closed' ||
         event.currentTarget.iceConnectionState === 'failed') {
       if (event.currentTarget.iceConnectionState === 'failed') {
-        this._handleError('ICE connection failed.');
+        this._handleError('connection failed.');
+      } else {
+        // Fire ended event if publication or subscription exists.
+        this._fireEndedEventOnPublicationOrSubscription();
+      }
+    }
+  }
+
+  _onConnectionStateChange(event) {
+    if (this._pc.connectionState === 'closed' ||
+        this._pc.connectionState === 'failed') {
+      if (this._pc.connectionState === 'failed') {
+        this._handleError('connection failed.');
+      } else {
+        // Fire ended event if publication or subscription exists.
+        this._fireEndedEventOnPublicationOrSubscription();
       }
-      // Fire ended event if publication or subscription exists.
-      this._fireEndedEventOnPublicationOrSubscription();
     }
   }
 
@@ -564,6 +584,9 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
     this._pc.oniceconnectionstatechange = (event) => {
       this._onIceConnectionStateChange.apply(this, [event]);
     };
+    this._pc.onconnectionstatechange = (event) => {
+      this._onConnectionStateChange.apply(this, [event]);
+    };
   }
 
   _getStats() {
@@ -645,6 +668,8 @@ export class ConferencePeerConnectionChannel extends EventDispatcher {
       error: error,
     });
     dispatcher.dispatchEvent(errorEvent);
+    // Fire ended event when error occured
+    this._fireEndedEventOnPublicationOrSubscription();
   }
 
   _setCodecOrder(sdp, options) {