@babblevoice/babble-drachtio-callmanager 1.1.4 → 1.2.0

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.2.0",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {

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
     } )
   } )
 } )