@babblevoice/babble-drachtio-callmanager 2.2.6 → 2.2.7

package/lib/call.js

@@ -419,6 +419,14 @@ class call {
     this._remote.name = calleridname
   }
 
+  get callerid() {
+    return this._remote.id
+  }
+
+  get calleridname() {
+    return this._remote.name
+  }
+
   /**
    * 
    * @returns { object }
@@ -2495,9 +2503,11 @@ class call {
 
     const contactinfo = await callmanager.options.registrar.contacts( options.entity )
 
-    if( !contactinfo || 0 == contactinfo.contacts.length ) {
+    if( 0 == contactinfo.contacts.length )
       return false
-    }
+
+    if( options.first )
+      contactinfo.contacts = [ contactinfo.contacts[ 0 ] ]
 
     let numcontacts = 0
     const ourcallbacks = {}
@@ -2680,16 +2690,26 @@ class call {
         realm = remote.host
         user = remote.user
       }
+
+      if( this.parent.callerid ) {
+        user = this.parent.callerid.number
+      }
+
+      if( this.parent.calleridname ) {
+        name = this.parent.calleridname
+      }
     }
 
     /* oveide caller id */
     if( options.callerid ) {
       if( options.callerid.number ) {
         user = options.callerid.number
+        this.callerid = user
       }
 
       if( options.callerid.name ) {
         name = options.callerid.name
+        this.calleridname = name
       }
     }
 
@@ -2741,6 +2761,7 @@ class call {
   @param { string } [ options.entity.realm ]
   @param { string } [ options.entity.uri ]
   @param { number } [ options.entity.max ] - if included no more than this number of calls for this entity (only if we look user up)
+  @param { number } [ options.entity.first ] - if multiple contacts for this entity use the first only
   @param { object } [ options.callerid ]
   @param { string } [ options.callerid.number ]
   @param { string } [ options.callerid.name ]

package/package.json

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