@babblevoice/babble-drachtio-callmanager 2.2.6 → 2.3.0

package/lib/call.js

@@ -130,6 +130,7 @@ class call {
       @property { boolean } authed
       @property { boolean } cleaned
       @property { boolean } refered
+      @property { boolean } picked
     */
 
     /** @member { callstate } */
@@ -143,7 +144,8 @@ class call {
       "held": false,
       "authed": false,
       "cleaned": false,
-      "refered": false
+      "refered": false,
+      "picked": false
     }
 
     /**
@@ -419,6 +421,14 @@ class call {
     this._remote.name = calleridname
   }
 
+  get callerid() {
+    return this._remote.id
+  }
+
+  get calleridname() {
+    return this._remote.name
+  }
+
   /**
    * 
    * @returns { object }
@@ -865,6 +875,7 @@ class call {
   It wuld be normal to bridge this call to another after this call has been made.
   */
   pick() {
+    this.state.picked = true
     this._em.emit( "call.pick", this )
   }
 
@@ -2495,9 +2506,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 +2693,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 +2764,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.3.0",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {