werift 0.20.1 → 0.21.0

package/src/transport/ice.ts

@@ -2,29 +2,35 @@ import debug from "debug";
 import { v4 } from "uuid";
 import { Event } from "../imports/common";
 
-import { Candidate, Connection, type IceOptions } from "../../../ice/src";
+import {
+  Candidate,
+  Connection,
+  type IceConnection,
+  type IceOptions,
+} from "../../../ice/src";
 import { candidateFromSdp, candidateToSdp } from "../sdp";
 
 const log = debug("werift:packages/webrtc/src/transport/ice.ts");
 
 export class RTCIceTransport {
   readonly id = v4();
-  connection: Connection;
+  connection: IceConnection;
   state: RTCIceConnectionState = "new";
+  private waitStart?: Event<[]>;
+  private renominating = false;
 
   readonly onStateChange = new Event<[RTCIceConnectionState]>();
+  readonly onIceCandidate = new Event<[IceCandidate | undefined]>();
+  readonly onNegotiationNeeded = new Event<[]>();
 
-  private waitStart?: Event<[]>;
-
-  constructor(private gather: RTCIceGatherer) {
-    this.connection = this.gather.connection;
+  constructor(private iceGather: RTCIceGatherer) {
+    this.connection = this.iceGather.connection;
     this.connection.stateChanged.subscribe((state) => {
       this.setState(state);
     });
-  }
-
-  get iceGather() {
-    return this.gather;
+    this.iceGather.onIceCandidate = (candidate) => {
+      this.onIceCandidate.execute(candidate);
+    };
   }
 
   get role() {
@@ -32,21 +38,30 @@ export class RTCIceTransport {
     else return "controlled";
   }
 
+  get gatheringState() {
+    return this.iceGather.gatheringState;
+  }
+
+  get localCandidates() {
+    return this.iceGather.localCandidates;
+  }
+
+  get localParameters() {
+    return this.iceGather.localParameters;
+  }
+
   private setState(state: RTCIceConnectionState) {
     if (state !== this.state) {
       this.state = state;
 
-      if (this.onStateChange.ended) return;
-
-      if (state === "closed") {
-        this.onStateChange.execute(state);
-        this.onStateChange.complete();
-      } else {
-        this.onStateChange.execute(state);
-      }
+      this.onStateChange.execute(state);
     }
   }
 
+  gather() {
+    return this.iceGather.gather();
+  }
+
   addRemoteCandidate = (candidate?: IceCandidate) => {
     if (!this.connection.remoteCandidatesEnd) {
       if (!candidate) {
@@ -57,19 +72,36 @@ export class RTCIceTransport {
     }
   };
 
-  setRemoteParams(remoteParameters: RTCIceParameters) {
+  setRemoteParams(remoteParameters: RTCIceParameters, renomination = false) {
+    if (renomination) {
+      this.renominating = true;
+    }
     if (
       this.connection.remoteUsername &&
       this.connection.remotePassword &&
       (this.connection.remoteUsername !== remoteParameters.usernameFragment ||
         this.connection.remotePassword !== remoteParameters.password)
     ) {
-      log("restartIce", remoteParameters);
-      this.connection.resetNominatedPair();
+      if (this.renominating) {
+        log("renomination", remoteParameters);
+        this.connection.resetNominatedPair();
+        this.renominating = false;
+      } else {
+        log("restart", remoteParameters);
+        this.restart();
+      }
     }
     this.connection.setRemoteParams(remoteParameters);
   }
 
+  restart() {
+    this.connection.restart();
+    this.setState("new");
+    this.iceGather.gatheringState = "new";
+    this.waitStart = undefined;
+    this.onNegotiationNeeded.execute();
+  }
+
   async start() {
     if (this.state === "closed") {
       throw new Error("RTCIceTransport is closed");
@@ -92,7 +124,9 @@ export class RTCIceTransport {
       throw error;
     }
 
+    this.waitStart.execute();
     this.waitStart.complete();
+    this.waitStart = undefined;
   }
 
   async stop() {
@@ -100,6 +134,9 @@ export class RTCIceTransport {
       this.setState("closed");
       await this.connection.close();
     }
+    this.onStateChange.complete();
+    this.onIceCandidate.complete();
+    this.onNegotiationNeeded.complete();
   }
 }
 
@@ -120,20 +157,21 @@ export type IceGathererState = (typeof IceGathererStates)[number];
 export class RTCIceGatherer {
   onIceCandidate: (candidate: IceCandidate | undefined) => void = () => {};
   gatheringState: IceGathererState = "new";
+  readonly connection: IceConnection;
 
   readonly onGatheringStateChange = new Event<[IceGathererState]>();
-  readonly connection: Connection;
 
   constructor(private options: Partial<IceOptions> = {}) {
     this.connection = new Connection(false, this.options);
+    this.connection.onIceCandidate.subscribe((candidate) => {
+      this.onIceCandidate(candidateFromIce(candidate));
+    });
   }
 
   async gather() {
     if (this.gatheringState === "new") {
       this.setState("gathering");
-      await this.connection.gatherCandidates((candidate) => {
-        this.onIceCandidate(candidateFromIce(candidate));
-      });
+      await this.connection.gatherCandidates();
       this.onIceCandidate(undefined);
       this.setState("complete");
     }
@@ -145,7 +183,7 @@ export class RTCIceGatherer {
 
   get localParameters() {
     const params = new RTCIceParameters({
-      usernameFragment: this.connection.localUserName,
+      usernameFragment: this.connection.localUsername,
       password: this.connection.localPassword,
     });
 
@@ -169,6 +207,8 @@ export function candidateFromIce(c: Candidate) {
     c.priority,
     c.transport,
     c.type,
+    c.generation,
+    c.ufrag,
   );
   candidate.relatedAddress = c.relatedAddress;
   candidate.relatedPort = c.relatedPort;
@@ -188,6 +228,8 @@ export function candidateToIce(x: IceCandidate) {
     x.relatedAddress,
     x.relatedPort,
     x.tcpType,
+    x.generation,
+    x.ufrag,
   );
 }
 
@@ -195,6 +237,7 @@ export class RTCIceCandidate {
   candidate!: string;
   sdpMid?: string;
   sdpMLineIndex?: number;
+  usernameFragment?: string;
 
   constructor(props: Partial<RTCIceCandidate>) {
     Object.assign(this, props);
@@ -209,6 +252,7 @@ export class RTCIceCandidate {
       candidate: this.candidate,
       sdpMid: this.sdpMid,
       sdpMLineIndex: this.sdpMLineIndex,
+      usernameFragment: this.usernameFragment,
     };
   }
 }
@@ -233,6 +277,8 @@ export class IceCandidate {
     public priority: number,
     public protocol: string,
     public type: string,
+    public generation?: number,
+    public ufrag?: string,
   ) {}
 
   toJSON(): RTCIceCandidate {
@@ -240,6 +286,7 @@ export class IceCandidate {
       candidate: candidateToSdp(this),
       sdpMLineIndex: this.sdpMLineIndex,
       sdpMid: this.sdpMid,
+      usernameFragment: this.ufrag,
     });
   }