@babblevoice/babble-drachtio-callmanager 2.0.2 → 2.0.3

package/test/interface/xfer.js

@@ -1,9 +1,7 @@
 
 const expect = require( "chai" ).expect
-const callmanager = require( "../../index.js" )
 const call = require( "../../lib/call.js" )
 const srf = require( "../mock/srf.js" )
-const projectrtp = require( "@babblevoice/projectrtp" ).projectrtp
 
 /* These DO NOT form part of our interface */
 const clearcallmanager = require( "../../lib/callmanager.js" )._clear
@@ -18,22 +16,21 @@ describe( "xfer", function() {
     clearcallmanager()
   } )
 
-  it( `call blind xfer single leg should fail`, async function() {
+  it( "call blind xfer single leg should fail", async function() {
 
-    let srfscenario = new srf.srfscenario()
+    const srfscenario = new srf.srfscenario()
 
-    let call = await new Promise( ( resolve ) => {
+    const call = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
       srfscenario.inbound()
     } )
 
-    let req = new srf.req( new srf.options() )
-    let res = new srf.res()
+    const req = new srf.req( new srf.options() )
+    const res = new srf.res()
 
-    let sipcodesent, msgsent
-    res.onsend( ( sipcode, msg ) => {
+    let sipcodesent
+    res.onsend( ( sipcode ) => {
       sipcodesent = sipcode
-      msgsent = msg
     } )
 
     await call.answer()
@@ -46,7 +43,7 @@ describe( "xfer", function() {
 
   } )
 
-  it( `call blind xfer 2 leg no auth`, async function() {
+  it( "call blind xfer 2 leg no auth", async function() {
 
     /*
     Client a                           Us                             Client b
@@ -65,9 +62,9 @@ describe( "xfer", function() {
     em.emit( "call.referred", call )
     */
 
-    let srfscenario = new srf.srfscenario()
+    const srfscenario = new srf.srfscenario()
 
-    let call = await new Promise( ( resolve ) => {
+    const call = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
       srfscenario.inbound()
     } )
@@ -82,19 +79,18 @@ describe( "xfer", function() {
       globalev = r
     } )
 
-    let req = new srf.req( new srf.options() )
-    let res = new srf.res()
+    const req = new srf.req( new srf.options() )
+    const res = new srf.res()
 
     req.setparsedheader( "refer-to", { "uri": "sip:alice@atlanta.example.com" } )
 
-    let sipcodesent, msgsent
-    res.onsend( ( sipcode, msg ) => {
+    let sipcodesent
+    res.onsend( ( sipcode ) => {
       sipcodesent = sipcode
-      msgsent = msg
     } )
 
     await call.answer()
-    let child = await call.newuac( { "contact": "1000@dummy" } )
+    const child = await call.newuac( { "contact": "1000@dummy" } )
     child.referauthrequired = false
 
     await child._dialog.callbacks.refer( req, res )
@@ -121,7 +117,7 @@ describe( "xfer", function() {
 
   } )
 
-  it( `call blind xfer 2 leg auth`, async function() {
+  it( "call blind xfer 2 leg auth", async function() {
 
     /*
     Client a                           Us                             Client b
@@ -146,7 +142,7 @@ describe( "xfer", function() {
     */
 
     /* Step 1-4 */
-    let options = {
+    const options = {
       "userlookup": async ( username, realm ) => {
         return {
           "secret": "zanzibar",
@@ -156,29 +152,26 @@ describe( "xfer", function() {
       }
     }
 
-    let srfscenario = new srf.srfscenario( options )
+    const srfscenario = new srf.srfscenario( options )
 
-    let eventhappened = false
     srfscenario.options.em.on( "call.authed", ( c ) => {
       expect( c ).to.be.an.instanceof( call )
       expect( c.type ).to.be.an( "string" ).to.be.equal( "uas" )
-      eventhappened = true
     } )
 
-    let c = await new Promise( ( resolve ) => {
+    const c = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => {
         resolve( call )
       } )
       srfscenario.inbound()
     } )
 
-    let onsendcount = 0
     /* mock -
     auth example from https://datatracker.ietf.org/doc/html/draft-smith-sipping-auth-examples-01 3.3*/
     c._req.msg.uri = "sip:bob@biloxi.com"
     c._req.setparsedheader( "from", { "params": { "tag": "767sf76wew" }, "uri": "sip:bob@biloxi.com", "host": "biloxi.com" } )
 
-    c._res.onsend( ( code, msg ) => {
+    c._res.onsend( ( code ) => {
 
       if( 407 == code ) {
 
@@ -187,19 +180,17 @@ describe( "xfer", function() {
 
         /* We would normally look here to get nonce and opaque - howevere we are frigging it */
         //let request = msg.headers[ "Proxy-Authenticate" ]
-        let request = `Digest realm="biloxi.com", algorithm=MD5, qop="auth", nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false`
+        let request = "Digest realm=\"biloxi.com\", algorithm=MD5, qop=\"auth\", nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\", stale=false"
 
         /* The items a uac will add */
-        request += `, username="bob", nc=00000001,cnonce="0a4f113b",`
-        request += ` uri="sip:bob@biloxi.com",`
-        request += ` response="89eb0059246c02b2f6ee02c7961d5ea3"`
+        request += ", username=\"bob\", nc=00000001,cnonce=\"0a4f113b\","
+        request += " uri=\"sip:bob@biloxi.com\","
+        request += " response=\"89eb0059246c02b2f6ee02c7961d5ea3\""
 
         srfscenario.req.set( "Proxy-Authorization", request )
         c._onauth( srfscenario.req, srfscenario.res )
 
       }
-
-      onsendcount++
     } )
 
     let referedcall
@@ -211,34 +202,34 @@ describe( "xfer", function() {
     await c.answer()
 
     /* Step 5-8 */
-    let child = await c.newuac( { "contact": "1000@dummy" } )
+    const child = await c.newuac( { "contact": "1000@dummy" } )
 
     /* Step 9-16 */
-    let req = new srf.req( new srf.options() )
-    let res = new srf.res()
+    const req = new srf.req( new srf.options() )
+    const res = new srf.res()
 
     req.setparsedheader( "refer-to", { "uri": "sip:alice@atlanta.example.com" } )
 
-    let sipcodesent, msgsent
+    let sipcodesent
 
     req.msg.uri = "sip:bob@biloxi.com"
     req.setparsedheader( "from", { "params": { "tag": "767sf76wew" }, "uri": "sip:bob@biloxi.com", "host": "biloxi.com" } )
 
-    res.onsend( ( code, msg ) => {
+    res.onsend( ( code ) => {
 
       if( 407 == code ) {
 
         child._auth._nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093"
         child._auth._opaque = "5ccc069c403ebaf9f0171e9517f40e41"
 
-         /* We would normally look here to get nonce and opaque - howevere we are frigging it */
+        /* We would normally look here to get nonce and opaque - howevere we are frigging it */
         //let request = msg.headers[ "Proxy-Authenticate" ]
-        let request = `Digest realm="biloxi.com", algorithm=MD5, qop="auth", nonce="dcd98b7102dd2f0e8b11d0f600bfb0c093", opaque="5ccc069c403ebaf9f0171e9517f40e41", stale=false`
+        let request = "Digest realm=\"biloxi.com\", algorithm=MD5, qop=\"auth\", nonce=\"dcd98b7102dd2f0e8b11d0f600bfb0c093\", opaque=\"5ccc069c403ebaf9f0171e9517f40e41\", stale=false"
 
         /* The items a uac will add */
-        request += `, username="bob", nc=00000001,cnonce="0a4f113b",`
-        request += ` uri="sip:bob@biloxi.com",`
-        request += ` response="89eb0059246c02b2f6ee02c7961d5ea3"`
+        request += ", username=\"bob\", nc=00000001,cnonce=\"0a4f113b\","
+        request += " uri=\"sip:bob@biloxi.com\","
+        request += " response=\"89eb0059246c02b2f6ee02c7961d5ea3\""
 
         req.set( "Proxy-Authorization", request )
 
@@ -276,18 +267,18 @@ describe( "xfer", function() {
 
   } )
 
-  it( `call attended xfer 2 leg no auth`, async function() {
+  it( "call attended xfer 2 leg no auth", async function() {
     /* using terminology referenced in call.js */
-    let srfscenario = new srf.srfscenario()
+    const srfscenario = new srf.srfscenario()
 
-    let b_1 = await new Promise( ( resolve ) => {
+    const b_1 = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
       srfscenario.inbound()
     } )
 
-    let a_1 = await b_1.newuac( { "contact": "1000@dummy" } )
+    const a_1 = await b_1.newuac( { "contact": "1000@dummy" } )
 
-    let b_2 = await new Promise( ( resolve ) => {
+    const b_2 = await new Promise( ( resolve ) => {
       srfscenario.oncall( async ( call ) => { resolve( call ) } )
       srfscenario.inbound()
     } )
@@ -295,13 +286,13 @@ describe( "xfer", function() {
     /* needed for _dialog.on... */
     await b_2.answer()
 
-    let c_1 = await b_2.newuac( { "contact": "1001@dummy" } )
+    const c_1 = await b_2.newuac( { "contact": "1001@dummy" } )
 
     /* now we refer b_2 to b_1 */
-    let req = new srf.req( new srf.options() )
-    let res = new srf.res()
+    const req = new srf.req( new srf.options() )
+    const res = new srf.res()
 
-    let xfermessages = []
+    const xfermessages = []
     res.onsend( ( sipcode, msg ) => {
       xfermessages.push( {
         "code": sipcode,
@@ -315,10 +306,10 @@ describe( "xfer", function() {
 
     /* Refer-To: <sip:dave@denver.example.org?Replaces=12345%40192.168.118.3%3B
               to-tag%3D12345%3Bfrom-tag%3D5FFE-3994> */
-    let callid = b_1.sip.callid
-    let totag = b_1.sip.tags.local
-    let fromtag = b_1.sip.tags.remote
-    let referto = `sip:1000@dummy.com?Replaces=${callid}%3Bto-tag%3D${totag}%3Bfrom-tag%3D${fromtag}`
+    const callid = b_1.sip.callid
+    const totag = b_1.sip.tags.local
+    const fromtag = b_1.sip.tags.remote
+    const referto = `sip:1000@dummy.com?Replaces=${callid}%3Bto-tag%3D${totag}%3Bfrom-tag%3D${fromtag}`
     req.setparsedheader( "refer-to", { "uri": referto } )
 
     b_2.referauthrequired = false

package/test/interface/serverconnect.js

@@ -1,79 +0,0 @@
-
-const prtp = require( "@babblevoice/projectrtp" )
-const node = require( "@babblevoice/projectrtp/lib/node" )
-const expect = require( "chai" ).expect
-const call = require( "../../lib/call" )
-
-/**
- * Test file to run tests acting as a remote note. Starts a babble-rtp node in the background
- * before any tests begin then runs tests to open, play, polly etc.
- */
-describe( "server connect interface", () => {
-
-  before( async () => {
-    const host = "127.0.0.1"
-    const port = 9002
-    await prtp.projectrtp.node.listen( host, port )
-    prtp.projectrtp.server.addnode( { host, port} )
-    
-  } )
-
-  after( () => {
-    prtp.projectrtp.server.clearnodes()
-    node.interface.destroy()
-  } )
-
-  /**
-   * Primarily testing waitforanyevent and related event handling functions.
-   */
-  it( "server connect and open channel", async function () {
-    this.timeout( 7000 )
-    this.slow( 5000 )
-
-    const totalotherchannelcount = 100
-    let chanclosecount = 0
-    let allchannelsclosedresolve
-    const allchannelsclosed = new Promise( resolve => allchannelsclosedresolve = resolve )
-    const onclose = ( e ) => {
-      if( "close" == e.action ) chanclosecount++
-      if( totalotherchannelcount == chanclosecount ) allchannelsclosedresolve()
-    }
-
-    // A very short wav file
-    prtp.projectrtp.tone.generate( "350+440*0.5:100", "/tmp/serverconnecttestwavghghgh.wav" )
-    prtp.projectrtp.tone.generate( "350+440*0.5:100", "/tmp/otherserverconnecttestwavghhh.wav" )
-
-    const channels = []
-    for( let i = 0; totalotherchannelcount > i; i++ ) {
-      channels.push( await prtp.projectrtp.openchannel( onclose ) )
-    }
-
-    for( let i = 0; 3 > i; i++ ) {
-      const ourcall = new call()
-  
-      const chan = await prtp.projectrtp.openchannel( ourcall._handlechannelevents.bind( ourcall ) )
-
-      ourcall._em.on( "channel", ( e ) => {
-        /* For this test we don't want the call object to run our hangup 
-        handlers as they are  more complex than we are trying to test here */
-        if( "close" == e.event.action ) e.event.action = ""
-       } )
-  
-      chan.play( { "interupt":true, "files": [ { "wav": "/tmp/serverconnecttestwavghghgh.wav" }, { "wav": "/tmp/otherserverconnecttestwavghhh.wav" } ] } )
-
-      await ourcall.waitforanyevent( { "action": "play", "event": "start", "reason": "new" } )
-      await ourcall.waitforanyevent( { "action": "play", "event": "end", "reason": /^((?!replaced).)*$/ } )
-
-      chan.close()
-    }
-
-    for( const chan of channels ) {
-      chan.close()
-    }
-
-    if( 0 != totalotherchannelcount )
-    await allchannelsclosed
-    expect( chanclosecount ).to.equal( totalotherchannelcount )
-  } )
-
-} )