@babblevoice/babble-drachtio-callmanager 1.1.4 → 1.3.0

package/lib/call.js

@@ -1060,7 +1060,7 @@ class call {
 
     this._req.on( "cancel", () => this._oncanceled() )
 
-    let authorization = this._auth.parseauthheaders( this._req, this._res )
+    let authorization = this._auth.parseauthheaders( this._req )
 
     if( undefined === callmanager.options.userlookup ) { 
       this._promises.reject.auth( "no userlookup function provided")
@@ -1443,6 +1443,24 @@ class call {
     }
   }
 
+  /**
+   * Set the sound soup for music on hold.
+   * @param { object } soup - sound soup as described in projectrtp
+   */
+  set moh( soup ) {
+    this._moh = soup 
+  }
+
+  /**
+   * Return the current moh
+   */
+  get moh() {
+    if( this._moh ) {
+      return this._moh
+    }
+    return callmanager.options.moh
+  }
+
   /**
    * If we have been placed on hold (and it has been neotiated) then configure audio to match.
    * @private
@@ -1458,7 +1476,7 @@ class call {
     let other = this.other
     if( other ) {
       other.channels.audio.unmix()
-      other.channels.audio.play( callmanager.options.moh )
+      other.channels.audio.play( this.moh )
     }
 
     this._em.emit( "call.hold", this )

package/lib/store.js

@@ -3,6 +3,7 @@
 let storebycallid = new Map()
 let storebyuuid = new Map()
 let storebyentity = new Map()
+let storebyentityrealm = new Map()
 
 /** @module store */
 
@@ -39,14 +40,33 @@ module.exports.set = async ( c ) => {
   let entity = c._entity
   if( !entity ) return true
 
+  if( !entity.uri && entity.username && entity.realm ) {
+    entity.uri = entity.username + "@" + entity.realm
+  }
+
+  if( entity.uri && !entity.username ) {
+    entity.username = entity.uri.split( '@' ).shift()
+  }
+
+  if( entity.uri && !entity.realm ) {
+    entity.realm = entity.uri.split( '@' ).pop()
+  }
+
   let storedentity = storebyentity.get( entity.uri )
-  if( undefined === storedentity ) {
+  if( !storedentity ) {
     storedentity = new Map()
     storebyentity.set( entity.uri, storedentity )
   }
 
   storedentity.set( c.uuid, c )
 
+  let storedentityrealm = storebyentityrealm.get( entity.realm )
+  if( !storedentityrealm ) {
+    storedentityrealm = new Map()
+    storebyentityrealm.set( entity.realm, storedentityrealm )
+  }
+  storedentityrealm.set( c.uuid, c )
+
   return true
 }
 
@@ -60,6 +80,16 @@ module.exports.getbyentity = async ( uri ) => {
   return storebyentity.get( uri )
 }
 
+/**
+ *  Retreive call object by realm.
+ *  @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 )
+}
+
 /**
  *  Returns a unique call by call id and sip tags.
  *  @param {object} sip - sip params required
@@ -110,17 +140,33 @@ module.exports.delete = async function( c ) {
   }
 
   let entity = c._entity
-  
-  if( entity ) {
-    if( !entity.uri && entity.username && entity.realm ) {
-      entity.uri = entity.username + "@" + entity.realm
+  if( !entity ) return
+
+  if( !entity.uri && entity.username && entity.realm ) {
+    entity.uri = entity.username + "@" + entity.realm
+  }
+
+  if( entity.uri && !entity.username ) {
+    entity.username = entity.uri.split( '@' ).shift()
+  }
+
+  if( entity.uri && !entity.realm ) {
+    entity.realm = entity.uri.split( '@' ).pop()
+  }
+
+  let entityentries = storebyentity.get( entity.uri )
+  if( undefined !== entityentries ) {
+    entityentries.delete( c.uuid )
+    if( 0 === entityentries.size ) {
+      storebyentity.delete( entity.uri )
     }
-    let entityentries = storebyentity.get( entity.uri )
-    if( undefined !== entityentries ) {
-      entityentries.delete( c.uuid )
-      if( 0 === entityentries.size ) {
-        storebyentity.delete( entity.uri )
-      }
+  }
+
+  let storedentityrealm = storebyentityrealm.get( entity.realm )
+  if( storedentityrealm ) {
+    storedentityrealm.delete( c.uuid )
+    if( 0 === storedentityrealm.size ) {
+      storebyentityrealm.delete( entity.realm )
     }
   }
 }
@@ -132,6 +178,7 @@ module.exports.clear = async() => {
   storebycallid = new Map()
   storebyuuid = new Map()
   storebyentity = new Map()
+  storebyentityrealm = new Map()
 }
 
 /**
@@ -141,6 +188,7 @@ module.exports.stats = async () => {
   return {
     "storebycallid": storebycallid.size,
     "storebyuuid": storebyuuid.size,
-    "storebyentity": storebyentity.size
+    "storebyentity": storebyentity.size,
+    "storebyentityrealm": storebyentityrealm.size
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/babble-drachtio-callmanager",
-  "version": "1.1.4",
+  "version": "1.3.0",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@babblevoice/babble-drachtio-auth": "^1.0.1",
+    "@babblevoice/babble-drachtio-auth": "^1.0.2",
     "chai": "^4.3.4",
     "drachtio-srf": "^4.4.47",
     "mocha": "^9.2.2",

package/test/interface/call.js

@@ -752,7 +752,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - early callback is called`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -768,7 +768,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - confirmed callback is called`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -784,7 +784,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - simple update`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -814,7 +814,7 @@ describe( "call object", function() {
   } )
 
   it( `uas.newuac - simple update - but don't allow as not in allow`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -841,7 +841,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -864,7 +864,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on and removealllisteners call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -890,7 +890,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on and removealllisteners (none specified) call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -916,7 +916,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event on and off call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -944,7 +944,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit event once call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -968,7 +968,7 @@ describe( "call object", function() {
   } )
 
   it( `Test listen and emit call.pick on call object`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
 
     let options = {
       "contact": "ourcontactstring",
@@ -990,7 +990,7 @@ describe( "call object", function() {
   } )
 
   it( `Create a call and mock rtpengine and ensure we receive events`, async function() {
-    let srfscenario = new srf.srfscenario( {} )
+    new srf.srfscenario( {} )
     let rtpserver = callmanager.projectrtp.proxy.listen()
 
     let connection = net.createConnection( 9002, "127.0.0.1" )
@@ -1072,4 +1072,32 @@ describe( "call object", function() {
     connection.destroy()
     rtpserver.destroy()
   } )
+
+  it( `set get moh`, async function() {
+    new srf.srfscenario( {} )
+
+    let options = {
+      "contact": "ourcontactstring",
+      "late": true
+    }
+
+    let c = await call.newuac( options )
+
+    let s = {
+      "loop": true,
+      "files": [
+        { "wav": "some.wav" }
+      ]
+    }
+
+    /* no default configured */
+    expect( c.moh ).to.be.undefined
+    c.moh = s
+
+    expect( c._moh.loop ).to.equal( true )
+    expect( c.moh.loop ).to.equal( true )
+
+    c._onhangup( "wire" )
+
+  } )
 } )

package/test/unit/store.js

@@ -25,7 +25,8 @@ describe( "callmanager - store", function() {
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 1,
       "storebyuuid": 1,
-      "storebyentity": 1
+      "storebyentity": 1,
+      "storebyentityrealm": 1
     } )
   } )
 
@@ -47,7 +48,8 @@ describe( "callmanager - store", function() {
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 1,
       "storebyuuid": 1,
-      "storebyentity": 1
+      "storebyentity": 1,
+      "storebyentityrealm": 1
     } )
 
     dummycall.sip.tags.local = "4444"
@@ -56,7 +58,8 @@ describe( "callmanager - store", function() {
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 1,
       "storebyuuid": 1,
-      "storebyentity": 1
+      "storebyentity": 1,
+      "storebyentityrealm": 1
     } )
 
     let searchfor = {
@@ -111,7 +114,8 @@ describe( "callmanager - store", function() {
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 2,
       "storebyuuid": 2,
-      "storebyentity": 0
+      "storebyentity": 0,
+      "storebyentityrealm": 0
     } )
 
     dummycall1._entity = {
@@ -123,7 +127,8 @@ describe( "callmanager - store", function() {
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 2,
       "storebyuuid": 2,
-      "storebyentity": 1
+      "storebyentity": 1,
+      "storebyentityrealm": 1
     } )
 
     await callstore.set( dummycall3 )
@@ -131,7 +136,8 @@ describe( "callmanager - store", function() {
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 3,
       "storebyuuid": 3,
-      "storebyentity": 1
+      "storebyentity": 1,
+      "storebyentityrealm": 1
     } )
 
     let c = await callstore.getbycallid( dummycall1.sip )
@@ -147,7 +153,8 @@ describe( "callmanager - store", function() {
     expect( await callstore.stats() ).to.deep.include( {
       "storebycallid": 0,
       "storebyuuid": 0,
-      "storebyentity": 0
+      "storebyentity": 0,
+      "storebyentityrealm": 0
     } )
   } )
 } )