sip-lab 1.17.4 → 1.17.7

package/DEV.md

@@ -78,9 +78,11 @@ After the message is built you can pass them to prebuildify-cross:
 nvm use v16.13.1
 npx prebuildify-cross -i mayamatakeshi/sip-lab-debian11:latest -t 19.0.0 -t 20.0.0 -t 21.0.0 --strip
 ```
-
 Obs: however the above will fail if you are behind proxy (solution pending).
 
+Also, although we don't use '-t 15.0.0 -t 16.0.0 -t 17.0.0 -t 18.0.0' it will still work with them. 
+And actually, it seem if use the above, it will not work with them (see https://github.com/MayamaTakeshi/sip-lab/issues/68)
+
 #### Running tests
 ```
 npm test

package/README.md

@@ -23,7 +23,7 @@ TODO:
 ### Installation
 
 This is a node.js addon and it is known to work on Debian 11, Debian 10, Ubuntu 22.04 and Ubuntu 20.04.
-It is distributed with prebuild binaries for node.js 19.0.0 and above (but built for Debian 11. For other Debian versions or for Ubuntu a local build of the addon will be executed. Being the case, be patient as the build process will take several minutes to complete).
+It is distributed with prebuild binaries for node.js 15.0.0 and above (but built for Debian 11. For other Debian versions or for Ubuntu a local build of the addon will be executed. Being the case, be patient as the build process will take several minutes to complete). 
 
 To install it, first install some build dependencies (you might not need them if your are on Debian 11).
 ```

package/package.json

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

package/samples/100_calls.js

@@ -48,7 +48,7 @@ async function test() {
         event: "incoming_call",
         call_id: m.push("ic_ids"),
         transport_id: t.id,
-    })).value(), 30000)
+    })).value(), 50000)
 
     // Now we answer the calls
     z.store.ic_ids.forEach(ic_id => { 
@@ -84,7 +84,7 @@ async function test() {
         status: 'ok',
     })).value())
 
-    await z.wait(events, 30000)
+    await z.wait(events, 50000)
 
     ocs.forEach(oc => {
         sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
@@ -96,7 +96,7 @@ async function test() {
         digits: '1234',
         mode: 0,
         media_id: 0,
-    })).value(), 30000)
+    })).value(), 50000)
 
     z.store.ic_ids.forEach(ic_id => {
         sip.call.send_dtmf(ic_id, {digits: '4321', mode: 1})
@@ -108,7 +108,7 @@ async function test() {
         digits: '4321',
         mode: 1,
         media_id: 0,
-    })).value(), 30000)
+    })).value(), 50000)
 
     // now we terminate the calls
     ocs.forEach(oc => {
@@ -136,7 +136,7 @@ async function test() {
         call_id: ic_id,
     })).value())
 
-    await z.wait(events, 30000)
+    await z.wait(events, 50000)
 
     console.log("Success")
 

package/src/sip.cpp

@@ -4692,7 +4692,7 @@ static void on_state_changed(pjsip_inv_session *inv, pjsip_event *e) {
       MediaEndpoint *me = call->media[i];
       if (ENDPOINT_TYPE_AUDIO == me->type) {
         AudioEndpoint *ae = (AudioEndpoint *)me->endpoint.audio;
-        addon_log(L_DBG, "processing media[%d] as AudioEndpoing\n", i);
+        addon_log(L_DBG, "processing media[%d] as AudioEndpoint\n", i);
         if (ae->master_port) {
           addon_log(L_DBG, "calling pjmedia_port_stop\n");
           status = pjmedia_master_port_stop(ae->master_port);

package/samples/16_calls.js

@@ -1,152 +0,0 @@
-// 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)
-})
-