@babblevoice/babble-drachtio-callmanager 3.7.0 → 3.7.2

package/lib/call.js

@@ -543,6 +543,10 @@ class call {
     return "uas"==this.type?"inbound":"outbound"
   }
 
+  /**
+   * 
+   * @param { object } startingpoint 
+   */
   #overridecallerid( startingpoint ) {
 
     if( this.options.callerid ) {
@@ -552,6 +556,10 @@ class call {
     }
   }
 
+  /**
+   * 
+   * @param { object } startingpoint 
+   */
   #overridecalledid( startingpoint ) {
     startingpoint.privacy = this.options.privacy
 
@@ -653,6 +661,10 @@ class call {
     this.#fromremoteheaders( startingpoint )
   }
 
+  /**
+   * 
+   * @returns { object }
+   */
   #callerid() {
     const startingpoint = {
       "name": "",
@@ -699,6 +711,10 @@ class call {
     return this.#callerid()
   }
 
+  /**
+   * 
+   * @returns { object }
+   */
   #calledid() {
     const startingpoint = {
       "name": "",
@@ -710,24 +726,7 @@ class call {
     }
 
     if( "uas" == this.type ) this.#calledidforuas( startingpoint )
-    else {
-      if( !this.options.partycalled ) this.#calledidforuac( startingpoint )
-
-      const other = this.other
-
-      if( other ) {
-        if( "uas" == other.type ) {
-          if( this.options.partycalled ) {
-            other.#calleridforuas( startingpoint )
-          } else {
-            other.#calledidforuas( startingpoint )
-          }
-        } else {
-          other.#calledidforuac( startingpoint )
-        }
-        other.#overridecalledid( startingpoint )
-      }
-    }
+    else if( !this.options.partycalled ) this.#calledidforuac( startingpoint )
 
     this.#overridecalledid( startingpoint )
 
@@ -735,11 +734,11 @@ class call {
   }
 
   /**
- * Returns the called object. i.e.
- * If we are inbound then this is the destination
- * If we are outbound then this is the entity we are calling
- * @returns { remoteid }
- */
+   * Returns the called object. i.e.
+   * If we are inbound then this is the destination
+   * If we are outbound then this is the entity we are calling
+   * @returns { remoteid }
+   */
   get calledid() {
     return this.#calledid()
   }
@@ -1456,15 +1455,21 @@ class call {
       return
     }
 
+    const authtimeoutms = 10000
     this._timers.auth = setTimeout( () => {
-      this._promises.reject.auth( new SipError( hangupcodes.REQUEST_TIMEOUT, "Auth timed out" ) )
+      /* something has overtaken events and cleaned us up already */
+      if( !this._promises.reject ) return
+      if( !this._promises.reject.auth ) return
+
+      const rej = this._promises.reject.auth
       this._promises.resolve.auth = undefined
       this._promises.reject.auth = undefined
       this._timers.auth = undefined
 
+      rej( new SipError( hangupcodes.REQUEST_TIMEOUT, "Auth timed out" ) )
       this.hangup( hangupcodes.REQUEST_TIMEOUT )
 
-    }, 50000 )
+    }, authtimeoutms )
 
     const authpromise = new Promise( ( resolve, reject ) => {
       this._promises.resolve.auth = resolve

package/package.json

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