@babblevoice/babble-drachtio-callmanager 2.3.17 → 2.3.19

package/lib/call.js

@@ -1841,47 +1841,28 @@ 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() {
 
-    this.sdp.local
-      .clearcodecs()
-      .addcodecs( this.selectedcodec )
-      .select( this.selectedcodec )
-      .setaudiodirection( "sendrecv" )
+    this.sdp.local = sdpgen.create().addcodecs( this.selectedcodec )
+    this.sdp.local.setaudioport( this.channels.audio.local.port )
+      .setconnectionaddress( this.channels.audio.local.address )
 
-    if( true === callmanager.options.rfc2833 ) {
-      this.sdp.local.addcodecs( "2833" )
+    this.#checkandadd2833()
+
+    /* DTLS is only supported ( outbound ) on websocket connections */
+    if( this._iswebrtc ) {
+      this.sdp.local
+        .addssrc( this.channels.audio.local.ssrc )
+        .secure( this.channels.audio.local.dtls.fingerprint ,"passive" )
+        .addicecandidates( this.channels.audio.local.address, this.channels.audio.local.port, this.channels.audio.local.icepwd )
+        .rtcpmux()
     }
 
     const remotesdp = await this._dialog.modify( this.sdp.local.toString() )
@@ -2237,8 +2218,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()
@@ -2254,10 +2233,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.17",
+  "version": "2.3.19",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {