@babblevoice/projectrtp 2.6.0 → 2.6.2

package/Dockerfile

@@ -11,12 +11,12 @@ RUN apk add --no-cache \
     cd libilbc-3.0.4; \
     cmake . -DCMAKE_INSTALL_LIBDIR=/lib -DCMAKE_INSTALL_INCLUDEDIR=/usr/include; cmake --build .; cmake --install .; 
     
-WORKDIR /usr/local/lib/node_modules/@babblevoice/projectrtp/
+WORKDIR /usr/src/projectrtp
 COPY . .
 
-RUN npm ci --no-optional --production && \
-    rm -fr src/build/Release/obj.target && \
-    rm -fr build/Release/obj.target/projectrtp
+# a more correct to install this module into the global location
+RUN npm install --production --build-from-source && \
+    npm install -g . 
 
 FROM alpine:3.21 AS app
 

package/README.md

@@ -66,7 +66,7 @@ If you wish to build outsode of a Docker image, there are npm target scripts for
 
 ```bash
 docker buildx prune
-docker buildx build --platform linux/amd64,linux/arm64 -t tinpotnick/projectrtp:2.5.37_beta22 . --push
+docker buildx build --platform linux/amd64,linux/arm64 -t tinpotnick/projectrtp:2.6.2 . --push
 ```
 
 ### Dev build

package/binding.gyp

@@ -33,12 +33,14 @@
         [
           "build_type=='prod'", {
             "cflags": [
-              "-O3"
+              "-O3",
+              "-g"
             ]
           }
         ]
       ],
       "ldflags": [
+        "-g",
         "-Wl,-z,relro",
         "-Wl,-z,now",
         "-Wl,--export-dynamic" ],

package/lib/server.js

@@ -103,8 +103,9 @@ class channel {
   openresolve
 
   /**
+   * listening or connection
    * @private
-   * @type { string }
+   * @type { "l" | "c" }
    */
   ctype
 
@@ -346,6 +347,7 @@ class channel {
       const newchannel = new channel()
       if( cb ) newchannel.em.on( "all", cb )
 
+      newchannel.ctype = this.ctype
       newchannel.connection = this.connection
       newchannel.channels = this.channels
       newchannel.channels.push( newchannel )
@@ -541,7 +543,7 @@ class channel {
   }
 
   /**
-   * We have received teh open confirm message so we should action it
+   * We have received the open confirm message so we should action it
    * @private
    * @param { object } msg
    * @returns { boolean } - is further processing required
@@ -592,14 +594,17 @@ class channel {
   }
 
   #cleanupsharedchannels() {
-    if( this.channels ) { 
-      // adjust with filter
-      const index = this.channels.indexOf( this )
-      if( -1 < index ) this.channels.splice( index, 1 )
-      if( this.ctype == "c" && 0 === this.channels.length && this.connection.sock ) {
-        this.connection.sock.destroy()
-      }
-    }
+    if( !this.channels ) return
+
+    // adjust with filter
+    const index = this.channels.indexOf( this )
+    if( -1 < index ) this.channels.splice( index, 1 )
+
+    if( "c" !== this.ctype ) return
+    if( 0 !== this.channels.length ) return
+    if( !this.connection.sock ) return
+
+    this.connection.sock.destroy()
   }
 
   #haserror( msg ) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/projectrtp",
-  "version": "2.6.0",
+  "version": "2.6.2",
   "description": "A scalable Node addon RTP server",
   "main": "index.js",
   "directories": {

package/src/projectrtpchannel.cpp

@@ -83,6 +83,7 @@ projectrtpchannel::projectrtpchannel( unsigned short port ):
   ssrcin( 0 ),
   ssrcout( 0 ),
   tsout( 0 ),
+  eventtsout( 0 ),
   snout( 0 ),
   send( true ),
   recv( true ),
@@ -710,20 +711,33 @@ bool projectrtpchannel::recordercompleted( const channelrecorder::pointer& rec )
 }
 
 /**
- * @brief Helper function for checkfordtmf - signal back to our control server that an event has been received.
- * 
+ * Helper function for checkfordtmf - 
+ * 1. stop player if set to stop on event
+ * 2. signal back to our control server that an event has been received.
+ * 3. forward to other channels we are mixing with
  */
 static char dtmfchars[] = { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '#', 'A', 'B', 'C', 'D', 'F' };
 void projectrtpchannel::sendtelevent( void ) {
   auto self = shared_from_this();
-  SpinLockGuard guard( this->playerlock );
 
-  if( this->player && this->player->doesinterupt() ) {
-    postdatabacktojsfromthread( self, "play", "end", "telephone-event" );
-    this->player = nullptr;
+  {
+    SpinLockGuard guard( this->playerlock );
+
+    if( this->player && this->player->doesinterupt() ) {
+      postdatabacktojsfromthread( self, "play", "end", "telephone-event" );
+      this->player = nullptr;
+    }
   }
 
   postdatabacktojsfromthread( self, "telephone-event", std::string( 1, dtmfchars[ this->lasttelephoneevent ] ) );
+
+  if( !this->mixing ) return;
+
+  {
+    SpinLockGuard guard( this->mixerlock );
+    this->mixer->senddtmf( self, dtmfchars[ this->lasttelephoneevent ] );
+  }
+
 }
 /*
 ## checkfordtmf
@@ -1233,19 +1247,26 @@ void projectrtpchannel::dounmix( void ) {
   }
 }
 
-/*
-## dtmf
-Queue digits to send as RFC 2833.
-*/
+/**
+ * Queue digits to send as RFC 2833.
+ */
 void projectrtpchannel::dtmf( std::string digits ) {
   SpinLockGuard guard( this->queuddigitslock );
   this->queueddigits += digits;
 }
 
-const char volume = 10;
+/**
+ * Queue digit to send as RFC 2833.
+ */
+void projectrtpchannel::dtmf( char digit ) {
+  SpinLockGuard guard( this->queuddigitslock );
+  this->queueddigits += digit;
+}
+
+const char volume = 13;
 const char endofevent = 0x80;
 
-const int numevents = 3;
+const int numevents = 10;
 const int numendevents = 3;
 
 /*
@@ -1265,9 +1286,7 @@ void projectrtpchannel::senddtmf( void ) {
     }
   }
 
-  if( 0 == tosend ) {
-    return;
-  }
+  if( 0 == tosend ) return;
 
   /*
     RFC 2833:
@@ -1297,9 +1316,18 @@ void projectrtpchannel::senddtmf( void ) {
 
   if( this->dtmfsendcount <= numevents ) {
     rtppacket *dst = this->gettempoutbuf();
+    /* the timestamp is fixed to the start of the event */
+    if( 0 == this->dtmfsendcount ) {
+      this->eventtsout = this->tsout;
+    }
+
+    dst->settimestamp( this->eventtsout );
     dst->setpayloadtype( this->rfc2833pt );
     dst->setpayloadlength( 4 );
-    uint8_t *pl =  dst->getpayload();
+    uint8_t *pl = dst->getpayload();
+
+    dst->setmarker( 0 == this->dtmfsendcount );
+
     pl[ 0 ] = tosend;
     pl[ 1 ] = volume; /* end of event & reserved & volume */
     uint16_t *tmp = ( uint16_t * ) &pl[ 2 ]; /* event duration */
@@ -1310,8 +1338,9 @@ void projectrtpchannel::senddtmf( void ) {
   } else {
     /* end packet */
     rtppacket *dst = this->gettempoutbuf();
+
+    dst->settimestamp( this->eventtsout );
     dst->setpayloadtype( this->rfc2833pt );
-    dst->setmarker();
     dst->setpayloadlength( 4 );
     uint8_t *pl =  dst->getpayload();
     pl[ 0 ] = tosend;

package/src/projectrtpchannel.h

@@ -114,12 +114,14 @@ public:
   bool mix( projectrtpchannel::pointer other );
   bool unmix( void );
   void dtmf( std::string digits );
+  void dtmf( char digit );
   rtppacket *gettempoutbuf( void );
 
   std::atomic_uint32_t codec;
   uint32_t ssrcin;
   uint32_t ssrcout;
   uint32_t tsout;
+  uint32_t eventtsout;
   uint16_t snout;
 
   /* do we send, do we receive */

package/src/projectrtpchannelmux.cpp

@@ -85,11 +85,6 @@ void projectchannelmux::mixall( void ) {
 
       if( !chan->checkfordtmf( src ) ) break;
 
-      for( auto& dtmfchan: this->channels ) {
-        if( dtmfchan->recv && chan.get() != dtmfchan.get() ) {
-          this->postrtpdata( chan, dtmfchan, src );
-        }
-      }
       /* remove the DTMF packet */
       {
         SpinLockGuard guard( chan->rtpbufferlock );
@@ -175,8 +170,8 @@ void projectchannelmux::mix2( void ) {
       }
     }
 
+    /* process but ignore and look for next other packet */
     if( !chan1->checkfordtmf( src ) ) break;
-    this->postrtpdata( chan1, chan2, src );
   }
   this->postrtpdata( chan1, chan2, src );
 
@@ -205,11 +200,25 @@ void projectchannelmux::mix2( void ) {
     }
 
     if( !chan2->checkfordtmf( src ) ) break;
-    this->postrtpdata( chan2, chan1, src );
   }
+
   this->postrtpdata( chan2, chan1, src );
 }
 
+/**
+ * Called from a channel which has received DTMF - we forward onto all other channels,
+ * this is likely to have been called from mix2 and mixall. NB this only queues
+ * the digit on the outbound - we have to actuall send them as well.
+ */
+void projectchannelmux::senddtmf( projectrtpchannelptr from, char digit ) {
+  for( auto& chan: this->channels ) {
+    if( chan.get() == from.get() ) continue;
+    if( !chan->recv ) continue;
+
+    chan->dtmf( digit );
+  }
+}
+
 bool projectchannelmux::channelremoverequested( const projectrtpchannelptr& chan ) {
   if( chan->removemixer || chan->_requestclose || (!chan->active) ) {
     chan->dounmix();
@@ -267,7 +276,7 @@ void projectchannelmux::handletick( const boost::system::error_code& error ) {
 
   for( auto& chan: workingchannels ) {
     chan->senddtmf();
-    chan->writerecordings();  //////////////////// crash here -> channel -> soundfile - there is a problem with the CODEC - this can remove recorders from channel
+    chan->writerecordings();
     chan->checkidlerecv();    // this can call doclose() - recorders might be destroyed now
     chan->endticktimer();
 

package/src/projectrtpchannelmux.h

@@ -35,6 +35,7 @@ public:
   inline size_t size() { return this->channels.size(); }
   void addchannel( projectrtpchannelptr chan );
   void addchannels( projectrtpchannelptr chana, projectrtpchannelptr chanb );
+  void senddtmf( projectrtpchannelptr from, char digit );
   void go( void );
 
 private:

package/test/interface/projectrtpdtmf.js

@@ -5,6 +5,11 @@ const dgram = require( "dgram" )
 
 const pcap = require( "./pcap" )
 
+const pkcountperdtmfdigit = 14 /* defined in projectrtpchannel::senddtmf */
+const pausebetweendtmfdigits = 200 /* mS 10 pks ref projectrtpchannel::senddtmf */
+const timeperdtmfdigit = ( pkcountperdtmfdigit * 20 /* mS */ ) + pausebetweendtmfdigits
+const dtmfeventduration = ( ( pkcountperdtmfdigit - 2)  * 160 )
+
 /*
 i.e. the RTP payload
 str = "80 e5 03 b5 00 02 44 a0 1e e3 61 fb 03 0a 00 a0 4c d1"
@@ -168,9 +173,13 @@ describe( "dtmf", function() {
   } )
 
 
-  it( "single channel and request rtp server to send 2833", function( done ) {
+  it( "single channel and request rtp server to send 2833", async function() {
     /* TODO - check tre fuller structure of an RTP event (duration, volume, etc) */
     /* create our RTP/UDP endpoint */
+
+    let done
+    const finished = new Promise( resolve => done = resolve )
+
     const server = dgram.createSocket( "udp4" )
     let dtmfpkcount = 0
     server.on( "message", function( msg ) {
@@ -182,41 +191,46 @@ describe( "dtmf", function() {
       }
     } )
 
-    this.timeout( 3000 )
-    this.slow( 2500 )
+    this.timeout( 5000 )
+    this.slow( 4000 )
 
     server.bind()
-    server.on( "listening", async function() {
+    await new Promise( resolve => server.on( "listening", resolve ) ) 
 
-      const ourport = server.address().port
+    const ourport = server.address().port
 
-      let expectedmessagecount = 0
-      const expectedmessages = [
-        { action: "close" }
-      ]
+    let expectedmessagecount = 0
+    const expectedmessages = [
+      { action: "close" }
+    ]
 
-      const channel = await projectrtp.openchannel( { "remote": { "address": "localhost", "port": ourport, "codec": 0 } }, function( d ) {
+    const channel = await projectrtp.openchannel( { "remote": { "address": "localhost", "port": ourport, "codec": 0 } }, function( d ) {
 
-        expect( d ).to.deep.include( expectedmessages[ expectedmessagecount ] )
-        expectedmessagecount++
+      expect( d ).to.deep.include( expectedmessages[ expectedmessagecount ] )
+      expectedmessagecount++
 
-        if( "close" === d.action ) {
-          server.close()
-          expect( dtmfpkcount ).to.equal( 2*7 )
-          done()
-        }
-      } )
+      if( "close" === d.action ) {
+        server.close()
+        done()
+      }
+    } )
 
-      expect( channel.echo() ).to.be.true
+    expect( channel.echo() ).to.be.true
 
-      /* send a packet every 20mS x 50 */
-      for( let i = 0;  50 > i; i ++ ) {
-        sendpk( i, i*160, i*20, channel.local.port, server )
-      }
+    /* send a packet every 20mS x 50 */
+    for( let i = 0;  50 > i; i ++ ) {
+      sendpk( i, i*160, i*20, channel.local.port, server )
+    }
+
+    await new Promise( resolve => setTimeout( resolve, 400 ) )
+    channel.dtmf( "#1" )
+
+    await new Promise( resolve => setTimeout( resolve, 1000 ) )
+    channel.close()
+    await finished
+
+    expect( dtmfpkcount ).to.equal( 2*pkcountperdtmfdigit )
 
-      setTimeout( () => channel.dtmf( "#1" ), 400 )
-      setTimeout( () => channel.close(), 1000 )
-    } )
   } )
 
 
@@ -274,7 +288,7 @@ describe( "dtmf", function() {
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 400 ) } )
     channela.dtmf( "*9F" )
-    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 800 ) } )
+    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 3 * timeperdtmfdigit ) } )
     channela.close()
 
     await finished
@@ -282,18 +296,14 @@ describe( "dtmf", function() {
     clienta.close()
     clientb.close()
 
-    expect( dtmfpks.length ).to.equal( 3*7 )
+    expect( dtmfpks.length ).to.equal( 3*pkcountperdtmfdigit )
     expect( dtmfpks[ 0 ].event.id ).to.equal( 10 )
     expect( dtmfpks[ 0 ].event.duration ).to.equal( 160 )
     expect( dtmfpks[ 0 ].event.eoe ).to.be.false
 
-    expect( dtmfpks[ 4 ].event.id ).to.equal( 10 )
-    expect( dtmfpks[ 4 ].event.duration ).to.equal( 800 )
-    expect( dtmfpks[ 4 ].event.eoe ).to.be.true
-
-    expect( dtmfpks[ 6 ].event.id ).to.equal( 10 )
-    expect( dtmfpks[ 6 ].event.duration ).to.equal( 800 )
-    expect( dtmfpks[ 6 ].event.eoe ).to.be.true
+    expect( dtmfpks[ pkcountperdtmfdigit - 3 ].event.id ).to.equal( 10 )
+    expect( dtmfpks[ pkcountperdtmfdigit - 3 ].event.duration ).to.equal( dtmfeventduration )
+    expect( dtmfpks[ pkcountperdtmfdigit - 3 ].event.eoe ).to.be.true
 
   } )
 
@@ -354,7 +364,7 @@ describe( "dtmf", function() {
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 400 ) } )
     channela.dtmf( "*9F" )
-    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 800 ) } )
+    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 3 * timeperdtmfdigit ) } )
     channela.close()
 
     await finished
@@ -362,7 +372,7 @@ describe( "dtmf", function() {
     clienta.close()
     clientb.close()
 
-    expect( dtmfpkcount ).to.equal( 3*7 )
+    expect( dtmfpkcount ).to.equal( 3*pkcountperdtmfdigit )
   } )
 
   it( "3 channels mixing and request rtp server to send 2833 to one", async function() {
@@ -436,14 +446,14 @@ describe( "dtmf", function() {
 
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 100 ) } )
     channela.dtmf( "*9ABD" )
-    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 1500 ) } )
+    await new Promise( ( resolve ) => { setTimeout( () => resolve(), 5 * timeperdtmfdigit ) } )
     channela.close()
 
     clienta.close()
     clientb.close()
     clientc.close()
 
-    expect( dtmfpks.length ).to.equal( 5*7 )
+    expect( dtmfpks.length ).to.equal( 5*pkcountperdtmfdigit )
 
     await finished
   } )
@@ -721,9 +731,9 @@ describe( "dtmf", function() {
 
     await finished
 
+    expect( dtmfpkcount ).to.be.within( ( pkcountperdtmfdigit * 2 ) - 4 , pkcountperdtmfdigit * 2 ) /* allow loss */
     expect( endpointapkcount ).to.be.within( 30, 51 )
-    expect( endpointbpkcount ).to.be.within( 30, 51 )
-    expect( dtmfpkcount ).to.be.within( 4, 8 )
+    expect( endpointbpkcount - dtmfpkcount ).to.be.within( 30, 51 )
 
     expect( receivedmessages.length ).to.equal( 5 )
 
@@ -742,7 +752,7 @@ describe( "dtmf", function() {
   } )
 
 
-  it( "mix 2 channels - pcmu <-> pcma and send DTMF different 2833 pt", async function() {
+  it( "wefwef mix 2 channels - pcmu <-> pcma and send DTMF different 2833 pt", async function() {
 
     /*
       When mixing 2 channels, we expect the second leg to receive the 2833 packets
@@ -864,11 +874,11 @@ describe( "dtmf", function() {
     await finished
 
     expect( endpointapkcount ).to.be.within( 30, 51 )
-    expect( endpointbpkcount ).to.be.within( 30, 51 )
+    expect( endpointbpkcount - dtmfpkcount ).to.be.within( 30, 51 )
 
     expect( receivedmessages.length ).to.equal( 5 )
 
-    expect( dtmfpkcount ).to.be.within( 4, 8 )
+    expect( dtmfpkcount ).to.be.within( ( pkcountperdtmfdigit * 2 ) - 4 , pkcountperdtmfdigit * 2 ) /* allow loss */
 
     expect( receivedmessages[ 0 ].action ).to.equal( "mix" )
     expect( receivedmessages[ 1 ].action ).to.equal( "telephone-event" )
@@ -936,13 +946,13 @@ describe( "dtmf", function() {
     } )
 
     endpointa.bind()
-    await new Promise( ( r ) => { endpointa.on( "listening", function() { r() } ) } )
+    await new Promise( ( resolve ) => { endpointa.on( "listening", function() { resolve() } ) } )
 
     endpointb.bind()
-    await new Promise( ( r ) => { endpointb.on( "listening", function() { r() } ) } )
+    await new Promise( ( resolve ) => { endpointb.on( "listening", function() { resolve() } ) } )
 
     endpointc.bind()
-    await new Promise( ( r ) => { endpointc.on( "listening", function() { r() } ) } )
+    await new Promise( ( resolve ) => { endpointc.on( "listening", function() { resolve() } ) } )
 
     const receveiedmessages = []
 
@@ -1053,13 +1063,13 @@ describe( "dtmf", function() {
     ] )
 
     expect( endpointapkcount ).to.be.within( 59, 70 )
-    expect( endpointbpkcount ).to.be.within( 59, 70 )
-    expect( endpointcpkcount ).to.be.within( 59, 70 )
+    expect( endpointbpkcount - dtmfbpkcount ).to.be.within( 59, 70 )
+    expect( endpointcpkcount - dtmfcpkcount ).to.be.within( 59, 70 )
 
     // 3 after we return to the event loop and enter the callback with close event.
     expect( dtmfapkcount ).to.equal( 0 )
-    expect( dtmfbpkcount ).to.be.within( 4, 8 )
-    expect( dtmfcpkcount ).to.be.within( 4, 8 )
+    expect( dtmfbpkcount ).to.be.within( ( pkcountperdtmfdigit * 2 ) - 4, pkcountperdtmfdigit * 2 )
+    expect( dtmfcpkcount ).to.be.within( ( pkcountperdtmfdigit * 2 ) - 4, pkcountperdtmfdigit * 2 )
 
     expect( receveiedmessages[ 0 ].action ).to.equal( "mix" )
     expect( receveiedmessages[ 1 ].action ).to.equal( "mix" )

package/test/interface/projectrtprecord.js

@@ -407,11 +407,10 @@ describe( "record", function() {
     this.slow( 7000 )
 
     let done
-    const finished = new Promise( ( r ) => done = r )
+    const finished = new Promise( ( resolve ) => done = resolve )
 
     /* create our RTP/UDP endpoint */
     const server = dgram.createSocket( "udp4" )
-    let channel
 
     /* generate our data */
     const startsilenceseconds = 1
@@ -430,44 +429,41 @@ describe( "record", function() {
     ] )
 
     server.on( "message", function() {} )
-
     server.bind()
+    await new Promise( resolve => server.on( "listening", resolve ) )
+
     const receivedmessages = []
+    const channel = await prtp.projectrtp.openchannel( { "remote": { "address": "localhost", "port": server.address().port, "codec": 0 } }, function( d ) {
+      receivedmessages.push( d )
+      if( "close" !== d.action ) return
 
-    server.on( "listening", async function() {
+      done()
+    } )
 
-      channel = await prtp.projectrtp.openchannel( { "remote": { "address": "localhost", "port": server.address().port, "codec": 0 } }, function( d ) {
-        receivedmessages.push( d )  
-        if( "close" === d.action ) {
-          done()
-        }
-      } )
+    expect( channel.record( {
+      "file": "/tmp/dualrecording.wav"
+    } ) ).to.be.true
 
-      expect( channel.record( {
-        "file": "/tmp/dualrecording.wav"
-      } ) ).to.be.true
+    expect( channel.record( {
+      "file": "/tmp/dualrecordingpower.wav",
+      "startabovepower": 40,
+      "finishbelowpower": 200,
+      "minduration": 200,
+      "maxduration": 3500,
+      "poweraveragepackets": 10 /* faster response */
+    } ) ).to.be.true
 
-      expect( channel.record( {
-        "file": "/tmp/dualrecordingpower.wav",
-        "startabovepower": 40,
-        "finishbelowpower": 200,
-        "minduration": 200,
-        "maxduration": 3500,
-        "poweraveragepackets": 10 /* faster response */
-      } ) ).to.be.true
-
-      /* something to record */
-      expect( channel.echo() ).to.be.true
+    /* something to record */
+    expect( channel.echo() ).to.be.true
 
-      for( let i = 0;  i < 50*totalseconds; i ++ ) {
-        sendpk( i, i, channel.local.port, server, sendbuffer )
-      }
-    } )
+    for( let i = 0;  i < 50*totalseconds; i ++ ) {
+      sendpk( i, i, channel.local.port, server, sendbuffer )
+    }
 
-    setTimeout( () => channel.close(), totalseconds * 1000 )
+    await new Promise( resolve => setTimeout( resolve, totalseconds * 1000 ) )
+    channel.close()
     await finished
-
-    server.close()
+    await new Promise( resolve => server.close( () => resolve() ) )
 
     let stats = fs.statSync( "/tmp/dualrecordingpower.wav" )
     expect( stats.size ).to.be.within( 30000 , 41000 )

package/test/interface/rtpproxyserver.js

@@ -52,10 +52,15 @@ describe( "rtpproxy server", function() {
     } )
 
     let closereceived = false
-    n.setmessagehandler( "close", () => {
+    n.setmessagehandler( "close", ( msg ) => {
+
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
+
       closereceived = true
-      n.destroy()
-      p.destroy()
     } )
 
     const ourport = getnextport()
@@ -80,9 +85,10 @@ describe( "rtpproxy server", function() {
     expect( channel.uuid ).that.is.a( "string" )
     expect( channel.id ).that.is.a( "string" )
 
-    channel.close()
+    await channel.close()
 
-    await new Promise( ( r ) => { setTimeout( () => r(), 10 ) } )
+    n.destroy()
+    p.destroy()
 
     expect( closereceived ).to.be.true
   } )
@@ -108,12 +114,12 @@ describe( "rtpproxy server", function() {
       receivedecho = true
     } )
 
-    let closeresolve
-    const closereceived = new Promise( resolve => closeresolve = resolve )
-    n.setmessagehandler( "close", () => {
-      n.destroy()
-      p.destroy()
-      closeresolve()
+    n.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
     } )
 
     const ourport = getnextport()
@@ -121,10 +127,11 @@ describe( "rtpproxy server", function() {
     await n.connect( ourport )
     const channel = await prtp.openchannel()
     channel.echo()
-    channel.close()
+    await channel.close()
+
+    n.destroy()
+    p.destroy()
 
-    /* this will only resolve when close received */
-    await closereceived
 
     expect( receivedecho ).to.be.true
   } )
@@ -154,12 +161,12 @@ describe( "rtpproxy server", function() {
       expect( msg ).to.have.property( "digits" ).that.is.a( "string" ).to.equal( "#123" )
     } )
 
-    let closeresolve
-    const closereceived = new Promise( resolve => closeresolve = resolve )
-    n.setmessagehandler( "close", () => {
-      n.destroy()
-      p.destroy()
-      closeresolve()
+    n.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
     } )
 
     const ourport = getnextport()
@@ -167,9 +174,10 @@ describe( "rtpproxy server", function() {
     await n.connect( ourport )
     const channel = await prtp.openchannel()
     channel.dtmf( "#123" )
-    channel.close()
+    await channel.close()
 
-    await closereceived
+    n.destroy()
+    p.destroy()
 
     expect( reveiveddtmf ).to.be.true
   } )
@@ -197,12 +205,12 @@ describe( "rtpproxy server", function() {
     let unmxmsg = {}
     n.setmessagehandler( "unmix", ( msg ) => unmxmsg = msg )
 
-    let closeresolve
-    const closereceived = new Promise( resolve => closeresolve = resolve )
-    n.setmessagehandler( "close", () => {
-      n.destroy()
-      p.destroy()
-      closeresolve()
+    n.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
     } )
 
     const ourport = getnextport()
@@ -213,10 +221,13 @@ describe( "rtpproxy server", function() {
     channela.mix( channelb )
     channela.unmix()
 
-    channela.close()
-    channelb.close()
+    await Promise.all( [
+      channela.close(),
+      channelb.close()
+    ] )
 
-    await closereceived
+    n.destroy()
+    p.destroy()
 
     expect( mxmsg ).to.have.property( "channel" ).that.is.a( "string" ).to.equal( "mix" )
     expect( mxmsg ).to.have.property( "other" ).that.is.a( "object" )
@@ -250,7 +261,13 @@ describe( "rtpproxy server", function() {
       } )
     } )
     
-    n.setmessagehandler( "close", () => {} )
+    n.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
+    } )
 
     n2.setmessagehandler( "open", ( msg ) => {
       n2.sendmessage( {
@@ -266,7 +283,13 @@ describe( "rtpproxy server", function() {
 
     } )
 
-    n2.setmessagehandler( "close", () => {} )
+    n2.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
+    } )
 
     const ourport = getnextport()
     const p = await prtp.proxy.listen( undefined, "127.0.0.1", ourport )
@@ -276,10 +299,11 @@ describe( "rtpproxy server", function() {
     const channel1 = await prtp.openchannel()
     const channel2 = await prtp.openchannel()
 
-    channel1.close()
-    channel2.close()
-
-    await new Promise( ( r ) => { setTimeout( () => r(), 10 ) } )
+    await Promise.all( [
+      channel1.close(),
+      channel2.close()
+    ] )
+    
 
     n.destroy()
     n2.destroy()
@@ -314,12 +338,12 @@ describe( "rtpproxy server", function() {
       remotereceived = true
     } )
 
-    let closeresolve
-    const closereceived = new Promise( resolve => closeresolve = resolve )
-    n.setmessagehandler( "close", () => {
-      n.destroy()
-      p.destroy()
-      closeresolve()
+    n.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
     } )
 
     const ourport = getnextport()
@@ -328,8 +352,9 @@ describe( "rtpproxy server", function() {
     const channel = await prtp.openchannel()
     channel.remote( "wouldbearemoteobject" )
 
-    channel.close()
-    await closereceived
+    await channel.close()
+    n.destroy()
+    p.destroy()
 
     expect( remotereceived ).to.be.true
   } )
@@ -370,11 +395,15 @@ describe( "rtpproxy server", function() {
     let recmsg
     n.setmessagehandler( "record", ( msg ) => {
       recmsg = msg
-      channel.close()
+      done()
     } )
 
-    n.setmessagehandler( "close", () => {
-      done()
+    n.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
     } )
 
     const ourport = getnextport()
@@ -384,6 +413,7 @@ describe( "rtpproxy server", function() {
     channel.play( "wouldbeaplayobject" )
 
     await completed
+    await channel.close()
 
     n.destroy()
     p.destroy()
@@ -400,7 +430,7 @@ describe( "rtpproxy server", function() {
     expect( playmsg ).to.have.property( "uuid" ).that.is.a( "string" )
     expect( playmsg ).to.have.property( "soup" ).that.is.a( "string" ).to.equal( "wouldbeaplayobject" )
 
-    expect( channel.history ).to.be.an( "array" ).to.have.length( 6 )
+    expect( channel.history ).to.be.an( "array" ).to.have.length( 7 )
 
   } )
 
@@ -437,12 +467,17 @@ describe( "rtpproxy server", function() {
         "uuid": msg.uuid
       } )
 
-      setTimeout( () => channel.close(), 10 )
-    } )
-    n.setmessagehandler( "close", () => {
       done()
     } )
 
+    n.setmessagehandler( "close", ( msg ) => {
+      n.sendmessage( {
+        "action": "close",
+        "id": msg.id,
+        "uuid": msg.uuid
+      } )
+    } )
+
     const ourport = getnextport()
     const p = await prtp.proxy.listen( undefined, "127.0.0.1", ourport )
     await n.connect( ourport )
@@ -450,6 +485,7 @@ describe( "rtpproxy server", function() {
     channel.direction( { send: false, recv: false } )
 
     await completed
+    await channel.close()
 
     n.destroy()
     p.destroy()
@@ -482,16 +518,12 @@ describe( "rtpproxy server", function() {
       } )
     } )
 
-    let closeresolv
-    const closepromise = new Promise( ( r ) => closeresolv = r )
     n.setmessagehandler( "close", ( msg, sendmessage ) => {
       sendmessage( {
         "action": "close",
         "uuid": msg.uuid,
         "id": msg.id
       } )
-
-      closeresolv()
     } )
     
     const chnl = await prtp.openchannel()
@@ -500,9 +532,7 @@ describe( "rtpproxy server", function() {
     expect( chnl ).to.have.property( "local" ).that.is.a( "object" )
     expect( chnl.local ).to.have.property( "port" ).that.is.a( "number" )
     expect( chnl.local ).to.have.property( "address" ).that.is.a( "string" )
-    chnl.close()
-    
-    await closepromise
+    await chnl.close()
     
     n.destroy()
     
@@ -554,15 +584,13 @@ describe( "rtpproxy server", function() {
       } )
     } )
 
-    let closeresolv
-    const closepromise = new Promise( ( r ) => closeresolv = r )
+
     n.setmessagehandler( "close", ( msg, sendmessage ) => {
       sendmessage( {
         "action": "close",
         "uuid": msg.uuid,
         "id": msg.id
       } )
-      closeresolv()
     } )
 
     n2.setmessagehandler( "close", ( msg, sendmessage ) => {
@@ -571,7 +599,6 @@ describe( "rtpproxy server", function() {
         "uuid": msg.uuid,
         "id": msg.id
       } )
-      closeresolv()
     } )
 
     const chnl = await prtp.openchannel()
@@ -579,10 +606,10 @@ describe( "rtpproxy server", function() {
 
     expect( chnl.connection ).to.be.equal( chnl2.connection )
 
-    chnl.close()
-    chnl2.close()
-
-    await closepromise
+    Promise.all( [
+      chnl.close(),
+      chnl2.close()
+    ] )
 
     n.destroy()
     n2.destroy()