sip-lab 1.38.0 → 1.40.0

package/DEV.md

@@ -6,7 +6,7 @@ Basic tasks for development:
 
 #### To build
 ```
-sudo apt install build-essential automake autoconf libtool libspeex-dev libopus-dev libsdl2-dev libavdevice-dev libswscale-dev libv4l-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libvo-amrwbenc-dev libboost-dev libtiff-dev libpcap-dev libssl-dev uuid-dev cmake
+sudo apt install build-essential automake autoconf libtool libspeex-dev libopus-dev libsdl2-dev libavdevice-dev libswscale-dev libv4l-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libvo-amrwbenc-dev libboost-dev libtiff-dev libpcap-dev libssl-dev uuid-dev cmake flite-dev
 
 npm install
 ```
@@ -73,7 +73,7 @@ If it fails due to proxy problems, check if you have proxy configured in ~/.dock
 
 ```
 
-After the message is built you can pass them to prebuildify-cross:
+After the image is built you can pass them to prebuildify-cross:
 ```
 nvm use v16.13.1
 npx prebuildify-cross -i mayamatakeshi/sip-lab-debian11:latest -t 15.0.0 -t 16.0.0 -t 17.0.0 -t 18.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 --strip

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

@@ -110,7 +110,8 @@ if [[ ! -d pjwebsock ]]
 then
     git clone https://github.com/jimying/pjwebsock
     cd pjwebsock
-    git checkout a0616ea27f01d5e3bdfd5b801fb1499473a0b0cb
+    #git checkout a0616ea27f01d5e3bdfd5b801fb1499473a0b0cb
+    git checkout ed8bfee79e26ef4e023bac1359301c201ee133af
 fi
 
 

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.38.0",
+  "version": "1.40.0",
   "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)
+})