sip-lab 1.31.0 → 1.33.0

package/samples/start_play_wav_with_end_of_file_event.js

@@ -235,6 +235,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/start_play_wav_with_no_loop.js

@@ -223,6 +223,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/stop_with_cleanup.js

@@ -0,0 +1,134 @@
+const sip = require ('../index.js')
+const Zeq = require('@mayama/zeq')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+
+// here we create our Zeq instance
+var z = new Zeq()
+
+
+async function test() {
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    const t1 = sip.transport.create({address: "127.0.0.1"})
+    const t2 = sip.transport.create({address: "127.0.0.1"})
+
+    const oc = sip.call.create(t1.id, {
+        from_uri: 'sip:alice@test.com',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+        headers: {
+            'X-MyHeader1': 'abc',
+            'X-MyHeader2': 'def',
+        },
+    })
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            transport_id: t2.id,
+            msg: sip_msg({
+                $rU: 'bob',
+                $fU: 'alice',
+                $tU: 'bob',
+                $fd: 'test.com',
+            })
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+            }),
+        },
+    ], 1000)
+
+    const ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {
+        code: 200,
+        reason: 'OK',
+    })
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 1000)
+
+    // Now force an error in the script.
+    // This will be catched by exception handler at the end of the script where
+    // sip.stop(true) will be called (true: terminate all remaining calls, registrations and subscriptions)
+
+    throw "SOME ERROR"
+
+    sip.call.terminate(oc.id)
+
+    // and wait for termination events
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'BYE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
+    ], 1000)
+
+    console.log("Success")
+
+    sip.stop()
+    process.exit(0)
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    sip.stop(true)
+
+    if(e == "SOME ERROR") {
+        console.log("Expected error catched")
+        process.exit(0)
+    } else {
+        console.log("Unexpected error catched")
+        process.exit(1)
+    }
+})
+

package/samples/tcp.js

@@ -401,6 +401,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/text_to_speech.js

@@ -157,6 +157,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/tls.js

@@ -117,6 +117,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/two_audio_streams.js

@@ -477,6 +477,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/two_audio_streams.port_zero.js

@@ -489,6 +489,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.bfsk.js

@@ -143,6 +143,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.dtmf.js

@@ -143,6 +143,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.google.js

@@ -153,6 +153,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/ws_speech_server.send_bfsk.js

@@ -145,6 +145,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples_extra/{ws_speech_server.start_bfsk_detection.js.future → ws_speech_server.start_bfsk_detection.js}

@@ -153,6 +153,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/src/addon.cpp

@@ -1568,7 +1568,15 @@ Napi::Value do_poll(const Napi::CallbackInfo &info) {
 Napi::Value shutdown_(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
 
-  int res = __pjw_shutdown();
+  if (info.Length() != 1) {
+    Napi::Error::New(
+        env, "Wrong number of arguments. Expected: clean_up")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int clean_up = info[0].As<Napi::Number>().Int32Value();
+
+  int res = __pjw_shutdown(clean_up);
 
   if (res != 0) {
     Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();

package/src/idmanager.cpp

@@ -75,3 +75,7 @@ void IdManager::iterate(void (*f)(long id, long val)) {
     ++pos;
   }
 }
+
+int IdManager::size() {
+    return ids.size();
+}

package/src/idmanager.hpp

@@ -17,6 +17,7 @@ public:
   bool get(long id, long &val);
   bool get_id(long val, long &id);
   void iterate(void (*f)(long id, long val));
+  int size();
 
   map<long, long> id_map; // hack to test tcpdumper
 private:

package/src/pjmedia/include/pjmedia/bfsk_det2.h

@@ -0,0 +1,23 @@
+#ifndef __PJMEDIA_BFSK_DET2_H__
+#define __PJMEDIA_BFSK_DET2_H__
+
+#include <pjmedia/port.h>
+
+PJ_BEGIN_DECL
+
+PJ_DEF(pj_status_t) pjmedia_bfsk_det2_create( pj_pool_t *pool,
+                unsigned clock_rate,
+                unsigned channel_count,
+                unsigned samples_per_frame,
+                unsigned bits_per_sample,
+                void (*cb)(pjmedia_port*,
+                void *user_data,
+                int bit),
+                void *user_data,
+                int freq_zero,
+                int freq_one,
+                pjmedia_port **p_port);
+
+PJ_END_DECL
+
+#endif	/* __PJMEDIA_BFSK_DET2_H__ */

package/src/pjmedia/src/pjmedia/bfsk_det.c

@@ -36,88 +36,106 @@
 #   define TRACE_(expr)
 #endif
 
-// Adapted https://github.com/ericksc/goertzel/blob/master/main.cpp
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
 
-#define PI 3.14159265358979
+// Converted by ChatGPT from https://github.com/hackergrrl/goertzel/blob/master/index.js
 
 typedef struct {
-	float coeff;
-	int fix_coeff;
-	int Q1;
-	int Q2;
-	double sine;
-	double cosine;
+    int freq;
+    int sampleRate;
+    int samplesPerFrame;
+    double targetMagnitude;  // Store the precomputed magnitude
 } goertzel_t;
 
-//Para definir punto fijo de 32 bits.
-int FIXED_POINT_16 = 16;
-int ONE_16 = 1 << 16;
+#define CHUNK_SIZE 16
+#define THRESHOLD 0.9
 
-int FIXED_POINT_30 = 30;
-int ONE_30 = 1 << 30;
+double precalcMagnitude(int freq, double rate) {
+    double t = 0.0;
+    double tstep = 1.0 / rate;
+    double samples[CHUNK_SIZE];
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        samples[i] = sin(2 * M_PI * freq * t);
+        t += tstep;
+    }
 
-int toFix( float val, int ONE ) {
-    // Escalamiento
-    return (int) (val * ONE);
-}
+    int k = (int)(0.5 + (CHUNK_SIZE * freq) / rate);
+    double w = (2 * M_PI / CHUNK_SIZE) * k;
+    double c = cos(w);
+    double s = sin(w);
+    double coeff = 2.0 * c;
+
+    double q0 = 0.0, q1 = 0.0, q2 = 0.0;
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        q0 = coeff * q1 - q2 + samples[i];
+        q2 = q1;
+        q1 = q0;
+    }
 
-float floatVal( int fix, int ONE ) {
-    return ((float) fix) / ONE;
-}
+    double real = q1 - q2 * c;
+    double imaginary = q2 * s;
+    double magSquared = real * real + imaginary * imaginary;
 
-int intVal( int fix, int FIXED_POINT ) {
-    return fix >> FIXED_POINT;
+    return magSquared;
 }
 
-int mul(int fix_coeff, int Q1, int FIXED_POINT_mixed) {
-    // Manejo de 64 bit para el resultado inmedianto de la multiplicación
-    // Conversion a 32 bits para posterior uso
-    return (int)((long long int)fix_coeff * (long long int)Q1 >> FIXED_POINT_mixed);
-}
+void goertzel_det_init(goertzel_t *g, int freq, int sample_rate) {
+    g->freq = freq;
+    g->sampleRate = sample_rate;
+    g->samplesPerFrame = CHUNK_SIZE;
 
-/* Call this routine before every "block" (size=N) of samples. */
-void goertzel_det_reset(goertzel_t *g)
-{
-    g->Q2 = 0;
-    g->Q1 = 0;
-}
-/* Call this once, to precompute the constants. */
-void goertzel_det_init(goertzel_t *g, float frequency, float sampling_rate, int samples_per_frame)
-{
-    int k;
-    double floatN;
-    double omega;
-    floatN = (double)samples_per_frame;
-    k = (int)(0.5 + ((floatN * frequency) / sampling_rate));
-    omega = (2.0 * PI * k) / floatN;
-    g->sine = sin(omega);
-    g->cosine = cos(omega);
-    g->coeff = 2.0 * g->cosine;
-    g->fix_coeff = toFix(g->coeff, ONE_30);
-    printf("For sampling_rate = %f", sampling_rate);
-    printf("samples_per_frame = %d", samples_per_frame);
-    printf(" and frequency = %f,\n", frequency);
-    printf("k = %d and coeff = %f\n\n", k, g->coeff);
-    goertzel_det_reset(g);
+    assert(g->sampleRate >= g->freq * 2);
+
+    g->samplesPerFrame = (int)floor(g->samplesPerFrame);
+
+    // Precompute the target magnitude and store it in the struct
+    g->targetMagnitude = precalcMagnitude(g->freq, g->sampleRate);
+    // printf("Target Magnitude: %f\n", g->targetMagnitude);
 }
 
-float goertzel_mag(goertzel_t *g, int *buf, int size)
-{
-    for (int index = 0; index < size; index++)
-    {
-        // Punto fijo 32. INT
-        int Q0;
-        Q0 = mul(g->fix_coeff, g->Q1, 30) - g->Q2 + toFix(buf[index], ONE_16);
-        g->Q2 = g->Q1;
-        g->Q1 = Q0;
+float goertzel_mag(goertzel_t *g, void *samples) {
+    // Allocate an array of floats to hold normalized samples
+    float float_samples[CHUNK_SIZE];
+    uint8_t *byteBuffer = (uint8_t *)samples;  // Cast the void* to a byte array (uint8_t *)
+    for (int i = 0; i < CHUNK_SIZE ; i++) {
+        // Combine two consecutive bytes into a 16-bit signed integer (little-endian)
+        int16_t sample = byteBuffer[i * 2] | (byteBuffer[i * 2 + 1] << 8);
+        float_samples[i] = sample * 2.0f / 0x7FFF;
     }
 
-    float result;
-    result = floatVal(g->Q1, ONE_16) * floatVal(g->Q1,ONE_16) + floatVal(g->Q2,ONE_16) * floatVal(g->Q2,ONE_16) - floatVal(g->Q1,ONE_16) * floatVal(g->Q2,ONE_16) * g->coeff;
-    goertzel_det_reset(g);
-    return result;
-}
+    /*
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        printf("%f,", float_samples[i]);
+    }
+    printf("\n");
+    */
+
+
+    int k = (int)(0.5f + (CHUNK_SIZE * g->freq) / g->sampleRate);
+    float w = (2.0f * M_PI / CHUNK_SIZE) * k;
+    float c = cosf(w);
+    float s = sinf(w);
+    float coeff = 2.0f * c;
+
+    float q0 = 0.0f, q1 = 0.0f, q2 = 0.0f;
+
+    for (int i = 0; i < CHUNK_SIZE; i++) {
+        q0 = coeff * q1 - q2 + float_samples[i];
+        q2 = q1;
+        q1 = q0;
+    }
 
+    float real = q1 - q2 * c;
+    float imaginary = q2 * s;
+    float magSquared = real * real + imaginary * imaginary;
+
+    float per = magSquared / g->targetMagnitude;
+    //printf("(freq=%i) MagSquared=%f targetMagnitude=%f per=%f\n", g->freq, magSquared, g->targetMagnitude, per);
+    return per;
+}
 
 
 static pj_status_t bfsk_det_put_frame(pjmedia_port *this_port, 
@@ -141,24 +159,6 @@ struct bfsk_det
     void *bfsk_cb_user_data;
 };
 
-/*
-static void bfsk_det_bit_callback(void *user_data, int bit)
-{
-    printf("bfsk_det_bit_callback got bit=%i\n", bit);
-    if(bit != 0 && bit != 1) return;
-
-    struct bfsk_det *dport = (struct bfsk_det*)user_data;
-
-    TRACE_((THIS_FILE, "bfsk_det bit detected: %c", bit)); 
-
-    if(!dport->bfsk_cb) return;
-
-    dport->bfsk_cb((pjmedia_port*)dport,
-        dport->bfsk_cb_user_data,
-        bit);
-}
-*/
-	
 PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 				unsigned clock_rate,
 				unsigned channel_count,
@@ -172,10 +172,9 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
                 int freq_one,
 				pjmedia_port **p_port)
 {
-    printf("pjmedia_bfsk_det_create\n");
+    //printf("pjmedia_bfsk_det_create\n");
     struct bfsk_det *det;
 
-    printf("p1\n");
     const pj_str_t name = pj_str("bfsk_det");
 
     PJ_ASSERT_RETURN(pool && clock_rate && channel_count && 
@@ -184,11 +183,8 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 
     PJ_ASSERT_RETURN(pool && p_port, PJ_EINVAL);
 
-    printf("p2\n");
-
     det = PJ_POOL_ZALLOC_T(pool, struct bfsk_det);
     PJ_ASSERT_RETURN(pool != NULL, PJ_ENOMEM);
-    printf("p3\n");
 
     pjmedia_port_info_init(&det->base.info, &name, SIGNATURE, clock_rate,
 			   channel_count, bits_per_sample, samples_per_frame);
@@ -196,13 +192,9 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
     det->base.put_frame = &bfsk_det_put_frame;
     det->base.on_destroy = &bfsk_det_on_destroy;
 
-    printf("p5\n");
-
     det->bfsk_cb = cb;
     det->bfsk_cb_user_data = user_data;
 
-    printf("p6\n");
-
     det->clock_rate = clock_rate;
     det->freq_zero = freq_zero;
     det->freq_one = freq_one;
@@ -217,15 +209,10 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 
     int sample_rate = clock_rate;
 
-    goertzel_det_init(det->goertzel_zero, det->freq_zero, sample_rate, samples_per_frame);
-    goertzel_det_init(det->goertzel_one, det->freq_one, sample_rate, samples_per_frame);
-
-    printf("p7\n");
-
-    TRACE_((THIS_FILE, "bfsk_det created: clock_rate=%u channel_count=%u samples_per_frame=%u bits_per_frame=%u", clock_rate, 
-	    channel_count, samples_per_frame, bits_per_sample));
+    //printf("bfsk_det: clock_rate=%u channel_count=%u samples_per_frame=%u bits_per_frame=%u", clock_rate, channel_count, samples_per_frame, bits_per_sample);
 
-    printf("fsk_rx_init done\n");
+    goertzel_det_init(det->goertzel_zero, det->freq_zero, sample_rate);
+    goertzel_det_init(det->goertzel_one, det->freq_one, sample_rate);
 
     *p_port = &det->base; 
     return PJ_SUCCESS;
@@ -234,50 +221,56 @@ PJ_DEF(pj_status_t) pjmedia_bfsk_det_create( pj_pool_t *pool,
 static pj_status_t bfsk_det_put_frame(pjmedia_port *this_port, 
 				  pjmedia_frame *frame)
 {
-    printf("bfsk_det_put_frame\n");
+    //printf("bfsk_det put_frame\n");
     if(frame->type != PJMEDIA_FRAME_TYPE_AUDIO) return PJ_SUCCESS;
 
     struct bfsk_det *dport = (struct bfsk_det*) this_port;
 
-    int size = PJMEDIA_PIA_SPF(&dport->base.info);
+    int size = frame->size;
     int bps = PJMEDIA_PIA_BITS(&dport->base.info);
 
-    printf("p=%x, size=%i clock_rate=%i bits_per_sample=%i\n", frame->buf, size, dport->clock_rate, bps);
+    //printf("p=%x, size=%i clock_rate=%i bits_per_sample=%i\n", frame->buf, size, dport->clock_rate, bps);
 
     int16_t * samples = (int16_t*)frame->buf;
 
+    /*
     printf("Buffer contents:\n");
     for (int i = 0; i < size; i++) {
-        printf("%04x ", samples[i] & 0xFFFF);
+        printf("%02x", samples[i] & 0xFF);
+        printf("%02x", samples[i] >> 8 & 0xFF);
     }
     printf("\n");
-
-    float zero_power = goertzel_mag(dport->goertzel_zero, frame->buf, size);
-    float  one_power = goertzel_mag(dport->goertzel_one,  frame->buf, size);
-
-    int zero = zero_power > 1000000000.0;
-    int  one =  one_power > 1000000000.0;
-
-    printf("zero_power=%f zero_in_progress=%i zero=%i\n", zero_power, dport->zero_in_progress, zero);
-    printf("one_power=%f one_in_progress=%i  one=%i\n", one_power, dport->one_in_progress, one);
-
-
-    // Check for zero signal extinction
-    if(dport->zero_in_progress && zero == 0) {
-        printf("notifying bit=0\n");
-        dport->bfsk_cb((pjmedia_port*)dport, dport->bfsk_cb_user_data, 0);
-        dport->zero_in_progress = 0;
-    } else {
-        dport->zero_in_progress = zero;
-    }
-
-    // Check for one signal extinction
-    if(dport->one_in_progress && one == 0) {
-        printf("notifying bit=1\n");
-        dport->bfsk_cb((pjmedia_port*)dport, dport->bfsk_cb_user_data, 1);
-        dport->one_in_progress = 0;
-    } else {
-        dport->one_in_progress = one;
+    */
+
+    for(int i=0 ; i<size/2/CHUNK_SIZE; i++) {
+        double zero_power = goertzel_mag(dport->goertzel_zero, &frame->buf[i*2*CHUNK_SIZE]);
+        double  one_power = goertzel_mag(dport->goertzel_one,  &frame->buf[i*2*CHUNK_SIZE]);
+
+        int zero = zero_power > THRESHOLD;
+        int  one =  one_power > THRESHOLD;
+
+        /*
+        printf("zero_power=%f zero_in_progress=%i zero=%i threshold=%f\n", zero_power, dport->zero_in_progress, zero, THRESHOLD);
+        printf(" one_power=%f  one_in_progress=%i  one=%i threshold=%f\n", one_power, dport->one_in_progress, one, THRESHOLD);
+        */
+
+        // Check for zero signal extinction
+        if(dport->zero_in_progress && zero == 0) {
+            printf("notifying bit=0\n");
+            dport->bfsk_cb((pjmedia_port*)dport, dport->bfsk_cb_user_data, 0);
+            dport->zero_in_progress = 0;
+        } else {
+            dport->zero_in_progress = zero;
+        }
+
+        // Check for one signal extinction
+        if(dport->one_in_progress && one == 0) {
+            printf("notifying bit=1\n");
+            dport->bfsk_cb((pjmedia_port*)dport, dport->bfsk_cb_user_data, 1);
+            dport->one_in_progress = 0;
+        } else {
+            dport->one_in_progress = one;
+        }
     }
 
     return PJ_SUCCESS;