@babblevoice/babble-drachtio-callmanager 2.3.2 → 2.3.4

package/lib/call.js

@@ -277,7 +277,8 @@ class call {
         "channelevent": false
       },
       "reject": {
-        "auth": false
+        "auth": false,
+        "channelevent": false
       },
       "promise": {
         "hangup": false,
@@ -1316,7 +1317,7 @@ class call {
   */
   waitfortelevents( match = /[0-9A-D*#]/, timeout = 30000 ) {
 
-    if( this.destroyed ) throw "Call already destroyed"
+    if( this.destroyed ) throw Error( "Call already destroyed" )
     if( this._promises.promise.events ) return this._promises.promise.events
 
     this._promises.promise.events = new Promise( ( resolve ) => {
@@ -1556,6 +1557,7 @@ class call {
 
     const r = this._promises.resolve.channelevent
     this._promises.resolve.channelevent = false
+    this._promises.reject.channelevent = false
     this._promises.promise.channelevent = false
     if( r ) r( e )
   }
@@ -1597,12 +1599,13 @@ class call {
   */
   waitforanyevent( constraints, timeout = 500 ) {
 
-    if( this.destroyed ) throw "Call already destroyed"
+    if( this.destroyed ) throw Error( "Call already destroyed" )
     if ( this._promises.promise.channelevent ) return this._promises.promise.channelevent
 
     this._eventconstraints = constraints
 
-    this._promises.promise.channelevent = new Promise( ( resolve ) => {
+    this._promises.promise.channelevent = new Promise( ( resolve, reject ) => {
+      this._promises.reject.channelevent = reject
       this._promises.resolve.channelevent = resolve
     } )
 
@@ -1610,6 +1613,7 @@ class call {
       const r = this._promises.resolve.channelevent
       this._promises.promise.channelevent = false
       this._promises.resolve.channelevent = false
+      this._promises.reject.channelevent = false
       if( r ) r( "timeout" )
     }, timeout * 1000 )
 
@@ -2252,6 +2256,12 @@ class call {
     this._promises.resolve.auth = false
     if( authreject ) authreject( this )
 
+    const chanev = this._promises.reject.channelevent
+    this._promises.resolve.channelevent = false
+    this._promises.reject.channelevent = false
+    this._promises.promise.channelevent = false
+    if( chanev ) chanev( Error( "Call hungup" ) )
+
     const resolves = []
     for ( const [ key, value ] of Object.entries( this._promises.resolve ) ) {
       if( value ) resolves.push( value )
@@ -2384,20 +2394,17 @@ class call {
     }
 
     /* Check client supports update */
-    if( !this._req ) return false
-    if( !this._req.has( "Allow" ) ) return false
-    const allow = this._req.get( "Allow" )
-    if( !/\bupdate\b/i.test( allow ) ) return false
+    if( !this._allow ) return false
+    if( !/\bupdate\b/i.test( this._allow ) ) return false
 
     const requestoptions = {}
-    requestoptions.method = "update"
+    requestoptions.method = "UPDATE"
     if( this.sdp.local ) {
       requestoptions.body = this.sdp.local.toString()
     }
 
     requestoptions.headers = {}
-
-    const remoteidheader = "P-Preferred-Identity"
+    
     let name = ""
     let user = "0000000000"
     let realm = "localhost.localdomain"
@@ -2416,6 +2423,8 @@ class call {
       }
     }
 
+    /* RFC 3325 - should we also consider the P-Preferred-Identity header? */
+    const remoteidheader = "P-Asserted-Identity"
     const remoteid = `"${name}" <sip:${user}@${realm}>`
     requestoptions.headers[ remoteidheader ] = remoteid
 
@@ -2878,6 +2887,9 @@ class call {
         },
         cbProvisional: async ( res ) => {
           newcall._res = res
+
+          newcall.parseallow( res )
+
           if( 180 === res.status ) {
             newcall._onring()
           } else if( 183 === res.status ) {
@@ -2918,6 +2930,30 @@ class call {
     this.established = true
   }
 
+  /**
+   * Take as input a request or a response.
+   *
+   * @param { object } req
+   */
+  parseallow( req ) {
+    if( !req || !req.get ) return
+
+    let allw = req.get( "Allow" )
+    if( "string" === typeof allw ) {
+      allw = allw.trim()
+      allw = allw.replace( /"/g, "" )
+      this._allow = allw.split( /[\s,]+/ )
+    } else {
+      const contact = req.getParsedHeader( "Contact" )
+      if( !contact ) return
+      if( contact[ 0 ].params && contact[ 0 ].params.methods ) {
+        let methods = contact[ 0 ].params && contact[ 0 ].params.methods
+        methods = methods.replace( /"/g, "" )
+        this._allow = methods.split( /[\s,]+/ )
+      }
+    }
+  }
+
   /**
   Create a new object when we receive an INVITE request.
 
@@ -2957,6 +2993,8 @@ class call {
     */
     c._res = res
 
+    c.parseallow( req )
+
     c._req.on( "cancel", () => c._oncanceled.bind( c ) )
 
     await callstore.set( c )

package/package.json

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

package/test/interface/call.js

@@ -251,13 +251,13 @@ describe( "call object", function() {
     /* mock */
     let requestoptions = false
 
-    child._req.set( "ALLOW", "INVITE, UPDATE, OPTIONS" )
+    child.parseallow( { get:() => { return "INVITE, UPDATE, OPTIONS" } } )
     child._dialog.on( "request", ( options ) => requestoptions = options )
 
     child.update()
 
-    expect( requestoptions.method ).to.equal( "update" )
-    expect( requestoptions.headers[ "P-Preferred-Identity" ] ).to.equal( "\"\" <sip:0123456789@someotherrealm.com>" )
+    expect( requestoptions.method ).to.equal( "UPDATE" )
+    expect( requestoptions.headers[ "P-Asserted-Identity" ] ).to.equal( "\"\" <sip:0123456789@someotherrealm.com>" )
 
     await call.hangup()
 
@@ -829,11 +829,10 @@ describe( "call object", function() {
       "late": true
     }
 
-    const earlycallbackcalled = false
     const c = await call.newuac( options )
 
     /* mock */
-    c._req.set( "ALLOW", "INVITE, UPDATE, OPTIONS" )
+    c.parseallow( { get:() => { return "INVITE, UPDATE, OPTIONS" } } )
     let requestoptions
     c._dialog.on( "request", ( options ) => requestoptions = options )
 
@@ -845,9 +844,9 @@ describe( "call object", function() {
 
     c.hangup()
 
-    expect( requestoptions.method ).to.equal( "update" )
+    expect( requestoptions.method ).to.equal( "UPDATE" )
     expect( requestoptions.body ).to.be.a( "string" )
-    expect( requestoptions.headers[ "P-Preferred-Identity" ] ).to.equal( "\"Kermit\" <sip:kermy@muppetshow.com>" )
+    expect( requestoptions.headers[ "P-Asserted-Identity" ] ).to.equal( "\"Kermit\" <sip:kermy@muppetshow.com>" )
 
   } )
 

package/test/interface/early.js

@@ -105,6 +105,7 @@ describe( "call early", function() {
       /* Step 3. This is the mocked gateway message back to our newcall. */
       callbacks.cbProvisional( {
         "status": 183,
+        "get": () => { return "INVITE, UPDATE, OPTIONS" },
         "msg": {
           "body": `v=0
 o=- 1608235282228 0 IN IP4 127.0.0.1
@@ -140,7 +141,6 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
     const newcall = await call.newuac( { "contact": "callto" } )
     
     await call._onhangup( "wire" )
-    
     expect( newcall.state.early ).to.be.true
     expect( call.state.early ).to.be.true
     expect( mixing ).to.be.true