@babblevoice/babble-drachtio-callmanager 2.3.1 → 2.3.3

package/lib/call.js

@@ -277,7 +277,8 @@ class call {
         "channelevent": false
       },
       "reject": {
-        "auth": false
+        "auth": false,
+        "channelevent": false
       },
       "promise": {
         "hangup": false,
@@ -787,9 +788,11 @@ class call {
   /**
     Allows 3rd parties to emit events to listeners specific to this call.
     @param { string } ev - event name
+    @param { any } argv1
   */
-  emit( ev ) {
-    this._em.emit( ev, this )
+  emit( ev, argv1 ) {
+    if( argv1 ) return this._em.emit( ev, argv1 )
+    else return this._em.emit( ev, this )
   }
 
   /**
@@ -1314,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 ) => {
@@ -1554,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 )
   }
@@ -1570,7 +1574,7 @@ class call {
     } catch ( e ) { console.trace( e ) }
 
     switch( e.action ) {
-    case "close": 
+    case "close":
       this.#handlechannelevclose( e )
       return
     case "telephone-event":
@@ -1595,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
     } )
 
@@ -1608,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 )
 
@@ -1911,6 +1917,10 @@ class call {
           other.channels.audio.dtmf( digit )
         }
 
+        try {
+          this._em.emit( "channel", { "call": this, "event": { action: "telephone-event", event: digit, source: "sip-info" } } )
+        } catch ( e ) { console.trace( e ) }
+
         return res.send( 200 )
       }
       
@@ -2246,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 )
@@ -2460,16 +2476,17 @@ class call {
 
     /* If max-forwards is not specified then we decrement the parent and pass on */
     if( !( "headers" in options ) ) options.headers = {}
+
+    let maxforwards = 70
     if( !options.headers[ Object.keys( options.headers ).find( key => "max-forwards" === key.toLowerCase() ) ] ) {
-      if( !this._req.has( "Max-Forwards" ) ) {
-        return false
+      if( this._req.has( "Max-Forwards" ) ) {
+        maxforwards = parseInt( this._req.get( "Max-Forwards" ) ) - 1
+        if( isNaN( maxforwards ) || 0 >= maxforwards ) return false
       }
-  
-      const maxforwards = parseInt( this._req.get( "Max-Forwards" ) )
-      if( 0 >= maxforwards ) return false
-      options.headers[ "Max-Forwards" ] = maxforwards - 1
     }
 
+    options.headers[ "Max-Forwards" ] = maxforwards
+
     if( !options.orphan ) {
       options.parent = this
     }
@@ -2491,12 +2508,8 @@ class call {
     }
     return true
   }
-  
-  /**
-   * 
-   * @returns { Promise< boolean | object > }
-   */
-  static async #callcontactfornewuac( options, callbacks ) {
+
+  static async #sanityforcallcontact( options ) {
 
     if( !( await call.#checkmaxcallsforentity( options ) ) ) return false
 
@@ -2505,13 +2518,27 @@ class call {
     if( !options.entity ) return false
 
     const contactinfo = await callmanager.options.registrar.contacts( options.entity )
-
     if( 0 == contactinfo.contacts.length )
       return false
 
     if( options.first )
       contactinfo.contacts = [ contactinfo.contacts[ 0 ] ]
 
+    return contactinfo
+  }
+  
+  /**
+   * 
+   * @returns { Promise< boolean | object > }
+   */
+  static async #callcontactfornewuac( options, callbacks ) {
+
+    const contactinfo = await call.#sanityforcallcontact( options )
+    if( !contactinfo ) {
+      if( callbacks.fail ) callbacks.fail()
+      return false
+    }
+
     let numcontacts = 0
     const ourcallbacks = {}
     let failcount = 0
@@ -2556,6 +2583,11 @@ class call {
       }
     }
 
+    if( 0 == numcontacts ) {
+      if( callbacks.fail ) callbacks.fail()
+      return false
+    }
+
     const child = await waitonchildrenpromise
     return child
   }

package/package.json

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