@babblevoice/babble-drachtio-callmanager 3.3.0 → 3.3.2

package/lib/call.js

@@ -788,9 +788,6 @@ class call {
     }
 
     if( "uac" == this.type ) {
-      if( Array.isArray( this.sip.contact ) ) {
-        return parseuri( this.sip.contact[ 0 ].uri )
-      }
       return parseuri( this.options.contact )
     }
 
@@ -1298,7 +1295,10 @@ class call {
   */
   async _onlatebridge() {
 
-    this.sdp.remote = sdpgen.create( this._req.msg.body )
+    if ( this._dialog.res )
+      this.sdp.remote = sdpgen.create( this._dialog.res.msg.body )
+    else
+      this.sdp.remote = sdpgen.create( this._req.msg.body )
 
     const selectedcodec = this.sdp.remote.intersection( this.options.preferedcodecs, true )
     if( !selectedcodec ) {
@@ -1309,7 +1309,10 @@ class call {
     if( !channeldef )
       return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
 
-    await this.#openrelatedchannel()
+    if ( this.channels.audio )
+      this.channels.audio.destroy()
+
+    await this.#openrelatedchannel( channeldef )
 
     this.sdp.local = sdpgen.create()
       .addcodecs( selectedcodec )
@@ -1590,7 +1593,7 @@ class call {
     }
   }
 
-  /**
+  /**true
     Shortcut to hangup with the reason busy.
   */
   busy() {
@@ -1602,23 +1605,15 @@ class call {
    */
   get _iswebrtc() {
 
-    if( !this.sip || !this.sip.contact ) return false
-
-    let contactstr
-    if( Array.isArray( this.sip.contact ) ) {
-      contactstr = this.sip.contact[ 0 ].uri
-    } else {
-      contactstr = this.sip.contact
-    }
-
     /* Have we received remote SDP? */
     if( this.sdp.remote ) {
       return this.sdp.remote.sdp.media[ 0 ] &&
             -1 !== this.sdp.remote.sdp.media[ 0 ].protocol.toLowerCase().indexOf( "savpf" ) /* 'UDP/TLS/RTP/SAVPF' */
     }
 
-    return -1 !== contactstr.indexOf( ";transport=ws" )
-    
+    if( !this.options || !this.options.contact ) return false
+    return -1 !== this.options.contact.indexOf( ";transport=ws" )
+
   }
 
   /**
@@ -2842,11 +2837,15 @@ class call {
       if( callbacks.fail ) callbacks.fail( c )
     }
 
-    ourcallbacks.confirm = ( c ) => {
+    ourcallbacks.prebridge = ( c ) => {
+      if( callbacks.prebridge ) return callbacks.prebridge( c )
+    }
+
+    ourcallbacks.confirm = ( c, queuedcall ) => {
       if( false !== waitonchildrenresolve ) {
         waitonchildrenresolve( c )
         waitonchildrenresolve = false
-        if( callbacks.confirm ) callbacks.confirm( c )
+        if( callbacks.confirm ) callbacks.confirm( c, queuedcall )
       }
     }
 
@@ -2932,11 +2931,11 @@ class call {
       this.#checkandadd2833()
 
       /* DTLS is only supported ( outbound ) on websocket connections */
-      this.sip.contact = this.options.contact
       if( this._iswebrtc ) {
         this.sdp.local
           .addssrc( this.channels.audio.local.ssrc )
-          .secure( this.channels.audio.local.dtls.fingerprint ,"passive" )
+          /* ref: https://datatracker.ietf.org/doc/html/draft-ietf-rtcweb-jsep-14#page-34 offer MUST be actpass */
+          .secure( this.channels.audio.local.dtls.fingerprint ,"actpass" )
           .addicecandidates( this.channels.audio.local.address, this.channels.audio.local.port, this.channels.audio.local.icepwd )
           .rtcpmux()
       }
@@ -2967,7 +2966,12 @@ class call {
 
     callstore.set( this )
 
-    this.sip.tags.remote = this._dialog.sip.remoteTag
+    if ( this._dialog.sip )
+      this.sip.tags.remote = this._dialog.sip.remoteTag
+
+    let cookie = undefined
+    if( callbacks.prebridge )
+      cookie = await callbacks.prebridge( this )
 
     if( true === this.#noack ) {
       await this._onlatebridge()
@@ -2975,7 +2979,7 @@ class call {
       await this._onearlybridge()
     }
 
-    if( callbacks.confirm ) await callbacks.confirm( this )
+    if( callbacks.confirm ) await callbacks.confirm( this, cookie )
 
     this._em.emit( "call.answered", this )
     callmanager.options.em.emit( "call.answered", this )
@@ -3193,7 +3197,6 @@ class call {
     if( options.entity ) {
       newcall.entity = options.entity
       callstore.set( newcall )
-      
     }
 
     newcall.#configcalleridfornewuac()
@@ -3213,7 +3216,11 @@ class call {
     try {
       newdialog = await callmanager.options.srf.createUAC( 
         options.contact + newcall.options.contactparams, 
-        { ...newcall.options, ...{ localSdp: newcall.sdp.local?newcall.sdp.local.toString():"" } }, {
+        { 
+          ...newcall.options,
+          ...{ noAck: newcall.#noack },
+          ...{ localSdp: newcall.sdp.local?newcall.sdp.local.toString():"" 
+          } }, {
 
           cbRequest: ( err, req ) => {
 

package/package.json

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