@babblevoice/projectrtp 2.5.31 → 2.5.34

package/Dockerfile

@@ -1,7 +1,7 @@
 
 # docker build . -t <your username>/projectrtp
 # I have tied this to version alpine 3.16 as 3.17 has an exception symbol dynamic linking issue.
-FROM alpine:3.16 as builder
+FROM alpine:3.20 AS builder
 
 
 WORKDIR /usr/src/
@@ -20,7 +20,7 @@ COPY . .
 RUN npm ci --no-optional --production;\
     rm -fr src/build/Release/obj.target
 
-FROM alpine:3.16 as app
+FROM alpine:3.20 AS app
 
 RUN apk add --no-cache \
     spandsp tiff gnutls libsrtp libc6-compat openssl ca-certificates nodejs npm

package/binding.gyp

@@ -0,0 +1,45 @@
+{
+  "targets": [
+    {
+      "target_name": "projectrtp",
+      "defines": [ "NODE_MODULE", "BOOST_NO_EXCEPTIONS", "BOOST_EXCEPTION_DISABLE", "NAPI_DISABLE_CPP_EXCEPTIONS" ],
+      "cflags_cc!": [ "-fno-rtti" ],
+      "cflags_cc": [
+        "-O3",
+        "-g",
+        "-Wall",
+        "-fstack-protector-strong",
+        "-std=c++20",
+        "-Weffc++" ],
+      "ldflags": [
+        "-Wl,-z,relro",
+        "-Wl,-z,now",
+        "-Wl,--export-dynamic" ],
+      "libraries": [
+            "-lrt",
+            "-lspandsp",
+            "-lilbc",
+            "-lgnutls",
+            "-lsrtp2" ],
+      "sources": [
+        "src/boostexception.cpp",
+        "src/projectrtpfirfilter.cpp",
+        "src/projectrtpnodemain.cpp",
+        "src/projectrtpbuffer.cpp",
+        "src/projectrtppacket.cpp",
+        "src/projectrtprawsound.cpp",
+        "src/projectrtpcodecx.cpp",
+        "src/projectrtpchannelrecorder.cpp",
+        "src/projectrtpsoundfile.cpp",
+        "src/projectrtpsoundsoup.cpp",
+        "src/projectrtptonegen.cpp",
+        "src/projectrtpchannel.cpp",
+        "src/projectrtpchannelmux.cpp",
+        "src/projectrtpsrtp.cpp",
+        "src/projectrtpstun.cpp" ],
+      "include_dirs": [
+        "src"
+      ]
+    }
+  ]
+}

package/index.js

@@ -10,7 +10,7 @@ const { spawnSync } = require( "child_process" )
 
 let localaddress = "127.0.0.1"
 let privateaddress = "127.0.0.1"
-const bin = "./src/build/Release/projectrtp"
+const bin = "./build/Release/projectrtp"
 
 
 /**

package/lib/server.js

@@ -106,6 +106,12 @@ class channel {
    */
   openresolve
 
+  /**
+   * @private
+   * @type { string }
+   */
+  ctype
+
   /** 
    * @private
    * @type { function } 
@@ -218,6 +224,7 @@ class channel {
   static _createforlisten( request, remotenode, cb, openresolve, openreject ) {
 
     const newchannel = new channel( request.id )
+    newchannel.ctype = "l"
 
     newchannel.connection = remotenode
     if( cb ) newchannel.em.on( "all", cb )
@@ -246,6 +253,9 @@ class channel {
   static _createforconnect( options, cb, openresolve, openreject ) {
 
     const newchannel = new channel( options.id )
+
+    newchannel.ctype = "c"
+
     if( cb ) newchannel.em.on( "all", cb )
     const connecttonode = randomconnectnode()
     return new Promise( connectresolve => {
@@ -590,7 +600,7 @@ class channel {
       // adjust with filter
       const index = this.channels.indexOf( this )
       if( -1 < index ) this.channels.splice( index, 1 )
-      if( 0 === this.channels.length && this.connection.sock ) {
+      if( this.ctype == "c" && 0 === this.channels.length && this.connection.sock ) {
         this.connection.sock.destroy()
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@babblevoice/projectrtp",
-  "version": "2.5.31",
+  "version": "2.5.34",
   "description": "A scalable Node addon RTP server",
   "main": "index.js",
   "directories": {
@@ -14,14 +14,14 @@
     "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",
-    "build:dev": "cd src; node-gyp build --debug",
-    "build": "cd src; node-gyp build",
-    "configure:dev": "cd src; node-gyp configure --debug",
-    "configure": "cd src; node-gyp configure",
-    "rebuild:dev": "cd src; node-gyp configure --debug; node-gyp rebuild --debug",
-    "rebuild": "cd src; node-gyp configure; node-gyp rebuild",
-    "clean": "cd src; node-gyp clean",
-    "install": "npm run rebuild"
+    "configure:dev": "node-gyp configure --debug",
+    "configure": "node-gyp configure",
+    "rebuild:dev": "node-gyp configure --debug; node-gyp rebuild --debug",
+    "clean": "node-gyp clean",
+    "build:dev": "node-gyp configure build --debug",
+    "build": "node-gyp configure build",
+    "rebuild": "node-gyp rebuild",
+    "install": "node-gyp rebuild"
   },
   "repository": {
     "type": "git",
@@ -34,6 +34,7 @@
   },
   "homepage": "https://github.com/babblevoice/projectrtp#readme",
   "dependencies": {
+    "node-addon-api": "^8.2.2",
     "uuid": "^9.0.0"
   },
   "keywords": [
@@ -48,7 +49,7 @@
     "@types/node": "^12.20.55",
     "@types/uuid": "^9.0.0",
     "chai": "^4.3.7",
-    "eslint": "^8.29.0",
+    "eslint": "^9.15.0",
     "fft-js": "^0.0.12",
     "jsdoc": "^4.0.0",
     "mocha": "^10.2.0",

package/src/boostexception.cpp

@@ -0,0 +1,24 @@
+
+#ifdef BOOST_NO_EXCEPTIONS
+
+#include <boost/throw_exception.hpp>
+#include <stdexcept>
+#include <iostream>
+
+/*
+  Provided exception handlers when BOOST_NO_EXCEPTIONS is defined 
+*/
+
+namespace boost {
+  void throw_exception( const std::exception& e ) {
+    std::cerr << "Boost exception: " << e.what() << std::endl;
+    std::terminate();
+  }
+
+  void throw_exception( const std::exception& e, const boost::source_location& ) {
+    std::cerr << "Boost exception with location: " << e.what() << std::endl;
+    std::terminate();
+  }
+}
+
+#endif

package/src/globals.h

@@ -50,8 +50,19 @@ private:
   std::shared_ptr< void > d; // Copied from Request
 };
 
-/* useful macros for use with std::atomic_bool */
-#define AQUIRESPINLOCK( l ) while( l.exchange( true, std::memory_order_acquire ) )
-#define RELEASESPINLOCK( l ) l.store( false, std::memory_order_release )
+/* Use spin locks for effiencent protection and ensure unlock */
+struct SpinLockGuard {
+  std::atomic_bool& lock;
+
+  SpinLockGuard( std::atomic_bool& l ) : lock( l ) {
+    while( lock.exchange( true, std::memory_order_acquire ) ) {
+      // Spin until the lock is acquired
+    }
+  }
+
+  ~SpinLockGuard() {
+    lock.store(false, std::memory_order_release);
+  }
+};
 
 #endif /* PROJECTRTPGLOBALS_H */

package/src/projectrtpchannel.cpp

@@ -26,10 +26,10 @@ std::atomic< std::uint32_t > channelscreated{ 0 };
  * Get the next available port.
  */
 unsigned short getavailableport( void ) {
-  AQUIRESPINLOCK( availableportslock );
+  SpinLockGuard guard( availableportslock );
+
   auto ourport = availableports.front();
   availableports.pop();
-  RELEASESPINLOCK( availableportslock );
 
   channelscreated.fetch_add( 1 );
 
@@ -41,11 +41,8 @@ unsigned short getavailableport( void ) {
  * @returns { size_t }
  */
 auto getvailableportsize() {
-  AQUIRESPINLOCK( availableportslock );
-  auto availableportssize = availableports.size();
-  RELEASESPINLOCK( availableportslock );
-
-  return availableportssize;
+  SpinLockGuard guard( availableportslock );
+  return availableports.size();
 }
 
 /**
@@ -55,10 +52,10 @@ auto getvailableportsize() {
 void projectrtpchannel::returnavailableport( void ) {
 
   if( 0 == this->port ) return;
-  AQUIRESPINLOCK( availableportslock );
+  SpinLockGuard guard( availableportslock );
+
   availableports.push( this->port );
   this->port = 0;
-  RELEASESPINLOCK( availableportslock );
 
   channelscreated.fetch_sub( 1 );
 }
@@ -230,9 +227,10 @@ void projectrtpchannel::remote( std::string address,
         }
       } );
 
-      AQUIRESPINLOCK( this->rtpdtlslock );
-      this->rtpdtls = newsession;
-      RELEASESPINLOCK( this->rtpdtlslock );
+      {
+        SpinLockGuard guard( this->rtpdtlslock );
+        this->rtpdtls = newsession;
+      }
     }
     
     this->receivedrtp = false;
@@ -426,15 +424,17 @@ void projectrtpchannel::doclose( void ) {
     postdatabacktojsfromthread( shared_from_this(), "play", "end", "channelclosed" );
   }
 
-  AQUIRESPINLOCK( this->newplaylock );
-  this->player = nullptr;
-  this->newplaydef = nullptr;
-  RELEASESPINLOCK( this->newplaylock );
+  {
+    SpinLockGuard guard( this->newplaylock );
+    this->player = nullptr;
+    this->newplaydef = nullptr;
+  }
 
   /* close our session if we have one */
-  AQUIRESPINLOCK( this->rtpdtlslock );
-  this->rtpdtls = nullptr;
-  RELEASESPINLOCK( this->rtpdtlslock );
+  {
+    SpinLockGuard dtlsguard( this->rtpdtlslock );
+    this->rtpdtls = nullptr;
+  }
 
   /* close up any remaining recorders */
   for( auto& rec: this->recorders ) {
@@ -499,7 +499,7 @@ void projectrtpchannel::handletick( const boost::system::error_code& error ) {
   if( this->mixing ) {
     this->setnexttick();
     return;
-  };
+  }
 
   this->startticktimer();
 
@@ -517,14 +517,16 @@ void projectrtpchannel::handletick( const boost::system::error_code& error ) {
 
   rtppacket *src;
   do {
-    AQUIRESPINLOCK( this->rtpbufferlock );
-    src = this->inbuff->pop();
-    RELEASESPINLOCK( this->rtpbufferlock );
-
-    AQUIRESPINLOCK( this->rtpdtlslock );
-    dtlssession::pointer currentdtlssession = this->rtpdtls;
-    RELEASESPINLOCK( this->rtpdtlslock );
+    {
+      SpinLockGuard guard( this->rtpbufferlock );
+      src = this->inbuff->pop();
+    }
 
+    dtlssession::pointer currentdtlssession;
+    {
+      SpinLockGuard guarddtls( this->rtpdtlslock );
+      currentdtlssession = this->rtpdtls;
+    }
 
     if( nullptr != currentdtlssession &&
         !currentdtlssession->rtpdtlshandshakeing ) {
@@ -545,19 +547,20 @@ void projectrtpchannel::handletick( const boost::system::error_code& error ) {
   {
     bool playerreplaced = false;
     bool playernew = false;
-    AQUIRESPINLOCK( this->newplaylock );
-    if( nullptr != this->newplaydef ) {
-      this->doecho = false;
+    {
+      SpinLockGuard guard( this->newplaylock );
+      if( nullptr != this->newplaydef ) {
+        this->doecho = false;
 
-      if( nullptr != this->player ) {
-        playerreplaced = true;
-      }
+        if( nullptr != this->player ) {
+          playerreplaced = true;
+        }
 
-      this->player = this->newplaydef;
-      this->newplaydef = nullptr;
-      playernew = true;
+        this->player = this->newplaydef;
+        this->newplaydef = nullptr;
+        playernew = true;
+      }
     }
-    RELEASESPINLOCK( this->newplaylock );
 
     if( playerreplaced ) {
       postdatabacktojsfromthread( shared_from_this(), "play", "end", "replaced" );
@@ -625,9 +628,8 @@ void projectrtpchannel::setnexttick( void ) {
 }
 
 void projectrtpchannel::requestplay( soundsoup::pointer newdef ) {
-  AQUIRESPINLOCK( this->newplaylock );
+  SpinLockGuard guard( this->newplaylock );
   this->newplaydef = newdef;
-  RELEASESPINLOCK( this->newplaylock );
 }
 
 /*
@@ -635,9 +637,8 @@ Post a request to record (or modify a param of a record). This function is typic
 called from a control thread (i.e. node).
 */
 void projectrtpchannel::requestrecord( channelrecorder::pointer rec ) {
-  AQUIRESPINLOCK( this->newrecorderslock );
+  SpinLockGuard guard( this->newrecorderslock );
   this->newrecorders.push_back( rec );
-  RELEASESPINLOCK( this->newrecorderslock );
 }
 
 /*
@@ -646,10 +647,9 @@ to requestrecord.
 */
 void projectrtpchannel::checkfornewrecorders( void ) {
   channelrecorder::pointer rec;
-  AQUIRESPINLOCK( this->newrecorderslock );
+  SpinLockGuard guard( this->newrecorderslock );
 
   for ( auto const& newrec : this->newrecorders ) {
-
     for( auto& currentrec: this->recorders ) {
       if( currentrec->file == newrec->file ) {
         currentrec->pause = newrec->pause;
@@ -669,8 +669,6 @@ endofwhileloop:;
   }
 
   this->newrecorders.clear();
-
-  RELEASESPINLOCK( this->newrecorderslock );
 }
 
 void projectrtpchannel::removeoldrecorders( void ) {
@@ -832,17 +830,14 @@ void projectrtpchannel::writerecordings( void ) {
 }
 
 bool projectrtpchannel::dtlsnegotiate( void ) {
+  SpinLockGuard guard( this->rtpdtlslock );
 
-  AQUIRESPINLOCK( this->rtpdtlslock );
   dtlssession::pointer oursession = this->rtpdtls;
-  RELEASESPINLOCK( this->rtpdtlslock );
 
   if( nullptr == oursession ) return false;
   if( !oursession->rtpdtlshandshakeing ) return false;
 
-  AQUIRESPINLOCK( this->rtpdtlslock );
   auto dtlsstate = oursession->handshake();
-  RELEASESPINLOCK( this->rtpdtlslock );
 
   if( GNUTLS_E_SUCCESS != dtlsstate && 0 != gnutls_error_is_fatal( dtlsstate ) ) {
     oursession->bye();
@@ -929,9 +924,12 @@ void projectrtpchannel::readsomertp( void ) {
   if( !this->active || this->_requestclose ) return;
 
   /* Grab a buffer */
-  AQUIRESPINLOCK( this->rtpbufferlock );
-  rtppacket* buf = this->inbuff->reserve();
-  RELEASESPINLOCK( this->rtpbufferlock );
+  rtppacket* buf;
+  {
+    SpinLockGuard guard( this->rtpbufferlock );
+    buf = this->inbuff->reserve();
+  }
+  
 
   if( nullptr == buf ) {
     fprintf( stderr, "Error no buffer\n" );
@@ -954,15 +952,19 @@ void projectrtpchannel::readsomertp( void ) {
         if( this->handlestun( buf->pk, bytesrecvd ) )
           goto readsomemore;
 
-        AQUIRESPINLOCK( this->rtpdtlslock );
-        dtlssession::pointer currentdtlssession = this->rtpdtls;
-        RELEASESPINLOCK( this->rtpdtlslock );
+        dtlssession::pointer currentdtlssession;
+        {
+          SpinLockGuard guard( this->rtpdtlslock );
+          currentdtlssession = this->rtpdtls;
+        }
 
         if( nullptr != currentdtlssession &&
             currentdtlssession->rtpdtlshandshakeing ) {
-          AQUIRESPINLOCK( this->rtpdtlslock );
-          currentdtlssession->write( buf->pk, bytesrecvd );
-          RELEASESPINLOCK( this->rtpdtlslock );
+          {
+            SpinLockGuard guard( this->rtpdtlslock );
+            currentdtlssession->write( buf->pk, bytesrecvd );
+          }
+
           this->dtlsnegotiate();
           goto readsomemore;
         }
@@ -1010,9 +1012,10 @@ void projectrtpchannel::readsomertp( void ) {
           buf->setpayloadtype( RFC2833PAYLOADTYPE );
         }
 
-        AQUIRESPINLOCK( this->rtpbufferlock );
-        this->inbuff->push();
-        RELEASESPINLOCK( this->rtpbufferlock );
+        {
+          SpinLockGuard guard( this->rtpbufferlock );
+          this->inbuff->push();
+        }
       }
 
 readsomemore:
@@ -1079,9 +1082,11 @@ void projectrtpchannel::writepacket( rtppacket *pk ) {
 
   if( !this->active ) return;
 
-  AQUIRESPINLOCK( this->rtpdtlslock );
-  dtlssession::pointer currentdtlssession = this->rtpdtls;
-  RELEASESPINLOCK( this->rtpdtlslock );
+  dtlssession::pointer currentdtlssession;
+  {
+    SpinLockGuard guard( this->rtpdtlslock );
+    currentdtlssession = this->rtpdtls;
+  }
 
   if( nullptr != currentdtlssession &&
       currentdtlssession->rtpdtlshandshakeing ) {
@@ -1143,7 +1148,7 @@ bool projectrtpchannel::mix( projectrtpchannel::pointer other ) {
     return true;
   }
 
-  AQUIRESPINLOCK( this->mixerlock );
+  SpinLockGuard guard( this->mixerlock );
 
   if( nullptr == this->mixer && nullptr != other->mixer ) {
     this->mixer = other->mixer;
@@ -1162,13 +1167,10 @@ bool projectrtpchannel::mix( projectrtpchannel::pointer other ) {
     this->mixer->go();
   } else {
     /* If we get here this and other are already mixing and should be cleaned up first */
-    RELEASESPINLOCK( this->mixerlock );
     postdatabacktojsfromthread( shared_from_this(), "mix", "busy" );
     return false;
   }
 
-  RELEASESPINLOCK( this->mixerlock );
-
   postdatabacktojsfromthread( shared_from_this(), "mix", "start" );
   postdatabacktojsfromthread( other, "mix", "start" );
 
@@ -1181,11 +1183,9 @@ Add the other to a mixer - both channels have access to the same mixer.
 n way relationship. Adds to queue for when our main thread calls into us.
 */
 bool projectrtpchannel::unmix( void ) {
+  SpinLockGuard guard( this->mixerlock );
 
-  AQUIRESPINLOCK( this->mixerlock );
   if( nullptr != this->mixer ) this->removemixer = true;
-  RELEASESPINLOCK( this->mixerlock );
-
   return true;
 }
 
@@ -1196,9 +1196,10 @@ bool projectrtpchannel::unmix( void ) {
 void projectrtpchannel::dounmix( void ) {
   this->mixing = false;
   this->removemixer = false;
-  AQUIRESPINLOCK( this->mixerlock );
+
+  SpinLockGuard guard( this->mixerlock );
+
   this->mixer = nullptr;
-  RELEASESPINLOCK( this->mixerlock );
 
   postdatabacktojsfromthread( shared_from_this(), "mix", "finished" );
 
@@ -1212,9 +1213,8 @@ void projectrtpchannel::dounmix( void ) {
 Queue digits to send as RFC 2833.
 */
 void projectrtpchannel::dtmf( std::string digits ) {
-  AQUIRESPINLOCK( this->queuddigitslock );
+  SpinLockGuard guard( this->queuddigitslock );
   this->queueddigits += digits;
-  RELEASESPINLOCK( this->queuddigitslock );
 }
 
 /*
@@ -1227,12 +1227,13 @@ void projectrtpchannel::senddtmf( void ) {
   }
 
   uint8_t tosend = 0;
-  AQUIRESPINLOCK( this->queuddigitslock );
-  if( this->queueddigits.size() > 0 ) {
-    tosend = this->queueddigits[ 0 ];
-    this->queueddigits.erase( this->queueddigits.begin() );
+  {
+    SpinLockGuard guard( this->queuddigitslock );
+    if( this->queueddigits.size() > 0 ) {
+      tosend = this->queueddigits[ 0 ];
+      this->queueddigits.erase( this->queueddigits.begin() );
+    }
   }
-  RELEASESPINLOCK( this->queuddigitslock );
 
   if( 0 == tosend ) {
     return;
@@ -2368,12 +2369,14 @@ void getchannelstats( napi_env env, napi_value &result ) {
 void initrtpchannel( napi_env env, napi_value &result, int32_t startport, int32_t endport ) {
   napi_value ccreate;
 
-  AQUIRESPINLOCK( availableportslock );
-  while(!availableports.empty()) availableports.pop();
-  for( int i = (int) startport; i < (int) endport; i = i + 2 ) {
-    availableports.push( i );
+  {
+    SpinLockGuard guard( availableportslock );
+
+    while(!availableports.empty()) availableports.pop();
+    for( int i = (int) startport; i < (int) endport; i = i + 2 ) {
+      availableports.push( i );
+    }
   }
-  RELEASESPINLOCK( availableportslock );
 
   if( napi_ok != napi_create_function( env, "exports", NAPI_AUTO_LENGTH, channelcreate, nullptr, &ccreate ) ) return;
   if( napi_ok != napi_set_named_property( env, result, "openchannel", ccreate ) ) return;

package/src/projectrtpchannelmux.cpp

@@ -56,24 +56,30 @@ void projectchannelmux::mixall( void ) {
 
     rtppacket *src;
     while( true ) {
-      AQUIRESPINLOCK( chan->rtpbufferlock );
-      src = chan->inbuff->peek();
-      RELEASESPINLOCK( chan->rtpbufferlock );
+      {
+        SpinLockGuard guard( chan->rtpbufferlock );
+        src = chan->inbuff->peek();
+      }
 
       if( nullptr == src ) break;
 
-      AQUIRESPINLOCK( chan->rtpdtlslock );
-      dtlssession::pointer currentdtlssession = chan->rtpdtls;
-      RELEASESPINLOCK( chan->rtpdtlslock );
+      dtlssession::pointer currentdtlssession;
+      {
+        SpinLockGuard guard( chan->rtpdtlslock );
+        currentdtlssession = chan->rtpdtls;
+      }
+
       if( nullptr != currentdtlssession &&
           !currentdtlssession->rtpdtlshandshakeing ) {
         if( !currentdtlssession->unprotect( src ) ) {
           chan->receivedpkskip++;
           src = nullptr;
-          
-          AQUIRESPINLOCK( chan->rtpbufferlock );
-          chan->inbuff->poppeeked();
-          RELEASESPINLOCK( chan->rtpbufferlock );
+
+          {
+            SpinLockGuard guard( chan->rtpbufferlock );
+            chan->inbuff->poppeeked();
+          }
+
           break;
         }
       }
@@ -86,9 +92,10 @@ void projectchannelmux::mixall( void ) {
         }
       }
       /* remove the DTMF packet */
-      AQUIRESPINLOCK( chan->rtpbufferlock );
-      chan->inbuff->poppeeked();
-      RELEASESPINLOCK( chan->rtpbufferlock );
+      {
+        SpinLockGuard guard( chan->rtpbufferlock );
+        chan->inbuff->poppeeked();
+      }
     }
 
     if( nullptr != src ) {
@@ -101,9 +108,8 @@ void projectchannelmux::mixall( void ) {
   /* Now we subtract this channel to send to this channel. */
   for( auto& chan: this->channels ) {
     if( !chan->send ) {
-      AQUIRESPINLOCK( chan->rtpbufferlock );
+      SpinLockGuard guard( chan->rtpbufferlock );
       chan->inbuff->poppeeked();
-      RELEASESPINLOCK( chan->rtpbufferlock );
       continue;
     }
 
@@ -113,15 +119,20 @@ void projectchannelmux::mixall( void ) {
     this->subtracted.copy( this->added );
 
     if( chan->recv ) {
-      AQUIRESPINLOCK( chan->rtpbufferlock );
-      rtppacket *src = chan->inbuff->peeked();
-      RELEASESPINLOCK( chan->rtpbufferlock );
+      rtppacket *src;
+      {
+        SpinLockGuard guard( chan->rtpbufferlock );
+        src = chan->inbuff->peeked();
+      }
+
       if( nullptr != src ) {
         this->subtracted -= chan->incodec;
       }
-      AQUIRESPINLOCK( chan->rtpbufferlock );
-      chan->inbuff->poppeeked();
-      RELEASESPINLOCK( chan->rtpbufferlock );
+
+      {
+        SpinLockGuard guard( chan->rtpbufferlock );
+        chan->inbuff->poppeeked();
+      }
     }
 
     chan->outcodec << codecx::next;
@@ -144,15 +155,20 @@ void projectchannelmux::mix2( void ) {
   rtppacket *src;
 
   while( true ) {
-    AQUIRESPINLOCK( chan1->rtpbufferlock );
-    src = chan1->inbuff->pop();
-    RELEASESPINLOCK( chan1->rtpbufferlock );
+    {
+      SpinLockGuard guard( chan1->rtpbufferlock );
+      src = chan1->inbuff->pop();
+    }
 
     if( nullptr == src ) break;
 
-    AQUIRESPINLOCK( chan1->rtpdtlslock );
-    dtlssession::pointer currentdtlssession = chan1->rtpdtls;
-    RELEASESPINLOCK( chan1->rtpdtlslock );
+    dtlssession::pointer currentdtlssession;
+    {
+      SpinLockGuard guard( chan1->rtpdtlslock );
+      currentdtlssession = chan1->rtpdtls;
+    }
+
+
     if( nullptr != currentdtlssession &&
         !currentdtlssession->rtpdtlshandshakeing ) {
       if( !currentdtlssession->unprotect( src ) ) {
@@ -168,15 +184,20 @@ void projectchannelmux::mix2( void ) {
   this->postrtpdata( chan1, chan2, src );
 
   while( true ) {
-    AQUIRESPINLOCK( chan2->rtpbufferlock );
-    src = chan2->inbuff->pop();
-    RELEASESPINLOCK( chan2->rtpbufferlock );
+    {
+      SpinLockGuard guard( chan2->rtpbufferlock );
+      src = chan2->inbuff->pop();
+    }
 
     if( nullptr == src ) break;
 
-    AQUIRESPINLOCK( chan2->rtpdtlslock );
-    dtlssession::pointer currentdtlssession = chan2->rtpdtls;
-    RELEASESPINLOCK( chan2->rtpdtlslock );
+
+    dtlssession::pointer currentdtlssession;    
+    {
+      SpinLockGuard guard( chan2->rtpdtlslock );
+      currentdtlssession = chan2->rtpdtls;
+    }
+
     if( nullptr != currentdtlssession &&
         !currentdtlssession->rtpdtlshandshakeing ) {
       if( !currentdtlssession->unprotect( src ) ) {
@@ -299,8 +320,7 @@ static bool underlyingpointercmp( projectrtpchannelptr l, projectrtpchannelptr r
 Check for new channels to add to the mix in our own thread.
 */
 void projectchannelmux::checkfornewmixes( void ) {
-
-  AQUIRESPINLOCK( this->newchannelslock );
+  SpinLockGuard guard( this->newchannelslock );
 
   for ( auto const& newchan : this->newchannels ) {
     this->channels.push_back( newchan );
@@ -309,24 +329,22 @@ void projectchannelmux::checkfornewmixes( void ) {
 
   this->channels.sort( underlyingpointercmp );
   this->channels.unique( underlyingpointerequal );
-
-  RELEASESPINLOCK( this->newchannelslock );
 }
 
 void projectchannelmux::addchannel( projectrtpchannelptr chan ) {
-  AQUIRESPINLOCK( this->newchannelslock );
+  SpinLockGuard guard( this->newchannelslock );
+
   chan->mixing = true;
   this->newchannels.push_back( chan );
-  RELEASESPINLOCK( this->newchannelslock );
 }
 
 void projectchannelmux::addchannels( projectrtpchannelptr chana, projectrtpchannelptr chanb ) {
-  AQUIRESPINLOCK( this->newchannelslock );
+  SpinLockGuard guard( this->newchannelslock );
+
   chana->mixing = true;
   chanb->mixing = true;
   this->newchannels.push_back( chana );
   this->newchannels.push_back( chanb );
-  RELEASESPINLOCK( this->newchannelslock );
 }
 
 /*

package/src/projectrtpnodemain.cpp

@@ -28,12 +28,6 @@ static std::atomic_bool warningissued( false );
 int32_t startport = 10000;
 int32_t endport = 20000;
 
-void boost::throw_exception( std::exception const & e ) {
-  std::string err = boost::diagnostic_information( e );
-  fprintf( stderr, "%s", err.c_str() );
-  exit( EXIT_FAILURE );
-}
-
 /* our work queue requires some work to not exit */
 static ourhighrestimer periodictimer( workercontext );
 
@@ -203,33 +197,35 @@ void initserver( napi_env env, napi_value &result ) {
   if( napi_ok != napi_set_named_property( env, result, "stats", cstats ) ) return;
 }
 
-NAPI_MODULE_INIT() {
-  napi_value result;
-
-  std::atomic_bool test;
-  if( !test.is_lock_free() ) {
-    fprintf( stderr, "Warning - performance will be poor as atomic variables are not available\n" );
-  }
-
-  srand( time( NULL ) );
+/* Initialize the module */
+napi_value initprtp(napi_env env, napi_value exports) {
+    std::atomic_bool test;
+    if (!test.is_lock_free()) {
+        fprintf(stderr, "Warning - performance will be poor as atomic variables are not available\n");
+    }
 
-  dtlsinit();
+    srand(time(NULL));
 
-  if( napi_ok != napi_create_object( env, &result ) ) return NULL;
+    /* Initialize DTLS or other dependencies */
+    dtlsinit();
 
-  /* Init our modules */
-  initserver( env, result );
-  initrtpbuffer( env, result );
-  initrtpchannel( env, result, startport, endport );
-  initrtpsoundfile( env, result );
-  initrtpcodecx( env, result );
-  initfilter( env, result );
-  inittonegen( env, result );
-  initsrtp( env, result );
+    /* Initialize the exported module object */
+    initserver(env, exports);
+    initrtpbuffer(env, exports);
+    initrtpchannel(env, exports, startport, endport);
+    initrtpsoundfile(env, exports);
+    initrtpcodecx(env, exports);
+    initfilter(env, exports);
+    inittonegen(env, exports);
+    initsrtp(env, exports);
 
-  gen711convertdata();
+    /* Generate G.711 conversion data */
+    gen711convertdata();
 
-  return result;
+    return exports;
 }
 
+/* Register the module */
+NAPI_MODULE(NODE_GYP_MODULE_NAME, initprtp)
+
 #endif /* NODE_MODULE */

package/stress/index.js

@@ -46,6 +46,18 @@ const run = async () => {
     await node.listen( projectrtp, "127.0.0.1", 9002 )
   } else console.log( "Mode: server as listener" )
 
+  let currentstatsquery = 0
+  const intervaletimers = [
+    setInterval( () => {
+      currentstatsquery++
+      const prtpstats = projectrtp.stats()
+      currentstatsquery--
+    }, 100 ),
+    setInterval( () => {
+      if( currentstatsquery > 3 ) utils.log( "Problem with stats not completing" )
+    }, 100 )
+  ]
+
   while ( rununtil > Math.floor( Date.now() / 1000 ) ) {
     if( utils.currentchannelcount() < maxnumberofsessions ) {
       scenarios[ utils.between( 0, scenarios.length ) ]( utils.between( minmscalllength, maxmscalllength ) )
@@ -56,6 +68,9 @@ const run = async () => {
 
   /* It is safe to call shutdown before we are complete - it will just shutdown after all the work is done */
   projectrtp.shutdown()
+
+  clearInterval( intervaletimers[ 0 ] )
+  clearInterval( intervaletimers[ 1 ] )
 }
 
 run()

package/test/interface/rtpproxyserver.js

@@ -680,7 +680,6 @@ describe( "rtpproxy server", function() {
     const p = await prtp.proxy.listen( undefined, "127.0.0.1", ourport )
     const ournode = await prtp.node.connect( ourport, "127.0.0.1" )
 
-
     const chnl = await prtp.openchannel()
     await new Promise( ( resolve ) => { setTimeout( () => resolve(), 100 ) } )
     await chnl.close()

package/src/binding.gyp

@@ -1,40 +0,0 @@
-{
-  "targets": [
-    {
-      "target_name": "projectrtp",
-      "defines": [ "NODE_MODULE", "BOOST_NO_EXCEPTIONS", "BOOST_EXCEPTION_DISABLE" ],
-      "cflags_cc!": [ "-fno-rtti" ],
-      "cflags_cc": [
-        "-O3",
-        "-g",
-        "-Wall",
-        "-fstack-protector-all",
-        "-std=c++17",
-        "-fconcepts-ts",
-        "-Weffc++" ],
-      "libraries": [
-            "-lrt",
-            "-lspandsp",
-            "-lilbc",
-            "-lgnutls",
-            "-lsrtp2",
-            "-fstack-protector-all"
-          ],
-      "sources": [
-        "projectrtpfirfilter.cpp",
-        "projectrtpnodemain.cpp",
-        "projectrtpbuffer.cpp",
-        "projectrtppacket.cpp",
-        "projectrtprawsound.cpp",
-        "projectrtpcodecx.cpp",
-        "projectrtpchannelrecorder.cpp",
-        "projectrtpsoundfile.cpp",
-        "projectrtpsoundsoup.cpp",
-        "projectrtptonegen.cpp",
-        "projectrtpchannel.cpp",
-        "projectrtpchannelmux.cpp",
-        "projectrtpsrtp.cpp",
-        "projectrtpstun.cpp" ]
-    }
-  ]
-}