@babblevoice/babble-drachtio-callmanager 1.6.1 → 1.6.2

package/lib/call.js

@@ -1853,10 +1853,11 @@ class call {
       let replaces = replacesuri.match( /replaces=(.*?)(;|$)/i )
 
       if( null !== replaces ) {
-        return this._runattendedxfer( req, res, replaces, replacesuri )
-      } else {
-        this._runblindxfer( req, res, referto )
+        await this._runattendedxfer( req, res, replaces, replacesuri )
+        return
       }
+
+      await this._runblindxfer( req, res, referto )
     } )
   }
 
@@ -1865,7 +1866,7 @@ class call {
   a blind xfer on the other leg.
   @private
   */
-  _runblindxfer( req, res, referto ) {
+  async _runblindxfer( req, res, referto ) {
     let othercall = this.other
     if( !othercall ) return res.send( 400, "We have no-one to refer" )
 
@@ -1876,6 +1877,7 @@ class call {
     this._notifyreferstart()
 
     othercall.referingtouri = referto.uri
+    othercall.referedby = this
     callmanager.options.em.emit( "call.new", othercall )
     this._notifyrefercomplete()
 

package/package.json

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

package/test/interface/call.js

@@ -35,6 +35,11 @@ describe( "call object", function() {
 
     let srfscenario = new srf.srfscenario()
 
+    let newcallcalled = false
+    srfscenario.options.em.on( "call.new", ( /*newcall*/ ) => {
+      newcallcalled = true
+    } )
+
     let call = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
       srfscenario.inbound()
@@ -54,6 +59,7 @@ describe( "call object", function() {
       "storebyentity": 0
     } )
 
+    expect( newcallcalled ).to.be.true
     expect( call ).to.have.property( "uuid" ).that.is.a( "string" )
     expect( call ).to.have.property( "type" ).that.is.a( "string" ).to.equal( "uas" )
     expect( call ).to.have.property( "state" ).that.is.a( "object" )

package/test/interface/xfer.js

@@ -46,9 +46,30 @@ describe( "xfer", function() {
 
   } )
 
-  it( `call blind xfer 2 leg no auth`, async function() {
+  it( `call blind xfer 2 leg auth`, async function() {
+
+    /*
+    Client a                           Us                             Client b
+    |--------------INVITE ------------>|                                  |(1)
+    |<-------------407 proxy auth------|                                  |(2)
+    |--------------INVITE w auth ----->|                                  |(3)
+    |<-------------200 ok--------------|                                  |(4)
+    |                                  |--------------INVITE ------------>|(5)
+    |                                  |<-------------200 ok--------------|(6)
+    |                                  |<-------------REFER --------------|(7)
+    |                                  |--------------202 --------------->|(8)
+    |                                  |--------------NOTIFY (100)------->|(9)
+    |                                  |<-------------200 ----------------|(10)
+    |                                  |--------------NOTIFY (200)------->|(11)
+    |                                  |<-------------200 ----------------|(12)
+    em.emit( "call.new", call )
+    */
 
     let srfscenario = new srf.srfscenario()
+    let referedcall
+    srfscenario.options.em.on( "call.new", ( r ) => {
+      referedcall = r
+    } )
 
     let call = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
@@ -69,19 +90,26 @@ describe( "xfer", function() {
     await call.answer()
     let child = await call.newuac( { "contact": "1000@dummy" } )
 
-    call._dialog.callbacks.refer( req, res )
+    await child._dialog.callbacks.refer( req, res )
 
     await call.hangup()
 
     expect( call.hangup_cause.sip ).equal( 487 )
-    expect( call.hangup_cause.src ).equal( "wire" )
-    expect( call.hangup_cause.reason ).equal( "BLIND_TRANSFER" )
+    expect( call.hangup_cause.src ).equal( "us" )
+    expect( call.hangup_cause.reason ).equal( "NORMAL_CLEARING" )
+    expect( child.hangup_cause.reason ).equal( "BLIND_TRANSFER" )
 
     expect( sipcodesent ).to.equal( 202 )
 
-    expect( child.state.refered ).to.be.true
-    /* a final hangup outside of the xfer */
-    child.hangup()
+    /* should be the same call */
+    expect( call.state.refered ).to.be.true
+    expect( referedcall.state.refered ).to.be.true
+    expect( referedcall.referingtouri ).to.equal( "sip:alice@atlanta.example.com" )
+
+    expect( referedcall.referedby.uuid ).to.equal( child.uuid )
+
+    /* the child (the xferer) finishes with sending BYE */
+    child._onhangup( "wire" )
 
   } )