sip-lab 1.16.0 → 1.17.1

package/build_deps.sh

@@ -65,6 +65,9 @@ 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
+#define PJSUA_MAX_ACC (20000)
+#define PJ_IOQUEUE_MAX_HANDLES (1024)
+#define PJSUA_MAX_CALLS (20000)
 EOF
     make dep && make clean && make
 fi

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.16.0",
+  "version": "1.17.1",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -21,7 +21,7 @@
   "gypfile": true,
   "homepage": "https://github.com/MayamaTakeshi/sip-lab",
   "dependencies": {
-    "@mayama/zeq": "^4.7.1",
+    "@mayama/zeq": "^4.12.0",
     "mrcp": "^1.4.0",
     "mrcp-matching": "^1.0.0",
     "node-addon-api": "^5.0.0",

package/samples/100_calls.js

@@ -0,0 +1,152 @@
+// This test creates 256 caller UDP SIP endpoints, 256 callee UDP SIP endpoines and makes one call between them, test dtmf and disconeects.
+
+const sip = require ('../index.js')
+const Zeq = require('@mayama/zeq')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+const _ = require('lodash')
+
+const NUMBER_OF_CALLS = 100
+
+var z = new Zeq()
+
+sip.dtmf_aggregation_on(500)
+
+z.add_event_filter({
+    event: 'response',
+    msg: sip_msg({
+        $rs: '100',
+    }),
+})
+
+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 caller_ts = []
+    const callee_ts = []
+
+    const ocs = []
+
+    for(var i=0 ; i<NUMBER_OF_CALLS ; i++) {   
+        const caller_t = sip.transport.create({address: "127.0.0.1"})
+        caller_ts.push(caller_t)
+        const callee_t = sip.transport.create({address: "127.0.0.1"})
+        callee_ts.push(callee_t)
+
+        // make the call 
+        const oc = sip.call.create(caller_t.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${callee_t.address}:${callee_t.port}`})
+        ocs.push(oc)
+    }
+
+    // Here we will wait for the calls to arrive
+    await z.wait(_.chain(callee_ts).map(t => ({
+        event: "incoming_call",
+        call_id: m.push("ic_ids"),
+        transport_id: t.id,
+    })).value(), 20000)
+
+    // Now we answer the calls
+    z.store.ic_ids.forEach(ic_id => { 
+        sip.call.respond(ic_id, {code: 200, reason: 'OK'})
+    })
+
+    // Then we wait for the '200 OK' at the caller side
+    var events = _.chain(ocs).map(oc => ({
+        event: 'response',
+        call_id: oc.id,
+        method: 'INVITE',
+        msg: sip_msg({
+            $rs: '200',
+            $rr: 'OK',
+            '$(hdrcnt(VIA))': 1,
+            $fU: 'alice',
+            $fd: 'test.com',
+            $tU: 'bob',
+            '$hdr(content-type)': 'application/sdp',
+            $rb: '!{_}a=sendrecv',
+        }),
+    })).value()
+
+    events = events.concat(_.chain(ocs).map(oc => ({
+        event: 'media_update',
+        call_id: oc.id,
+        status: 'ok',
+    })).value())
+    
+    events = events.concat(_.chain(z.store.ic_ids).map(ic_id => ({
+        event: 'media_update',
+        call_id: ic_id,
+        status: 'ok',
+    })).value())
+
+    await z.wait(events, 20000)
+
+    ocs.forEach(oc => {
+        sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    })
+
+    await z.wait(_.chain(z.store.ic_ids).map(ic_id => ({
+        event: 'dtmf',
+        call_id: ic_id,
+        digits: '1234',
+        mode: 0,
+        media_id: 0,
+    })).value(), 20000)
+
+    z.store.ic_ids.forEach(ic_id => {
+        sip.call.send_dtmf(ic_id, {digits: '4321', mode: 1})
+    })
+
+    await z.wait(_.chain(ocs).map(oc => ({
+        event: 'dtmf',
+        call_id: oc.id,
+        digits: '4321',
+        mode: 1,
+        media_id: 0,
+    })).value(), 20000)
+
+    // now we terminate the calls
+    ocs.forEach(oc => {
+        sip.call.terminate(oc.id)
+    })
+
+    // and wait for termination events
+    events = _.chain(ocs).map(oc => ({
+        event: 'response',
+        call_id: oc.id,
+        method: 'BYE',
+        msg: sip_msg({
+            $rs: '200',
+            $rr: 'OK',
+        }),
+    })).value()
+
+    events = events.concat(_.chain(ocs).map(oc => ({
+        event: 'call_ended',
+        call_id: oc.id,
+    })).value())
+
+    events = events.concat(_.chain(z.store.ic_ids).map(ic_id => ({
+        event: 'call_ended',
+        call_id: ic_id,
+    })).value())
+
+    await z.wait(events, 20000)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/samples/16_calls.js

@@ -0,0 +1,152 @@
+// This test creates 256 caller UDP SIP endpoints, 256 callee UDP SIP endpoines and makes one call between them, test dtmf and disconeects.
+
+const sip = require ('../index.js')
+const Zeq = require('@mayama/zeq')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+const _ = require('lodash')
+
+const NUMBER_OF_CALLS = 16
+
+var z = new Zeq()
+
+sip.dtmf_aggregation_on(500)
+
+z.add_event_filter({
+    event: 'response',
+    msg: sip_msg({
+        $rs: '100',
+    }),
+})
+
+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 caller_ts = []
+    const callee_ts = []
+
+    const ocs = []
+
+    for(var i=0 ; i<NUMBER_OF_CALLS ; i++) {   
+        const caller_t = sip.transport.create({address: "127.0.0.1"})
+        caller_ts.push(caller_t)
+        const callee_t = sip.transport.create({address: "127.0.0.1"})
+        callee_ts.push(callee_t)
+
+        // make the call 
+        const oc = sip.call.create(caller_t.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${callee_t.address}:${callee_t.port}`})
+        ocs.push(oc)
+    }
+
+    // Here we will wait for the calls to arrive
+    await z.wait(_.chain(callee_ts).map(t => ({
+        event: "incoming_call",
+        call_id: m.push("ic_ids"),
+        transport_id: t.id,
+    })).value(), 5000)
+
+    // Now we answer the calls
+    z.store.ic_ids.forEach(ic_id => { 
+        sip.call.respond(ic_id, {code: 200, reason: 'OK'})
+    })
+
+    // Then we wait for the '200 OK' at the caller side
+    var events = _.chain(ocs).map(oc => ({
+        event: 'response',
+        call_id: oc.id,
+        method: 'INVITE',
+        msg: sip_msg({
+            $rs: '200',
+            $rr: 'OK',
+            '$(hdrcnt(VIA))': 1,
+            $fU: 'alice',
+            $fd: 'test.com',
+            $tU: 'bob',
+            '$hdr(content-type)': 'application/sdp',
+            $rb: '!{_}a=sendrecv',
+        }),
+    })).value()
+
+    events = events.concat(_.chain(ocs).map(oc => ({
+        event: 'media_update',
+        call_id: oc.id,
+        status: 'ok',
+    })).value())
+    
+    events = events.concat(_.chain(z.store.ic_ids).map(ic_id => ({
+        event: 'media_update',
+        call_id: ic_id,
+        status: 'ok',
+    })).value())
+
+    await z.wait(events, 5000)
+
+    ocs.forEach(oc => {
+        sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    })
+
+    await z.wait(_.chain(z.store.ic_ids).map(ic_id => ({
+        event: 'dtmf',
+        call_id: ic_id,
+        digits: '1234',
+        mode: 0,
+        media_id: 0,
+    })).value(), 5000)
+
+    z.store.ic_ids.forEach(ic_id => {
+        sip.call.send_dtmf(ic_id, {digits: '4321', mode: 1})
+    })
+
+    await z.wait(_.chain(ocs).map(oc => ({
+        event: 'dtmf',
+        call_id: oc.id,
+        digits: '4321',
+        mode: 1,
+        media_id: 0,
+    })).value(), 5000)
+
+    // now we terminate the calls
+    ocs.forEach(oc => {
+        sip.call.terminate(oc.id)
+    })
+
+    // and wait for termination events
+    events = _.chain(ocs).map(oc => ({
+        event: 'response',
+        call_id: oc.id,
+        method: 'BYE',
+        msg: sip_msg({
+            $rs: '200',
+            $rr: 'OK',
+        }),
+    })).value()
+
+    events = events.concat(_.chain(ocs).map(oc => ({
+        event: 'call_ended',
+        call_id: oc.id,
+    })).value())
+
+    events = events.concat(_.chain(z.store.ic_ids).map(ic_id => ({
+        event: 'call_ended',
+        call_id: ic_id,
+    })).value())
+
+    await z.wait(events, 5000)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/src/sip.cpp

@@ -4757,21 +4757,29 @@ static void on_forked(pjsip_inv_session *inv, pjsip_event *e) {
 
 static pjmedia_transport *create_media_transport(const pj_str_t *addr,
                                                  pj_uint16_t *allocated_port) {
+  printf("create_media_transport\n");
   pjmedia_transport *med_transport;
   pj_status_t status;
   for (int i = 0; i < 1000; ++i) {
     int port = 10000 + (i * 2);
+    //printf("trying port=%i\n", port);
     status = pjmedia_transport_udp_create3(g_med_endpt, AF, NULL, addr, port, 0,
                                            &med_transport);
     if (status == PJ_SUCCESS) {
       pjmedia_transport_info tpinfo;
       pjmedia_transport_info_init(&tpinfo);
       status = pjmedia_transport_get_info(med_transport, &tpinfo);
-      printf("create_media_transport created %x\n", med_transport);
+      //printf("create_media_transport port=%i created %x\n", port,  med_transport);
       *allocated_port = port;
       return med_transport;
+    } else {
+      char err[1024];
+      pj_strerror(status, err, sizeof(err));
+
+      printf("pjmedia_transport_udp_create3 status=%i (%s)\n", status, err);
     }
   }
+  printf("no port available\n");
   return NULL;
 }