@babblevoice/projectrtp 2.6.2 → 2.6.4

package/.github/workflows/buildimage.yaml

@@ -1,7 +1,6 @@
 name: Build
 
-# Controls when the workflow will run
-on: 
+on:
   workflow_dispatch:
   push:
     branches:
@@ -12,51 +11,29 @@ on:
     branches:
       - 'main'
 
-#GH
 permissions:
   contents: read
 
 jobs:
   build:
     runs-on: ubuntu-latest
+
     steps:
-    # Get the repository's code
       - name: Checkout
-        uses: actions/checkout@v3
-      # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU
-        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        
-      - 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 }}
+        uses: actions/checkout@v5
 
-      - name: Build and export to Docker
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          load: true
-          tags: docker.io/tinpotnick/projectrtp:test
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
 
-      - 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: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
       - name: Docker meta
         id: ourdockertags
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v5
         with:
-          # list of Docker images to use as base name for tags
           images: |
             docker.io/tinpotnick/projectrtp
-          # Docker tags based on the following events/attributes
           tags: |
             type=schedule
             type=ref,event=branch
@@ -65,9 +42,16 @@ jobs:
             type=semver,pattern={{major}}.{{minor}}
             type=semver,pattern={{major}}
             type=sha
-    
+
+      - name: Login to Docker Hub
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v6
         with:
           context: .
           platforms: linux/amd64,linux/arm64

package/Dockerfile

@@ -1,5 +1,5 @@
 
-FROM alpine:3.21 AS builder
+FROM alpine:3.22 AS builder
 
 WORKDIR /usr/src/
 
@@ -9,16 +9,16 @@ RUN apk add --no-cache \
     wget https://github.com/TimothyGu/libilbc/releases/download/v3.0.4/libilbc-3.0.4.tar.gz; \
     tar xvzf libilbc-3.0.4.tar.gz; \
     cd libilbc-3.0.4; \
-    cmake . -DCMAKE_INSTALL_LIBDIR=/lib -DCMAKE_INSTALL_INCLUDEDIR=/usr/include; cmake --build .; cmake --install .; 
-    
+    cmake . -DCMAKE_INSTALL_LIBDIR=/lib -DCMAKE_INSTALL_INCLUDEDIR=/usr/include; cmake --build .; cmake --install .;
+
 WORKDIR /usr/src/projectrtp
 COPY . .
 
 # a more correct to install this module into the global location
 RUN npm install --production --build-from-source && \
-    npm install -g . 
+    npm install -g .
 
-FROM alpine:3.21 AS app
+FROM alpine:3.22 AS app
 
 RUN apk add --no-cache \
     spandsp tiff gnutls libsrtp libc6-compat openssl ca-certificates nodejs npm

package/README.md

@@ -62,22 +62,13 @@ These are designed to create real world scenarios - opening and closing multiple
 
 ### Local build
 
-If you wish to build outsode of a Docker image, there are npm target scripts for build and rebuild. For beta releases the following can be done.
+Local dev build
 
 ```bash
-docker buildx prune
-docker buildx build --platform linux/amd64,linux/arm64 -t tinpotnick/projectrtp:2.6.2 . --push
-```
-
-### Dev build
+docker build --target builder -t projectrtp:dev .
 
-Some items might need installing.
-```sh
-sudo dnf install libasan libubsan
-```
-
-```sh
-npm run build:dev
+# to run
+docker run -it --rm projectrtp:dev [command ie sh or npm test etc]
 ```
 
 ## Example scripts
@@ -129,7 +120,7 @@ A server would typically run application logic before then opening media ports.
 
 const prtp = require( "@babblevoice/projectrtp" ).projectrtp
 
-/* This switches this server to a central 
+/* This switches this server to a central
 server and requires nodes to connect to us
 to provide worker nodes */
 await prtp.server.listen()
@@ -199,7 +190,7 @@ async function go() {
   const pa = await wgets( "https://checkip.amazonaws.com" )
 
   prtp.setaddress( pa )
-  
+
 }
 
 listen()
@@ -209,7 +200,7 @@ listen()
 ## Stats
 
 When we receive an object back from our node (or if standlone just ourself), the object contains information about the
-state of the sevrer. It includes items such as number of channels open, MOS quality score etc. 
+state of the sevrer. It includes items such as number of channels open, MOS quality score etc.
 
 MOS is only included for our received measurements.
 

package/package.json

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

package/src/projectrtpchannel.cpp

@@ -188,13 +188,13 @@ void projectrtpchannel::remote( std::string address,
     this->remoteaddress = address;
     changed = true;
   }
-  
+
   if( port != this->remoteport ) {
     this->remoteport = port;
     changed = true;
   }
 
-  
+
   if( this->dtlsfingerprint != fingerprint ) {
     this->dtlsfingerprint = fingerprint;
     changed = true;
@@ -233,7 +233,7 @@ void projectrtpchannel::remote( std::string address,
         this->rtpdtls = newsession;
       }
     }
-    
+
     this->receivedrtp = false;
     this->remoteconfirmed = false;
     this->autoadjust = true;
@@ -316,7 +316,7 @@ void projectrtpchannel::badsocketopen( const char *err ) {
     this->rtpsocket.close();
   }
 
-  if( !this->rtcpsocket.is_open() ) {
+  if( this->rtcpsocket.is_open() ) {
     this->rtcpsocket.close();
   }
 
@@ -470,7 +470,7 @@ bool projectrtpchannel::checkidlerecv( void ) {
         this->doclose();
         return true;
         }
-    
+
     } else if( this->hardtickswithnortpcount > ( 50 * 60 * 60 ) ) { /* 1hr hard timeout */
       this->closereason = "idle";
       this->doclose();
@@ -535,12 +535,14 @@ void projectrtpchannel::handletick( const boost::system::error_code& error ) {
   }
 
   rtppacket *src;
-  do {
+  while( true ) {
     {
       SpinLockGuard guard( this->rtpbufferlock );
-      src = this->inbuff->pop();
+      src = this->inbuff->peek();
     }
 
+    if( nullptr == src ) break;
+
     dtlssession::pointer currentdtlssession;
     {
       SpinLockGuard guarddtls( this->rtpdtlslock );
@@ -551,10 +553,22 @@ void projectrtpchannel::handletick( const boost::system::error_code& error ) {
         !currentdtlssession->rtpdtlshandshakeing ) {
       if( !currentdtlssession->unprotect( src ) ) {
         this->receivedpkskip++;
+        {
+          SpinLockGuard guard( this->rtpbufferlock );
+          this->inbuff->poppeeked();
+        }
         src = nullptr;
+        break;
       }
     }
-  } while( this->checkfordtmf( src ) );
+
+    if( !this->checkfordtmf( src ) ) break;
+
+    {
+      SpinLockGuard guard( this->rtpbufferlock );
+      this->inbuff->poppeeked();
+    }
+  }
 
   this->senddtmf();
 
@@ -592,6 +606,11 @@ void projectrtpchannel::handletick( const boost::system::error_code& error ) {
     }
   }
 
+  if( nullptr != src ) {
+    SpinLockGuard guard( this->rtpbufferlock );
+    this->inbuff->poppeeked();
+  }
+
   this->writerecordings();
 
   this->endticktimer();
@@ -711,7 +730,7 @@ bool projectrtpchannel::recordercompleted( const channelrecorder::pointer& rec )
 }
 
 /**
- * Helper function for checkfordtmf - 
+ * 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
@@ -821,7 +840,7 @@ void projectrtpchannel::writerecordings( void ) {
 
     /* calculate power for the below tests and the finish test in ::removeoldrecorders */
     uint16_t pav = 0;
-    if( ( !rec->isactive() && rec->startabovepower > 0 ) || 
+    if( ( !rec->isactive() && rec->startabovepower > 0 ) ||
         ( rec->isactive() && rec->finishbelowpower > 0 ) ) {
       pav = rec->poweravg( power );
     }
@@ -875,10 +894,10 @@ bool projectrtpchannel::dtlsnegotiate( void ) {
 }
 
 /**
- * @brief 
- * 
- * @return true 
- * @return false 
+ * @brief
+ *
+ * @return true
+ * @return false
  */
 bool projectrtpchannel::handlestun( uint8_t *pk, size_t len ) {
 
@@ -904,7 +923,7 @@ bool projectrtpchannel::handlestun( uint8_t *pk, size_t len ) {
 }
 
 /**
- * Auto correct our to send to address if required. 
+ * Auto correct our to send to address if required.
  */
 void projectrtpchannel::correctaddress( void ) {
 
@@ -949,7 +968,7 @@ void projectrtpchannel::readsomertp( void ) {
     SpinLockGuard guard( this->rtpbufferlock );
     buf = this->inbuff->reserve();
   }
-  
+
 
   if( nullptr == buf ) {
     fprintf( stderr, "Error no buffer\n" );
@@ -957,48 +976,49 @@ void projectrtpchannel::readsomertp( void ) {
     return;
   }
 
+  auto self = shared_from_this();
+
   this->rtpsocket.async_receive_from(
   boost::asio::buffer( buf->pk, RTPMAXLENGTH  ), this->rtpsenderendpoint,
-    [ this, buf ]( boost::system::error_code ec, std::size_t bytesrecvd ) {
-
-      if ( ec && ec != boost::asio::error::message_size ) return;
-      this->receivedpkcount++;
+    [ self, buf ]( boost::system::error_code ec, std::size_t bytesrecvd ) {
 
-      if( !this->active || this->_requestclose ) return;
+      if( !self->active || self->_requestclose ) return;
+      if( ec && ec != boost::asio::error::message_size ) return;
+      self->receivedpkcount++;
 
       if ( bytesrecvd > 0 && bytesrecvd <= RTPMAXLENGTH ) {
         buf->length = bytesrecvd;
 
-        if( this->handlestun( buf->pk, bytesrecvd ) )
+        if( self->handlestun( buf->pk, bytesrecvd ) )
           goto readsomemore;
 
         dtlssession::pointer currentdtlssession;
         {
-          SpinLockGuard guard( this->rtpdtlslock );
-          currentdtlssession = this->rtpdtls;
+          SpinLockGuard guard( self->rtpdtlslock );
+          currentdtlssession = self->rtpdtls;
         }
 
         if( nullptr != currentdtlssession &&
             currentdtlssession->rtpdtlshandshakeing ) {
           {
-            SpinLockGuard guard( this->rtpdtlslock );
+            SpinLockGuard guard( self->rtpdtlslock );
             currentdtlssession->write( buf->pk, bytesrecvd );
           }
 
-          this->dtlsnegotiate();
+          self->dtlsnegotiate();
           goto readsomemore;
         }
 
         /* TODO ZRTP? */
         if( buf->getpacketextension() ) {
-          this->receivedpkskip++;
+          self->receivedpkskip++;
           goto readsomemore;
         }
 
-        this->correctaddress();
+        self->correctaddress();
 
-        if( !this->recv ) {
-          this->receivedpkskip++;
+        if( !self->recv ) {
+          self->receivedpkskip++;
           goto readsomemore;
         }
 
@@ -1007,10 +1027,10 @@ void projectrtpchannel::readsomertp( void ) {
         for now do not check.
         this->correctssrc( buf->getssrc() );
         */
-        
-        if( this->confirmedrtpsenderendpoint != this->rtpsenderendpoint ) {
+
+        if( self->confirmedrtpsenderendpoint != self->rtpsenderendpoint ) {
           /* After the first packet - we only accept data from the verified source */
-          this->receivedpkskip++;
+          self->receivedpkskip++;
           goto readsomemore;
         }
 
@@ -1021,25 +1041,27 @@ void projectrtpchannel::readsomertp( void ) {
         }
         */
 
-        this->tickswithnortpcount = 0;
-        this->hardtickswithnortpcount = 0;
+        self->tickswithnortpcount = 0;
+        self->hardtickswithnortpcount = 0;
 
         /* dynamic payload types */
         auto pt = buf->getpayloadtype();
-        if( pt == this->ilbcpt ) {
+        if( pt == self->ilbcpt ) {
           buf->setpayloadtype( ILBCPAYLOADTYPE );
-        } else if ( pt == this->rfc2833pt ) {
+        } else if ( pt == self->rfc2833pt ) {
           buf->setpayloadtype( RFC2833PAYLOADTYPE );
         }
 
         {
-          SpinLockGuard guard( this->rtpbufferlock );
-          this->inbuff->push();
+          SpinLockGuard guard( self->rtpbufferlock );
+          self->inbuff->push();
         }
       }
 
 readsomemore:
-      this->readsomertp();
+      if( self->active && !self->_requestclose ) {
+        self->readsomertp();
+      }
 
     } );
 }
@@ -1070,18 +1092,24 @@ rtppacket *projectrtpchannel::gettempoutbuf( void ) {
 Wait for RTP data
 */
 void projectrtpchannel::readsomertcp( void ) {
+
+  if( !this->active || this->_requestclose ) return;
+
+  auto self = shared_from_this();
+
   this->rtcpsocket.async_receive_from(
   boost::asio::buffer( &this->rtcpdata[ 0 ], RTCPMAXLENGTH ), this->rtcpsenderendpoint,
-    [ this ]( boost::system::error_code ec, std::size_t bytes_recvd ) {
+    [ self ]( boost::system::error_code ec, std::size_t bytes_recvd ) {
 
+      if( !self->active || self->_requestclose ) return;
       if( ec ) return;
 
       if ( bytes_recvd > 0 && bytes_recvd <= RTCPMAXLENGTH ) {
-        this->handlertcpdata();
+        self->handlertcpdata();
       }
 
-      if( bytes_recvd > 0 && this->active ) {
-        this->readsomertcp();
+      if( bytes_recvd > 0 && self->active && !self->_requestclose ) {
+        self->readsomertcp();
       }
     } );
 }
@@ -1230,7 +1258,7 @@ bool projectrtpchannel::unmix( void ) {
 
 /**
  * @brief Actual do set the variables ot show unmixed.
- * 
+ *
  */
 void projectrtpchannel::dounmix( void ) {
   this->mixing = false;
@@ -1334,7 +1362,7 @@ void projectrtpchannel::senddtmf( void ) {
     *tmp = htons( ( this->dtmfsendcount + 1 ) * 160 );
 
     this->writepacket( dst );
-    
+
   } else {
     /* end packet */
     rtppacket *dst = this->gettempoutbuf();
@@ -1452,7 +1480,7 @@ static projectrtpchannel::pointer getrtpchannelfromargv( napi_env env, napi_call
 static napi_value channelclose( napi_env env, napi_callback_info info ) {
 
   projectrtpchannel::pointer chan = getrtpchannelfromthis( env, info );
-  if( nullptr == chan ) createnapibool( env, false );
+  if( nullptr == chan ) return createnapibool( env, false );
   chan->requestclose( "requested" );
 
   return createnapibool( env, true );
@@ -1563,7 +1591,7 @@ static napi_value channelrecord( napi_env env, napi_callback_info info ) {
   if( napi_ok == napi_has_named_property( env, argv[ 0 ], "numchannels", &hasit ) &&
       hasit &&
       napi_ok == napi_get_named_property( env, argv[ 0 ], "numchannels", &mtmp ) ) {
-        
+
     uint32_t numchannels = 2;
     napi_get_value_uint32( env, mtmp, &numchannels );
     if( 1 == numchannels || 2 == numchannels ) {
@@ -2118,8 +2146,8 @@ static napi_value channelcreate( napi_env env, napi_callback_info info ) {
   if( napi_ok == napi_has_named_property( env, argv[ 0 ], "remote", &hasit ) &&
       hasit &&
       napi_ok == napi_get_named_property( env, argv[ 0 ], "remote", &nremote ) ) {
-    /* 
-    optional - DTLS 
+    /*
+    optional - DTLS
     "dtls": {
       "fingerprint": {
         "type": "sha-256 - but ignored for now!",
@@ -2364,7 +2392,7 @@ nodtls:
       napi_ok != napi_create_string_utf8( env, getdtlssrtpsha256fingerprint(), NAPI_AUTO_LENGTH, &fp ) ||
       napi_ok != napi_set_named_property( env, ndtls, "fingerprint", fp ) ||
       napi_ok != napi_set_named_property( env, ndtls, "enabled", createnapibool( env, dtlsenabled ) ) ||
-      
+
       napi_ok != napi_create_string_utf8( env, p->icelocalpwd.c_str(), NAPI_AUTO_LENGTH, &nicepwd ) ||
       napi_ok != napi_set_named_property( env, nlocal, "icepwd", nicepwd ) ) {
 

package/src/projectrtpchannelmux.cpp

@@ -149,7 +149,7 @@ void projectchannelmux::mix2( void ) {
   while( true ) {
     {
       SpinLockGuard guard( chan1->rtpbufferlock );
-      src = chan1->inbuff->pop();
+      src = chan1->inbuff->peek();
     }
 
     if( nullptr == src ) break;
@@ -165,6 +165,10 @@ void projectchannelmux::mix2( void ) {
         !currentdtlssession->rtpdtlshandshakeing ) {
       if( !currentdtlssession->unprotect( src ) ) {
         chan1->receivedpkskip++;
+        {
+          SpinLockGuard guard( chan1->rtpbufferlock );
+          chan1->inbuff->poppeeked();
+        }
         src = nullptr;
         break;
       }
@@ -172,13 +176,22 @@ void projectchannelmux::mix2( void ) {
 
     /* process but ignore and look for next other packet */
     if( !chan1->checkfordtmf( src ) ) break;
+
+    {
+      SpinLockGuard guard( chan1->rtpbufferlock );
+      chan1->inbuff->poppeeked();
+    }
   }
   this->postrtpdata( chan1, chan2, src );
+  if( nullptr != src ) {
+    SpinLockGuard guard( chan1->rtpbufferlock );
+    chan1->inbuff->poppeeked();
+  }
 
   while( true ) {
     {
       SpinLockGuard guard( chan2->rtpbufferlock );
-      src = chan2->inbuff->pop();
+      src = chan2->inbuff->peek();
     }
 
     if( nullptr == src ) break;
@@ -194,15 +207,28 @@ void projectchannelmux::mix2( void ) {
         !currentdtlssession->rtpdtlshandshakeing ) {
       if( !currentdtlssession->unprotect( src ) ) {
         chan2->receivedpkskip++;
+        {
+          SpinLockGuard guard( chan2->rtpbufferlock );
+          chan2->inbuff->poppeeked();
+        }
         src = nullptr;
         break;
       }
     }
 
     if( !chan2->checkfordtmf( src ) ) break;
+
+    {
+      SpinLockGuard guard( chan2->rtpbufferlock );
+      chan2->inbuff->poppeeked();
+    }
   }
 
   this->postrtpdata( chan2, chan1, src );
+  if( nullptr != src ) {
+    SpinLockGuard guard( chan2->rtpbufferlock );
+    chan2->inbuff->poppeeked();
+  }
 }
 
 /**