@babblevoice/babble-drachtio-callmanager 3.6.5 → 3.6.9

package/lib/call.js

@@ -1316,14 +1316,23 @@ class call {
     }
 
     const channeldef = await this.#createchannelremotedef()
-    if( !channeldef )
-      return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
+    if( !channeldef ) {
+      this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
+      return
+    }
 
-    if ( this.channels.audio )
-      this.channels.audio.destroy()
+    if ( this.channels.audio ) {
+      this.channels.audio.close()
+      delete this.channels.audio
+    }
 
     await this.#openrelatedchannel( channeldef )
 
+    if ( !this.channels.audio ) {
+      this.hangup( hangupcodes.SERVER_ERROR )
+      return
+    }
+
     this.sdp.local = sdpgen.create()
       .addcodecs( selectedcodec )
       .setconnectionaddress( this.channels.audio.local.address )
@@ -1656,6 +1665,10 @@ class call {
     } else {
 
       await this.#openrelatedchannel( channeldef )
+      if( !this.channels.audio ) {
+        this.hangup( hangupcodes.SERVER_ERROR )
+        return
+      }
 
       this.sdp.local = sdpgen.create()
         .addcodecs( this.sdp.remote.selected.name )
@@ -1715,6 +1728,12 @@ class call {
       this._em.emit( "call.early", this )
       callmanager.options.em.emit( "call.early", this )
     } else {
+
+      if ( !this.sdp.local ) {
+        this.hangup( hangupcodes.SERVER_ERROR )
+        return
+      }
+
       const dialog = await callmanager.options.srf.createUAS( this._req, this._res, {
         localSdp: this.sdp.local.toString(),
         headers: {
@@ -1743,9 +1762,8 @@ class call {
     }
 
     this.channels.count--
-
     if ( 0 === this.channels.count ) {
-      this.channels.audio = undefined
+      delete this.channels.audio
 
       if( this._state._onhangup ) {
         this._cleanup()
@@ -1756,6 +1774,7 @@ class call {
       // based on the above flag
       this.hangup()
     }
+
   }
 
   /**
@@ -1832,7 +1851,12 @@ class call {
   */
   waitforanyevent( constraints, timeout = 500 ) {
 
-    if( this.destroyed ) throw Error( "Call already destroyed" )
+    if( this.destroyed ) {
+      const ourerror = Error( "Call already destroyed" )
+      // @ts-ignore
+      ourerror.normalandsilent = true
+      throw ourerror
+    }
     if ( this._promises.promise.channelevent ) return this._promises.promise.channelevent
 
     this._eventconstraints = constraints
@@ -2139,6 +2163,11 @@ class call {
 
       const oldchannel = othercall.channels.audio
       const newchannel = await this.#openchannel( channeldef, othercall )
+      if( !newchannel ) {
+        this.hangup( hangupcodes.SERVER_ERROR )
+        return
+      }
+
       await othercall.bond( this ).reinvite( channeldef, newchannel )
 
       await oldchannel.unmix()
@@ -2390,8 +2419,6 @@ class call {
         this._req = req
         this._res = res
 
-        if( !this.other ) return res.send( 400, "1 legged calls" )
-
         /* Auth the request - todo make a way of allow un authed refer - but we should nudge to secure */
         if( this.referauthrequired ) {
           if( this._auth.has( this._req ) ) {
@@ -2485,6 +2512,23 @@ class call {
       console.trace( e )
     }
   }
+  
+  /**
+   * For 3-legged attended xfer
+   * @param { object } b_1 - legb
+   * @param { object } b_2 - lega
+   * @param { object } req
+   * @param { object } res
+   * @returns 
+   */
+  async #handle3leggedxfer( b_1, b_2, req, res ) {
+    await b_2._runblindxfer( req, res, { "uri": "sip:" + b_1.destination.user + "@" + b_1.destination.host } )
+    if( b_1.channels.audio ) {
+      b_1.channels.audio.unmix()
+      await b_1.waitforanyevent( { "action": "mix", "event": "finished" }, 0.5 )
+    }
+    b_1.hangup( b_1.hangupcodes.ATTENDED_TRANSFER )
+  }
 
   /**
   Attended xfers have 4 calls. 2 pairs.
@@ -2493,7 +2537,8 @@ class call {
 
   b wants to connect a and c and then step out of the way
   where b_2 is the active call and b_1 is the one b placed on hold
-  therefore b_2 = this
+  therefore b_2 = this. Thus, a_1 is the call that receives the REFER
+  and will be transferred to c_1 (c_1 callid present in replaces header)
 
   It is also pottential this could be requested
   a_1 -> b_1
@@ -2517,7 +2562,7 @@ class call {
   b_2 - conference
 
   ends up with
-  a_1 - b_2 (rtp channel)
+  a_1 - conference
 
   @private
   */
@@ -2547,11 +2592,11 @@ class call {
     if( !b_1.sdp.remote ) return res.send( 400, "No remote sdp negotiated (b_1)!" )
     const b_2 = this /* so we can follow the above terminology */
 
-    let c_1 = b_2.other
-    if( !c_1 ) c_1 = b_2
+    const c_1 = b_2.other
+    if( !c_1 ) return res.send( 400, "No call to transfer!" )
 
     const a_1 = b_1.other
-    if( !a_1 ) return res.send( 400, "Can't attened xfer 1 legged calls" )
+    if( !a_1 ) return await this.#handle3leggedxfer( b_1, b_2, req, res)
     if( !a_1.sdp.remote ) return res.send( 400, "No remote sdp negotiated (a_1)!" )
 
     if( !a_1.channels.audio ) return res.send( 400, "No channel (a_1)" )
@@ -2876,16 +2921,18 @@ class call {
     /* flag destroyed so when we receive our close event we know what to do */
     this.destroyed = true
     if( this.channels.audio ) {
-      this.channels.audio.close()
-      this._timers.cleanup = setTimeout( () => {
-        console.trace( this.uuid + " Timeout waiting for channel close, cleaning up anyway, chan uuid: " + this.channels.audio.uuid + ", channel count: " + this.channels.count )
-        this._cleanup() 
-      }, 60 * 1000 )
-
-      await this.waitforhangup()
-    } else {
-      this._cleanup()
+      try {
+        const cl = await this.channels.audio.close( { timeout: 60 * 1000 } )
+        /* This probably needs tidying for consistency. If projectrtp is loaded as a modyule then this will return tru or false
+        If it is a remote node we will get the close object. If this happens then this has also been passed back to us as
+        an event on the event listener so we can safely return here and not call _cleanup */
+        if( "object" == typeof cl ) return
+      } catch( e ) {
+        console.error( "timed out waiting for channel close" )
+      }
     }
+
+    this._cleanup()
   }
 
   /**
@@ -2972,14 +3019,17 @@ class call {
   * @param { object } [ remote ]
   */
   async update( remote ) {
-
     /* if we are asked to update it suggests we have received new information and overrides should go */
     delete this.options.callerid
     delete this.options.calledid
 
     if( remote ) {
       if( remote.callerid ) {
-        this.callerid = remote.callerid.number
+        if ( remote.callerid.number )
+          this.callerid = remote.callerid.number
+        else
+          this.callerid = remote.callerid.user
+
         this.calleridname = remote.callerid.name
       }
     }
@@ -3196,6 +3246,10 @@ class call {
     } else {
 
       await this.#openrelatedchannel( channeldef )
+      if( !this.channels.audio ) {
+        this.hangup( hangupcodes.SERVER_ERROR )
+        return
+      }
 
       this.sdp.local = sdpgen.create()
         .addcodecs( this.options.preferedcodecs )
@@ -3221,6 +3275,7 @@ class call {
    * @param { object } callbacks 
    * @returns 
    */
+  // eslint-disable-next-line complexity
   async #onnewuacsuccess( callbacks ) {
 
     if( this.destroyedcancelledorhungup ) {
@@ -3246,8 +3301,12 @@ class call {
       this.sip.tags.remote = this._dialog.sip.remoteTag
 
     let cookie = undefined
-    if( callbacks.prebridge )
-      cookie = await callbacks.prebridge( this )
+    try {
+      if( callbacks.prebridge )
+        cookie = await callbacks.prebridge( this )
+    } catch( e ) {
+      console.trace( e )
+    }
 
     if( true === this.#noack ) {
       await this._onlatebridge()
@@ -3255,7 +3314,11 @@ class call {
       await this._onearlybridge()
     }
 
-    if( callbacks.confirm ) await callbacks.confirm( this, cookie )
+    try {
+      if( callbacks.confirm ) await callbacks.confirm( this, cookie )
+    } catch( e ) {
+      console.trace( e )
+    }
 
     this._em.emit( "call.answered", this )
     callmanager.options.em.emit( "call.answered", this )
@@ -3293,7 +3356,11 @@ class call {
     }
 
     const callerid = this.callerid
-    const calleridstr = `"${callerid.name}" <sip:${callerid.user}@${callerid.host}>`
+    const firsthalf = `"${callerid.name}"`
+    let calleridstr = `<sip:${callerid.user}@${callerid.host}>`
+
+    if ( callerid.name )
+      calleridstr = firsthalf + " " + calleridstr
 
     let privacy = ""
     if( true === this.options.privacy ) {

package/lib/callmanager.js

@@ -62,8 +62,11 @@ class callmanager {
         /* auth failed or timed out excluded as this is noral(ish) */
         if( 403 === e.code ) return
         if( 408 === e.code ) return
+        if( true === e.normalandsilent ) return
 
         console.trace( e )
+
+        if( c.destroyed ) return
         c.hangup( this.hangupcodes.SERVER_ERROR )
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "3.6.5",
+  "version": "3.6.9",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {
@@ -25,7 +25,7 @@
     "uuid": "^8.3.2"
   },
   "optionalDependencies": {
-    "@babblevoice/projectrtp": "^2.3.7"
+    "@babblevoice/projectrtp": "^2.5.28"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.48.2",

package/test/interface/call.js

@@ -258,9 +258,10 @@ 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( "<sip:0123456789@someotherrealm.com>;party=calling;screen=yes" )
 
-    await call.hangup()
+    /* simulate wire to propogate hangup */
+    await call.hangup( call.hangupcodes.NORMAL_CLEARING, false, "wire" )
 
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 0,
@@ -321,7 +322,7 @@ describe( "call object", function() {
       child3newcalls[ 1 ].hangup()
     ] )
 
-    await inboundcall.hangup()
+    await inboundcall.hangup( call.hangupcodes.NORMAL_CLEARING, false, "wire" )
 
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 0,
@@ -405,8 +406,8 @@ describe( "call object", function() {
     expect( children[ 0 ].hangup_cause.reason ).equal( "USER_BUSY" )
 
     expect( await callstore.stats() ).to.deep.include( {
-      "storebycallid": 2,
-      "storebyuuid": 2,
+      "storebycallid": 1,
+      "storebyuuid": 1,
       "storebyentity": 0
     } )
 
@@ -789,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( "<sip:0000000000@localhost.localdomain>;party=calling;screen=yes" )
     expect( createuacoptions.late ).to.be.true
   } )
 
@@ -1172,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( "<sip:012345789@localhost.localdomain>;party=calling;screen=yes" )
 
     c._onhangup( "wire" )
 

package/test/interface/latecall.js

@@ -1,6 +1,5 @@
 
 const expect = require( "chai" ).expect
-const call = require( "../../lib/call.js" )
 const srf = require( "../mock/srf.js" )
 
 /* These DO NOT form part of our interface */
@@ -117,8 +116,8 @@ describe( "uas.newuac - late", function() {
     } )
 
 
-    /* Hangup parent - child should follow */
-    await call.hangup()
+    /* Hangup parent - child should follow (if the wire is the source) */
+    await call.hangup( call.hangupcodes.NORMAL_CLEARING, false, "wire" )
 
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 0,

package/test/interface/xfer.js

@@ -16,9 +16,12 @@ describe( "xfer", function() {
     clearcallmanager()
   } )
 
-  it( "call blind xfer single leg should fail", async function() {
+  /* TODO - this needs fixing as it requires auth now 1 legged is expected to do something and checking a blind xfer happened */
+  xit( "call blind xfer single leg should fail on auth", async function() {
 
-    const srfscenario = new srf.srfscenario()
+    const srfscenario = new srf.srfscenario( {
+      userlookup: () => {}
+    } )
 
     const call = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
@@ -40,7 +43,6 @@ describe( "xfer", function() {
     await call.hangup()
 
     expect( sipcodesent ).to.equal( 400 )
-
   } )
 
   it( "call blind xfer 2 leg no auth", async function() {