Merge pull request #150 from uProxy/bemasc-pc-close

Make PeerConnection.close() return a Promise.

Author: bemasc

package.json

@@ -1,7 +1,7 @@
 {
   "name": "uproxy-lib",
   "description": "Shared libraries for uProxy projects.",
-  "version": "20.1.1",
+  "version": "21.0.0",
   "repository": {
     "type": "git",
     "url": "https://github.com/uProxy/uproxy-lib"

src/webrtc/peerconnection.ts

@@ -87,7 +87,7 @@ export interface PeerConnection<TSignallingMessage> {
   // Closing the peer connection will close all associated data channels
   // and set |pcState| to |DISCONNECTED| (and hence fulfills
   // |onceDisconnected|)
-  close: () => void;
+  close: () => Promise<void>;
 }
 
 export interface SignallingMessage {
@@ -260,25 +260,20 @@ export class PeerConnectionClass implements PeerConnection<SignallingMessage> {
   }
 
   // Close the peer connection. This function is idempotent.
-  public close = () : void => {
+  public close = () : Promise<void> => {
     log.info(this.peerName_ + ': ' + 'close');
 
-    // This may happen because calling close will invoke pc_.close, which
-    // may call |onSignallingStateChange_| with |this.pc_.signalingState ===
-    // 'closed'|.
-    if (this.pcState === State.DISCONNECTED) { return; }
-
     if (this.pcState === State.CONNECTING) {
       this.rejectConnected_(new Error('close was called while connecting.'));
     }
 
     this.pcState = State.DISCONNECTED;
     this.fulfillDisconnected_();
 
-    this.pc_.getSignalingState().then((state:string) => {
+    return this.pc_.getSignalingState().then((state:string) => {
       if (state !== 'closed') {
         // Note is expected to invoke |onSignallingStateChange_|
-        this.pc_.close();
+        return this.pc_.close();
       }
     });
   }