@babblevoice/babble-drachtio-callmanager 1.6.9 → 1.6.11

package/lib/call.js

@@ -275,6 +275,9 @@ class call {
     */
     this._em = new events.EventEmitter()
 
+    /* copy default */
+    this.options = { ...callmanager.options }
+
     /**
     @member
     @private
@@ -1019,36 +1022,9 @@ class call {
 
     this.sdp.remote = sdpgen.create( this._req.msg.body )
 
-    let alegremotesdp
-    if( this.parent ) {
-      if( this.parent.established ) {
-        alegremotesdp = this.parent.sdp.remote
-      } else {
-        alegremotesdp = sdpgen.create( this.parent._req.msg.body )
-      }
-      let alegpossiblecodecs = alegremotesdp.intersection( this.options.preferedcodecs )
-      if( !alegpossiblecodecs ) alegpossiblecodecs = alegremotesdp.intersection( callmanager.options.preferedcodecs )
-      if( !alegpossiblecodecs ) {
-        return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
-      }
-
-      this.selectedcodec = this.sdp.remote.intersection( alegpossiblecodecs, true )
-      /* if this doesn't work - then we will have to transcode if we can find a codec which works */
-      if( this.selectedcodec ) {
-        this.parent.selectedcodec = this.selectedcodec
-      } else {
-        this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-        if( !this.selectedcodec ) this.selectedcodec = this.sdp.remote.intersection( callmanager.options.preferedcodecs )
-        if( !this.selectedcodec ) {
-          return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
-        }
-      }
-    } else {
-      /* no parent - just pick our prefered codec */
-      this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-      if( !this.selectedcodec ) {
-        return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
-      }
+    this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
+    if( !this.selectedcodec ) {
+      return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
     }
 
     let target = this.sdp.remote.getaudio()
@@ -1433,13 +1409,11 @@ class call {
 
     if( this.canceled || this.established ) return
 
-    options = { ...callmanager.options, ...this.options, ...options }
+    this.options = { ...this.options, ...options }
 
     let channeldef
     if( this._req.msg && this._req.msg.body ) {
-      /* options.preferedcodecs may have been narrowed down so we still check callmanager as well */
-      this.selectedcodec = this.sdp.remote.intersection( options.preferedcodecs, true )
-      if( !this.selectedcodec ) this.selectedcodec = this.sdp.remote.intersection( callmanager.options.preferedcodecs, true )
+      this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
       if( !this.selectedcodec ) {
         return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
       }
@@ -1476,7 +1450,7 @@ class call {
                 .setconnectionaddress( ch.local.address )
                 .setaudioport( ch.local.port )
 
-      if( callmanager.options.rfc2833 ) {
+      if( this.options.rfc2833 ) {
         this.sdp.local.addcodecs( "2833" )
       }
 
@@ -1490,7 +1464,7 @@ class call {
       if( this.canceled ) return
     }
 
-    if( options.early ) {
+    if( this.options.early ) {
       this.state.early = true
       this._em.emit( "call.early", this )
       callmanager.options.em.emit( "call.early", this )

package/package.json

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

package/test/interface/call.js

@@ -99,6 +99,9 @@ describe( "call object", function() {
 
     expect( call.state.cleaned ).to.be.true
 
+    /* defaults are loaded from call manager */
+    expect( call.options.preferedcodecs ).to.equal( "g722 ilbc pcmu pcma" )
+
   } )
 
   it( `uas.newuac - create uac`, async function() {

package/test/interface/early.js

@@ -448,8 +448,8 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
     expect( channelmessages[ 2 ].remote.address ).to.equal( "82.19.206.102" )
     expect( channelmessages[ 3 ].channel ).to.equal( "mix" )
 
+    expect( channelmessages[ 6 ].channel ).to.equal( "close" )
     expect( channelmessages[ 7 ].channel ).to.equal( "close" )
-    expect( channelmessages[ 8 ].channel ).to.equal( "close" )
 
     expect( msginfo.body ).to.include( "UDP/TLS/RTP/SAVPF" )
 

package/test/interface/xfer.js

@@ -292,6 +292,9 @@ describe( "xfer", function() {
       srfscenario.inbound()
     } )
 
+    /* needed for _dialog.on... */
+    await b_2.answer()
+
     let c_1 = await b_2.newuac( { "contact": "1001@dummy" } )
 
     /* now we refer b_2 to b_1 */