Revert "Resolve join promise after API channel ready (#185)" (#190)

This reverts commit 4d1d436.
ionorg · Apr 18, 2021 · 95a4af8 · 95a4af8
1 parent 4d1d436
commit 95a4af8
Showing 1 changed file with 14 additions and 19 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -107,24 +107,21 @@ export default class Client {
       }
     };
 
-    const apiReady = new Promise<void>((resolve) => {
-      this.transports![Role.sub].pc.ondatachannel = (ev: RTCDataChannelEvent) => {
-        if (ev.channel.label === API_CHANNEL) {
-          this.transports![Role.sub].api = ev.channel;
-          ev.channel.onmessage = (e) => {
-            if (this.onspeaker) {
-              this.onspeaker(JSON.parse(e.data));
-            }
-          };
-          resolve();
-          return;
-        }
+    this.transports[Role.sub].pc.ondatachannel = (ev: RTCDataChannelEvent) => {
+      if (ev.channel.label === API_CHANNEL) {
+        this.transports![Role.sub].api = ev.channel;
+        ev.channel.onmessage = (e) => {
+          if (this.onspeaker) {
+            this.onspeaker(JSON.parse(e.data));
+          }
+        };
+        return;
+      }
 
-        if (this.ondatachannel) {
-          this.ondatachannel(ev);
-        }
-      };
-    });
+      if (this.ondatachannel) {
+        this.ondatachannel(ev);
+      }
+    };
 
     const offer = await this.transports[Role.pub].pc.createOffer();
     await this.transports[Role.pub].pc.setLocalDescription(offer);
@@ -133,8 +130,6 @@ export default class Client {
     await this.transports[Role.pub].pc.setRemoteDescription(answer);
     this.transports[Role.pub].candidates.forEach((c) => this.transports![Role.pub].pc.addIceCandidate(c));
     this.transports[Role.pub].pc.onnegotiationneeded = this.onNegotiationNeeded.bind(this);
-
-    return apiReady;
   }
 
   leave() {