@babblevoice/babble-drachtio-callmanager 3.10.0 → 3.10.2

package/lib/call.js

@@ -1354,12 +1354,19 @@ class call {
     /* When we adopt-and-mix (enterprise queues and ring groups connect this
        way rather than via #answerparent) we are the parent leg. preconnect
        runs before the mix (projectrtp cannot play into a mixing channel),
-       then we mix, then postconnect. */
+       then we mix, then postconnect. Only take the deferred (hook) path when a
+       hook is actually registered - otherwise mix synchronously in this tick,
+       exactly as before, so callers that assume the mix has been issued on
+       return (recording, queue setup) don't race a microtask. */
     if( mix ) {
-      this.#notifyconnecthook( this, other, "preconnect" )
-        .then( () => this.mix( other ) )
-        .then( () => this.#notifyconnecthook( this, other, "postconnect" ) )
-        .catch( ( e ) => console.trace( e ) )
+      if( this.callbacks && ( this.callbacks.preconnect || this.callbacks.postconnect ) ) {
+        this.#notifyconnecthook( this, other, "preconnect" )
+          .then( () => this.mix( other ) )
+          .then( () => this.#notifyconnecthook( this, other, "postconnect" ) )
+          .catch( ( e ) => console.trace( e ) )
+      } else {
+        this.mix( other )
+      }
     }
     return this
   }
@@ -1534,8 +1541,13 @@ class call {
     /* preconnect: our parent leg's handler runs BEFORE the mix. projectrtp
        cannot play audio into a channel that is being mixed, so a prompt that
        must be heard on connect is played to each leg separately here (both
-       channels are open by this point), then we mix. */
-    await this.#notifyconnecthook( this.parent, this, "preconnect" )
+       channels are open by this point), then we mix. Only yield when a hook is
+       actually registered - a normal bridge must mix synchronously in this tick
+       exactly as before, or recording/queue setup that assumes the mix has been
+       issued can race. */
+    if( this.parent.callbacks.preconnect ) {
+      await this.#notifyconnecthook( this.parent, this, "preconnect" )
+    }
 
     this.channels.audio.mix( this.parent.channels.audio )
 
@@ -1558,7 +1570,9 @@ class call {
       }
     }
 
-    await this.#notifyconnecthook( this.parent, this, "postconnect" )
+    if( this.parent.callbacks.postconnect ) {
+      await this.#notifyconnecthook( this.parent, this, "postconnect" )
+    }
 
     return this
   }
@@ -4280,6 +4294,16 @@ class call {
               newcall._onring()
             } else if( 183 === res.status ) {
               earlypromise = newcall._onearly()
+              /* Early media: the far end is progressing (e.g. a carrier sending
+                 183 Session Progress that answers only after the ring timeout
+                 would fire). _onearly clears the ring timer (_timers.newuac);
+                 also clear the settle watchdog so it doesn't tear the call down
+                 with a REQUEST_TIMEOUT before the (late) answer arrives. The SIP
+                 transaction layer remains the backstop if it never answers. */
+              if( settlewatchdog ) {
+                clearTimeout( settlewatchdog )
+                settlewatchdog = undefined
+              }
             }
 
             if( newcall.canceled ) {

package/package.json

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