@babblevoice/babble-drachtio-callmanager 2.1.1 → 2.2.0

package/index.js

@@ -12,7 +12,8 @@ const default_options = {
   "rfc2833": true,  /* Enable RFC 2833 - DTMF */
   "late": false,  /* Late negotiation */
   "registrar": false, /* our registrar object or falsey */
-  "referauthrequired": true
+  "referauthrequired": true,
+  "ignoreipv6candidates": true /* ipv6 does not work in projectrtp */
 }
 
 /**

package/lib/call.js

@@ -11,6 +11,8 @@ const callstore = require( "./store.js" )
 
 const sipauth = require( "@babblevoice/babble-drachtio-auth" )
 
+const ipv6regex = /^(?:(?:[a-fA-F\d]{1,4}:){7}(?:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){6}(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|:[a-fA-F\d]{1,4}|:)|(?:[a-fA-F\d]{1,4}:){5}(?::(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,2}|:)|(?:[a-fA-F\d]{1,4}:){4}(?:(?::[a-fA-F\d]{1,4}){0,1}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,3}|:)|(?:[a-fA-F\d]{1,4}:){3}(?:(?::[a-fA-F\d]{1,4}){0,2}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,4}|:)|(?:[a-fA-F\d]{1,4}:){2}(?:(?::[a-fA-F\d]{1,4}){0,3}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,5}|:)|(?:[a-fA-F\d]{1,4}:){1}(?:(?::[a-fA-F\d]{1,4}){0,4}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,6}|:)|(?::(?:(?::[a-fA-F\d]{1,4}){0,5}:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)(?:\\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]\d|\d)){3}|(?::[a-fA-F\d]{1,4}){1,7}|:)))(?:%[0-9a-zA-Z]{1,})?$/gm
+
 /*
 Enum for different reasons for hangup.
 */
@@ -910,8 +912,15 @@ class call {
   static async _parsesdpcandidates( target, sdp ) {
 
     if( Array.isArray( sdp.media[ 0 ].candidates ) ) {
-      const candidates = sdp.media[ 0 ].candidates
+      let candidates = sdp.media[ 0 ].candidates
       if( 0 < candidates.length ) {
+        if( callmanager.options.ignoreipv6candidates ) {
+          candidates = candidates.filter( ( c ) => { 
+            const ismatch = ipv6regex.test( c.ip )
+            return !ismatch
+          } )
+        }
+        
         candidates.sort( ( l, r ) => { return r.priority - l.priority } )
         target.port = candidates[ 0 ].port
 
@@ -1037,10 +1046,8 @@ class call {
     } else {
       channeldef = call._createchannelremotedef( target.address, target.port, target.audio.payloads[ 0 ] ) 
     }
-   
-    const other = this.other
-    if( other && other.channels.audio ) this.channels.audio = await other.channels.audio.openchannel( channeldef, this._handlechannelevents.bind( this ) )
-    else this.channels.audio = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+
+    await this.#openrelatedchannel()
 
     this.sdp.local = sdpgen.create()
       .addcodecs( this.selectedcodec )
@@ -1069,7 +1076,7 @@ class call {
 
   /**
     Sometimes we don't care who if we are the parent or child - we just want the other party
-    @return {object|bool} returns call object or if none false
+    @return { object|bool } returns call object or if none false
   */
   get other() {
     if( this.parent ) return this.parent
@@ -1347,23 +1354,25 @@ class call {
    */
   async #openchannelsforanswer( channeldef ) {
     if( this.channels.audio ) {
+      /* we have already opened a channel (probably early now answering) */
       this.channels.audio.remote( channeldef.remote )
     } else {
-      const ch = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
-      this.channels.audio = ch
+      
+      await this.#openrelatedchannel( channeldef )
+
       this.sdp.local = sdpgen.create()
         .addcodecs( this.selectedcodec )
-        .setconnectionaddress( ch.local.address )
-        .setaudioport( ch.local.port )
+        .setconnectionaddress( this.channels.audio.local.address )
+        .setaudioport( this.channels.audio.local.port )
 
       if( this.options.rfc2833 ) {
         this.sdp.local.addcodecs( "2833" )
       }
 
       if( this._iswebrtc ) {
-        this.sdp.local.addssrc( ch.local.ssrc )
-          .secure( ch.local.dtls.fingerprint, channeldef.remote.dtls.mode )
-          .addicecandidates( ch.local.address, ch.local.port, ch.local.icepwd )
+        this.sdp.local.addssrc( this.channels.audio.local.ssrc )
+          .secure( this.channels.audio.local.dtls.fingerprint, channeldef.remote.dtls.mode )
+          .addicecandidates( this.channels.audio.local.address, this.channels.audio.local.port, this.channels.audio.local.icepwd )
           .rtcpmux()
       }
     }
@@ -1379,13 +1388,13 @@ class call {
       if( !this.selectedcodec ) {
         return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
       }
+
+      this.sdp.remote.select( this.selectedcodec )
       
       const remoteaudio = this.sdp.remote.getaudio()
       if( !remoteaudio ) {
         return this.hangup( hangupcodes.INCOMPATIBLE_DESTINATION )
       }
-
-      this.sdp.remote.select( this.selectedcodec )
       
       await call._parsesdpcandidates( remoteaudio, this.sdp.remote.sdp )
 
@@ -2478,6 +2487,22 @@ class call {
     return child
   }
 
+  /**
+   * If any of our one of our related calls has a channel open
+   * try and use it. NB (other favours the answered if not then the first)
+   * It will use the channel on that call.
+   * @param { object } [ channeldef ]
+   */
+  async #openrelatedchannel( channeldef ) {
+
+    const relatedcall = this.other
+    if( relatedcall && relatedcall.channels.audio ) 
+      this.channels.audio = await relatedcall.channels.audio.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+    else 
+      this.channels.audio = await projectrtp.openchannel( channeldef, this._handlechannelevents.bind( this ) )
+
+  }
+
   /**
    * 
    */
@@ -2485,8 +2510,8 @@ class call {
     if( this.options.late ) {
       this.options.noAck = true /* this is a MUST for late negotiation */
     } else {
-      if( this.options.parent && this.options.parent.channels.audio ) this.channels.audio = await this.options.parent.channels.audio.openchannel( this._handlechannelevents.bind( this ) )
-      else this.channels.audio = await projectrtp.openchannel( this._handlechannelevents.bind( this ) )
+
+      await this.#openrelatedchannel()
 
       this.sdp.local = sdpgen.create().addcodecs( this.options.preferedcodecs )
       this.sdp.local.setaudioport( this.channels.audio.local.port )

package/package.json

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

package/test/interface/sdp.js

@@ -1,8 +1,9 @@
 
 
 const expect = require( "chai" ).expect
-const sdp = require( "../../lib/sdp.js" )
-const call = require( "../../lib/call.js" )
+const sdp = require( "../../lib/sdp" )
+const call = require( "../../lib/call" )
+const callmanager = require( "../../index" )
 
 describe( "sdp", function() {
 
@@ -643,4 +644,58 @@ a=rtcp-mux`
     expect( bvdesktopinvite200sdpobj.intersection( ourcodecs, true ) ).to.equal( "g722" )
     expect( magrathea200sdpobj.intersection( ourcodecs, true ) ).to.equal( "pcma" )
   } )
+
+  it( "outbound example - inc ipv6", async () => {
+
+    const sdpstr = `v=0
+o=- 7873703533563891424 2 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=group:BUNDLE 0
+a=extmap-allow-mixed
+a=msid-semantic: WMS a46039f4-1857-410e-b1cc-215c09878068
+m=audio 41645 UDP/TLS/RTP/SAVPF 111 63 9 0 8 13 110 126
+c=IN IP4 86.169.150.38
+a=rtcp:9 IN IP4 0.0.0.0
+a=candidate:532873972 1 udp 2122131711 2a00:23c6:e093:a801:6722:f7bb:aeeb:5e04 39087 typ host generation 0 network-id 4 network-cost 10
+a=candidate:226183667 1 udp 1685987071 86.169.150.38 41645 typ srflx raddr 172.17.0.1 rport 41645 generation 0 network-id 2
+a=ice-ufrag:c97P
+a=ice-pwd:sK0NGVPIIx4/qEX+tCVW5dzH
+a=ice-options:trickle
+a=fingerprint:sha-256 0F:37:28:0F:66:1B:7E:D5:36:A4:EB:2D:D4:A8:6E:33:69:31:3B:D4:7B:71:0B:DE:41:09:D1:6C:1E:56:02:1C
+a=setup:actpass
+a=mid:0
+a=extmap:1 urn:ietf:params:rtp-hdrext:ssrc-audio-level
+a=extmap:2 http://www.webrtc.org/experiments/rtp-hdrext/abs-send-time
+a=extmap:3 http://www.ietf.org/id/draft-holmer-rmcat-transport-wide-cc-extensions-01
+a=extmap:4 urn:ietf:params:rtp-hdrext:sdes:mid
+a=sendrecv
+a=msid:a46039f4-1857-410e-b1cc-215c09878068 ce8c9c25-2ea0-4079-aaa5-54f771d53310
+a=rtcp-mux
+a=rtpmap:111 opus/48000/2
+a=rtcp-fb:111 transport-cc
+a=fmtp:111 minptime=10;useinbandfec=1
+a=rtpmap:63 red/48000/2
+a=fmtp:63 111/111
+a=rtpmap:9 G722/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:8 PCMA/8000
+a=rtpmap:13 CN/8000
+a=rtpmap:110 telephone-event/48000
+a=rtpmap:126 telephone-event/8000
+a=ssrc:222390620 cname:q7Is0hRbTrTbcMJM
+a=ssrc:222390620 msid:a46039f4-1857-410e-b1cc-215c09878068 ce8c9c25-2ea0-4079-aaa5-54f771d53310
+    `
+    callmanager.callmanager( { srf: { use: () => {} } } )
+    const sdpobj = sdp.create( sdpstr )
+    const target = {}
+    await call._parsesdpcandidates( target, sdpobj.sdp )
+    sdpobj.intersection( "g722", true )
+
+    /* our default is to ignore IPv6 addresses (until projectrtp supports it) */
+    expect( target.port ).to.equal( 41645 )
+    expect( target.address ).to.equal( "86.169.150.38" )
+
+    
+  } )
 } )