werift 0.19.9 → 0.20.1

package/src/transport/dtls.ts

@@ -1,8 +1,8 @@
 import { Certificate, PrivateKey } from "@fidm/x509";
 import debug from "debug";
-import Event from "rx.mini";
 import { setTimeout } from "timers/promises";
 import { v4 } from "uuid";
+import { Event } from "../imports/common";
 
 import {
   DtlsClient,
@@ -106,8 +106,12 @@ export class RTCDtlsTransport {
   }
 
   async start() {
-    if (this.state !== "new") throw new Error();
-    if (this.remoteParameters?.fingerprints.length === 0) throw new Error();
+    if (this.state !== "new") {
+      throw new Error("state must be new");
+    }
+    if (this.remoteParameters?.fingerprints.length === 0) {
+      throw new Error("remote fingerprint not exist");
+    }
 
     if (this.role === "auto") {
       if (this.iceTransport.role === "controlling") {
@@ -119,7 +123,7 @@ export class RTCDtlsTransport {
 
     this.setState("connecting");
 
-    await new Promise<void>(async (r) => {
+    await new Promise<void>(async (r, f) => {
       if (this.role === "server") {
         this.dtls = new DtlsServer({
           cert: this.localCertificate?.certPem,
@@ -153,9 +157,10 @@ export class RTCDtlsTransport {
         this.setState("closed");
       });
       this.dtls.onConnect.once(r);
-      this.dtls.onError.subscribe((error) => {
+      this.dtls.onError.once((error) => {
         this.setState("failed");
         log("dtls failed", error);
+        f(error);
       });
 
       if (this.dtls instanceof DtlsClient) {
@@ -163,6 +168,7 @@ export class RTCDtlsTransport {
         this.dtls.connect().catch((error) => {
           this.setState("failed");
           log("dtls connect failed", error);
+          f(error);
         });
       }
     });

package/src/transport/ice.ts

@@ -1,6 +1,6 @@
 import debug from "debug";
-import Event from "rx.mini";
 import { v4 } from "uuid";
+import { Event } from "../imports/common";
 
 import { Candidate, Connection, type IceOptions } from "../../../ice/src";
 import { candidateFromSdp, candidateToSdp } from "../sdp";
@@ -71,11 +71,16 @@ export class RTCIceTransport {
   }
 
   async start() {
-    if (this.state === "closed") throw new Error("RTCIceTransport is closed");
-    if (!this.connection.remotePassword || !this.connection.remoteUsername)
+    if (this.state === "closed") {
+      throw new Error("RTCIceTransport is closed");
+    }
+    if (!this.connection.remotePassword || !this.connection.remoteUsername) {
       throw new Error("remoteParams missing");
+    }
 
-    if (this.waitStart) await this.waitStart.asPromise();
+    if (this.waitStart) {
+      await this.waitStart.asPromise();
+    }
     this.waitStart = new Event();
 
     this.setState("checking");
@@ -113,7 +118,7 @@ export const IceGathererStates = ["new", "gathering", "complete"] as const;
 export type IceGathererState = (typeof IceGathererStates)[number];
 
 export class RTCIceGatherer {
-  onIceCandidate: (candidate: IceCandidate) => void = () => {};
+  onIceCandidate: (candidate: IceCandidate | undefined) => void = () => {};
   gatheringState: IceGathererState = "new";
 
   readonly onGatheringStateChange = new Event<[IceGathererState]>();
@@ -126,9 +131,10 @@ export class RTCIceGatherer {
   async gather() {
     if (this.gatheringState === "new") {
       this.setState("gathering");
-      await this.connection.gatherCandidates((candidate) =>
-        this.onIceCandidate(candidateFromIce(candidate)),
-      );
+      await this.connection.gatherCandidates((candidate) => {
+        this.onIceCandidate(candidateFromIce(candidate));
+      });
+      this.onIceCandidate(undefined);
       this.setState("complete");
     }
   }

package/src/transport/sctp.ts

@@ -1,7 +1,7 @@
 import { jspack } from "@shinyoshiaki/jspack";
 import debug from "debug";
-import { Event } from "rx.mini";
 import * as uuid from "uuid";
+import { Event } from "../imports/common";
 
 import { SCTP, SCTP_STATE, type Transport } from "../../../sctp/src";
 import {