@babblevoice/babble-drachtio-callmanager 2.3.13 → 2.3.15

package/lib/call.js

@@ -1711,18 +1711,23 @@ class call {
 
   /**
    * If we have been placed on hold (and it has been neotiated) then configure audio to match.
+   * @param { "inactive"|"sendonly" } direction
    * @private
    */
-  _hold() {
+  _hold( direction = "inactive" ) {
 
     if( this.state.held ) return
     this.state.held = true
 
-    this.channels.audio.direction( { "send": false, "recv": false } )
-    this.sdp.local.setaudiodirection( "inactive" )
+    const d = { "send": false, "recv": false }
+    if( "sendonly" == direction ) d.send = true
+
+    this.channels.audio.direction( d )
+    this.sdp.local.setaudiodirection( direction )
 
     const other = this.other
     if( other ) {
+      this.channels.audio.unmix()
       other.channels.audio.unmix()
       other.channels.audio.play( this.moh )
     }
@@ -1745,6 +1750,11 @@ class call {
     const other = this.other
     if( other ) {
       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._em.emit( "call.unhold", this )
@@ -1831,6 +1841,11 @@ class call {
       } )
   }
 
+  /**
+   * 
+   * @param { object } other
+   * @returns { object }
+   */
   swapchannel( other ){
 
     const this_audio = this.channels.audio
@@ -1845,6 +1860,12 @@ class call {
     other.channels.audio = this_audio
     other.channels.audio.em = other_chem
     other.sdp.local = this_sdp
+
+    /* reinvite will pick up on this */
+    const selectedcodec = this.selectedcodec
+    other.selectedcodec = this.selectedcodec
+    this.selectedcodec = selectedcodec
+    return this
   }
 
   /**
@@ -1986,8 +2007,10 @@ class call {
 
       /* this was tested against jssip - which I don't think is correct. It was sending us
       sendonly when placing the call on hold. It didn't change the connection IP (although it did set the rtcp connection ip to 0.0.0.0!). */
-      if( ( "inactive" === sdp.media.direction || "sendonly" === sdp.media.direction || "0.0.0.0" === sdp.ip ) && !this.state.held ) {
-        this._hold()
+      let d = sdp.media.direction
+      if( "0.0.0.0" === sdp.ip ) d = "inactive"
+      if( ( "inactive" === d || "sendonly" === d ) && !this.state.held ) {
+        this._hold( d )
         res.send( 200, {
           "headers": {
             "Subject" : "Call on hold",
@@ -2090,13 +2113,16 @@ class call {
       othercall.state.refered = true
 
       this.detach()
-      if( this.channels.audio ) this.channels.audio.unmix()
-      if( othercall.channels.audio ) othercall.channels.audio.unmix()
-
-      await Promise.all( [
-        this.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 ),
-        othercall.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 ),
-      ] )
+      if( this.channels.audio ) {
+        this.channels.audio.direction( { "send": true, "recv": true } )
+        this.channels.audio.unmix()
+        await this.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 )
+      }
+      if( othercall.channels.audio ) {
+        othercall.channels.audio.direction( { "send": true, "recv": true } )
+        othercall.channels.audio.unmix()
+        await othercall.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 )
+      }
 
       if( othercall.channels.audio && this.moh ) othercall.channels.audio.play( this.moh )
 
@@ -2194,6 +2220,11 @@ class call {
     b_1.detach()
     b_2.detach()
 
+    a_1._unhold()
+    b_1._unhold()
+    b_2._unhold()
+    c_1._unhold()
+
     a_1.channels.audio.unmix()
     b_1.channels.audio.unmix()
     b_2.channels.audio.unmix()

package/lib/sdp.js

@@ -288,8 +288,14 @@ class sdp {
     return m
   }
 
-  setaudiodirection( direction /* sendrecv|inactive|sendonly|recvonly */ ) {
+  /**
+   * 
+   * @param { "sendrecv"|"inactive"|"sendonly"|"recvonly" } direction 
+   * @returns { object }
+   */
+  setaudiodirection( direction ) {
     this.getmedia().direction = direction
+    return this
   }
 
   /*

package/package.json

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