fix: dont remove datachannel on unpublish

ionorg · Oct 27, 2020 · 42bdd1a · 42bdd1a
1 parent 7b63090
commit 42bdd1a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/src/client.ts b/src/client.ts
@@ -54,7 +54,7 @@ export default class Client {
   }
 
   private async join(sid: string) {
-    const offer = await this.pc.createOffer({ offerToReceiveVideo: true, offerToReceiveAudio: true });
+    const offer = await this.pc.createOffer();
     await this.pc.setLocalDescription(offer);
     const answer = await this.signal.join(sid, offer);
 
@@ -74,10 +74,8 @@ export default class Client {
   private async negotiate(description: RTCSessionDescriptionInit) {
     try {
       await this.pc.setRemoteDescription(description); // SRD rolls back as needed
-      if (description.type === 'offer') {
-        await this.pc.setLocalDescription();
-        this.signal.answer(this.pc.localDescription!);
-      }
+      await this.pc.setLocalDescription();
+      this.signal.answer(this.pc.localDescription!);
     } catch (err) {
       /* tslint:disable-next-line:no-console */
       console.error(err);

diff --git a/src/stream.ts b/src/stream.ts
@@ -213,9 +213,9 @@ export class LocalStream {
 
   unpublish() {
     if (this.pc) {
-      this.pc.getSenders().forEach(async (sender: RTCRtpSender) => {
-        if (sender.track && this.stream.getTracks().includes(sender.track)) {
-          this.pc!.removeTrack(sender);
+      this.pc.getSenders().forEach((s: RTCRtpSender) => {
+        if (s.track !== undefined) {
+          this.pc!.removeTrack(s);
         }
       });
     }