@babblevoice/babble-drachtio-callmanager 3.3.5 → 3.4.0

package/lib/call.js

@@ -1120,9 +1120,10 @@ class call {
     Delink calls logically - any calls which have parent or children they are all removed.
     when the dialog is either answered (or doesn't answer for some reason).
     The promise resolves to a new call is one is generated, or undefined if not.
+    @param { boolean } [ unmix ] if true also unmix this call
     @return { call }
   */
-  detach() {
+  detach( unmix ) {
     if( this.parent ) {
       this.parent.children.delete( this )
     }
@@ -1133,6 +1134,9 @@ class call {
 
     this.parent = undefined
     this.children.clear()
+
+    if( unmix && this.channels.audio ) this.channels.audio.unmix()
+
     return this
   }
 
@@ -1150,17 +1154,7 @@ class call {
     /* maintain privacy */
     other.options.privacy = this.options.privacy
 
-    if( mix ) {
-      this.channels.audio.mix( other.channels.audio )
-
-      this._em.emit( "call.mix", this )
-      callmanager.options.em.emit( "call.mix", this )
-      other._em.emit( "call.mix", other )
-      callmanager.options.em.emit( "call.mix", other )
-
-      this.epochs.mix = Math.floor( +new Date() / 1000 )
-      other.epochs.mix = Math.floor( +new Date() / 1000 )
-    }
+    if( mix ) this.mix( other )
     return this
   }
 
@@ -2045,7 +2039,7 @@ class call {
 
   /**
     Mix two calls. If the two calls are on a different node
-    the second call is bonded and reinvited.
+    the other call is bonded and reinvited.
     @param { call } othercall - our call object which is early
     @private
   */
@@ -2057,8 +2051,7 @@ class call {
       const channeldef = await othercall.#createchannelremotedef()
 
       const oldchannel = othercall.channels.audio
-      const newchannel = await this.#openchannel( channeldef, othercall )
-
+      const newchannel = await this.#openchannel( channeldef, this )
       await othercall.bond( this ).reinvite( channeldef, newchannel )
 
       await oldchannel.unmix()
@@ -2066,6 +2059,14 @@ class call {
     }
 
     await this.channels.audio.mix( othercall.channels.audio )
+
+    this._em.emit( "call.mix", this )
+    callmanager.options.em.emit( "call.mix", this )
+    othercall._em.emit( "call.mix", othercall )
+    callmanager.options.em.emit( "call.mix", othercall )
+
+    this.epochs.mix = Math.floor( +new Date() / 1000 )
+    othercall.epochs.mix = Math.floor( +new Date() / 1000 )
   }
 
   /**
@@ -2083,7 +2084,7 @@ class call {
       this.channels.count++
       return chan
     }
-    
+
     const chan = await projectrtp.openchannel(
       channeldef, this._handlechannelevents.bind( this ) )
     this.channels.count++

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "3.3.5",
+  "version": "3.4.0",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {