@babblevoice/babble-drachtio-callmanager 3.6.10 → 3.6.12

package/lib/call.js

@@ -673,6 +673,12 @@ class call {
             other.#calledidforuac( startingpoint )
           }
         } else {
+
+          if ( this.options.partycaller ) {
+            this.#overridecalledid( startingpoint )
+            return startingpoint
+          }
+
           this.#calleridforuac( startingpoint )
         }
       }
@@ -1299,10 +1305,16 @@ class call {
 
     this.sdp.remote = sdpgen.create( this._dialog.remote.sdp )
 
-    if( !this.sdp.remote.intersection( this.options.preferedcodecs, true ) ) {
+    const selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
+    if( !selectedcodec ) {
       return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
     }
 
+    this.sdp.local.select( selectedcodec )
+    if( true === this.options.rfc2833 && this.sdp.remote.has( "2833" ) ) {
+      this.sdp.local.addcodecs( "2833" )
+    }
+
     this.#parsesrtpsetup()
 
     this.sdp.remote.setdynamepayloadtypes( this.sdp.local )
@@ -3324,7 +3336,10 @@ class call {
     for( const contact of contactinfo.contacts ) {
       if( undefined === contact ) continue
       const newoptions = { ...options }
-      
+
+      if ( newoptions.clicktocall )
+        newoptions.partycaller = true
+
       if( contact.contact && "string" == typeof contact.contact ) {
         numcontacts++
         newoptions.contact = contact.contact
@@ -3515,11 +3530,13 @@ class call {
     }
 
     const callerid = this.callerid
-    const firsthalf = `"${callerid.name}"`
+
     let calleridstr = `<sip:${callerid.user}@${callerid.host}>`
 
     if ( callerid.name )
-      calleridstr = firsthalf + " " + calleridstr
+      calleridstr = `"${callerid.name}"` + " " + calleridstr
+    else
+      calleridstr = `"${callerid.user}"` + " " + calleridstr
 
     let privacy = ""
     if( true === this.options.privacy ) {
@@ -3621,9 +3638,10 @@ class call {
    * @property { object } [ headers ] - Object containing extra sip headers required.
    * @property { object } [ uactimeout ] - override the deault timeout
    * @property { true | number } [ autoanswer ] - if true add call-info to auto answer, if number delay to add
-   * @property { boolean } [ clicktocall ] - if set to true, will set autoanswer to true and swap the source and desination on caller ID
-   * @property { boolean } [ partycalled ] - reverses the direction of the call from the invite
-   * @property { boolean } [ late ] - late negotiation
+   * @property { boolean } [ clicktocall ] - if set to true, will set autoanswer to true and swap the source and desination on caller ID, set to true for both caller and called
+   * @property { boolean } [ partycalled ] - reverses the direction of the call from the invite, from the point of view of the called in a 3pcc context
+   * @property { boolean } [ partycaller ] - reverses the direction of the call from the invite, from the point of view of the caller in a 3pcc context
+  * @property { boolean } [ late ] - late negotiation
    * @property { boolean } [ privacy ] - sets the privacy
    * @property { entity } [ entity ] - used to store this call against and look up a contact string if not supplied.
    * @property { object } [ entity ]

package/lib/sdp.js

@@ -355,13 +355,14 @@ class sdp {
     return false
   }
 
-  /*
-  select works in conjunction with getaudioremote and allows us to force the
-  selection of the codec we send to our RTP server. This is used on the offered SDP.
-  If intersect has been called with firstonly flag set then this has the same effect.
-  */
+  /**
+   * select works in conjunction with getaudioremote and allows us to force the
+   * selection of the codec we send to our RTP server. This is used on the offered SDP.
+   * If intersect has been called with firstonly flag set then this has the same effect.
+   * @param { string } codec
+   */
   select( codec ) {
-    if ( isNaN( codec ) ) {
+    if ( isNaN( parseInt( codec ) ) ) {
       if ( undefined === this.#dynamicpts.hascodec( codec ) ) return
       codec = this.#dynamicpts.getpt( codec )
     }
@@ -412,6 +413,11 @@ class sdp {
     return this
   }
 
+  /**
+   * 
+   * @param { string } type 
+   * @returns 
+   */
   getmedia( type = "audio" ) {
     let m = this.sdp.media.find( mo => type === mo.type )
     if ( !m ) {
@@ -433,13 +439,14 @@ class sdp {
     return this
   }
 
-  /*
-  Add a CODEC or CODECs, formats:
-  "pcma"
-  "pcma pcmu"
-  "pcma, pcmu"
-  [ "pcma", pcmu ]
-  */
+  /** 
+   * Add a CODEC or CODECs, formats:
+   * "pcma"
+   * "pcma pcmu"
+   * "pcma, pcmu"
+   * [ "pcma", pcmu ]
+   * @param { string | Array< string > } codecs
+   */
   addcodecs( codecs ) {
     let codecarr = codecs
     if ( !Array.isArray( codecarr ) && "string" === typeof codecs ) {
@@ -722,9 +729,26 @@ class sdp {
 
   toString() {
 
-    /* We need to convert payloads back to string to stop a , being added */
+    
     const co = Object.assign( this.sdp )
 
+
+    let rfc2833 = ""
+    if( this.#dynamicpts.hascodec( "2833" ) ) {
+      rfc2833 = this.#dynamicpts.getpt( "2833" )
+    }
+
+    /** only return selected */
+    if( this.#selected ) {
+      co.media.forEach( ( media ) => {
+        media.rtp = media.rtp.filter( item => [ this.#selected, rfc2833 ].includes( item.payload ))
+        media.fmtp = media.fmtp.filter( item => [ this.#selected, rfc2833 ].includes( item.payload ))
+        media.payloads = [ this.#selected ]
+        if( rfc2833 ) media.payloads.push( rfc2833 )
+      } )
+    }
+
+    /* We need to convert payloads back to string to stop a , being added */
     co.media.forEach( ( media, i, a ) => {
       if( Array.isArray( media.payloads ) ) {
         a[ i ].payloads = media.payloads.join( " " )

package/package.json

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

package/test/interface/call.js

@@ -258,7 +258,7 @@ describe( "call object", function() {
     child.update()
 
     expect( requestoptions.method ).to.equal( "UPDATE" )
-    expect( requestoptions.headers[ "remote-party-id" ] ).to.equal( "<sip:0123456789@someotherrealm.com>;party=calling;screen=yes" )
+    expect( requestoptions.headers[ "remote-party-id" ] ).to.equal( "\"0123456789\" <sip:0123456789@someotherrealm.com>;party=calling;screen=yes" )
 
     /* simulate wire to propogate hangup */
     await call.hangup( call.hangupcodes.NORMAL_CLEARING, false, "wire" )
@@ -790,7 +790,7 @@ describe( "call object", function() {
 
     await call.newuac( options, { "early": ( c ) => c.hangup() } )
 
-    expect( createuacoptions.headers[ "remote-party-id" ] ).to.equal( "<sip:0000000000@localhost.localdomain>;party=calling;screen=yes" )
+    expect( createuacoptions.headers[ "remote-party-id" ] ).to.equal( "\"0000000000\" <sip:0000000000@localhost.localdomain>;party=calling;screen=yes" )
     expect( createuacoptions.late ).to.be.true
   } )
 
@@ -1173,7 +1173,7 @@ describe( "call object", function() {
 
 
     /* no default configured */
-    expect( c.options.headers[ "remote-party-id" ] ).to.equal( "<sip:012345789@localhost.localdomain>;party=calling;screen=yes" )
+    expect( c.options.headers[ "remote-party-id" ] ).to.equal( "\"012345789\" <sip:012345789@localhost.localdomain>;party=calling;screen=yes" )
 
     c._onhangup( "wire" )
 

package/test/interface/sdp.js

@@ -167,6 +167,7 @@ a=fmtp:18 annexb=no
 a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
 
     const remote = sdp.create( testsdp )
+    /* intersection with first only will call select */
     expect( remote.intersection( "g722 pcmu", true ) ).to.equal( "g722" )
 
     remote.setaudiodirection( "inactive" )
@@ -176,15 +177,9 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
       "s=Z\r\n" +
       "c=IN IP4 127.0.0.1\r\n" +
       "t=0 0\r\n" +
-      "m=audio 56858 RTP/AVP 106 9 98 101 0 8 18 3\r\n" +
-      "a=rtpmap:106 opus/48000/2\r\n" +
-      "a=rtpmap:98 telephone-event/48000\r\n" +
+      "m=audio 56858 RTP/AVP 9 101\r\n" +
       "a=rtpmap:101 telephone-event/8000\r\n" +
-      "a=rtpmap:18 G729/8000\r\n" +
-      "a=fmtp:106 maxplaybackrate=16000; sprop-maxcapturerate=16000; minptime=20; cbr=1; maxaveragebitrate=20000; useinbandfec=1\r\n" +
-      "a=fmtp:98 0-16\r\n" +
       "a=fmtp:101 0-16\r\n" +
-      "a=fmtp:18 annexb=no\r\n" +
       "a=inactive\r\n"
     )
   } )
@@ -1076,4 +1071,68 @@ a=ssrc:874678690 msid:283cd9e0-ac17-4a6b-b5bc-60fceb19b94f a3f88fda-444b-4d7b-b5
       expect( target.port ).to.equal( 61955 )
     }
   } )
+
+  it( "select codecs and regenerate sdp 1", async () => {
+    const testsdp = `v=0
+o=Z 1608236465345 1 IN IP4 192.168.0.141
+s=Z
+c=IN IP4 192.168.0.141
+t=0 0
+m=audio 56802 RTP/AVP 8 0 9 97 106 98
+a=rtpmap:97 iLBC/8000
+a=fmtp:97 mode=20
+a=rtpmap:106 opus/48000/2
+a=fmtp:106 minptime=20; cbr=1; maxaveragebitrate=40000; useinbandfec=1
+a=rtpmap:98 telephone-event/48000
+a=fmtp:98 0-16
+a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
+
+    const sdpobj = sdp.create( testsdp )
+    sdpobj.select( "ilbc" )
+    const oursdpstr = sdpobj.toString()
+
+    expect( oursdpstr ).to.include( "RTP/AVP 97 101\r\n" )
+  } )
+
+  it( "select codecs and regenerate sdp 2", async () => {
+    const testsdp = `v=0
+o=Z 1608236465345 1 IN IP4 192.168.0.141
+s=Z
+c=IN IP4 192.168.0.141
+t=0 0
+m=audio 56802 RTP/AVP 8 0 9 97 106 101
+a=rtpmap:97 iLBC/8000
+a=fmtp:97 mode=20
+a=rtpmap:106 opus/48000/2
+a=fmtp:106 minptime=20; cbr=1; maxaveragebitrate=40000; useinbandfec=1
+a=rtpmap:101 telephone-event/48000
+a=fmtp:101 0-16
+a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
+
+    const sdpobj = sdp.create( testsdp )
+    sdpobj.select( "ilbc" )
+    const oursdpstr = sdpobj.toString()
+
+    expect( oursdpstr ).to.include( "RTP/AVP 97 101\r\n" )
+  } )
+
+  it( "select codecs and regenerate sdp 3", async () => {
+    const testsdp = `v=0
+o=Z 1608236465345 1 IN IP4 192.168.0.141
+s=Z
+c=IN IP4 192.168.0.141
+t=0 0
+m=audio 56802 RTP/AVP 8 0 9 97 106
+a=rtpmap:97 iLBC/8000
+a=fmtp:97 mode=20
+a=rtpmap:106 opus/48000/2
+a=fmtp:106 minptime=20; cbr=1; maxaveragebitrate=40000; useinbandfec=1
+a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
+
+    const sdpobj = sdp.create( testsdp )
+    sdpobj.select( "ilbc" )
+    const oursdpstr = sdpobj.toString()
+
+    expect( oursdpstr ).to.include( "RTP/AVP 97 101\r\n" )
+  } )
 } )