@babblevoice/babble-drachtio-callmanager 1.6.8 → 1.6.10

package/lib/call.js

@@ -953,7 +953,7 @@ class call {
 
     this.sdp.remote = sdpgen.create( this._dialog.remote.sdp )
     this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-    if( "" == this.selectedcodec ) {
+    if( !this.selectedcodec ) {
       return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
     }
 
@@ -1019,32 +1019,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 )
-      }
-
-      this.selectedcodec = this.sdp.remote.intersection(
-        alegremotesdp.intersection( this.options.preferedcodecs ), true )
-
-      if( this.selectedcodec ) {
-        this.parent.selectedcodec = this.selectedcodec
-      } else {
-        /* Ok - transcode */
-        this.selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
-        if( "" == this.selectedcodec || "" == this.parent.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()
@@ -1088,7 +1065,7 @@ class call {
 
     if( this.parent ) {
       if( !this.parent.established ) {
-        await this.parent.answer( { "preferedcodecs": this.selectedcodec } )
+        await this.parent.answer()
           .catch( ( err ) => {
             console.trace( err )
           } )
@@ -1429,15 +1406,15 @@ class call {
 
     if( this.canceled || this.established ) return
 
-    options = { ...callmanager.options, ...this.options, ...options }
+    this.options = { ...callmanager.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( false === 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 )
       }
+      
       let remoteaudio = this.sdp.remote.getaudio()
       if( !remoteaudio ) return
 
@@ -1470,7 +1447,7 @@ class call {
                 .setconnectionaddress( ch.local.address )
                 .setaudioport( ch.local.port )
 
-      if( callmanager.options.rfc2833 ) {
+      if( this.options.rfc2833 ) {
         this.sdp.local.addcodecs( "2833" )
       }
 
@@ -1484,7 +1461,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/lib/sdp.js

@@ -431,7 +431,10 @@ class sdp {
       if ( undefined != codecconv[ codec ] ) a[ i ] = codecconv[ codec ]
     } )
 
-    return retval.join( " " )
+    let full = retval.join( " " )
+    if( !full ) return false
+    
+    return full
   }
 
   toString() {

package/package.json

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

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/sdp.js

@@ -330,4 +330,41 @@ a=rtpmap:8 PCMA/8000`
     expect( def.remote.port ).to.equal( 48380 )
     expect( def.remote.codec ).to.equal( 8 )
   } )
+
+  it( `another real life example`, async function() {
+    const testsdp = `v=0
+o=MTLSBC 1664810796 1664810796 IN IP4 213.166.4.133
+s=SIP Call
+c=IN IP4 213.166.4.133
+t=0 0
+m=audio 52290 RTP/AVP 8 101 13 0 3 18
+a=rtpmap:8 PCMA/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:3 GSM/8000
+a=rtpmap:18 G729/8000
+a=fmtp:18 annexb=no
+a=rtpmap:101 telephone-event/8000
+a=fmtp:101 0-16
+a=rtpmap:13 CN/8000
+a=ptime:20`
+
+    let oursdp = sdp.create( testsdp )
+
+    let selectedcodec = oursdp.intersection( "g722", true )
+    console.log("selectedcodec",selectedcodec)
+    return
+    selectedcodec = oursdp.intersection( "g722", true )
+    let remoteaudio = oursdp.getaudio()
+
+    oursdp.select( selectedcodec )
+
+    let ourlocalsdp = sdp.create()
+                .addcodecs( selectedcodec )
+                .addcodecs( "2833" )
+                .setconnectionaddress( "1.1.1.1" )
+                .setaudioport( 1000 )
+
+    console.log(ourlocalsdp.toString())
+
+  } )
 } )

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 */