@babblevoice/babble-drachtio-callmanager 2.1.0 → 2.1.2

package/lib/call.js

@@ -1037,10 +1037,8 @@ class call {
     } else {
       channeldef = call._createchannelremotedef( target.address, target.port, target.audio.payloads[ 0 ] ) 
     }
-   
-    const other = this.other
-    if( other && other.channels.audio ) this.channels.audio = await other.channels.audio.openchannel( channeldef, this._handlechannelevents.bind( this ) )
-    else this.channels.audio = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+
+    await this.#openrelatedchannel()
 
     this.sdp.local = sdpgen.create()
       .addcodecs( this.selectedcodec )
@@ -1069,7 +1067,7 @@ class call {
 
   /**
     Sometimes we don't care who if we are the parent or child - we just want the other party
-    @return {object|bool} returns call object or if none false
+    @return { object|bool } returns call object or if none false
   */
   get other() {
     if( this.parent ) return this.parent
@@ -1347,23 +1345,25 @@ class call {
    */
   async #openchannelsforanswer( channeldef ) {
     if( this.channels.audio ) {
+      /* we have already opened a channel (probably early now answering) */
       this.channels.audio.remote( channeldef.remote )
     } else {
-      const ch = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
-      this.channels.audio = ch
+      
+      await this.#openrelatedchannel( channeldef )
+
       this.sdp.local = sdpgen.create()
         .addcodecs( this.selectedcodec )
-        .setconnectionaddress( ch.local.address )
-        .setaudioport( ch.local.port )
+        .setconnectionaddress( this.channels.audio.local.address )
+        .setaudioport( this.channels.audio.local.port )
 
       if( this.options.rfc2833 ) {
         this.sdp.local.addcodecs( "2833" )
       }
 
       if( this._iswebrtc ) {
-        this.sdp.local.addssrc( ch.local.ssrc )
-          .secure( ch.local.dtls.fingerprint, channeldef.remote.dtls.mode )
-          .addicecandidates( ch.local.address, ch.local.port, ch.local.icepwd )
+        this.sdp.local.addssrc( this.channels.audio.local.ssrc )
+          .secure( this.channels.audio.local.dtls.fingerprint, channeldef.remote.dtls.mode )
+          .addicecandidates( this.channels.audio.local.address, this.channels.audio.local.port, this.channels.audio.local.icepwd )
           .rtcpmux()
       }
     }
@@ -2478,6 +2478,22 @@ class call {
     return child
   }
 
+  /**
+   * If any of our one of our related calls has a channel open
+   * try and use it. NB (other favours the answered if not then the first)
+   * It will use the channel on that call.
+   * @param { object } [ channeldef ]
+   */
+  async #openrelatedchannel( channeldef ) {
+
+    const relatedcall = this.other
+    if( relatedcall && relatedcall.channels.audio ) 
+      this.channels.audio = await relatedcall.channels.audio.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+    else 
+      this.channels.audio = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+
+  }
+
   /**
    * 
    */
@@ -2485,13 +2501,17 @@ class call {
     if( this.options.late ) {
       this.options.noAck = true /* this is a MUST for late negotiation */
     } else {
-      if( this.options.parent && this.options.parent.channels.audio ) this.channels.audio = await this.options.parent.channels.audio.openchannel( this._handlechannelevents.bind( this ) )
-      else this.channels.audio = await projectrtp.openchannel( this._handlechannelevents.bind( this ) )
+
+      await this.#openrelatedchannel()
 
       this.sdp.local = sdpgen.create().addcodecs( this.options.preferedcodecs )
       this.sdp.local.setaudioport( this.channels.audio.local.port )
         .setconnectionaddress( this.channels.audio.local.address )
 
+      if( this.options.rfc2833 ) {
+        this.sdp.local.addcodecs( "2833" )
+      }
+
       /* DTLS is only supported ( outbound ) on websocket connections */
       this.sip.contact = this.options.contact
       if( this._iswebrtc ) {

package/package.json

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