sip-lab 1.2.3 → 1.5.0

package/README.md

@@ -1,13 +1,24 @@
 ## sip-lab
 
-Node module that helps to write functional tests for SIP systems (including media operations).
+### Overview
+
+A nodejs module that helps to write functional tests for SIP systems (including media operations).
 It uses pjproject for SIP and media processing.
 
+### Installation
+
 This will require for you to have some libraries installed. So do:
 ```
 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 libopus-dev libsdl2-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libboost-dev libspandsp-dev libpcap-dev libssl-dev uuid-dev
 ```
 
+We will also support G729 codec by installing bcg729.
+
+There is a helper script that you can use:
+```
+./install_bcg729.sh
+```
+
 Then install sip-lab by doing:
 ```
   npm install sip-lab
@@ -25,12 +36,12 @@ But if you do so, you will need to set NODE_PATH for node to find it by doing:
 
 To test from within this repo just run:
 ```
+  npm install -g node-gyp
   npm install --unsafe-perm
 
   node samples/simple.js
 ```
 
-
 The module is known to work properly in Ubuntu 18.04.4, Debian 8 and Debian 10 (and it is expected to work in Debian 9).
 It was originally developed with node v.10 and tested with v.12 and it is expected to work with latest versions of node.
 (it is known to not work with node v.8)

package/binding.gyp

@@ -38,6 +38,9 @@
             '-Wno-maybe-uninitialized',
             '-fPIC',
           ],
+          'ldflags_cc': [
+            '-all-static',
+          ]
           }
         ]
       ],
@@ -50,6 +53,7 @@
             '-L ../pjproject/pjmedia/lib',
             '-L ../pjproject/pjsip/lib',
             '-L ../pjproject/third_party/lib',
+            '-L ../bcg729/src',
             '-l pjnath-x86_64-unknown-linux-gnu',
             '-l ilbccodec-x86_64-unknown-linux-gnu',
             '-l srtp-x86_64-unknown-linux-gnu',
@@ -94,6 +98,7 @@
             '-lopencore-amrwb',
             '-lvo-amrwbenc',
             '-lspeex',
+            '-lbcg729',
           ],
       },
     },

package/install.sh

@@ -8,7 +8,8 @@ if [[ ! -d pjproject ]]
 then
 	git clone https://github.com/pjsip/pjproject
 	cd pjproject
-	git checkout de3d744c2e1188b59bb907b6ee32ef83740ebc64
+	#git checkout de3d744c2e1188b59bb907b6ee32ef83740ebc64
+    git checkout 33a3c9e0a5eb84426edef05a9aa98af17d8011c3 # required for bcg729
 
     #echo "Patching sip_transaction.c to avoid problems with CANCEL"
     sed -i -r 's|event->body.tx_msg.tdata == tsx->last_tx,|\t\t\t1, /* \0 */|' pjsip/src/pjsip/sip_transaction.c 
@@ -18,7 +19,7 @@ then
 	export LDFLAGS +=
 EOF
 
-	./configure
+	./configure --with-bcg729
 	cat > pjlib/include/pj/config_site.h <<EOF
 #define PJMEDIA_HAS_SRTP  0
 EOF

package/install_bcg729.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+if [[ ! -d bcg729 ]]
+then
+    git clone https://github.com/MayamaTakeshi/bcg729
+    cd bcg729
+    git checkout faaa895862165acde6df8add722ba4f85a25007d
+    cmake . 
+    make
+    sudo make install
+    sudo ldconfig
+fi
+
+echo success

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.2.3",
+  "version": "1.5.0",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -19,12 +19,12 @@
   "homepage": "https://github.com/MayamaTakeshi/sip-lab",
   "dependencies": {
     "node-addon-api": "^1.7.2",
-    "node-gyp": "^7.0.0"
+    "node-gyp": "^8.4.1"
   },
   "devDependencies": {
-    "data-matching": "^1.23.6",
-    "sip-matching": "^1.3.11",
-    "string-matching": "^1.11.7",
-    "zester": "^2.20.9"
+    "data-matching": "^1.23.7",
+    "sip-matching": "^1.3.12",
+    "string-matching": "^1.11.8",
+    "zester": "^3.0.1"
   }
 }

package/{a.js → samples/g729.js}

@@ -1,5 +1,6 @@
-var sip = require ('sip-lab')
-var z = require('zester')
+var sip = require ('../index.js')
+var Zester = require('zester')
+var z = new Zester()
 var m = require('data-matching')
 var sip_msg = require('sip-matching')
 
@@ -19,6 +20,8 @@ t2 = sip.transport.create("127.0.0.1", 5092, 1)
 console.log("t1", t1)
 console.log("t2", t2)
 
+sip.set_codecs("g729/8000/1:128")
+
 flags = 0
 
 oc = sip.call.create(t1.id, flags, 'sip:a@t', 'sip:b@127.0.0.1:5092')
@@ -84,25 +87,6 @@ z.wait([
 	},
 ], 1000)
 
-sip.call.send_dtmf(oc.id, '1234', 0)
-sip.call.send_dtmf(ic.id, '4321', 1)
-
-z.wait([
-	{
-		event: 'dtmf',
-		call_id: ic.id,
-		digits: '1234',
-		mode: 0,
-	},
-	{
-		event: 'dtmf',
-		call_id: oc.id,
-		digits: '4321',
-		mode: 1,
-	},
-], 2000)
-
-
 sip.call.reinvite(oc.id, true, 0)
 
 z.wait([
@@ -132,80 +116,6 @@ z.wait([
 	},
 ], 500)
 
-sip.call.send_dtmf(oc.id, '1234', 0)
-sip.call.send_dtmf(ic.id, '4321', 1) // this will not generate event 'dtmf' as the call is on hold
-
-z.wait([
-	{
-		event: 'dtmf',
-		call_id: ic.id,
-		digits: '1234',
-		mode: 0,
-	},
-], 2000)
-
-sip.call.reinvite(ic.id, false, 0)
-
-z.wait([
-	{
-		event: 'response',
-		call_id: ic.id,
-		method: 'INVITE',
-		msg: sip_msg({
-			$rs: '200',
-			$rr: 'OK',
-			$rb: '!{_}a=sendonly',
-		}),
-	},
-	{
-		event: 'media_status',
-		call_id: oc.id,
-		status: 'setup_ok',
-		local_mode: 'sendonly',
-		remote_mode: 'recvonly',
-	},
-	{
-		event: 'media_status',
-		call_id: ic.id,
-		status: 'setup_ok',
-		local_mode: 'recvonly',
-		remote_mode: 'sendonly',
-	},
-], 500)
-
-sip.call.send_dtmf(oc.id, '1234', 0)
-sip.call.send_dtmf(ic.id, '4321', 1) // this will not generate event 'dtmf' as the call is on hold
-
-z.wait([
-	{
-		event: 'dtmf',
-		call_id: ic.id,
-		digits: '1234',
-		mode: 0,
-	},
-], 2000)
-
-sip.call.send_request(oc.id, 'INFO')
-
-z.wait([
-	{
-		event: 'request',
-		call_id: ic.id,
-		msg: sip_msg({
-			$rm: 'INFO',
-		}),
-	},
-	{
-		event: 'response',
-		call_id: oc.id,
-		method: 'INFO',
-		msg: sip_msg({
-			$rs: '200',
-			$rr: 'OK',
-		}),
-	},
-], 500)
-
 sip.call.reinvite(oc.id, false, 0)
 
 z.wait([
@@ -235,24 +145,6 @@ z.wait([
 	},
 ], 500)
 
-sip.call.send_dtmf(oc.id, '1234', 0)
-sip.call.send_dtmf(ic.id, '4321', 1)
-
-z.wait([
-	{
-		event: 'dtmf',
-		call_id: ic.id,
-		digits: '1234',
-		mode: 0,
-	},
-	{
-		event: 'dtmf',
-		call_id: oc.id,
-		digits: '4321',
-		mode: 1,
-	},
-], 2000)
-
 sip.call.terminate(oc.id)
 
 z.wait([

package/samples/late_negotiation.js

@@ -1,5 +1,6 @@
 var sip = require ('../index.js')
-var z = require('zester')
+var Zester = require('zester')
+var z = new Zester()
 var m = require('data-matching')
 var sip_msg = require('sip-matching')
 

package/samples/simple.js

@@ -1,5 +1,6 @@
 var sip = require ('../index.js')
-var z = require('zester')
+var Zester = require('zester')
+var z = new Zester()
 var m = require('data-matching')
 var sip_msg = require('sip-matching')
 

package/samples/sip_cancel.js

@@ -1,5 +1,6 @@
 var sip = require ('../index.js')
-var z = require('zester')
+var Zester = require('zester')
+var z = new Zester()
 var m = require('data-matching')
 var sip_msg = require('sip-matching')
 

package/src/sip.cpp

@@ -527,6 +527,16 @@ int __pjw_init()
 		return 1;
 	}
 
+    g_pool = pj_pool_create(&cp.factory, "tester", 1000, 1000, NULL);
+
+    /* Create event manager */
+    status = pjmedia_event_mgr_create(g_pool, 0, NULL);
+    if(status != PJ_SUCCESS)
+    {
+        addon_log(LOG_LEVEL_DEBUG, "pjmedia_event_mgr_create  failed\n");
+        return 1;
+    }
+
 	const pj_str_t msg_tag = { "MESSAGE", 7 };
 	const pj_str_t STR_MIME_TEXT_PLAIN = { "text/plain", 10 };
 	const pj_str_t STR_MIME_APP_ISCOMPOSING = { "application/im-iscomposing+xml", 30 };
@@ -693,6 +703,22 @@ int __pjw_init()
 	}
 #endif
 
+#if defined(PJMEDIA_HAS_OPUS_CODEC) && PJMEDIA_HAS_OPUS_CODEC!=0
+    status = pjmedia_codec_opus_init(g_med_endpt);
+    if(status != PJ_SUCCESS)
+    {
+        addon_log(LOG_LEVEL_DEBUG, "pjmedia_codec_opus_init failed\n");
+        return 1;
+    }
+#endif
+
+    status = pjmedia_codec_bcg729_init(g_med_endpt);
+    if(status != PJ_SUCCESS)
+    {
+        printf("pjmedia_codec_bcg729_init failed\n");
+        return 1;
+    }
+
 	status = pj_thread_register("main_thread", g_main_thread_descriptor, &g_main_thread);
 	if(status != PJ_SUCCESS)
 	{
@@ -2251,6 +2277,9 @@ static void on_media_update( pjsip_inv_session *inv, pj_status_t status){
 		return;
 	}
 
+    /* Start the UDP media transport */
+    pjmedia_transport_media_start(call->med_transport, 0, 0, 0, 0);
+
 	pjmedia_port *stream_port;
 	status = pjmedia_stream_get_port(call->med_stream, &stream_port);
 	if(status != PJ_SUCCESS){
@@ -3478,6 +3507,11 @@ void close_media_transport(pjmedia_transport *med_transport) {
 		g_PacketDumper->remove_endpoint( tpinfo.sock_info.rtcp_addr_name.ipv4.sin_addr.s_addr, tpinfo.sock_info.rtcp_addr_name.ipv4.sin_port );
 	}
 
+    status = pjmedia_transport_media_stop(med_transport);
+    if( status != PJ_SUCCESS ) {
+        addon_log(LOG_LEVEL_DEBUG, "Critical Error: pjmedia_transport_media_stop failed. status=%d\n", status);
+    }
+
 	status = pjmedia_transport_close(med_transport);
 	if( status != PJ_SUCCESS ) {
 		addon_log(LOG_LEVEL_DEBUG, "Critical Error: pjmedia_transport_close failed. status=%d\n", status);

package/src/README

@@ -1,3 +0,0 @@
-
-# install boost library
-sudo apt install libboost-all-dev