@babblevoice/babble-drachtio-callmanager 1.3.7 → 1.4.2

package/README.md

@@ -37,14 +37,14 @@ const r = new Registrar( {
   "staletime": 180, /* number of seconds we consider a client stale if we don't hear a response from an OPTIONS or REGISTER ping */
   "expires": 3600, /* default expires */
   "minexpires": 3600, /* Force the client with 423 to extend expires to this amount - conflicts with regping */
-  "passwordLookup": passwordLookup
+  "userlookup": passwordLookup
 } )
 
 
 const cm = new CallManager( {
   "srf": srf,
   "registrar": r,
-  "passwordLookup": passwordLookup
+  "userlookup": passwordLookup
 } )
 
 cm.on( "call", async ( c ) => {
@@ -59,7 +59,7 @@ CallManager takes an options object as part of its construction. srf and a passw
 ```json
 {
   "srf": srf,
-  "passwordLookup": passwordLookup,
+  "userlookup": passwordLookup,
   "preferedcodecs": "pcmu pcma 2833",
   "transcode": true
 }

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
@@ -1440,6 +1465,8 @@ class call {
 
     this._timers.anyevent = setTimeout( () => {
       let r = this._promises.resolve.channelevent
+      this._promises.promise.channelevent = false
+      this._promises.resolve.channelevent = false
       if( r ) r( "timeout" )
     }, timeout * 1000 )
 
@@ -1633,6 +1660,26 @@ class call {
       this._onhangup( "wire" )
     } )
 
+    dialog.on( "info", async ( req, res ) => {
+      if( "application/dtmf-relay" === req.get( "Content-Type" ).toLowerCase() &&
+            parseInt( req.get( "content-length" ) ) > 0 ) {
+
+        const matches = req.msg.body.match( /Signal=(.+?)/i )
+        if( !matches || !Array.isArray( matches ) || matches.length < 2 ) return res.send( 415, "Badly formated SIP INFO" )
+
+        const digit = matches[ 1 ]
+        this._tevent( digit )
+        const other = this.other
+        if( other && other.channels.audio ) {
+          other.channels.audio.dtmf( digit )
+        }
+
+        return res.send( 200 )
+      }
+      
+      return res.send( 415, "Unsupported Media Type" )
+    } )
+
     dialog.on( "modify", ( req, res ) => {
       //  The application must respond, using the res parameter provided.
       if( "INVITE" === req.msg.method ) {
@@ -2067,7 +2114,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.3.7",
+  "version": "1.4.2",
   "description": "Call processing to create a PBX",
   "main": "index.js",
   "scripts": {