@babblevoice/babble-drachtio-callmanager 2.3.0 → 2.3.2

package/lib/call.js

@@ -787,9 +787,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 )
   }
 
   /**
@@ -1570,7 +1572,7 @@ class call {
     } catch ( e ) { console.trace( e ) }
 
     switch( e.action ) {
-    case "close": 
+    case "close":
       this.#handlechannelevclose( e )
       return
     case "telephone-event":
@@ -1911,6 +1913,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 )
       }
       
@@ -2460,16 +2466,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 +2498,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 +2508,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 +2573,11 @@ class call {
       }
     }
 
+    if( 0 == numcontacts ) {
+      if( callbacks.fail ) callbacks.fail()
+      return false
+    }
+
     const child = await waitonchildrenpromise
     return child
   }

package/lib/store.js

@@ -3,7 +3,7 @@
 let storebycallid = new Map()
 let storebyuuid = new Map()
 let storebyentity = new Map()
-let storebyentityrealm = new Map()
+let storebyrealm = new Map()
 
 /** @module store */
 
@@ -104,6 +104,7 @@ function fixentity( c ) {
  *  @param {object} c.entity - entity object
  *  @param {object} c.entity.uri
  *  @param {object} c._entity
+ *  @param {object} c.destination
  *  @param {object} [ c._state ]
  *  @param {boolean} [ c._state._hangup ]
  *  @return {Promise} - which resolves on completion (for future in case we support redis or similar)
@@ -118,21 +119,29 @@ module.exports.set = async ( c ) => {
   storebyuuid.set( c.uuid, c )
   addtocallidset( c )
 
+  let realm = ""
+  const destination = c.destination
+  if( destination ) realm = c.destination.host
+
   const entity = fixentity( c )
-  if( "boolean" == typeof entity ) return entity
+  if( "boolean" !== typeof entity ) {
+
+    let storedentity = storebyentity.get( entity.uri )
+    if( !storedentity ) {
+      storedentity = new Map()
+      storebyentity.set( entity.uri, storedentity )
+    }
 
-  let storedentity = storebyentity.get( entity.uri )
-  if( !storedentity ) {
-    storedentity = new Map()
-    storebyentity.set( entity.uri, storedentity )
+    storedentity.set( c.uuid, c )
+    realm = entity.realm
   }
 
-  storedentity.set( c.uuid, c )
+  if( !realm ) return true
 
-  let storedentityrealm = storebyentityrealm.get( entity.realm )
+  let storedentityrealm = storebyrealm.get( realm )
   if( !storedentityrealm ) {
     storedentityrealm = new Map()
-    storebyentityrealm.set( entity.realm, storedentityrealm )
+    storebyrealm.set( realm, storedentityrealm )
   }
   storedentityrealm.set( c.uuid, c )
 
@@ -154,11 +163,14 @@ module.exports.getbyentity = async ( uri ) => {
  *  @param {string} realm - the entity realm
  *  @return {Promise} which resolves to either a set containing calls for this entity or undefined
  */
-module.exports.getbyentityrealm = async ( realm ) => {
-  if( !storebyentityrealm.has( realm ) ) return false
-  return storebyentityrealm.get( realm )
+module.exports.getbyrealm = async ( realm ) => {
+  if( !storebyrealm.has( realm ) ) return false
+  return storebyrealm.get( realm )
 }
 
+/* backwards compat - is now realm more generally */
+module.exports.getbyentityrealm = module.exports.getbyrealm
+
 /**
  *  Returns a unique call by call id and sip tags.
  *  @param {object} sip - sip params required
@@ -201,22 +213,27 @@ module.exports.delete = async function( c ) {
 
   deletefromcallidset( c )
 
-  const entity = fixentity( c )
-  if( "boolean" == typeof entity ) return entity
+  let realm = ""
+  const destination = c.destination
+  if( destination ) realm = c.destination.host
 
-  const entityentries = storebyentity.get( entity.uri )
-  if( undefined !== entityentries ) {
-    entityentries.delete( c.uuid )
-    if( 0 === entityentries.size ) {
-      storebyentity.delete( entity.uri )
+  const entity = fixentity( c )
+  if( "boolean" !== typeof entity ) {
+    const entityentries = storebyentity.get( entity.uri )
+    if( undefined !== entityentries ) {
+      entityentries.delete( c.uuid )
+      if( 0 === entityentries.size ) {
+        storebyentity.delete( entity.uri )
+      }
     }
+    realm = entity.realm
   }
 
-  const storedentityrealm = storebyentityrealm.get( entity.realm )
-  if( storedentityrealm ) {
-    storedentityrealm.delete( c.uuid )
-    if( 0 === storedentityrealm.size ) {
-      storebyentityrealm.delete( entity.realm )
+  const storedrealm = storebyrealm.get( realm )
+  if( storedrealm ) {
+    storedrealm.delete( c.uuid )
+    if( 0 === storedrealm.size ) {
+      storebyrealm.delete( entity.realm )
     }
   }
 }
@@ -228,7 +245,7 @@ module.exports.clear = async() => {
   storebycallid = new Map()
   storebyuuid = new Map()
   storebyentity = new Map()
-  storebyentityrealm = new Map()
+  storebyrealm = new Map()
 }
 
 /**
@@ -239,7 +256,7 @@ module.exports.stats = async () => {
     "storebycallid": storebycallid.size,
     "storebyuuid": storebyuuid.size,
     "storebyentity": storebyentity.size,
-    "storebyentityrealm": storebyentityrealm.size
+    "storebyrealm": storebyrealm.size
   }
 }
 
@@ -247,5 +264,5 @@ module.exports.stats = async () => {
  * Debug only
  */
 module.exports._dump = () => {
-  console.log( storebycallid, storebyuuid, storebyentity, storebyentityrealm ) 
+  console.log( storebycallid, storebyuuid, storebyentity, storebyrealm ) 
 }

package/package.json

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

package/test/unit/store.js

@@ -30,7 +30,7 @@ describe( "callmanager - store", function() {
       "storebycallid": 1,
       "storebyuuid": 1,
       "storebyentity": 1,
-      "storebyentityrealm": 1
+      "storebyrealm": 1
     } )
   } )
 
@@ -53,7 +53,7 @@ describe( "callmanager - store", function() {
       "storebycallid": 1,
       "storebyuuid": 1,
       "storebyentity": 1,
-      "storebyentityrealm": 1
+      "storebyrealm": 1
     } )
 
     dummycall.sip.tags.local = "4444"
@@ -63,7 +63,7 @@ describe( "callmanager - store", function() {
       "storebycallid": 1,
       "storebyuuid": 1,
       "storebyentity": 1,
-      "storebyentityrealm": 1
+      "storebyrealm": 1
     } )
 
     let searchfor = {
@@ -119,7 +119,7 @@ describe( "callmanager - store", function() {
       "storebycallid": 2,
       "storebyuuid": 2,
       "storebyentity": 0,
-      "storebyentityrealm": 0
+      "storebyrealm": 0
     } )
 
     dummycall1._entity = {
@@ -132,7 +132,7 @@ describe( "callmanager - store", function() {
       "storebycallid": 2,
       "storebyuuid": 2,
       "storebyentity": 1,
-      "storebyentityrealm": 1
+      "storebyrealm": 1
     } )
 
     await callstore.set( dummycall3 )
@@ -141,7 +141,7 @@ describe( "callmanager - store", function() {
       "storebycallid": 3,
       "storebyuuid": 3,
       "storebyentity": 1,
-      "storebyentityrealm": 1
+      "storebyrealm": 1
     } )
 
     let c = await callstore.getbycallid( dummycall1.sip )
@@ -158,7 +158,7 @@ describe( "callmanager - store", function() {
       "storebycallid": 0,
       "storebyuuid": 0,
       "storebyentity": 0,
-      "storebyentityrealm": 0
+      "storebyrealm": 0
     } )
   } )
 } )