@babblevoice/babble-drachtio-callmanager 3.7.15 → 3.7.17

package/lib/call.js

@@ -669,15 +669,14 @@ class call {
   #fromoutentity( startingpoint ) {
 
     const entity = this.options.entity
-    if( entity ) {
-      startingpoint.name = entity.display
-      startingpoint.uri = entity.uri
-      startingpoint.user = entity.username
-      startingpoint.host = entity.realm
-      return true
-    }
+    if( !entity ) return false
 
-    return false
+    startingpoint.name = entity.display
+    startingpoint.uri = entity.uri
+    startingpoint.user = entity.username
+    startingpoint.host = entity.realm
+    return true
+  
   }
 
   /**
@@ -751,6 +750,20 @@ class call {
     }
   }
 
+  /**
+   * 
+   * @param { object } startingpoint 
+   * @param { object } other 
+   */
+  #calledidother( startingpoint, other ) {
+    if( "uas" === other.type ) {
+      other.#calledidforuas( startingpoint )
+      other.#overridecalledid( startingpoint )
+    } else {
+      other.#calleridforuac( startingpoint )
+    }
+  }
+
   /**
    * 
    * @returns { object }
@@ -765,22 +778,23 @@ class call {
       "type": "callerid"
     }
 
-    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
-    }
-
-    if( this.options.partycalled ) {
-      this.#calleridforuac( startingpoint )
-    } else if( "uas" === this.type ) {
-      this.#calleridforuas( startingpoint )
+    if( "uas" === this.type ) {
+      if( this.options.partycalled ) {
+        this.#calleridforuac( startingpoint )
+      } else {
+        this.#calleridforuas( startingpoint )
+      }
     } else {
+      if( this.options.partycalling ) {
+        this.#fromoutentity( startingpoint )
+        this.#overridecallerid( startingpoint )
+        return startingpoint
+      } else if ( this.options.partycaller ) {
+        console.error( "WARNING: partycaller retired - use partycalling instead" )
+        this.#fromoutentity( startingpoint )
+        this.#overridecallerid( startingpoint )
+        return startingpoint
+      }
       const other = this.other
       if( other ) {
         this.#calleridother( startingpoint, other )
@@ -814,18 +828,23 @@ class call {
       "type": "calledid"
     }
 
-    const other = this.other
-
-    if( this.options.partycalling ) {
-      if( other ) {
-        other.#fromoutentity( startingpoint )
+    if( "uas" == this.type ) {
+      if( this.options.partycalled ) {
+        this.#fromrefertouri( startingpoint )
+      } else {
+        this.#calledidforuas( startingpoint )
       }
-    } else if( this.options.partycalled ) {
-      this.#fromrefertouri( startingpoint )
-    } else if( "uas" == this.type ) {
-      this.#calledidforuas( startingpoint )
     } else {
-      this.#calledidforuac( startingpoint )
+      if( this.options.partycalling ) {
+        const other = this.other
+        if( other ) {
+          this.#calledidother( startingpoint, other )
+        } else {
+          this.#fromrefertouri( startingpoint )
+        }
+      } else {
+        this.#calledidforuac( startingpoint )
+      }
     }
 
     this.#overridecalledid( startingpoint )
@@ -3780,13 +3799,16 @@ class call {
    */
   #configcalleridfornewuac() {
 
-    const callerid = this.callerid
-    const calleridrem = this.callerid
-
+    let callerid, calleridrem
     let party = ";party=calling"
-    if( this.options.partycalled ) {
+
+    if( "inbound" === this.direction ) {
+      callerid = this.calledid
+      calleridrem = this.calledid
+    } else {
+      callerid = this.callerid
+      calleridrem = this.callerid
       party = ";party=called"
-      this.#fromrefertouri( calleridrem )
     }
 
     const calleridstr = `"${callerid.name?callerid.name:callerid.user}" <sip:${callerid.user}@${callerid.host}>`

package/package.json

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