@babblevoice/babble-drachtio-callmanager 3.7.14 → 3.7.15

package/lib/call.js

@@ -558,12 +558,20 @@ class call {
    * We make an outbound call. i.e. we send an INVITE
    * 
    * Exceptions
-   * partycalled/clicktocall - we send an INVITE but that is an inbound call
-   * so the invite is i nthe opposie direction.
+   * partycalled - we send an INVITE but that is an inbound call
+   * so the invite is in the opposite direction.
    * @returns { "inbound" | "outbound" }
    */
   get direction() {
-    if( this.options.partycalled ) return "inbound"
+    if( this.options.partycalled ) return "outbound"
+
+    if( this.options.partycaller ) {
+      console.error( "WARNING: partycaller retired - use partycalling instead" )
+      return "inbound"
+    }
+
+    if( this.options.partycalling ) return "inbound"
+
     return "uas"===this.type?"inbound":"outbound"
   }
 
@@ -721,13 +729,28 @@ class call {
 
   /** 
    * We have received an INVITE - so caller ID comes from headers / auth 
-   * * @param { object } startingpoint
+   * @param { object } startingpoint
    */
   #calleridforuas( startingpoint ) {
     this.#frominentity( startingpoint )
     this.#fromremoteheaders( startingpoint )
   }
 
+  /**
+   * Get the caller id when we have another leg. 
+   * @param { object } startingpoint 
+   * @param { object } other 
+   */
+  #calleridother( startingpoint, other ) {
+    if( "uas" === other.type ) {
+      other.#calleridforuas( startingpoint )
+      other.#overridecallerid( startingpoint )
+    } else {
+      other.#calledidforuac( startingpoint )
+      if( this.type !== other.type ) other.#fromrefertouri( startingpoint )
+    }
+  }
+
   /**
    * 
    * @returns { object }
@@ -742,29 +765,27 @@ class call {
       "type": "callerid"
     }
 
-    if( "uas" === this.type ) this.#calleridforuas( startingpoint )
-    else {
-      if( this.options.partycalled ) {
-        this.#calleridforuac( startingpoint )
-      } else {
-        const other = this.other
-        if( other ) {
-          if( "uas" === other.type ) {
-            other.#calleridforuas( startingpoint )
-            other.#overridecallerid( startingpoint )
-          } else {
-            other.#calledidforuac( startingpoint )
-            if( this.type !== other.type ) other.#fromrefertouri( startingpoint )
-          }
-        } else {
-
-          if ( this.options.partycaller ) {
-            this.#overridecalledid( startingpoint )
-            return startingpoint
-          }
+    if( this.options.partycalling ) {
+      this.#fromoutentity( startingpoint )
+      this.#overridecalledid( startingpoint )
+      return startingpoint
+    } else if ( this.options.partycaller ) {
+      console.error( "WARNING: partycaller retired - use partycalling instead" )
+      this.#fromoutentity( startingpoint )
+      this.#overridecalledid( startingpoint )
+      return startingpoint
+    }
 
-          this.#calleridforuac( startingpoint )
-        }
+    if( this.options.partycalled ) {
+      this.#calleridforuac( startingpoint )
+    } else if( "uas" === this.type ) {
+      this.#calleridforuas( startingpoint )
+    } else {
+      const other = this.other
+      if( other ) {
+        this.#calleridother( startingpoint, other )
+      } else {
+        this.#calleridforuac( startingpoint )
       }
     }
 
@@ -793,9 +814,19 @@ class call {
       "type": "calledid"
     }
 
-    if( "uas" == this.type ) this.#calledidforuas( startingpoint )
-    else if( this.options.partycalled ) this.#fromrefertouri( startingpoint )
-    else this.#calledidforuac( startingpoint )
+    const other = this.other
+
+    if( this.options.partycalling ) {
+      if( other ) {
+        other.#fromoutentity( startingpoint )
+      }
+    } else if( this.options.partycalled ) {
+      this.#fromrefertouri( startingpoint )
+    } else if( "uas" == this.type ) {
+      this.#calledidforuas( startingpoint )
+    } else {
+      this.#calledidforuac( startingpoint )
+    }
 
     this.#overridecalledid( startingpoint )
 
@@ -3545,9 +3576,8 @@ class call {
     for( const contact of contactinfo.contacts ) {
       if( undefined === contact ) continue
       const newoptions = { ...options }
-
       if ( newoptions.clicktocall )
-        newoptions.partycaller = true
+        newoptions.partycalling = true
 
       if( contact.contact && "string" == typeof contact.contact ) {
         numcontacts++
@@ -3806,7 +3836,7 @@ class call {
     const parts = parseuri( contactstr )
 
     if( this.options.clicktocall ) {
-      this.options.partycalled = true
+      this.options.partycalling = true
       this.options.autoanswer = true
     }
 
@@ -3875,9 +3905,10 @@ class call {
    * @property { number } [ uactimeout ] - override the deault timeout
    * @property { string } [ uactimeoutreason ] - send a reason for timeout as Reason header
    * @property { true | number } [ autoanswer ] - if true add call-info to auto answer, if number delay to add
-   * @property { boolean } [ clicktocall ] - if set to true, will set autoanswer to true and swap the source and desination on caller ID, set to true for both caller and called
-   * @property { boolean } [ partycalled ] - reverses the direction of the call from the invite, from the point of view of the called in a 3pcc context
-   * @property { boolean } [ partycaller ] - reverses the direction of the call from the invite, from the point of view of the caller in a 3pcc context
+   * @property { boolean } [ clicktocall ] - if set to true, will set autoanswer to true and set to partycalling
+   * @property { boolean } [ partycalled ] - we are the one recevieving the call
+   * @property { boolean } [ partycaller ] - retired - wrong term use partycalling
+   * @property { boolean } [ partycalling ] - we are the party making the call
    * @property { boolean } [ late ] - late negotiation
    * @property { boolean } [ privacy ] - sets the privacy
    * @property { entity } [ entity ] - used to store this call against and look up a contact string if not supplied.

package/package.json

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