sip-lab 1.13.1 → 1.14.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.13.1",
+  "version": "1.14.0",
   "description": "",
   "main": "index.js",
   "engines": {
@@ -21,18 +21,18 @@
   "gypfile": true,
   "homepage": "https://github.com/MayamaTakeshi/sip-lab",
   "dependencies": {
-    "@mayama/zeq": "^4.1.17",
+    "@mayama/zeq": "^4.7.1",
     "mrcp": "^1.4.0",
     "mrcp-matching": "^1.0.0",
     "node-addon-api": "^5.0.0",
     "node-gyp": "^9.3.0",
     "node-gyp-build": "^4.5.0",
-    "sdp-matching": "^1.2.0",
-    "sip-matching": "^1.3.34"
+    "sip-matching": "^1.5.2"
   },
   "devDependencies": {
     "prebuildify": "^5.0.1",
-    "prebuildify-cross": "github:MayamaTakeshi/prebuildify-cross#use_existing_images"
+    "prebuildify-cross": "github:MayamaTakeshi/prebuildify-cross#use_existing_images",
+    "sdp-matching": "^1.3.2"
   },
   "files": [
     "index.js",

package/samples/183_session_progress.js.future

@@ -0,0 +1,246 @@
+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')
+
+async function test() {
+    sip.set_log_level(9)
+
+    //sip.set_log_level(6)
+    sip.dtmf_aggregation_on(500)
+
+    // Let's ignore '100 Trying'
+    z.add_event_filter({
+        event: 'response',
+        msg: sip_msg({
+            $rs: '100',
+        }),
+    })
+
+    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)
+
+    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"),
+        },
+    ], 1000)
+
+    ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {code: 183, reason: 'Session Progress'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '183',
+                $rr: 'Session Progress',
+                '$(hdrcnt(VIA))': 1,
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                '$hdr(content-type)': 'application/sdp',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+              },
+           ],
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+              },
+            ],
+        },
+    ], 1000)
+
+    sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 1})
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+            media_id: 0
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+            media_id: 0
+        },
+    ], 2000)
+
+    await z.sleep(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: '183',
+                $rr: 'Session Progress',
+                '$(hdrcnt(VIA))': 1,
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+                '$hdr(content-type)': 'application/sdp',
+                $rb: '!{_}a=sendrecv',
+            }),
+        },
+    ], 1000)
+ 
+    sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 1})
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+            media_id: 0
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+            media_id: 0
+        },
+    ], 2000)
+
+    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: '200',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+              },
+            ]
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+              },
+            ]
+        },
+    ], 1000)
+
+    sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 1})
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+            media_id: 0
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+            media_id: 0
+        },
+    ], 2000)
+
+    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()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/samples/delayed_media.js

@@ -3,6 +3,7 @@ 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')
 
 async function test() {
     //sip.set_log_level(6)
@@ -65,15 +66,25 @@ async function test() {
                 $fd: 'test.com',
                 $tU: 'bob',
                 '$hdr(content-type)': 'application/sdp',
-                $rb: '!{_}a=sendrecv',
+                $rb: sdp.matcher({
+                    media: m.full_match([
+                        m.partial_match({
+                            desc: {
+                                type: 'audio',
+                                port: m.nonzero,
+                                protocol: "RTP/AVP",
+                            },
+                        }),
+                    ]),
+                })
             }),
         },
         {
             event: 'media_update',
             call_id: oc.id,
             status: 'ok',
-            media: [
-              {
+            media: m.full_match([
+              m.partial_match({
                 type: 'audio',
                 local: {
                   mode: 'sendrecv'
@@ -81,15 +92,15 @@ async function test() {
                 remote: {
                   mode: 'sendrecv'
                 },
-              }
-            ],
+              }),
+            ]),
         },
         {
             event: 'media_update',
             call_id: ic.id,
             status: 'ok',
-            media: [
-              {
+            media: m.full_match([
+              m.partial_match({
                 type: 'audio',
                 local: {
                   mode: 'sendrecv'
@@ -97,8 +108,8 @@ async function test() {
                 remote: {
                   mode: 'sendrecv'
                 },
-              }
-            ],
+              }),
+            ]),
         },
 
     ], 1000)

package/samples/four_audio_streams_two_refused.js

@@ -0,0 +1,328 @@
+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')
+
+async function test() {
+    sip.set_log_level(9)
+
+    //sip.set_log_level(6)
+    sip.dtmf_aggregation_on(500)
+
+    // Let's ignore '100 Trying'
+    z.add_event_filter({
+        event: 'response',
+        msg: sip_msg({
+            $rs: '100',
+        }),
+    })
+
+    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", port: 5090, type: 'udp'})
+    t2 = sip.transport.create({address: "127.0.0.1", port: 5092, type: 'udp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    oc = sip.call.create(t1.id, {from_uri: 'sip:alice@test.com', to_uri: `sip:bob@${t2.address}:${t2.port}`, media: [
+        "audio",
+        {
+            type: "audio",
+            port: 0, // it means not in use
+        },
+	"audio",
+	{
+            type: "audio",
+            port: 0, // it means not in use
+        }
+    ]})
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+        },
+    ], 1000)
+
+    ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK', media: [
+        "audio",
+        {
+            type: "audio",
+            port: 0, // it means not in use
+        },
+	"audio",
+	{
+            type: "audio",
+            port: 0, // it means not in use
+        }
+    ]})
+
+    await z.wait([
+        {
+            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',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+                local: {},
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+              {
+                type: 'audio',
+                local: {},
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+            ],
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+                local: {},
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+              {
+                type: 'audio',
+                local: {},
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+            ],
+        },
+    ], 1000)
+
+    sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 1})
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+            media_id: 0
+        },
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+            media_id: 2
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+            media_id: 0
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+            media_id: 2
+        },
+    ], 2000)
+
+    sip.call.reinvite(oc.id, {media: [
+        "audio",
+        {
+            type: "audio",
+            port: 0, // it means not in use
+        },
+	"audio",
+	{
+            type: "audio",
+            port: 0, // it means not in use
+        }
+    ]})
+
+    await z.wait([
+        {
+            event: 'reinvite',
+            call_id: ic.id,
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {code: 200, reason: 'OK', media: [
+        "audio",
+        {
+            type: "audio",
+            port: 0, // it means not in use
+        },
+	"audio",
+	{
+            type: "audio",
+            port: 0, // it means not in use
+        }
+    ]})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+                local: {}
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+              {
+                type: 'audio',
+                local: {},
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+            ],
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+                local: {}
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+              {
+                type: 'audio',
+                local: {},
+              },
+              {
+                type: 'audio',
+                port: 0,
+              },
+            ],
+        },
+    ], 1000)
+
+    sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
+    sip.call.send_dtmf(ic.id, {digits: '4321', mode: 1})
+
+    await z.wait([
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+            media_id: 0
+        },
+        {
+            event: 'dtmf',
+            call_id: ic.id,
+            digits: '1234',
+            mode: 0,
+            media_id: 2
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+            media_id: 0
+        },
+        {
+            event: 'dtmf',
+            call_id: oc.id,
+            digits: '4321',
+            mode: 1,
+            media_id: 2
+        },
+    ], 2000)
+
+    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()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/samples/g729.js

@@ -3,6 +3,7 @@ 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')
 

package/samples/mrcp_and_audio.js

@@ -3,9 +3,9 @@ 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 mrcp = require('mrcp')
 var mrcp_msg = require('mrcp-matching')
-var sdp_msg = require('sdp-matching')
 
 async function test() {
     sip.set_log_level(9)
@@ -115,7 +115,7 @@ async function test() {
                 $fd: 'test.com',
                 $tU: 'bob',
                 '$hdr(content-type)': 'application/sdp',
-                $rb: sdp_msg({
+                $rb: sdp.jsonpath_matcher({
                     '$.media[?(@.desc.type=="application")].val_attrs.channel': [m.collect('mrcp_channel')],
                 }),
             }),
@@ -407,8 +407,6 @@ async function test() {
         },
     ], 500)
 
-    await z.sleep(1000) // we need this delay otherwise, frequently the app will crash after this point.
-
     sip.call.terminate(oc.id)
 
     await z.wait([