@babblevoice/babble-drachtio-callmanager 1.4.0 → 1.4.1

package/lib/call.js

@@ -1,6 +1,7 @@
 
 const { v4: uuidv4 } = require( "uuid" )
 const events = require( "events" )
+const dns = require( "node:dns" )
 
 const projectrtp = require( "@babblevoice/projectrtp" ).projectrtp
 
@@ -854,6 +855,25 @@ class call {
     return this
   }
 
+  /* A simple implimentation if we are offered candidates */
+  static async _parsesdpcandidates( target, sdp ) {
+
+    if( Array.isArray( sdp.media[ 0 ].candidates ) ) {
+      let candidates = sdp.media[ 0 ].candidates
+      if( candidates.length > 0 ) {
+        candidates.sort( ( l, r ) => { return r.priority - l.priority } )
+        target.port = candidates[ 0 ].port
+
+        await new Promise( ( r ) => {
+          dns.lookup( candidates[ 0 ].ip, ( err, result ) => {
+            if( !err ) target.address = result
+            r()
+          } )
+        } )
+      }
+    }
+  }
+
   /**
     On an early negotiation we have already sent our sdp without
     knowing what the otherside is going to offer. We now have the
@@ -878,11 +898,13 @@ class call {
     let channeldef
     if( this._iswebrtc ) {
       let actpass = "active"
-      if( "act" == this.sdp.remote.sdp.media[ 0 ].setup ) actpass = "passive" /* act|pass|actpass */
+      if( "active" == this.sdp.remote.sdp.media[ 0 ].setup ) actpass = "passive" /* act|pass|actpass */
+
+      await call._parsesdpcandidates( target, this.sdp.remote.sdp )
 
       channeldef = call._createchannelremotedef( 
-                    target.address, 
-                    target.port, 
+                    target.address,
+                    target.port,
                     target.audio.payloads[ 0 ],
                     this.sdp.remote.sdp.media[ 0 ].fingerprint.hash,
                     actpass ).remote
@@ -1300,6 +1322,9 @@ class call {
     if( !remoteaudio ) return
 
     this.sdp.remote.select( this.selectedcodec )
+    
+    await call._parsesdpcandidates( remoteaudio, this.sdp.remote.sdp )
+
     let channeldef = call._createchannelremotedef( remoteaudio.address, remoteaudio.port, remoteaudio.audio.payloads[ 0 ] )
 
     let iswebrtc = this._iswebrtc
@@ -2087,7 +2112,7 @@ class call {
 
     } else if( "uac" === this.type ) {
       try {
-        this._req.cancel()
+        if( this._req ) this._req.cancel()
       } catch( e ) { console.error( e ) }
 
       this.canceled = true

package/package.json

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