@babblevoice/babble-drachtio-callmanager 1.5.0 → 1.5.3

package/lib/call.js

@@ -843,7 +843,7 @@ class call {
           "User-Agent": "project",
           "Supported": "replaces"
         },
-        "body": this.sdp.local.toString()
+        "body": this.parent.sdp.local.toString()
     } )
   }
 
@@ -1045,6 +1045,14 @@ class call {
       this.sdp.local.addcodecs( "2833" )
     }
 
+    if( this._iswebrtc ) {
+      let ch = this.channels.audio
+      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 )
+                    .rtcpmux()
+    }
+
     this._dialog = await this._dialog.ack( this.sdp.local.toString() )
     this._addevents( this._dialog )
 
@@ -1138,6 +1146,10 @@ class call {
     this._req = req
     this._res = res
 
+    if( this._req.msg && this._req.msg.body ) {
+      this.sdp.remote = sdpgen.create( this._req.msg.body )
+    }
+
     this._req.on( "cancel", () => this._oncanceled() )
 
     let authorization = this._auth.parseauthheaders( this._req )
@@ -1323,18 +1335,23 @@ class call {
    */
   get _iswebrtc() {
 
-    /* Have we received remote SDP? */
-    if( !this.sdp.remote ) {
-      return this.sip &&
-        this.sip.contact && 
-        -1 !== this.sip.contact.indexOf( ";transport=ws" )
+    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
     }
 
-    return this.sip &&
-            this.sip.contact && 
-            -1 !== this.sip.contact[ 0 ].uri.indexOf( ";transport=ws" ) &&
-            this.sdp.remote.sdp.media[ 0 ] &&
+    /* 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" )
+    
   }
 
   /**
@@ -1352,7 +1369,6 @@ class call {
 
     let channeldef
     if( this._req.msg && this._req.msg.body ) {
-      this.sdp.remote = sdpgen.create( this._req.msg.body )
       /* options.preferedcodecs may have been narrowed down so we still check callmanager as well */
       this.selectedcodec = this.sdp.remote.intersection( options.preferedcodecs, true )
       if( false === this.selectedcodec ) {
@@ -2604,6 +2620,10 @@ class call {
       callmanager.options.em.emit( "call.new", c )
     } )
 
+    if( c._req.msg && c._req.msg.body ) {
+      c.sdp.remote = sdpgen.create( c._req.msg.body )
+    }
+
     return c
 
   }

package/package.json

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

package/test/interface/early.js

@@ -22,9 +22,159 @@ describe( "call early", function() {
   } )
 
 
-  it( `Create call and send 183 - early`, async () => {
+  it( `Create call and send 183 - early basic`, async () => {
+
+    /*
+    Phone                 BV                   Gateway
+    |---------INVITE------>|                      |(1)
+    |                      |---------INVITE------>|(2)
+    |                      |<--------183 (w-sdp)--|(3)
+    |<--------183 (w-sdp)--|                      |(4)
+
+    Phone RTP: 192.168.0.200:18540
+    BV RTP: 192.168.0.141
+    Gateway RTP: 192.168.0.160:21000
+    */
+
+    /* Setup the mock RTP server */ 
     let srfscenario = new srf.srfscenario()
+    let rtpserver = callmanager.projectrtp.proxy.listen()
+
+    let connection = net.createConnection( 9002, "127.0.0.1" )
+      .on( "error", ( e ) => {
+        console.error( e )
+      } )
+
+    connection.on( "connect", () => {
+      /* announce our node */
+      connection.write( projectrtpmessage.createmessage( {"status":{"channel":{"available":5000,"current":0},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}} ) )
+    } )
+
+    let mixing
+    let messagestate = projectrtpmessage.newstate()
+    let channelmessages = []
+    let opencount = 0
+    
+    connection.on( "data", ( data ) => {
+      projectrtpmessage.parsemessage( messagestate, data, ( msg ) => {
+        try{
+          channelmessages.push( msg )
+          if( "open" === msg.channel ) {
+            if( 0 == opencount ) {
+              setTimeout( () => 
+                connection.write( 
+                  projectrtpmessage.createmessage( 
+                    {"local":{"port":10008,"dtls":
+                      {"fingerprint":"Some fingerprint","enabled":false},
+                      "address":"192.168.0.141"},
+                      "id": msg.id, 
+                      "uuid": uuidv4(),
+                      "action":"open",
+                      "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}
+                    } ) ), 2 )
+            } else {
+              setTimeout( () => 
+                connection.write( 
+                  projectrtpmessage.createmessage( 
+                    {"local":{"port": 10010,"dtls":
+                      {"fingerprint":"Some fingerprint","enabled":false},
+                      "address":"192.168.0.141"},
+                      "id": msg.id, 
+                      "uuid": uuidv4(),
+                      "action":"open",
+                      "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}
+                    } ) ), 2 )
+            }
+            opencount++
+          } else if ( "close" === msg.channel ) {
+            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
+          } else if ( "mix" === msg.channel ) {
+            mixing = true
+          }
+        } catch( e ) {
+          console.error( e )
+        }
+      } )
+    } )
+
+    /* ensure we are connected */
+    await new Promise( ( r ) => setTimeout( () => r(), 100 ) )
+
+    srfscenario.oncreateUAC( async ( contact, options, callbacks ) => {
+
+      /* Step 3. This is the mocked gateway message back to our newcall. */
+      callbacks.cbProvisional( {
+        "status": 183,
+        "msg": {
+          "body": `v=0
+o=- 1608235282228 0 IN IP4 127.0.0.1
+s=
+c=IN IP4 192.168.0.160
+t=0 0
+m=audio 21000 RTP/AVP 0 101
+a=rtpmap:101 telephone-event/8000
+a=fmtp:101 0-16
+a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
+        }
+      } )
+
+      await new Promise( ( r ) => setTimeout( () => r(), 100 ) )
+      throw { "status": 503 }
+    } )
+
+    /* Step 1. Phone sends INVITE */
+    let call = await new Promise( ( resolve ) => {
+      srfscenario.oncall( async ( call ) => { resolve( call ) } )
+      srfscenario.inbound()
+    } )
+
+    /* Step 4. BV sends 183 back to phone */
+    let msgsent, msginfo
+    srfscenario.res.onsend( ( c, i ) => {
+      msgsent = c
+      msginfo = i
+    } )
+
+
+    /* Step 2. New INVITE to the remote Gateway */
+    let newcall = await call.newuac( { "contact": "callto" } )
+    
+    await call._onhangup( "wire" )
+    
+    expect( newcall.state.early ).to.be.true
+    expect( call.state.early ).to.be.true
+    expect( mixing ).to.be.true
+    expect( msgsent ).to.equal( 183 )
 
+    expect( channelmessages[ 0 ].channel ).to.equal( "open" )
+    expect( channelmessages[ 1 ].channel ).to.equal( "remote" )
+    expect( channelmessages[ 1 ].remote.port ).to.equal( 21000 )
+    expect( channelmessages[ 1 ].remote.address ).to.equal( "192.168.0.160" )
+    expect( channelmessages[ 2 ].channel ).to.equal( "open" )
+    expect( channelmessages[ 2 ].remote.port ).to.equal( 18540 )
+    expect( channelmessages[ 2 ].remote.address ).to.equal( "192.168.0.200" )
+    expect( channelmessages[ 3 ].channel ).to.equal( "mix" )
+    expect( channelmessages[ 4 ].channel ).to.equal( "close" )
+    expect( channelmessages[ 5 ].channel ).to.equal( "close" )
+
+    expect( msginfo.body ).to.include( "audio 10010 RTP/AVP" )
+
+    connection.destroy()
+    rtpserver.destroy()
+  } )
+
+  it( `Create call and send 183 - early - SAVPF`, async () => {
+
+    /*
+    Phone (SAVPF)         BV                   Gateway
+    |---------INVITE------>|                      |(1)
+    |                      |---------INVITE------>|(2)
+    |                      |<--------183 (w-sdp)--|(3)
+    |<--------183 (w-sdp)--|                      |(4)
+    */
+
+    /* Setup the mock RTP server */ 
+    let srfscenario = new srf.srfscenario( { savpf: true } )
     let rtpserver = callmanager.projectrtp.proxy.listen()
 
     let connection = net.createConnection( 9002, "127.0.0.1" )
@@ -37,18 +187,49 @@ describe( "call early", function() {
       connection.write( projectrtpmessage.createmessage( {"status":{"channel":{"available":5000,"current":0},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}} ) )
     } )
 
-    let msgid
     let mixing
     let messagestate = projectrtpmessage.newstate()
+    let channelmessages = []
+    let opencount = 0
+    
     connection.on( "data", ( data ) => {
       projectrtpmessage.parsemessage( messagestate, data, ( msg ) => {
-        if( "open" === msg.channel ) {
-          msgid = msg.id
-          setTimeout( () => connection.write( projectrtpmessage.createmessage( {"local":{"port":10008,"dtls":{"fingerprint":"Some fingerprint","enabled":false},"address":"192.168.0.141"},"id": msg.id, "uuid": uuidv4(),"action":"open","status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}} ) ), 2 )
-        } else if ( "close" === msg.channel ) {
-          connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
-        } else if ( "mix" === msg.channel ) {
-          mixing = true
+        try{
+          channelmessages.push( msg )
+          if( "open" === msg.channel ) {
+            if( 0 == opencount ) {
+              setTimeout( () => 
+                connection.write( 
+                  projectrtpmessage.createmessage( 
+                    {"local":{"port":10008,"dtls":
+                      {"fingerprint":"Some fingerprint","enabled":false},
+                      "address":"192.168.0.141"},
+                      "id": msg.id, 
+                      "uuid": uuidv4(),
+                      "action":"open",
+                      "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}
+                    } ) ), 2 )
+            } else {
+              setTimeout( () => 
+                connection.write( 
+                  projectrtpmessage.createmessage( 
+                    {"local":{"port": 10010,"dtls":
+                      {"fingerprint":"Some fingerprint","enabled":false},
+                      "address":"192.168.0.141"},
+                      "id": msg.id, 
+                      "uuid": uuidv4(),
+                      "action":"open",
+                      "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}
+                    } ) ), 2 )
+            }
+            opencount++
+          } else if ( "close" === msg.channel ) {
+            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
+          } else if ( "mix" === msg.channel ) {
+            mixing = true
+          }
+        } catch( e ) {
+          console.error( e )
         }
       } )
     } )
@@ -57,6 +238,8 @@ describe( "call early", function() {
     await new Promise( ( r ) => setTimeout( () => r(), 100 ) )
 
     srfscenario.oncreateUAC( async ( contact, options, callbacks ) => {
+
+      /* Step 3. This is the mocked gateway message back to our newcall. */
       callbacks.cbProvisional( {
         "status": 183,
         "msg": {
@@ -76,16 +259,30 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
       throw { "status": 503 }
     } )
 
-    let msgsent
+    /* Step 1. Phone sends INVITE */
     let call = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
-      srfscenario.inbound()
-      srfscenario.res.onsend( (c) => {
-        msgsent = c
-      })
+
+      let req = new srf.req( { savpf: true } )
+      req.setparsedheader( "contact", [ {
+          name: undefined,
+          uri: 'sip:u3s2etdo@pc3lfsq1oh86.invalid;transport=ws;ob',
+          params: {}
+        }
+      ] )
+
+      srfscenario.inbound( req )
+    } )
+
+    /* Step 4. BV sends 183 back to phone */
+    let msgsent, msginfo
+    srfscenario.res.onsend( ( c, i ) => {
+      msgsent = c
+      msginfo = i
     } )
 
 
+    /* Step 2. New INVITE to the remote Gateway */
     let newcall = await call.newuac( { "contact": "callto" } )
     
     await call._onhangup( "wire" )
@@ -95,6 +292,167 @@ a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
     expect( mixing ).to.be.true
     expect( msgsent ).to.equal( 183 )
 
+    expect( channelmessages[ 0 ].channel ).to.equal( "open" )
+    expect( channelmessages[ 1 ].channel ).to.equal( "remote" )
+    expect( channelmessages[ 1 ].remote.port ).to.equal( 20000 )
+    expect( channelmessages[ 1 ].remote.address ).to.equal( "192.168.0.141" )
+    expect( channelmessages[ 2 ].channel ).to.equal( "open" )
+    expect( channelmessages[ 2 ].remote.port ).to.equal( 48356 )
+    expect( channelmessages[ 3 ].channel ).to.equal( "mix" )
+    expect( channelmessages[ 4 ].channel ).to.equal( "close" )
+    expect( channelmessages[ 5 ].channel ).to.equal( "close" )
+
+    expect( msginfo.body ).to.include( "UDP/TLS/RTP/SAVPF" )
+
+    connection.destroy()
+    rtpserver.destroy()
+  } )
+
+
+  it( `Create call and send 183 - early - SAVPF and 200 ok`, async () => {
+
+    /*
+    Phone (SAVPF)         BV                   Gateway
+    |---------INVITE------>|                      |(1)
+    |                      |---------INVITE------>|(2)
+    |                      |<--------183 (w-sdp)--|(3)
+    |<--------183 (w-sdp)--|                      |(4)
+    |                      |<--------200 (w-sdp)--|(5)
+    |<--------200 (w-sdp)--|                      |(6)
+    */
+
+    /* Setup the mock RTP server */ 
+    let srfscenario = new srf.srfscenario( { savpf: true } )
+    let rtpserver = callmanager.projectrtp.proxy.listen()
+
+    let connection = net.createConnection( 9002, "127.0.0.1" )
+      .on( "error", ( e ) => {
+        console.error( e )
+      } )
+
+    connection.on( "connect", () => {
+      /* announce our node */
+      connection.write( projectrtpmessage.createmessage( {"status":{"channel":{"available":5000,"current":0},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}} ) )
+    } )
+
+    let mixing
+    let messagestate = projectrtpmessage.newstate()
+    let channelmessages = []
+    let opencount = 0
+    
+    connection.on( "data", ( data ) => {
+      projectrtpmessage.parsemessage( messagestate, data, ( msg ) => {
+        try{
+          channelmessages.push( msg )
+          if( "open" === msg.channel ) {
+            if( 0 == opencount ) {
+              setTimeout( () => 
+                connection.write( 
+                  projectrtpmessage.createmessage( 
+                    {"local":{"port":10008,"dtls":
+                      {"fingerprint":"Some fingerprint","enabled":false},
+                      "address":"192.168.0.141"},
+                      "id": msg.id, 
+                      "uuid": uuidv4(),
+                      "action":"open",
+                      "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}
+                    } ) ), 2 )
+            } else {
+              setTimeout( () => 
+                connection.write( 
+                  projectrtpmessage.createmessage( 
+                    {"local":{"port": 10010,"dtls":
+                      {"fingerprint":"Some fingerprint","enabled":false},
+                      "address":"192.168.0.141"},
+                      "id": msg.id, 
+                      "uuid": uuidv4(),
+                      "action":"open",
+                      "status":{"channel":{"available":4995,"current":5},"workercount":12,"instance":"ca0ef6a9-9174-444d-bdeb-4c9eb54d4566"}
+                    } ) ), 2 )
+            }
+            opencount++
+          } else if ( "close" === msg.channel ) {
+            connection.write( projectrtpmessage.createmessage( {"id": msg.id,"uuid":msg.uuid,"action":"close","reason":"requested","stats":{"in":{"mos":4.5,"count":586,"dropped":0,"skip":0},"out":{"count":303,"skip":0},"tick":{"meanus":124,"maxus":508,"count":597}}} ) )
+          } else if ( "mix" === msg.channel ) {
+            mixing = true
+          }
+        } catch( e ) {
+          console.error( e )
+        }
+      } )
+    } )
+
+    /* ensure we are connected */
+    await new Promise( ( r ) => setTimeout( () => r(), 100 ) )
+
+    let req = new srf.req( { savpf: true } )
+    req.setparsedheader( "contact", [ {
+        name: undefined,
+        uri: 'sip:u3s2etdo@pc3lfsq1oh86.invalid;transport=ws;ob',
+        params: {}
+      }
+    ] )
+
+    srfscenario.oncreateUAC( async ( contact, options, callbacks ) => {
+
+      /* Step 3. This is the mocked gateway message back to our newcall. */
+      callbacks.cbProvisional( {
+        "status": 183,
+        "msg": {
+          "body": `v=0
+o=- 1608235282228 0 IN IP4 127.0.0.1
+s=
+c=IN IP4 192.168.0.141
+t=0 0
+m=audio 20000 RTP/AVP 0 101
+a=rtpmap:101 telephone-event/8000
+a=fmtp:101 0-16
+a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
+        }
+      } )
+
+      await new Promise( ( r ) => setTimeout( () => r(), 100 ) )
+      return new srf.dialog( req )
+    } )
+
+    /* Step 1. Phone sends INVITE */
+    let call = await new Promise( ( resolve ) => {
+      srfscenario.oncall( async ( call ) => { resolve( call ) } )
+      srfscenario.inbound( req )
+    } )
+
+    /* Step 4. BV sends 183 back to phone */
+    let msgsent, msginfo
+    srfscenario.res.onsend( ( c, i ) => {
+      msgsent = c
+      msginfo = i
+    } )
+
+
+    /* Step 2. New INVITE to the remote Gateway */
+    let newcall = await call.newuac( { "contact": "callto" } )
+    
+    await new Promise( ( r ) => setTimeout( () => r(), 500 ) )
+    await call._onhangup( "wire" )
+    
+    expect( newcall.state.early ).to.be.true
+    expect( call.state.early ).to.be.true
+    expect( mixing ).to.be.true
+    expect( msgsent ).to.equal( 183 )
+
+    expect( channelmessages[ 0 ].channel ).to.equal( "open" )
+    expect( channelmessages[ 1 ].channel ).to.equal( "remote" )
+    expect( channelmessages[ 1 ].remote.port ).to.equal( 20000 )
+    expect( channelmessages[ 2 ].channel ).to.equal( "open" )
+    expect( channelmessages[ 2 ].remote.port ).to.equal( 48356 )
+    expect( channelmessages[ 2 ].remote.address ).to.equal( "82.19.206.102" )
+    expect( channelmessages[ 3 ].channel ).to.equal( "mix" )
+
+    expect( channelmessages[ 7 ].channel ).to.equal( "close" )
+    expect( channelmessages[ 8 ].channel ).to.equal( "close" )
+
+    expect( msginfo.body ).to.include( "UDP/TLS/RTP/SAVPF" )
+
     connection.destroy()
     rtpserver.destroy()
   } )

package/test/mock/srf.js

@@ -86,13 +86,103 @@ a=fmtp:97 mode=20
 a=sendrecv`.replace(/(\r\n|\n|\r)/gm, "\r\n")
 ]
 
+let possiblesavpsdp = [
+  `v=0
+o=- 6278233949897424941 2 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=group:BUNDLE 0
+a=extmap-allow-mixed
+a=msid-semantic: WMS Aq3uReW2RJFKkrlg942QblHcszboGZx9dhvK
+m=audio 48356 UDP/TLS/RTP/SAVPF 111 63 103 104 9 0 8 106 105 13 110 112 113 126
+c=IN IP4 82.19.206.102
+a=rtcp:9 IN IP4 0.0.0.0
+a=candidate:79019993 1 udp 1686052607 82.19.206.102 48356 typ srflx raddr 172.17.0.1 rport 48356 generation 0 network-id 1
+a=ice-ufrag:K8PO
+a=ice-pwd:3RU9dMh3eDbYsfJIyQ4ki5va
+a=ice-options:trickle
+a=fingerprint:sha-256 73:D5:EC:C0:BF:A7:CA:42:1B:DE:B6:EA:CE:B9:D0:32:38:65:50:4A:27:BF:58:9A:DF:24:B2:10:53:58:88:B9
+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:Aq3uReW2RJFKkrlg942QblHcszboGZx9dhvK eaa81692-2187-4303-8e59-ed1bcb9591ee
+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:103 ISAC/16000
+a=rtpmap:104 ISAC/32000
+a=rtpmap:9 G722/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:8 PCMA/8000
+a=rtpmap:106 CN/32000
+a=rtpmap:105 CN/16000
+a=rtpmap:13 CN/8000
+a=rtpmap:110 telephone-event/48000
+a=rtpmap:112 telephone-event/32000
+a=rtpmap:113 telephone-event/16000
+a=rtpmap:126 telephone-event/8000
+a=ssrc:3789235955 cname:k129XMgcWznC/heR
+a=ssrc:3789235955 msid:Aq3uReW2RJFKkrlg942QblHcszboGZx9dhvK eaa81692-2187-4303-8e59-ed1bcb9591ee`.replace(/(\r\n|\n|\r)/gm, "\r\n"),
+`v=0
+o=- 6278233949897424941 2 IN IP4 127.0.0.1
+s=-
+t=0 0
+a=group:BUNDLE 0
+a=extmap-allow-mixed
+a=msid-semantic: WMS Aq3uReW2RJFKkrlg942QblHcszboGZx9dhvK
+m=audio 30000 UDP/TLS/RTP/SAVPF 111 63 103 104 9 0 8 106 105 13 110 112 113 126
+c=IN IP4 8.8.8.8
+a=rtcp:9 IN IP4 0.0.0.0
+a=candidate:79019993 1 udp 1686052607 8.8.8.8 30000 typ srflx raddr 172.17.0.1 rport 30000 generation 0 network-id 1
+a=ice-ufrag:K8PO
+a=ice-pwd:3RU9dMh3eDbYsfJIyQ4ki5va
+a=ice-options:trickle
+a=fingerprint:sha-256 73:D5:EC:C0:BF:A7:CA:42:1B:DE:B6:EA:CE:B9:D0:32:38:65:50:4A:27:BF:58:9A:DF:24:B2:10:53:58:88:B9
+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:Aq3uReW2RJFKkrlg942QblHcszboGZx9dhvK eaa81692-2187-4303-8e59-ed1bcb9591ee
+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:103 ISAC/16000
+a=rtpmap:104 ISAC/32000
+a=rtpmap:9 G722/8000
+a=rtpmap:0 PCMU/8000
+a=rtpmap:8 PCMA/8000
+a=rtpmap:106 CN/32000
+a=rtpmap:105 CN/16000
+a=rtpmap:13 CN/8000
+a=rtpmap:110 telephone-event/48000
+a=rtpmap:112 telephone-event/32000
+a=rtpmap:113 telephone-event/16000
+a=rtpmap:126 telephone-event/8000
+a=ssrc:3789235955 cname:k129XMgcWznC/heR
+a=ssrc:3789235955 msid:Aq3uReW2RJFKkrlg942QblHcszboGZx9dhvK eaa81692-2187-4303-8e59-ed1bcb9591ee`.replace(/(\r\n|\n|\r)/gm, "\r\n")
+]
+
+
 let sdpid = 0
 
 /*
 Mock req object
 */
 class req {
-  constructor( options ) {
+  constructor( options = {} ) {
     this.parsedheaders = {}
     this.headers = {}
 
@@ -109,8 +199,14 @@ class req {
 
     this.callbacks = {}
 
+    let sdp = possiblesdp[ sdpid % possiblesdp.length ]
+    
+    if( options.savpf ) {
+      sdp = possiblesavpsdp[ sdpid % possiblesavpsdp.length ]
+    }
+
     this.msg = {
-      "body": possiblesdp[ sdpid % possiblesdp.length ],
+      "body": sdp,
       method: "INVITE"
     }
     sdpid++
@@ -326,7 +422,7 @@ is bad testing.
 Our setup of the test and our mock objects need to look simple and are easily explainable.
 */
 class srfscenario {
-  constructor( options ) {
+  constructor( options = {} ) {
     /* every scenario we restart spd */
     sdpid = 0
 
@@ -342,6 +438,11 @@ class srfscenario {
       "uassdp": possiblesdp[ 1 ]
     }
 
+    if( options.savpf ) {
+      defaultoptions.uacsdp = possiblesavpsdp[ 0 ]
+      defaultoptions.uassdp = possiblesavpsdp[ 1 ]
+    }
+
     this.options = { ...defaultoptions, ...options }
     this.options.srf = new srf()
 
@@ -373,9 +474,13 @@ class srfscenario {
   /*
     simulate a new inbound call
   */
-  inbound() {
+  inbound( ureq ) {
     if( this.callbacks.call ) {
-      this.req = new req( new options() )
+      if( ureq ) {
+        this.req = ureq
+      } else {
+        this.req = new req( new options() )
+      }
       this.res = new res()
 
       let newcall = call.frominvite( this.req, this.res )