@babblevoice/projectrtp 2.4.1 → 2.4.3

package/.github/workflows/buildimage.yaml

@@ -6,13 +6,11 @@ on:
   push:
     branches:
       - 'main'
-      - 'dev'
     tags:
       - 'v*.*.*'
   pull_request:
     branches:
       - 'main'
-      - 'dev'
 
 #GH
 permissions:
@@ -27,17 +25,30 @@ jobs:
         uses: actions/checkout@v3
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v2        
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Build and export to Docker
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          load: true
+          tags: docker.io/tinpotnick/projectrtp:test
+
+      - name: Test
+        # Use --exit so we don't hang a test on exception
+        run: |
+          docker run --rm docker.io/tinpotnick/projectrtp:test /bin/sh -c 'npm run github:check'
+
       - name: Docker meta
         id: ourdockertags
         uses: docker/metadata-action@v3
@@ -56,7 +67,7 @@ jobs:
             type=sha
     
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           platforms: linux/amd64,linux/arm64

package/lib/node.js

@@ -117,7 +117,7 @@ class rtpnode {
    * @returns { void }
    */
   _onsocketconnect( /* sock */ ) {
-    console.log( "Connected to " + this.host + ":" + this.port )
+    //console.log( "Connected to " + this.host + ":" + this.port )
     this.send( {}, this.connection )
     this._onsocketreadypromiseresolve( this )
     this._reconnecttime = 500 /* mS */

package/lib/server.js

@@ -267,7 +267,7 @@ class channel {
     if( "function" == typeof options ) {
       cb = options
       options = {}
-    }
+    } else if ( !options ) options = {}
 
     options.channel = "open"
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/projectrtp",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "A scalable Node addon RTP server",
   "main": "index.js",
   "directories": {
@@ -9,7 +9,8 @@
     "test": "test"
   },
   "scripts": {
-    "test": "./node_modules/mocha/bin/_mocha --recursive --check-leaks",
+    "test": "./node_modules/mocha/bin/_mocha test/**/*.js --check-leaks",
+    "github:check": "node test/basictests.js; npm update; npm test",
     "check": "tsc --checkJs --noEmit --target es6 --module commonjs --skipLibCheck *.js test/**/*.js; ./node_modules/eslint/bin/eslint.js ./",
     "docs": "jsdoc -c jsdoc.conf.json ./README.md",
     "stress": "node stress/index.js",

package/src/projectrtpchannel.cpp

@@ -652,40 +652,20 @@ bool projectrtpchannel::checkfordtmf( rtppacket *src ) {
       uint8_t event = pl[ 0 ] & 0x7f;
 
       if( event <= 16 ) {
-        bool sendteleevent = false;
-        bool start = false;
-
         /* Test for start */
-        if( 0 == endbit &&
-            0 == this->lasttelephoneeventsn ) {
-          start = true;
-        }
-
-        if( 0 == endbit &&
-            0 != this->lasttelephoneeventsn && 
-              event != this->lasttelephoneevent
-             ) {
-          /* Did we lose the last end of event */
-          this->lasttelephoneeventsn = 0;
-          sendteleevent = true;
-        } else if( 1 == endbit &&
-                   0 != this->lasttelephoneeventsn ) {
-          sendteleevent = true;
-        }
-
-        if( sendteleevent ) this->sendtelevent();
-
-        if( start ) {
+        if( 0 == endbit ) {
           this->lasttelephoneeventsn = sn;
           this->lasttelephoneevent = event;
-        } else if( 1 == endbit ) {
+        } else if( 1 == endbit &&
+                   0 != this->lasttelephoneeventsn ) {
           this->lasttelephoneeventsn = 0;
+          this->sendtelevent();
         }
       }
     }
     return true;
   } else if( 0 != this->lasttelephoneeventsn &&
-             abs( static_cast< long long int >( sn - this->lasttelephoneeventsn ) ) > MAXDTMFSNDIFFERENCE ) {
+             abs( static_cast< long long int > ( sn - this->lasttelephoneeventsn ) ) > MAXDTMFSNDIFFERENCE ) {
     /* timeout on waiting for end packet */
     this->sendtelevent();
     this->lasttelephoneeventsn = 0;

package/src/projectrtpchannel.h

@@ -40,10 +40,16 @@ class projectchannelmux;
 #define OUTBUFFERPACKETCOUNT 16
 
 /* 
-   The SN difference between receiving the first DTMF EV and when we consider we have lost all end events.
-   Delay = MAXDTMFSNDIFFERENCE * 20mS
+  The SN difference between receiving the first DTMF EV and when we consider we have lost all end events.
+  Delay = MAXDTMFSNDIFFERENCE * 20mS
+
+  rfc2833 - 3.6: An audio source SHOULD start transmitting event packets as soon as it
+       recognizes an event and every 50 ms thereafter or the packet interval
+       for the audio codec used for this session, if known. 
+        This means our ts will not stay in sync with our sequence number - which increments 
+        with every packet.
 */
-#define MAXDTMFSNDIFFERENCE 75
+#define MAXDTMFSNDIFFERENCE 6
 
 
 /*

package/src/projectrtpnodemain.cpp

@@ -30,7 +30,7 @@ int32_t endport = 20000;
 
 void boost::throw_exception( std::exception const & e ) {
   std::string err = boost::diagnostic_information( e );
-  fprintf( stderr, err.c_str() );
+  fprintf( stderr, "%s", err.c_str() );
   exit( EXIT_FAILURE );
 }
 

package/test/basictests.js

@@ -0,0 +1,30 @@
+
+
+const prtp = require( "../index.js" )
+
+/**
+ * Very basic test - to run in release workflow before we install 
+ * dev dependancies - i.e. check we can run without dev dependancies.
+ */
+
+/**
+ * Test open a channel.
+ */
+async function testopen() {
+
+  
+  const chan = await prtp.projectrtp.openchannel()
+
+  try{
+    if( !chan ) throw new Error( "Bad channel" )
+    if( "number" !== typeof chan.local.port ) throw new Error( "Port doesn't look correct" )
+  } finally {
+    chan.close()
+  }
+}
+
+prtp.projectrtp.run()
+testopen()
+prtp.projectrtp.shutdown()
+
+

package/test/interface/projectrtpdtmf.js

@@ -24,7 +24,7 @@ function sendpayload( sendtime, pk, dstport, server ) {
 }
 
 /* helper functions */
-function sendpk( sn, sendtime, dstport, server, pt = 0, ts, ssrc ) {
+function sendpk( sn, ts, sendtime, dstport, server, pt = 0, ssrc ) {
 
   if( !ssrc ) ssrc = 25
   const pklength = 172
@@ -34,8 +34,6 @@ function sendpk( sn, sendtime, dstport, server, pt = 0, ts, ssrc ) {
     const payload = Buffer.alloc( pklength - 12 ).fill( projectrtp.codecx.linear162pcmu( sn ) & 0xff )
     const subheader = Buffer.alloc( 10 )
 
-    if( !ts ) ts = sn * 160
-
     subheader.writeUInt8( pt, 1 ) // payload type
     subheader.writeUInt16BE( ( sn ) % ( 2**16 ) )
     subheader.writeUInt32BE( ts, 2 )
@@ -121,15 +119,15 @@ describe( "dtmf", function() {
 
       /* send a packet every 20mS x 50 */
       for( let i = 0;  23 > i; i ++ ) {
-        sendpk( i, i*20, channel.local.port, server )
+        sendpk( i, i*160, i*20, channel.local.port, server )
       }
 
-      senddtmf( 23, 22 * 160, 23*20, channel.local.port, server, false, "4" )
-      senddtmf( 24, 22 * 160, 24*20, channel.local.port, server, false, "4" )
-      senddtmf( 25, 22 * 160, 25*20, channel.local.port, server, true, "4" )
+      senddtmf( 23, 22*160, 23*20, channel.local.port, server, false, "4" )
+      senddtmf( 24, 22*160, 24*20, channel.local.port, server, false, "4" )
+      senddtmf( 25, 22*160, 25*20, channel.local.port, server, true, "4" )
 
       for( let i = 26;  40 > i; i ++ ) {
-        sendpk( i, (i-3)*20, channel.local.port, server )
+        sendpk( i, i*160, (i-3)*20, channel.local.port, server )
       }
 
       setTimeout( () => channel.close(), 1000 )
@@ -180,7 +178,7 @@ describe( "dtmf", function() {
 
       /* send a packet every 20mS x 50 */
       for( let i = 0;  50 > i; i ++ ) {
-        sendpk( i, i*20, channel.local.port, server )
+        sendpk( i, i*160, i*20, channel.local.port, server )
       }
 
       setTimeout( () => channel.dtmf( "#1" ), 400 )
@@ -239,7 +237,7 @@ describe( "dtmf", function() {
 
     /* send a packet every 20mS x 70 */
     for( let i = 0;  50 > i; i ++ ) {
-      sendpk( i, i*20, channela.local.port, clienta )
+      sendpk( i, i*160, i*20, channela.local.port, clienta )
     }
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 400 ) } )
@@ -322,7 +320,7 @@ describe( "dtmf", function() {
 
     /* send a packet every 20mS x 50 */
     for( let i = 0;  50 > i; i ++ ) {
-      sendpk( i, i*20, channela.local.port, clienta )
+      sendpk( i, i*160, i*20, channela.local.port, clienta )
     }
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 100 ) } )
@@ -375,7 +373,7 @@ describe( "dtmf", function() {
 
       /* send a packet every 20mS x 50 */
       for( let i = 0;  13 > i; i ++ ) {
-        sendpk( i, i*20, channel.local.port, server )
+        sendpk( i, i*160, i*20, channel.local.port, server )
       }
 
       senddtmf( 13, 12 * 160, 13*20, channel.local.port, server, false, "4" )
@@ -384,7 +382,7 @@ describe( "dtmf", function() {
       // senddtmf( 15, 12 * 160, 15*20, channel.port, server, true, "4" )
 
       for( let i = 16;  23 > i; i ++ ) {
-        sendpk( i, (i-3)*20, channel.local.port, server )
+        sendpk( i, i*160, (i-3)*20, channel.local.port, server )
       }
 
       senddtmf( 23, 22 * 160, 23*20, channel.local.port, server, false, "5" )
@@ -392,7 +390,7 @@ describe( "dtmf", function() {
       senddtmf( 25, 22 * 160, 25*20, channel.local.port, server, true, "5" )
 
       for( let i = 26;  33 > i; i ++ ) {
-        sendpk( i, (i-6)*20, channel.local.port, server )
+        sendpk( i, i*160, (i-6)*20, channel.local.port, server )
       }
 
       setTimeout( () => channel.close(), 1000 )
@@ -432,20 +430,43 @@ describe( "dtmf", function() {
       expect( channel.echo() ).to.be.true
 
       /* send a packet every 20mS x 50 */
-      for( let i = 0;  13 > i; i ++ ) {
-        sendpk( i, i*20, channel.local.port, server )
-      }
-
-      senddtmf( 13, 12 * 160, 13*20, channel.local.port, server, false, "4" )
-      senddtmf( 14, 12 * 160, 14*20, channel.local.port, server, false, "4" )
+      sendpk( 0, 160, 0, channel.local.port, server )
+      sendpk( 1, 1*160, 1*20, channel.local.port, server )
+      sendpk( 2, 2*160, 2*20, channel.local.port, server )
+      sendpk( 3, 3*160, 3*20, channel.local.port, server )
+      sendpk( 4, 4*160, 4*20, channel.local.port, server )
+      sendpk( 5, 5*160, 5*20, channel.local.port, server )
+      sendpk( 6, 6*160, 6*20, channel.local.port, server )
+      sendpk( 7, 7*160, 7*20, channel.local.port, server )
+      sendpk( 8, 8*160, 8*20, channel.local.port, server )
+      sendpk( 9, 9*160, 9*20, channel.local.port, server )
+      sendpk( 10, 10*160, 10*20, channel.local.port, server )
+      sendpk( 11, 11*160, 11*20, channel.local.port, server )
+      sendpk( 12, 12*160, 12*20, channel.local.port, server )
+
+      senddtmf( 13, 13*160, 13*20, channel.local.port, server, false, "4" )
+      sendpk( 14, 13*160, 13*20, channel.local.port, server, 0 )
+      sendpk( 15, 14*160, 14*20, channel.local.port, server, 0 )
+
+      senddtmf( 16, (15*160)+10, (15*20)+10, channel.local.port, server, false, "4" )
+      sendpk( 17, 15*160, 15*20, channel.local.port, server, 0 )
+      sendpk( 18, 16*160, 16*20, channel.local.port, server, 0 )
       // Packet loss
-      // senddtmf( 15, 12 * 160, 15*20, channel.port, server, true, "4" )
-
-      for( let i = 17;  i < 17+75; i ++ ) {
-        sendpk( i, (i-3)*20, channel.local.port, server )
-      }
+      // senddtmf( 19, (16*160)+20, (16*20)+20, channel.local.port, server, true, "4" )
+
+      sendpk( 20, 17*160, 17*20, channel.local.port, server, 0 )
+      sendpk( 21, 18*160, 18*20, channel.local.port, server, 0 )
+      sendpk( 22, 19*160, 19*20, channel.local.port, server, 0 )
+      sendpk( 23, 20*160, 20*20, channel.local.port, server, 0 )
+      sendpk( 24, 21*160, 21*20, channel.local.port, server, 0 )
+      sendpk( 25, 22*160, 22*20, channel.local.port, server, 0 )
+      sendpk( 26, 23*160, 23*20, channel.local.port, server, 0 )
+      sendpk( 27, 24*160, 24*20, channel.local.port, server, 0 )
+      sendpk( 28, 25*160, 25*20, channel.local.port, server, 0 )
+      sendpk( 29, 26*160, 26*20, channel.local.port, server, 0 )
+      sendpk( 30, 27*160, 27*20, channel.local.port, server, 0 )
 
-      setTimeout( () => channel.close(), 2600 )
+      setTimeout( () => channel.close(), 1000 )
 
     } )
 
@@ -456,7 +477,7 @@ describe( "dtmf", function() {
       { action: "close" }
     ]
 
-    expect( receviedpkcount ).to.be.above( 83 )
+    expect( receviedpkcount ).to.be.above( 15 )
     expect( receivedmessages.length ).to.equal( 2 )
     expect( receivedmessages[ 0 ] ).to.deep.include( expectedmessages[ 0 ] )
     expect( receivedmessages[ 1 ] ).to.deep.include( expectedmessages[ 1 ] )
@@ -521,27 +542,62 @@ describe( "dtmf", function() {
     expect( channela.mix( channelb ) ).to.be.true
 
     /* send a packet every 20mS x 50 */
-    for( let i = 0;  13 > i; i ++ ) {
-      sendpk( i, i*20, channela.local.port, endpointa )
-    }
-
-    senddtmf( 13, 12 * 160, 13*20, channela.local.port, endpointa, false, "4" )
-    senddtmf( 14, 12 * 160, 14*20, channela.local.port, endpointa, false, "4" )
-    senddtmf( 15, 12 * 160, 15*20, channela.local.port, endpointa, true, "4" )
-
-    for( let i = 16;  23 > i; i ++ ) {
-      sendpk( i, (i-3)*20, channela.local.port, endpointa )
-    }
-
-    senddtmf( 23, 22 * 160, 23*20, channela.local.port, endpointa, false, "5" )
-    senddtmf( 24, 22 * 160, 24*20, channela.local.port, endpointa, false, "5" )
-    senddtmf( 25, 22 * 160, 25*20, channela.local.port, endpointa, true, "5" )
-
-    for( let i = 26;  50 > i; i ++ ) {
-      sendpk( i, (i-6)*20, channela.local.port, endpointa )
-    }
-
-    await new Promise( ( r ) => { setTimeout( () => r(), 1500 ) } )
+    sendpk( 0, 0, 0, channela.local.port, endpointa )
+    sendpk( 1, 1*160, 1*20, channela.local.port, endpointa )
+    sendpk( 2, 2*160, 2*20, channela.local.port, endpointa )
+    sendpk( 3, 3*160, 3*20, channela.local.port, endpointa )
+    sendpk( 4, 4*160, 4*20, channela.local.port, endpointa )
+    sendpk( 5, 5*160, 5*20, channela.local.port, endpointa )
+    sendpk( 6, 6*160, 6*20, channela.local.port, endpointa )
+    sendpk( 7, 7*160, 7*20, channela.local.port, endpointa )
+    sendpk( 8, 8*160, 8*20, channela.local.port, endpointa )
+    sendpk( 9, 9*160, 9*20, channela.local.port, endpointa )
+    sendpk( 10, 10*160, 10*20, channela.local.port, endpointa )
+    sendpk( 11, 11*160, 11*20, channela.local.port, endpointa )
+    sendpk( 12, 12*160, 12*20, channela.local.port, endpointa )
+
+    senddtmf( 13, 13*160, 13*20, channela.local.port, endpointa, false, "4" )
+    sendpk( 14, 13*160, 13*20, channela.local.port, endpointa, 0 )
+    sendpk( 15, 14*160, 14*20, channela.local.port, endpointa, 0 )
+    senddtmf( 16, (15*160)+10, (15*20)+10, channela.local.port, endpointa, false, "4" )
+    sendpk( 17, 15*160, 15*20, channela.local.port, endpointa, 0 )
+    sendpk( 18, 16*160, 16*20, channela.local.port, endpointa, 0 )
+    senddtmf( 19, (17*160)+20, (17*20)+20, channela.local.port, endpointa, true, "4" )
+    sendpk( 20, 17*160, 17*20, channela.local.port, endpointa, 0 )
+    sendpk( 21, 18*160, 18*20, channela.local.port, endpointa, 0 )
+    senddtmf( 22, (18*160)+30, (18*20)+30, channela.local.port, endpointa, true, "4" )
+    sendpk( 23, 19*160, 19*20, channela.local.port, endpointa, 0 )
+    sendpk( 24, 20*160, 20*20, channela.local.port, endpointa, 0 )
+    sendpk( 25, 21*160, 21*20, channela.local.port, endpointa, 0 )
+    sendpk( 26, 22*160, 22*20, channela.local.port, endpointa, 0 )
+    sendpk( 27, 23*160, 23*20, channela.local.port, endpointa, 0 )
+    sendpk( 28, 24*160, 24*20, channela.local.port, endpointa, 0 )
+    sendpk( 29, 25*160, 25*20, channela.local.port, endpointa, 0 )
+
+    senddtmf( 30, 26*160, 26*20, channela.local.port, endpointa, false, "5" )
+    sendpk( 31, 26*160, 26*20, channela.local.port, endpointa, 0 )
+    sendpk( 32, 27*160, 27*20, channela.local.port, endpointa, 0 )
+    senddtmf( 33, (27*160)+10, (27*20)+10, channela.local.port, endpointa, false, "5" )
+    sendpk( 34, 28*160, 28*20, channela.local.port, endpointa, 0 )
+    sendpk( 35, 29*160, 28*20, channela.local.port, endpointa, 0 )
+    senddtmf( 36, (28*160)+20, (28*20)+20, channela.local.port, endpointa, true, "5" )
+    sendpk( 37, 30*160, 29*20, channela.local.port, endpointa, 0 )
+    sendpk( 38, 31*160, 30*20, channela.local.port, endpointa, 0 )
+
+    senddtmf( 39, (38*160)+30, (30*20)+30, channela.local.port, endpointa, true, "5" )
+    sendpk( 40, 32*160, 31*20, channela.local.port, endpointa, 0 )
+    sendpk( 41, 33*160, 32*20, channela.local.port, endpointa, 0 )
+
+    sendpk( 42, 34*160, 33*20, channela.local.port, endpointa, 0 )
+    sendpk( 43, 35*160, 34*20, channela.local.port, endpointa, 0 )
+    sendpk( 44, 36*160, 35*20, channela.local.port, endpointa, 0 )
+    sendpk( 45, 37*160, 36*20, channela.local.port, endpointa, 0 )
+    sendpk( 46, 38*160, 37*20, channela.local.port, endpointa, 0 )
+    sendpk( 47, 39*160, 38*20, channela.local.port, endpointa, 0 )
+    sendpk( 48, 40*160, 39*20, channela.local.port, endpointa, 0 )
+    sendpk( 49, 51*160, 40*20, channela.local.port, endpointa, 0 )
+
+    await new Promise( ( r ) => { setTimeout( () => r(), 1400 ) } )
 
     channela.close()
     endpointa.close()
@@ -551,22 +607,20 @@ describe( "dtmf", function() {
 
     expect( endpointapkcount ).to.be.within( 30, 51 )
     expect( endpointbpkcount ).to.be.within( 30, 51 )
-    expect( dtmfpkcount ).to.equal( 6 )
-
-    const expectedmessages = [
-      { action: "mix", event: "start" },
-      { action: "telephone-event", event: "4" },
-      { action: "telephone-event", event: "5" },
-      { action: "mix", event: "finished" },
-      { action: "close" }
-    ]
+    expect( dtmfpkcount ).to.be.within( 4, 8 )
 
     expect( receivedmessages.length ).to.equal( 5 )
-    expect( receivedmessages[ 0 ] ).to.deep.include( expectedmessages[ 0 ] )
-    expect( receivedmessages[ 1 ] ).to.deep.include( expectedmessages[ 1 ] )
-    expect( receivedmessages[ 2 ] ).to.deep.include( expectedmessages[ 2 ] )
-    expect( receivedmessages[ 3 ] ).to.deep.include( expectedmessages[ 3 ] )
-    expect( receivedmessages[ 4 ] ).to.deep.include( expectedmessages[ 4 ] )
+
+    expect( receivedmessages[ 0 ].action ).to.equal( "mix" )
+    expect( receivedmessages[ 1 ].action ).to.equal( "telephone-event" )
+    expect( receivedmessages[ 2 ].action ).to.equal( "telephone-event" )
+    expect( receivedmessages[ 3 ].action ).to.equal( "mix" )
+    expect( receivedmessages[ 4 ].action ).to.equal( "close" )
+
+    expect( receivedmessages[ 0 ].event ).to.equal( "start" )
+    expect( receivedmessages[ 1 ].event ).to.equal( "4" )
+    expect( receivedmessages[ 2 ].event ).to.equal( "5" )
+    expect( receivedmessages[ 3 ].event ).to.equal( "finished" )
 
   } )
 
@@ -656,25 +710,70 @@ describe( "dtmf", function() {
     expect( channela.mix( channelc ) ).to.be.true
 
     /* send a packet every 20mS x 50 */
-    for( let i = 0;  13 > i; i ++ ) {
-      sendpk( i, i*20, channela.local.port, endpointa )
-    }
-
-    senddtmf( 13, 12 * 160, 13*20, channela.local.port, endpointa, false, "4" )
-    senddtmf( 14, 12 * 160, 14*20, channela.local.port, endpointa, false, "4" )
-    senddtmf( 15, 12 * 160, 15*20, channela.local.port, endpointa, true, "4" )
-
-    for( let i = 16;  23 > i; i ++ ) {
-      sendpk( i, (i-3)*20, channela.local.port, endpointa )
-    }
-
-    senddtmf( 23, 22 * 160, 23*20, channela.local.port, endpointa, false, "5" )
-    senddtmf( 24, 22 * 160, 24*20, channela.local.port, endpointa, false, "5" )
-    senddtmf( 25, 22 * 160, 25*20, channela.local.port, endpointa, true, "5" )
-
-    for( let i = 26;  50 > i; i ++ ) {
-      sendpk( i, (i-6)*20, channela.local.port, endpointa )
-    }
+    /* NO FOR LOOPS for explicit readablity of the test */
+    sendpk( 0, 0, 0, channela.local.port, endpointa )
+    sendpk( 1, 1*160, 20, channela.local.port, endpointa )
+    sendpk( 2, 2*160, 2*20, channela.local.port, endpointa )
+    sendpk( 3, 3*160, 3*20, channela.local.port, endpointa )
+    sendpk( 4, 4*160, 4*20, channela.local.port, endpointa )
+    sendpk( 5, 5*160, 5*20, channela.local.port, endpointa )
+    sendpk( 6, 6*160, 6*20, channela.local.port, endpointa )
+    sendpk( 7, 7*160, 7*20, channela.local.port, endpointa )
+    sendpk( 8, 8*160, 8*20, channela.local.port, endpointa )
+    sendpk( 9, 9*160, 9*20, channela.local.port, endpointa )
+    sendpk( 10, 10*160, 10*20, channela.local.port, endpointa )
+    sendpk( 11, 11*160, 11*20, channela.local.port, endpointa )
+    sendpk( 12, 12*160, 12*20, channela.local.port, endpointa )
+
+    /* rfc2833 - 3.6: An audio source SHOULD start transmitting event packets as soon as it
+       recognizes an event and every 50 ms thereafter or the packet interval
+       for the audio codec used for this session, if known. 
+        This means our ts will not stay in sync with our sequence number - which increments 
+        with every packet.
+        senddtmf( sn, ts, sendtime, port, socket, endofevent, event )
+        sendpk( sn, sendtime, port, socket, pt, ts, ssrc ) */
+    senddtmf( 13, 13*160, 13*20, channela.local.port, endpointa, false, "4" )
+    sendpk( 14, 13*160, 13*20, channela.local.port, endpointa, 0 )
+    sendpk( 15, 14*160, 14*20, channela.local.port, endpointa, 0 )
+    senddtmf( 16, (16*160), (13*20)+50, channela.local.port, endpointa, false, "4" )
+    sendpk( 17, 15*160, 15*20, channela.local.port, endpointa, 0 )
+    sendpk( 18, 16*160, 16*20, channela.local.port, endpointa, 0 )
+    senddtmf( 19, (19*160), (13*20)+100, channela.local.port, endpointa, true, "4" )
+    sendpk( 20, 17*160, 17*20, channela.local.port, endpointa, 0 )
+    sendpk( 21, 18*160, 18*20, channela.local.port, endpointa, 0 )
+    senddtmf( 22, (22*160)+20, (13*20)+150, channela.local.port, endpointa, true, "4" )
+    sendpk( 23, 19*160, 19*20, channela.local.port, endpointa, 0 )
+
+    senddtmf( 24, 20*160, 20*20, channela.local.port, endpointa, false, "5" )
+    sendpk( 25, 20*160, 20*20, channela.local.port, endpointa, 0 )
+    sendpk( 26, 21*160, 21*20, channela.local.port, endpointa, 0 )
+    senddtmf( 27, (27*160), (20*20)+50, channela.local.port, endpointa, false, "5" )
+    sendpk( 28, 22*160, 22*20, channela.local.port, endpointa, 0 )
+    sendpk( 29, 23*160, 23*20, channela.local.port, endpointa, 0 )
+    senddtmf( 30, (30*160), (20*20)+100, channela.local.port, endpointa, true, "5" )
+    sendpk( 31, 24*160, 24*20, channela.local.port, endpointa, 0 )
+    sendpk( 32, 25*160, 25*20, channela.local.port, endpointa, 0 )
+    senddtmf( 33, (33*160), (20*20)+150, channela.local.port, endpointa, true, "5" )
+    sendpk( 34, 26*160, 26*20, channela.local.port, endpointa, 0 )
+    sendpk( 35, 27*160, 27*20, channela.local.port, endpointa, 0 )
+    sendpk( 36, 28*160, 28*20, channela.local.port, endpointa, 0 )
+    sendpk( 37, 29*160, 29*20, channela.local.port, endpointa, 0 )
+    sendpk( 38, 30*160, 30*20, channela.local.port, endpointa, 0 )
+    sendpk( 39, 31*160, 31*20, channela.local.port, endpointa, 0 )
+    sendpk( 40, 32*160, 32*20, channela.local.port, endpointa, 0 )
+    sendpk( 41, 33*160, 33*20, channela.local.port, endpointa, 0 )
+    sendpk( 42, 34*160, 34*20, channela.local.port, endpointa, 0 )
+    sendpk( 43, 35*160, 35*20, channela.local.port, endpointa, 0 )
+    sendpk( 44, 36*160, 36*20, channela.local.port, endpointa, 0 )
+    sendpk( 45, 37*160, 37*20, channela.local.port, endpointa, 0 )
+    sendpk( 46, 38*160, 38*20, channela.local.port, endpointa, 0 )
+    sendpk( 47, 39*160, 39*20, channela.local.port, endpointa, 0 )
+    sendpk( 48, 40*160, 40*20, channela.local.port, endpointa, 0 )
+    sendpk( 49, 41*160, 41*20, channela.local.port, endpointa, 0 )
+    sendpk( 50, 42*160, 42*20, channela.local.port, endpointa, 0 )
+    sendpk( 51, 43*160, 43*20, channela.local.port, endpointa, 0 )
+    sendpk( 52, 44*160, 44*20, channela.local.port, endpointa, 0 )
+    sendpk( 53, 45*160, 45*20, channela.local.port, endpointa, 0 )
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 1200 ) } )
 
@@ -691,22 +790,22 @@ describe( "dtmf", function() {
 
     // 3 after we return to the event loop and enter the callback with close event.
     expect( dtmfapkcount ).to.equal( 0 )
-    expect( dtmfbpkcount ).to.equal( 6 )
-    expect( dtmfcpkcount ).to.equal( 6 )
-
-    const expectedmessages = [
-      { action: "mix", event: "start" }, //b
-      { action: "mix", event: "start" }, //c
-      { action: "telephone-event", event: "4" },
-      { action: "telephone-event", event: "5" },
-      { action: "mix", event: "finished" },
-      { action: "close" }
-    ]
+    expect( dtmfbpkcount ).to.be.within( 4, 8 )
+    expect( dtmfcpkcount ).to.be.within( 4, 8 )
+
+    expect( receveiedmessages[ 0 ].action ).to.equal( "mix" )
+    expect( receveiedmessages[ 1 ].action ).to.equal( "mix" )
+    expect( receveiedmessages[ 2 ].action ).to.equal( "telephone-event" )
+    expect( receveiedmessages[ 3 ].action ).to.equal( "telephone-event" )
+    expect( receveiedmessages[ 4 ].action ).to.equal( "mix" )
+    expect( receveiedmessages[ 5 ].action ).to.equal( "close" )
+
+    expect( receveiedmessages[ 0 ].event ).to.equal( "start" )
+    expect( receveiedmessages[ 1 ].event ).to.equal( "start" )
+    expect( receveiedmessages[ 2 ].event ).to.equal( "4" )
+    expect( receveiedmessages[ 3 ].event ).to.equal( "5" )
+    expect( receveiedmessages[ 4 ].event ).to.equal( "finished" )
 
-    for( let i = 0; i <  expectedmessages.length; i++ ) {
-      expect( expectedmessages[ i ].action ).to.equal( receveiedmessages[ i ].action )
-      if( expectedmessages[ i ].event ) expect( receveiedmessages[ i ].event ).to.equal( receveiedmessages[ i ].event )
-    }
   } )
 
   it( "DTMF captured not working", async function() {
@@ -747,29 +846,29 @@ describe( "dtmf", function() {
 
       // Event "3"
       const dstport = channel.local.port
-      sendpk( 948, 0, dstport, server, 0, 148480, 518218235 )
+      sendpk( 948, 148480, 0, dstport, server, 0, 518218235 )
       sendpayload( 20, fromstr( "80 e5 03 b5 00 02 44 a0 1e e3 61 fb 03 0a 00 a0 4c d1" ), dstport, server )
-      sendpk( 950, 40, dstport, server, 0, 148800, 518218235 )
+      sendpk( 950, 148800, 40, dstport, server, 0, 518218235 )
       sendpayload( 60, fromstr( "80 65 03 b7 00 02 44 a0 1e e3 61 fb 03 0a 01 40 25 b8" ), dstport, server )
-      sendpk( 952, 80, dstport, server, 0, 149120, 518218235 )
+      sendpk( 952, 149120, 80, dstport, server, 0, 518218235 )
       sendpayload( 100, fromstr( "80 65 03 b9 00 02 44 a0 1e e3 61 fb 03 0a 01 e0 e8 81" ), dstport, server )
-      sendpk( 954, 120, dstport, server, 0, 149440, 518218235 )
+      sendpk( 954, 149440,120, dstport, server, 0, 518218235 )
       sendpayload( 140, fromstr( "80 65 03 bb 00 02 44 a0 1e e3 61 fb 03 0a 02 80 e2 74" ), dstport, server )
-      sendpk( 956, 160, dstport, server, 0, 149760, 518218235 )
+      sendpk( 956, 149760, 160, dstport, server, 0, 518218235 )
       sendpayload( 180, fromstr( "80 65 03 bd 00 02 44 a0 1e e3 61 fb 03 0a 03 20 1f bb" ), dstport, server )
-      sendpk( 958, 200, dstport, server, 0, 150080, 518218235 )
+      sendpk( 958, 150080, 200, dstport, server, 0, 518218235 )
       sendpayload( 220, fromstr( "80 65 03 bf 00 02 44 a0 1e e3 61 fb 03 0a 03 c0 13 0c" ), dstport, server )
-      sendpk( 960, 240, dstport, server, 0, 150400, 518218235 )
+      sendpk( 960, 150400,240, dstport, server, 0, 518218235 )
       sendpayload( 260, fromstr( "80 65 03 c1 00 02 44 a0 1e e3 61 fb 03 0a 04 60 2e bf" ), dstport, server )
-      sendpk( 962, 280, dstport, server, 0, 150720, 518218235 )
+      sendpk( 962, 150720, 280, dstport, server, 0, 518218235 )
       sendpayload( 300, fromstr( "80 65 03 c3 00 02 44 a0 1e e3 61 fb 03 8a 04 60 05 c1" ), dstport, server )
       sendpayload( 320 ,fromstr( "80 65 03 c4 00 02 44 a0 1e e3 61 fb 03 8a 04 60 bb 69" ), dstport, server )
-      sendpk( 965, 340, dstport, server, 0, 151200, 518218235 )
+      sendpk( 965, 151200, 340, dstport, server, 0, 518218235 )
       sendpayload( 360, fromstr( "80 65 03 c6 00 02 44 a0 1e e3 61 fb 03 8a 04 60 1e 27" ), dstport, server )
-      sendpk( 967, 380, dstport, server, 0, 151520, 518218235 )
-      sendpk( 968, 400, dstport, server, 0, 151680, 518218235 )
-      sendpk( 969, 420, dstport, server, 0, 151840, 518218235 )
-      sendpk( 970, 440, dstport, server, 0, 152000, 518218235 )
+      sendpk( 967, 151520, 380, dstport, server, 0, 518218235 )
+      sendpk( 968, 151680, 400, dstport, server, 0, 518218235 )
+      sendpk( 969, 151840, 420, dstport, server, 0, 518218235 )
+      sendpk( 970, 152000, 440, dstport, server, 0, 518218235 )
 
       setTimeout( () => channel.close(), 25*20 )
     } )

package/test/interface/projectrtprecord.js

@@ -90,6 +90,7 @@ describe( "record", function() {
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 1300 ) } )
     channel.close()
+    await new Promise( resolve => { server.on( "close", resolve ) } )
 
     /* Now test the file */
     const wavinfo = prtp.projectrtp.soundfile.info( "/tmp/ourrecording.wav" )
@@ -135,9 +136,6 @@ describe( "record", function() {
 
     server.bind()
 
-    let done
-    const finished = new Promise( ( r ) => { done = r } )
-
     let expectedmessagecount = 0
     const expectedmessages = [
       { action: "record", file: "/tmp/ourstoppedrecording.wav", event: "recording" },
@@ -151,7 +149,6 @@ describe( "record", function() {
         expect( d ).to.deep.include( expectedmessages[ expectedmessagecount ] )
         expectedmessagecount++
         if( "close" === d.action ) {
-          done()
           server.close()
         }
       } )
@@ -175,7 +172,7 @@ describe( "record", function() {
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 1300 ) } )
     channel.close()
-    await finished
+    await new Promise( resolve => { server.on( "close", resolve ) } )
 
     /* Now test the file */
     const wavinfo = prtp.projectrtp.soundfile.info( "/tmp/ourstoppedrecording.wav" )
@@ -203,16 +200,12 @@ describe( "record", function() {
     this.timeout( 1500 )
     this.slow( 1200 )
 
-    let done
-    const finished = new Promise( ( r ) => { done = r } )
-
     server.bind()
     server.on( "listening", async function() {
 
       channel = await prtp.projectrtp.openchannel( { "remote": { "address": "localhost", "port": server.address().port, "codec": 0 } }, function( d ) {
         if( "close" === d.action ) {
           server.close()
-          done()
         }
       } )
 
@@ -238,8 +231,7 @@ describe( "record", function() {
 
     await new Promise( ( r ) => { setTimeout( () => r(), 1300 ) } )
     channel.close()
-
-    await finished
+    await new Promise( resolve => { server.on( "close", resolve ) } )
 
     /* Now test the file */
     const wavinfo = prtp.projectrtp.soundfile.info( "/tmp/ourpausedrecording.wav" )
@@ -248,12 +240,12 @@ describe( "record", function() {
     expect( wavinfo.samplerate ).to.equal( 8000 )
     expect( wavinfo.byterate ).to.equal( 32000 )
     expect( wavinfo.bitdepth ).to.equal( 16 )
-    expect( wavinfo.chunksize ).to.be.within( 3000, 7000 ) /* 200mS of audio */
+    expect( wavinfo.chunksize ).to.be.within( 2500, 7000 ) /* 200mS of audio */
     expect( wavinfo.fmtchunksize ).to.equal( 16 )
-    expect( wavinfo.subchunksize ).to.be.within( 3000, 7000 )
+    expect( wavinfo.subchunksize ).to.be.within( 2500, 7000 )
 
     const stats = fs.statSync( "/tmp/ourpausedrecording.wav" )
-    expect( stats.size ).to.be.within( 3000, 7000 )
+    expect( stats.size ).to.be.within( 2500, 7000 )
 
   } )