sip-lab 1.30.0 → 1.31.0

package/samples/mrcp_and_audio.js

@@ -128,11 +128,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10000,
                   mode: 'recvonly'
                 },
                 remote: {
-                  port: 10002,
                   mode: 'sendonly'
                 }
               }
@@ -155,11 +153,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10002,
                   mode: 'sendonly'
                 },
                 remote: {
-                  port: 10000,
                   mode: 'recvonly'
                 }
               }
@@ -273,11 +269,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10000,
                   mode: 'recvonly'
                 },
                 remote: {
-                  port: 10002,
                   mode: 'sendonly'
                 }
               }
@@ -300,11 +294,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10002,
                   mode: 'sendonly'
                 },
                 remote: {
-                  port: 10000,
                   mode: 'recvonly'
                 }
               }
@@ -359,11 +351,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10000,
                   mode: 'recvonly'
                 },
                 remote: {
-                  port: 10002,
                   mode: 'sendonly'
                 }
               }
@@ -386,11 +376,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10002,
                   mode: 'sendonly'
                 },
                 remote: {
-                  port: 10000,
                   mode: 'recvonly'
                 }
               }

package/samples/session_expires.update.js.future

@@ -0,0 +1,268 @@
+const sip = require ('../index.js')
+const Zeq = require('@mayama/zeq')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+const uuid = require('uuid')
+
+// here we create our Zeq instance
+var z = new Zeq()
+
+
+async function test() {
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    sip.set_codecs("pcmu/8000/1:128,pcma/8000/1:128,gsm/8000/1:128")
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    const t1 = sip.transport.create({address: "127.0.0.1"})
+    const t2 = sip.transport.create({address: "127.0.0.1"})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    const call_id = uuid.v4()
+
+    var oc = sip.call.create(t1.id, {
+        from_uri: 'sip:alice@test.com',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+        headers: {
+            'Call-ID': call_id,
+            'Supported': 'timer',
+            'Min-SE': '180',
+            'Session-Expires': '180',
+        },
+    })
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            transport_id: t2.id,
+            msg: sip_msg({
+                $rU: 'bob',
+                $fU: 'alice',
+                $tU: 'bob',
+                $fd: 'test.com',
+		$ci: call_id,
+                hdr_supported: 'timer',
+                hdr_min_se: '180',
+                hdr_session_expires: '180',
+            })
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+            }),
+        },
+    ], 1000)
+ 
+
+    var ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {
+        code: 422,
+        reason: 'Session Timer Too Small',
+        headers: {
+            'Supported': 'timer',
+            'Min-SE': '300',
+            'Session-Expires': '300;refresher=uac',
+        },
+    })
+
+    await z.wait([
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'response',
+            call_id: 0,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '422',
+                $rr: 'Session Timer Too Small',
+                hdr_supported: 'timer',
+                hdr_min_se: '300',
+                hdr_session_expires: '300;refresher=uac',
+            }),
+        },
+    ], 1000)
+
+    oc = sip.call.create(t1.id, {
+        from_uri: 'sip:alice@test.com',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+        headers: {
+            'Call-ID': call_id,
+            'Supported': 'timer',
+            'Min-SE': '300',
+            'Session-Expires': '300',
+        },
+    })
+
+    delete z.store.call_id
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            transport_id: t2.id,
+            msg: sip_msg({
+                $rU: 'bob',
+                $fU: 'alice',
+                $tU: 'bob',
+                $fd: 'test.com',
+		$ci: call_id,
+                hdr_supported: 'timer',
+                hdr_min_se: '300',
+                hdr_session_expires: '300',
+            })
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+            }),
+        },
+    ], 1000)
+ 
+    ic = {
+        id: z.store.call_id,
+        sip_call_id: z.store.sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {
+        code: 200,
+        reason: 'OK',
+        headers: {
+            'Supported': 'timer',
+            'Min-SE': '300',
+            'Session-Expires': '300;refresher=uac',
+        },
+    })
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                hdr_supported: 'timer',
+                hdr_min_se: '300',
+                hdr_session_expires: '300;refresher=uac',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+    ], 1000)
+
+    await z.sleep(1000)
+
+    sip.call.update(oc.id, {
+        headers: {
+            'Supported': 'timer',
+            'Min-SE': '300',
+            'Session-Expires': '300',
+        },
+    })
+
+    await z.wait([
+        {
+            event: 'request',
+            call_id: ic.id,
+            msg: sip_msg({
+                $rm: 'UPDATE',
+                hdr_supported: 'timer',
+            	hdr_min_se: '300',
+                hdr_session_expires: '300',
+            }),
+        },
+    ], 1000)
+
+    sip.call.respond(ic.id, {
+        code: 200,
+        reason: 'OK',
+        headers: {
+            'Supported': 'timer',
+            'Min-SE': '300',
+            'Session-Expires': '300;refresher=uac',
+        },
+    })
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            msg: sip_msg({
+                $rm: 'UPDATE',
+                $rs: '200',
+                $rr: 'OK',
+                hdr_supported: 'timer',
+		hdr_min_se: '300',
+                hdr_session_expires: '300;refresher=uac',
+            }),
+        },
+    ], 1000)
+
+    sip.call.terminate(oc.id)
+
+    // and wait for termination events
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'BYE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+        {
+            event: 'call_ended',
+            call_id: ic.id,
+        },
+    ], 1000)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/samples/session_expires.update.with_sipjs-lab.js

@@ -0,0 +1,312 @@
+const sip = require ('../index.js')
+const Zeq = require('@mayama/zeq')
+const m = require('data-matching')
+const sip_msg = require('sip-matching')
+const uuid = require('uuid')
+
+const sipjs = require('sipjs-lab')
+const {endpoint, dialog} = require('sipjs-lab')
+
+// here we create our Zeq instance
+
+var z = new Zeq()
+
+async function test() {
+    z.trap_events(sip.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    z.trap_events(sipjs.event_source, 'event', (evt) => {
+        var e = evt.args[0]
+        return e
+    })
+
+    sip.set_codecs("pcmu/8000/1:128,pcma/8000/1:128,gsm/8000/1:128")
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    const address = "127.0.0.1"
+
+    const t1 = sip.transport.create({address})
+
+    const e1_port = 7070
+    const e1 = endpoint.create({
+        address,
+        port: e1_port,
+        publicAddress: address
+    })
+
+    const sip_call_id = uuid.v4()
+
+    var oc = sip.call.create(t1.id, {
+        from_uri: 'sip:alice@test.com',
+        to_uri: `sip:bob@${address}:${e1_port}`,
+        headers: {
+            'Call-ID': sip_call_id,
+            'Supported': 'timer',
+            'Min-SE': '180',
+            'Session-Expires': '180',
+        },
+    })
+
+    await z.wait([
+        {
+            source: 'sip_endpoint',
+            req: m.collect('req', {
+                method: 'INVITE',
+                uri: `sip:bob@${address}:${e1_port}`,
+                headers: {
+                    from: {
+                        uri: 'sip:alice@test.com',
+                    },
+                    to: {
+                        uri: `sip:bob@${address}`,
+                    },
+                    supported: 'timer',
+                    'min-se': '180',
+                    'session-expires': '180',
+                },
+            }),
+            event: 'dialog_offer',
+            dialog_id: m.collect('dialog_id'),
+        },
+    ], 1000)
+
+    dialog.send_reply(
+        z.store.dialog_id,
+        z.store.req,
+        {
+            status: 422,
+            reason: 'Session Timer Too Small',
+            headers: {
+                'Min-SE': '300',
+                'Server': 'TBSIP',
+            },
+        }
+    )
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '422',
+                $rr: 'Session Timer Too Small',
+                hdr_min_se: '300',
+            }),
+        },
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        }
+    ], 1000)
+
+    dialog.destroy(z.store.dialog_id)
+
+    delete z.store.dialog_id
+
+    await z.sleep(1000)
+
+    oc = sip.call.create(t1.id, {
+        from_uri: 'sip:alice@test.com',
+        to_uri: `sip:bob@${address}:${e1_port}`,
+        headers: {
+            'Call-ID': sip_call_id,
+            'Supported': 'timer',
+            'Min-SE': '300',
+            'Session-Expires': '300',
+        },
+    })
+
+    delete z.store.req
+
+    await z.wait([
+        {
+            source: 'sip_endpoint',
+            req: m.collect('req', {
+                method: 'INVITE',
+                uri: `sip:bob@${address}:${e1_port}`,
+                headers: {
+                    from: {
+                        uri: 'sip:alice@test.com',
+                    },
+                    to: {
+                        uri: `sip:bob@${address}`,
+                    },
+                },
+            }),
+            event: 'dialog_offer',
+            dialog_id: m.collect('dialog_id'),
+        },
+    ], 1000)
+
+     const sdp_answer =`v=0
+o=- 3933986675 3933986676 IN IP4 0.0.0.0
+s=-
+c=IN IP4 ${address}
+t=0 0
+m=audio 20000 RTP/AVP 0 101
+a=sendrecv
+a=rtpmap:0 PCMU/8000
+a=rtpmap:101 telephone-event/8000
+a=fmtp:101 0-15
+a=ptime:20`.replace(/\n/g, "\r\n")
+
+    dialog.send_reply(
+        z.store.dialog_id,
+        z.store.req,
+        {
+            status: 200,
+            reason: 'OK',
+            headers: {
+                'Supported': 'timer',
+                'Min-SE': '300',
+                'Session-Expires': '300;refresher=uac',
+                'content-type': 'application/sdp',
+            },
+            content: sdp_answer,
+        }
+    )
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                hdr_supported: 'timer',
+                hdr_min_se: '300',
+                hdr_session_expires: '300;refresher=uac',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            source: 'sip_endpoint',
+            endpoint_id: z.store.endpoint_id,
+            req: {
+              method: 'ACK',
+            },
+            event: 'in_dialog_request',
+            dialog_id: z.store.dialog_id
+        },
+    ], 1000)
+
+
+    for(var i=0 ; i<5 ; i++) {
+
+        sip.call.update(oc.id, {
+            headers: {
+                'Supported': 'timer',
+                'Min-SE': '300',
+                'Session-Expires': '300',
+            },
+        })
+
+        delete z.store.req
+
+        await z.wait([
+            {
+                source: 'sip_endpoint',
+                req: m.collect('req', {
+                    method: 'UPDATE',
+                    headers: {
+                        'supported': 'timer',
+                        'min-se': '300',
+                        'session-expires': '300',
+                    },
+                }),
+                event: 'in_dialog_request',
+                dialog_id: z.store.dialog_id
+            },
+        ], 1000)
+
+        dialog.send_reply(
+            z.store.dialog_id,
+            z.store.req,
+            {
+                status: 200,
+                reason: 'OK',
+                headers: {
+                    'Supported': 'timer',
+                    'Min-SE': '300',
+                    'Session-Expires': '300;refresher=uac',
+                },
+            }
+        )
+
+        await z.wait([
+            {
+                event: 'response',
+                call_id: oc.id,
+                method: 'UPDATE',
+                msg: sip_msg({
+                    $rs: '200',
+                    $rr: 'OK',
+                    hdr_supported: 'timer',
+                    hdr_min_se: '300',
+                    hdr_session_expires: '300;refresher=uac',
+                }),
+            },
+        ], 1000)
+
+    }
+
+    sip.call.terminate(oc.id)
+
+    delete z.store.req
+
+    await z.wait([
+        {                                                                                                 
+            source: 'sip_endpoint',
+            req: m.collect('req', { 
+              method: 'BYE',
+            }),
+        },
+    ], 1000)
+
+    dialog.send_reply(
+        z.store.dialog_id,
+        z.store.req,
+        {
+            status: 200,
+            reason: 'OK',
+        }
+    )
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'BYE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+        {
+            event: 'call_ended',
+            call_id: oc.id,
+        },
+    ], 1000)
+
+    await z.sleep(100) // wait for any unexpected events
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/src/addon.cpp

@@ -467,6 +467,40 @@ Napi::Value call_reinvite(const Napi::CallbackInfo &info) {
   return env.Null();
 }
 
+Napi::Value call_update(const Napi::CallbackInfo &info) {
+  Napi::Env env = info.Env();
+
+  if (info.Length() != 2) {
+    Napi::Error::New(env,
+                     "Wrong number of arguments. Expected: call_id, params.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  if (!info[0].IsNumber()) {
+    Napi::TypeError::New(env, "call_id must be number.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  int call_id = info[0].As<Napi::Number>().Int32Value();
+
+  if (!info[1].IsString()) {
+    Napi::TypeError::New(env, "params must be a JSON string.")
+        .ThrowAsJavaScriptException();
+    return env.Null();
+  }
+  const string json = info[1].As<Napi::String>().Utf8Value();
+
+  int res = pjw_call_update(call_id, json.c_str());
+
+  if (res != 0) {
+    Napi::Error::New(env, pjw_get_error()).ThrowAsJavaScriptException();
+    return env.Null();
+  }
+
+  return env.Null();
+}
+
 Napi::Value call_send_request(const Napi::CallbackInfo &info) {
   Napi::Env env = info.Env();
 
@@ -1566,6 +1600,7 @@ Napi::Object init(Napi::Env env, Napi::Object exports) {
   exports.Set("call_send_dtmf", Napi::Function::New(env, call_send_dtmf));
   exports.Set("call_send_bfsk", Napi::Function::New(env, call_send_bfsk));
   exports.Set("call_reinvite", Napi::Function::New(env, call_reinvite));
+  exports.Set("call_update", Napi::Function::New(env, call_update));
   exports.Set("call_send_request", Napi::Function::New(env, call_send_request));
 
   exports.Set("call_start_record_wav", Napi::Function::New(env, call_start_record_wav));