@babblevoice/babble-drachtio-callmanager 2.3.18 → 2.3.20

package/lib/call.js

@@ -1712,6 +1712,7 @@ class call {
   /**
    * If we have been placed on hold (and it has been neotiated) then configure audio to match.
    * @param { "inactive"|"sendonly" } direction
+   * @returns { Promise } resolves on timeout or when unmix happens
    * @private
    */
   _hold( direction = "inactive" ) {
@@ -1719,21 +1720,30 @@ class call {
     if( this.state.held ) return
     this.state.held = true
 
+    const ourpromises = []
+
     const d = { "send": false, "recv": false }
     if( "sendonly" == direction ) d.send = true
 
-    this.channels.audio.direction( d )
+    if( this.channels.audio ) {
+      this.channels.audio.unmix()
+      ourpromises.push( this.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 ) )
+      this.channels.audio.direction( d )
+    }
+
     this.sdp.local.setaudiodirection( direction )
 
     const other = this.other
-    if( other ) {
-      this.channels.audio.unmix()
+    if( other && other.channels.audio ) {
       other.channels.audio.unmix()
+      ourpromises.push( other.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 ) )
       other.channels.audio.play( this.moh )
     }
 
     this._em.emit( "call.hold", this )
     callmanager.options.em.emit( "call.hold", this )
+
+    return Promise.all( ourpromises )
   }
 
   /**
@@ -1744,11 +1754,12 @@ class call {
     if( !this.state.held ) return
     this.state.held = false
 
-    this.channels.audio.direction( { "send": true, "recv": true } )
+    if( this.channels.audio )
+      this.channels.audio.direction( { "send": true, "recv": true } )
     this.sdp.local.setaudiodirection( "sendrecv" )
 
     const other = this.other
-    if( other ) {
+    if( other && other.channels.audio && this.channels.audio ) {
       this.channels.audio.mix( other.channels.audio )
 
       this._em.emit( "call.mix", this )
@@ -1841,35 +1852,11 @@ class call {
       } )
   }
 
-  /**
-   * 
-   * @param { object } other
-   * @returns { object }
-   */
-  swapchannel( other ){
-
-    const this_audio = this.channels.audio
-    const this_sdp = this.sdp.local
-    const this_chem = this.channels.audio.em
-    const other_chem = other.channels.audio.em
-
-    this.channels.audio = other.channels.audio
-    this.channels.audio.em = this_chem
-    this.sdp.local = other.sdp.local
-
-    other.channels.audio = this_audio
-    other.channels.audio.em = other_chem
-    other.sdp.local = this_sdp
-
-    /* reinvite will pick up on this */
-    const selectedcodec = other.selectedcodec
-    other.selectedcodec = this.selectedcodec
-    this.selectedcodec = selectedcodec
-    return this
-  }
-
   /**
     Send out modified SDP to get the audio to the new location.
+    This method might be use, but there are problems - so when it is used
+    it can be re-written but should use a mthod to create a codec - which is the 
+    same as used elsewhere.
     @private
   */
   async reinvite() {
@@ -2118,17 +2105,22 @@ class call {
       othercall.state.refered = true
 
       this.detach()
+
+      this._unhold()
+      othercall._unhold()
+
+      const ourpromises = []
       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 )
+        ourpromises.push( 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 )
+        ourpromises.push( othercall.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 ) )
       }
 
+      await Promise.all( ourpromises )
+
       if( othercall.channels.audio && this.moh ) othercall.channels.audio.play( this.moh )
 
       res.send( 202 )
@@ -2225,10 +2217,11 @@ class call {
     b_1.detach()
     b_2.detach()
 
-    a_1._unhold()
-    b_1._unhold()
-    b_2._unhold()
-    c_1._unhold()
+    await Promise.all( [ 
+      a_1._unhold(),
+      b_1._unhold(),
+      b_2._unhold(),
+      c_1._unhold() ] )
 
     a_1.channels.audio.unmix()
     b_1.channels.audio.unmix()
@@ -2242,8 +2235,6 @@ class call {
       c_1.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 ),
     ] )
 
-    a_1.swapchannel( b_2 )
-
     await new Promise( ( resolve ) => {
       res.send( 202, "Refering", {}, ( /* err, response */ ) => {
         resolve()
@@ -2259,10 +2250,6 @@ class call {
       return
     }
 
-    /* modify ports and renegotiate codecs */
-    await a_1.reinvite()
-
-    /* there might be situations where mix is not the correct thing - perhaps a pop push application? */
     /* Link logically and mix */
     a_1.adopt( c_1, true )
 

package/package.json

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