sip-lab 1.39.0 → 1.40.1

package/binding.gyp

@@ -14,6 +14,7 @@
             "src",
             "src/pjmedia/include",
             "src/pjmedia/include/pjmedia",
+            "src/pjsip/include",
             "3rdParty/rapidjson/include",
             "3rdParty/boost_1_66_0",
             "3rdParty/spandsp/src",
@@ -24,9 +25,10 @@
           ],
           'conditions': [
             [ 'OS!="win"', {
-              'cflags': ['-g'],
+              'cflags': ['-g', '-DPJ_HAS_SSL_SOCK=1'],
               'cflags_cc': [
                 '-g',
+                '-DPJ_HAS_SSL_SOCK=1',
                 '-fexceptions',
                 '-Wno-maybe-uninitialized',
                 '-fPIC',
@@ -39,6 +41,7 @@
           ],
           'link_settings': {
               'libraries': [
+                '-Wl,--start-group',
                 '-L ../3rdParty/pjproject/pjnath/lib',
                 '-L ../3rdParty/pjproject/pjlib/lib',
                 '-L ../3rdParty/pjproject/pjlib-util/lib',
@@ -92,6 +95,7 @@
 		'-lflite_cmu_us_slt',
 		'-lflite_cmu_us_kal16',
                 '-l srtp-x86_64-unknown-linux-gnu',
+                '-Wl,--end-group',
               ],
           },
        },
@@ -118,6 +122,7 @@
         'src/idmanager.cpp',
         'src/sip.cpp',
         'src/addon.cpp',
+        'src/pjsip/src/pjsip/sip_transport_ws.c',
         'src/pjmedia/src/pjmedia/dtmfdet.c',
         'src/pjmedia/src/pjmedia/bfsk_det.c',
         'src/pjmedia/src/pjmedia/bfsk_det2.c',

package/build_deps.sh

@@ -5,77 +5,72 @@ set -o nounset
 set -o pipefail
 
 
-START_DIR=`pwd`
+START_DIR=$(pwd)
+
+
+ensure_git_repo() {
+    local dir=$1
+    local repo=$2
+    local commit=$3
+    shift 3
+
+    cd "$START_DIR/3rdParty"
+    if [[ -d "$dir" ]]; then
+        cd "$dir"
+        local current=$(git rev-parse HEAD 2>/dev/null || echo "")
+        cd "$START_DIR/3rdParty"
+        if [[ "$current" == "$commit" ]]; then
+            echo "$dir: already at desired commit $commit, skipping"
+            return 0
+        fi
+        echo "$dir: commit mismatch ($current != $commit), re-cloning"
+        rm -rf "$dir"
+    fi
+
+    git clone "$repo" "$dir"
+    cd "$dir"
+    git checkout "$commit"
+
+    if [[ $# -gt 0 ]]; then
+        eval "$*"
+    fi
+    cd "$START_DIR/3rdParty"
+}
 
 
 mkdir -p $START_DIR/3rdParty
 
-
-cd $START_DIR/3rdParty
-if [[ ! -d spandsp ]]
-then
-    commit=e59ca8fb8b1591e626e6a12fdc60a2ebe83435ed
-    git clone https://github.com/freeswitch/spandsp
-    cd spandsp
-    git checkout $commit
+ensure_git_repo spandsp https://github.com/freeswitch/spandsp e59ca8fb8b1591e626e6a12fdc60a2ebe83435ed '
     ./bootstrap.sh
-    CFLAGS='-O -fPIC' ./configure --enable-shared
+    CFLAGS="-O -fPIC" ./configure --enable-shared
     make
-fi
+'
 
+ensure_git_repo rapidjson https://github.com/Tencent/rapidjson 27c3a8dc0e2c9218fe94986d249a12b5ed838f1d
 
-cd $START_DIR/3rdParty
-if [[ ! -d rapidjson ]]
-then
-    git clone https://github.com/Tencent/rapidjson
-    cd rapidjson
-    git checkout 27c3a8dc0e2c9218fe94986d249a12b5ed838f1d
-fi
-
-
-cd $START_DIR/3rdParty
-if [[ ! -d bcg729 ]]
-then
-    git clone https://github.com/MayamaTakeshi/bcg729
-    cd bcg729
-    git checkout faaa895862165acde6df8add722ba4f85a25007d
+ensure_git_repo bcg729 https://github.com/MayamaTakeshi/bcg729 faaa895862165acde6df8add722ba4f85a25007d '
     cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
     make
     mkdir -p lib
     cp -f src/libbcg729.a lib
-fi
-
-
-cd $START_DIR/3rdParty
-if [[ ! -d pjproject ]]
-then
-    git clone https://github.com/pjsip/pjproject
-    cd pjproject
-    #git checkout de3d744c2e1188b59bb907b6ee32ef83740ebc64
-    #git checkout 33a3c9e0a5eb84426edef05a9aa98af17d8011c3 # required for bcg729
-    #git checkout 797088ed133c98492519b7d042b75735f6f9388c # updated as part of #21
-    #git checkout 651df5b50129b7c5a5feec8336dda4468d53d2b0 # updated to latest to see of crash issues improve
-    #git checkout 043926a5846963a2c99378e8daa495230923eaab # updated to try to solve #49 (but issue remains)
-    #git checkout c36802585ddefb3ca477d1f6d773d179510c5412 # updated to try to solve #83 (but issue remains)
-    git checkout 9543a1bcf50be721d030be99afeeb63bd8cf2013 # updated to latest commit to permit to report https://github.com/pjsip/pjproject/issues/4082
+'
 
+ensure_git_repo pjproject https://github.com/pjsip/pjproject 9543a1bcf50be721d030be99afeeb63bd8cf2013 '
     cat > user.mak <<EOF
     export CFLAGS += -fPIC -g
     export LDFLAGS +=
 EOF
-
-    sed -i -r 's/BCG729_LIBS="-lbcg729"/BCG729_LIBS=''/' aconfigure
-    LIBS=`pwd`/../bcg729/src/libbcg729.a ./configure --with-bcg729=`pwd`/../bcg729
-    cat > pjlib/include/pj/config_site.h <<EOF
+    sed -i -r "s/BCG729_LIBS=\"-lbcg729\"/BCG729_LIBS=\"\"/" aconfigure
+    LIBS=$(pwd)/../bcg729/src/libbcg729.a ./configure --with-bcg729=$(pwd)/../bcg729
+    cat > pjlib/include/pj/config_site.h <<EOF2
 #define PJSUA_MAX_ACC (20000)
 #define PJ_IOQUEUE_MAX_HANDLES (1024)
 #define PJSUA_MAX_CALLS (20000)
 
 #define PJMEDIA_HAS_OPUS_CODEC 1
-EOF
+EOF2
     make dep && make clean && make
-fi
-
+'
 
 cd $START_DIR/3rdParty
 if [[ ! -d boost_1_66_0 ]]
@@ -84,13 +79,17 @@ then
     tar xf boost_1_66_0.tar.bz2
 fi
 
-
 cd $START_DIR/3rdParty
+POCKETSPHINX_VERSION=5.0.3
+if [[ -f pocketsphinx/.version && "$(cat pocketsphinx/.version)" != "$POCKETSPHINX_VERSION" ]]
+then
+    echo "pocketsphinx: version mismatch, re-downloading"
+    rm -rf pocketsphinx
+fi
 if [[ ! -d pocketsphinx ]]
 then
-    POCKETSPHINX_VERSION=5.0.3
     rm -f v${POCKETSPHINX_VERSION}.tar.gz
-    wget https://github.com/cmusphinx/pocketsphinx/archive/refs/tags/v${POCKETSPHINX_VERSION}.tar.gz 
+    wget https://github.com/cmusphinx/pocketsphinx/archive/refs/tags/v${POCKETSPHINX_VERSION}.tar.gz
     tar xf v${POCKETSPHINX_VERSION}.tar.gz
     rm -f v${POCKETSPHINX_VERSION}.tar.gz
     mv pocketsphinx-${POCKETSPHINX_VERSION} pocketsphinx
@@ -98,6 +97,7 @@ then
     sed -i '/include(GNUInstallDirs)/a \\nset(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")' CMakeLists.txt
     cmake -S . -B build
     cmake --build build
+    echo "$POCKETSPHINX_VERSION" > .version
 
     rm -fr ../../pocketsphinx
     mkdir -p ../../pocketsphinx
@@ -105,13 +105,7 @@ then
 fi
 
 
-cd $START_DIR/3rdParty
-if [[ ! -d pjwebsock ]]
-then
-    git clone https://github.com/jimying/pjwebsock
-    cd pjwebsock
-    git checkout a0616ea27f01d5e3bdfd5b801fb1499473a0b0cb
-fi
+ensure_git_repo pjwebsock https://github.com/jimying/pjwebsock ed8bfee79e26ef4e023bac1359301c201ee133af
 
 
 #cd $START_DIR/3rdParty

package/index.js

@@ -111,4 +111,6 @@ addon.subscription = {
     subscribe: (s_id, params) => { return addon.subscription_subscribe(s_id, JSON.stringify(params)) },
 }
 
+addon.set_opus_config = (params) => { return addon._set_opus_config(JSON.stringify(params)) }
+
 module.exports = addon;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.39.0",
+  "version": "1.40.1",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -10,7 +10,7 @@
     "install": "node-gyp-build",
     "build": "node-gyp build",
     "rebuild": "node-gyp rebuild",
-    "test": "./runtests"
+    "test": "./runtests -a 3"
   },
   "repository": {
     "type": "git",

package/runtests

@@ -4,77 +4,153 @@ set -o nounset
 
 function usage() {
     cat <<EOF
-Usage: $0 [-g]
+Usage: $0 [-g] [-e] [-f test_name] [-a attempts]
 
 Details:
       -g : run each test inside gdb
+      -e : include samples_extra
+      -f : start from a specific test, skipping any test before it
+      -a : if test fails, it can be retried up to XX times (default is 1)
 EOF
 }
 
 use_gdb=0
+extra=0
+from_test=""
+attempts=1
 
-while getopts "gh" o; do
+while getopts "gef:a:h" o; do
     case "${o}" in
         g)
             use_gdb=1
-	    ;;
+            ;;
+        e)
+            extra=1
+            ;;
+        f)
+            from_test=${OPTARG}
+            ;;
+        a)
+            attempts=${OPTARG}
+            ;;
         h)
             usage
-	    exit 0
-	    ;;
-	*)
+            exit 0
+            ;;
+        *)
             usage
-	    exit 1
-	    ;;
+            exit 1
+            ;;
     esac
 done
 shift $((OPTIND-1))
 
 successful_tests=()
+failed_tests=()
 
 function output_successful_tests() {
-    echo "Successful tests:"
-    for t in "${successful_tests[@]}"
-    do
-        echo "  - $t"
-    done
+    if [ ${#successful_tests[@]} -ne 0 ]; then
+        echo "Successful tests:"
+        for t in "${successful_tests[@]}"
+        do
+            echo "  - $t"
+        done
+    fi
+}
+
+function output_failed_tests() {
+    if [ ${#failed_tests[@]} -ne 0 ]; then
+        echo "Failed tests:"
+        for t in "${failed_tests[@]}"
+        do
+            echo "  - $t"
+        done
+    fi
 }
 
 echo
 
-for i in $(ls samples/*.js)
+# Get list of tests and sort them
+test_patterns="samples/*.js"
+if [[ "$extra" == 1 ]]; then
+    test_patterns="$test_patterns samples_extra/*.js"
+fi
+
+mapfile -t sorted_tests < <(ls -1 $test_patterns 2>/dev/null | sort)
+
+start_running=0
+if [[ -z "$from_test" ]]; then
+    start_running=1
+fi
+
+for i in "${sorted_tests[@]}"
 do
-    start_time=$(date +%s.%N)
+    if [[ "$start_running" -eq 0 && "$i" == "$from_test" ]]; then
+        start_running=1
+    fi
 
-    if [[ $use_gdb -eq 0 ]]
-    then
-        node $i
-    else
-        gdb -ex "handle SIGSEGV stop" -ex "run" -ex "bt" -ex "quit" --args node $i
+    if [[ "$start_running" -eq 0 ]]; then
+        echo "Skipping $i"
+        continue
     fi
 
-    if [[ $? -ne 0 ]]
+    echo "Running test: $i"
+    start_time=$(date +%s.%N)
+    
+    success=0
+    for (( c=1; c<=$attempts; c++ ))
+    do
+        if [[ $use_gdb -eq 0 ]]
+        then
+            node $i
+        else
+            gdb -ex "handle SIGSEGV stop" -ex "run" -ex "bt" -ex "quit" --args node $i
+        fi
+
+        if [[ $? -eq 0 ]]; then
+            success=1
+            break
+        fi
+
+        if [[ $c -lt $attempts ]]; then
+            echo "Test $i failed. Retrying (attempt $(($c + 1)) of $attempts)..."
+        fi
+    done
+
+    if [[ $success -eq 0 ]]
     then
-        echo "$i failed"
-	echo
-	output_successful_tests
-        exit 1
+        echo "$i failed after $attempts attempts"
+        failed_tests+=("$i")
     else
         end_time=$(date +%s.%N)
         duration=$(echo "$end_time - $start_time" | bc)
-	formatted_duration=$(printf "%.2f seconds" $duration)
-	successful_tests+=("$i: duration=$formatted_duration")
-
-	echo
-	echo "$i failed"
+        formatted_duration=$(printf "%.2f seconds" $duration)
+        
+        success_message="$i: duration=$formatted_duration"
+        # The variable c comes from the retry loop
+        if [[ $c -gt 1 ]]; then
+            success_message+=" (succeeded after $c attempts)"
+        fi
+        successful_tests+=("$success_message")
     fi
+    echo
 done
 
 echo
 
-echo "Success. All tests passed"
-echo
-output_successful_tests
-echo
-echo "Everything OK"
-echo
+if [ ${#failed_tests[@]} -ne 0 ]; then
+    output_successful_tests
+    echo
+    output_failed_tests
+    echo
+    echo "Some tests failed."
+    echo
+    exit 1
+else
+    echo "Success. All tests passed"
+    echo
+    output_successful_tests
+    echo
+    echo "Everything OK"
+    echo
+fi

package/samples/gsm.js

@@ -0,0 +1,230 @@
+var sip = require ('../index.js')
+var Zeq = require('@mayama/zeq')
+var z = new Zeq()
+var m = require('data-matching')
+var sip_msg = require('sip-matching')
+var sdp = require('sdp-matching')
+
+var assert = require('assert')
+
+async function test() {
+    //sip.set_log_level(6)
+    sip.dtmf_aggregation_on(500)
+
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    t1 = sip.transport.create({address: "127.0.0.1", type: 'udp'})
+    t2 = sip.transport.create({address: "127.0.0.1", type: 'udp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    assert(sip.get_codecs().indexOf("GSM/8000/1") > 0)
+
+    sip.set_codecs("GSM/8000/1:128")
+
+    flags = 0
+
+    oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`})
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+            }),
+        },
+    ], 1000)
+
+    ic = {
+        id: z.$call_id,
+        sip_call_id: z.$sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                'hdr_content_type': 'application/sdp',
+                $rb: '!{_}a=sendrecv!{_}',
+            }),
+        },
+    ], 1000)
+
+    sip.call.start_record_wav(oc.id, {file: './oc.wav'})
+    sip.call.start_record_wav(ic.id, {file: './ic.wav'})
+
+    sip.call.start_play_wav(oc.id, {file: 'samples/artifacts/hello_good_morning.wav', end_of_file_event: true, no_loop: true})
+    sip.call.start_play_wav(ic.id, {file: 'samples/artifacts/hello_good_morning.wav', end_of_file_event: true, no_loop: true})
+
+    await z.wait([
+        {
+            event: 'end_of_file',
+            call_id: oc.id,
+        },
+        {
+            event: 'end_of_file',
+            call_id: ic.id,
+        },
+    ], 5000)
+
+    sip.call.reinvite(oc.id)
+
+    await z.wait([
+        {
+            event: 'reinvite',
+            call_id: ic.id
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendrecv!{_}',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 500)
+
+    sip.call.reinvite(oc.id, false, 0)
+
+    await z.wait([
+        {
+            event: 'reinvite',
+            call_id: ic.id
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+            }),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                $rb: '!{_}a=sendrecv!{_}',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 500)
+
+    oc_stat = sip.call.get_stream_stat(oc.id, {media_id: 0})
+    ic_stat = sip.call.get_stream_stat(ic.id, {media_id: 0})
+
+    console.log(oc_stat)
+    console.log(ic_stat)
+
+    oc_stat = JSON.parse(oc_stat)
+    ic_stat = JSON.parse(ic_stat)
+
+    assert(oc_stat.CodecInfo == 'GSM/8000/1')
+    assert(ic_stat.CodecInfo == 'GSM/8000/1')
+
+    sip.call.stop_record_wav(oc.id)
+    sip.call.stop_record_wav(ic.id)
+
+    sip.call.terminate(oc.id)
+
+    await z.wait([
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'BYE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+    ], 1000)
+
+    console.log("Success")
+
+    sip.stop()
+    process.exit(0)
+}
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})