@babblevoice/babble-drachtio-callmanager 1.5.3 → 1.6.1

package/lib/call.js

@@ -1756,7 +1756,14 @@ class call {
         let sdp = sdpgen.create( req.msg.body )
         let media = sdp.getmedia()
 
-        if( ( "inactive" === media.direction || "0.0.0.0" === sdp.sdp.connection.ip ) && !this.state.held ) {
+        let ip
+        if( sdp && sdp && sdp.sdp.connection && sdp.sdp.connection.ip ) {
+          ip = sdp.sdp.connection.ip
+        }
+
+        /* this was tested against jssip - which I don't think is correct. It was sending us
+        sendonly when placing the call on hold. It didn't change the connection IP (although it did set the rtcp connection ip to 0.0.0.0!). */
+        if( ( "inactive" === media.direction || "sendonly" === media.direction || "0.0.0.0" === ip ) && !this.state.held ) {
           this._hold()
           res.send( 200, {
             "headers": {
@@ -1767,7 +1774,7 @@ class call {
             },
             "body": this.sdp.local.toString()
           } )
-        } else if( "inactive" !== media.direction && "0.0.0.0" !== sdp.sdp.connection.ip && this.state.held ) {
+        } else if( "inactive" !== media.direction && "sendonly" !== media.direction && "0.0.0.0" !== ip && this.state.held ) {
           this._unhold()
           res.send( 200, {
             "headers": {
@@ -2344,6 +2351,9 @@ class call {
   @param { string } [ options.entity.realm ]
   @param { string } [ options.entity.uri ]
   @param { number } [ options.entity.max ] - if included no more than this number of calls for this entity (only if we look user up)
+  @param { object } [ options.callerid ]
+  @param { string } [ options.callerid.number ]
+  @param { string } [ options.callerid.name ]
   @param { object } [ callbacks ]
   @param { earlycallback } [ callbacks.early ] - callback to provide a call object with early call (pre dialog)
   @param { confirmcallback } [ callbacks.confirm ] - called when a dialog is confirmed but before it is bridged with a parent - this provides an opportunity for another call to adopt this call
@@ -2454,6 +2464,17 @@ class call {
       }
     }
 
+    /* oveide caller id */
+    if( options.callerid ) {
+      if( options.callerid.number ) {
+        user = options.callerid.number
+      }
+
+      if( options.callerid.name ) {
+        name = options.callerid.name
+      }
+    }
+
     let callerid = `"${name}" <sip:${user}@${realm}>`
 
     newcall.options.headers[ "Remote-Party-ID" ] = callerid

package/package.json

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

package/test/interface/call.js

@@ -1100,4 +1100,44 @@ describe( "call object", function() {
     c._onhangup( "wire" )
 
   } )
+
+  it( `overide caller id name`, async function() {
+    new srf.srfscenario( {} )
+
+    let options = {
+      "contact": "ourcontactstring",
+      "callerid": {
+        "name": "Hello"
+      }
+    }
+
+    let c = await call.newuac( options )
+
+    /* no default configured */
+    expect( c.options.headers[ "Remote-Party-ID" ] ).to.equal( '"Hello" <sip:0000000000@localhost.localdomain>' )
+
+    c._onhangup( "wire" )
+
+  } )
+
+
+  it( `overide caller id number`, async function() {
+    new srf.srfscenario( {} )
+
+    let options = {
+      "contact": "ourcontactstring",
+      "callerid": {
+        "number": "012345789"
+      }
+    }
+
+    let c = await call.newuac( options )
+
+
+    /* no default configured */
+    expect( c.options.headers[ "Remote-Party-ID" ] ).to.equal( '"" <sip:012345789@localhost.localdomain>' )
+
+    c._onhangup( "wire" )
+
+  } )
 } )