sip-lab 1.31.0 → 1.33.0

package/README.md

@@ -8,6 +8,7 @@ It uses pjproject for SIP and media processing.
 It permits to:
   - make audio calls using UDP, TCP and TLS transports
   - send/receive DTMF inband/RFC2833/INFO.
+  - send/receive [BFSK](https://en.wikipedia.org/wiki/Frequency-shift_keying) bits.
   - play/record audio on a call from/to a wav file
   - send/receive fax (T.30 only)
   - send/receive MRCPv2 messages (TCP only, no TLS)
@@ -87,4 +88,8 @@ Although the code in written in *.cpp/*.hpp named files, this is not actually a
 
 It is mostly written in C using some C++ facilities.
 
+### Release Notes
+
+[ReleaseNotes](https://github.com/MayamaTakeshi/sip-lab/blob/master/RELEASE_NOTES.md)
+
 

package/binding.gyp

@@ -120,6 +120,7 @@
         'src/addon.cpp',
         'src/pjmedia/src/pjmedia/dtmfdet.c',
         'src/pjmedia/src/pjmedia/bfsk_det.c',
+        'src/pjmedia/src/pjmedia/bfsk_det2.c',
         'src/pjmedia/src/pjmedia/fax_port.c',
         'src/pjmedia/src/pjmedia/flite_port.c',
         'src/pjmedia/src/pjmedia/pocketsphinx_port.c',

package/index.js

@@ -6,8 +6,8 @@ var eventEmitter = new events.EventEmitter();
 
 process.on('SIGINT', function() {
 	console.log("SIGINT");
-	var res = addon.shutdown()
-	process.exit(0)
+	var res = addon.shutdown(1)
+	process.exit(1)
 });
 
 addon.event_source = eventEmitter
@@ -32,10 +32,9 @@ var timerId = setInterval(() => {
 	}
 }, 50)
 
-addon.stop = () => {
+addon.stop = (clean_up = false) => {
 	clearInterval(timerId)
-	var res = addon.shutdown()
-	process.exit(0)
+	var res = addon.shutdown(clean_up ? 1 : 0)
 }
 
 addon.transport = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sip-lab",
-  "version": "1.31.0",
+  "version": "1.33.0",
   "description": "",
   "main": "index.js",
   "engines": {

package/samples/100_calls.js

@@ -80,6 +80,11 @@ async function test() {
 
     await z.wait(events, 50000)
 
+    ocs.forEach(oc => {
+        sip.call.start_inband_dtmf_detection(oc.id)
+    })
+
+    // first send RFC2833 DTMF digits
     ocs.forEach(oc => {
         sip.call.send_dtmf(oc.id, {digits: '1234', mode: 0})
     })
@@ -92,10 +97,7 @@ async function test() {
         media_id: 0,
     })).value(), 50000)
 
-    ocs.forEach(oc => {
-        sip.call.start_inband_dtmf_detection(oc.id)
-    })
-
+    // now send inband DTMF digits
     z.store.ic_ids.forEach(ic_id => {
         sip.call.send_dtmf(ic_id, {digits: '4321', mode: 1})
     })
@@ -139,6 +141,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/16_audio_streams.js

@@ -139,6 +139,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/183_session_progress.js

@@ -374,6 +374,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/custom_call_id.js

@@ -208,6 +208,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/delayed_media.js

@@ -315,6 +315,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/four_audio_streams_two_refused.js

@@ -314,6 +314,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/g729.js

@@ -198,6 +198,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/media_fields.js

@@ -179,6 +179,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/mrcp_and_audio.js

@@ -411,6 +411,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/mrcp_and_audio.simplified_media.js

@@ -254,6 +254,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/multiple_audio_streams.js

@@ -144,6 +144,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/options.js

@@ -72,6 +72,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/pcma.js

@@ -197,6 +197,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/play_wav_and_speech_recog.bad_transcript.pcmu8000.js

@@ -148,6 +148,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/refer.js

@@ -206,6 +206,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/refuse_telephone_event.js

@@ -148,6 +148,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/register_no_expires.js

@@ -72,6 +72,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/register_subscribe.js

@@ -189,6 +189,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/reinvite_and_dtmf.js

@@ -435,6 +435,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/reinvite_audio_audio.js

@@ -301,6 +301,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/reinvite_with_hold_unhold.js

@@ -393,6 +393,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/rtp_and_srtp.js

@@ -452,6 +452,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/rtp_and_srtp.rtp_refused.js

@@ -416,6 +416,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/rtp_and_srtp.unbalanced_sdp_answer.js.future

@@ -178,6 +178,7 @@ a=crypto:1 AES_256_CM_HMAC_SHA1_80 inline:s6nwVuVNxwupG0Cls+/4X4L46Mx/fqoEMolllU
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/{send_and_receive_bfsk.js.future → send_and_receive_bfsk.js}

@@ -71,11 +71,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10000,
                   mode: 'sendrecv'
                 },
                 remote: {
-                  port: 10002,
                   mode: 'sendrecv'
                 },
               },
@@ -89,11 +87,9 @@ async function test() {
               {
                 type: 'audio',
                 local: {
-                  port: 10002,
                   mode: 'sendrecv'
                 },
                 remote: {
-                  port: 10000,
                   mode: 'sendrecv'
                 },
               }
@@ -104,33 +100,34 @@ async function test() {
     sip.call.start_record_wav(oc.id, {file: 'oc.wav'})
     sip.call.start_record_wav(ic.id, {file: 'ic.wav'})
 
-    await z.sleep(100)
-
-    sip.call.start_bfsk_detection(oc.id, {freq_zero: 880, freq_one: 1280})
-    //sip.call.start_bfsk_detection(ic.id, {freq_zero: 880, freq_one: 1280})
+    sip.call.start_bfsk_detection(oc.id, {freq_zero: 500, freq_one: 2000})
+    sip.call.start_bfsk_detection(ic.id, {freq_zero: 500, freq_one: 2000})
 
     oc_bits = '1010'
     ic_bits = '1100'
 
-    sip.call.send_bfsk(ic.id, {bits: ic_bits, freq_zero: 880, freq_one: 1280})
-    //sip.call.send_bfsk(oc.id, {bits: oc_bits, freq_zero: 880, freq_one: 1280})
-
-    await z.wait([
-       {
-            event: 'bfsk',
-            call_id: ic.id,
-            bits: oc_bits,
-            media_id: 0
-       },
-       {
-            event: 'bfsk',
-            call_id: oc.id,
-            bits: ic_bits,
-            media_id: 0
-       },
-    ], 10000)
-
-    await z.sleep(1000)
+    // wait a little for voice path to open
+    await z.sleep(50)
+
+    for(var i=0 ; i<5 ; i++) {
+        sip.call.send_bfsk(ic.id, {bits: ic_bits, freq_zero: 500, freq_one: 2000})
+        sip.call.send_bfsk(oc.id, {bits: oc_bits, freq_zero: 500, freq_one: 2000})
+
+        await z.wait([
+           {
+                event: 'bfsk',
+                call_id: ic.id,
+                bits: oc_bits,
+                media_id: 0
+           },
+           {
+                event: 'bfsk',
+                call_id: oc.id,
+                bits: ic_bits,
+                media_id: 0
+           },
+        ], 10000)
+    }
 
     sip.call.stop_record_wav(oc.id)
     sip.call.stop_record_wav(ic.id)
@@ -160,6 +157,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/send_and_receive_fax.js

@@ -117,6 +117,7 @@ async function test() {
     console.log(`Success. Fax file ${in_file} was transmitted and received as ${out_file}`)
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/session_expires.update.js.future

@@ -257,6 +257,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

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

@@ -5,7 +5,7 @@ const sip_msg = require('sip-matching')
 const uuid = require('uuid')
 
 const sipjs = require('sipjs-lab')
-const {endpoint, dialog} = require('sipjs-lab')
+const {endpoint, dialog, sip_msg: sipjs_sip_msg} = require('sipjs-lab')
 
 // here we create our Zeq instance
 
@@ -28,8 +28,6 @@ async function test() {
 
     const address = "127.0.0.1"
 
-    const t1 = sip.transport.create({address})
-
     const e1_port = 7070
     const e1 = endpoint.create({
         address,
@@ -37,6 +35,11 @@ async function test() {
         publicAddress: address
     })
 
+    // hack to not lose first INVITE
+    await z.sleep(0)
+
+    const t1 = sip.transport.create({address})
+
     const sip_call_id = uuid.v4()
 
     var oc = sip.call.create(t1.id, {
@@ -46,28 +49,19 @@ async function test() {
             'Call-ID': sip_call_id,
             'Supported': 'timer',
             'Min-SE': '180',
-            'Session-Expires': '180',
+            'Session-Expires': '180;refresher=uac',
         },
     })
 
     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',
-                },
-            }),
+            req: m.collect('req', sipjs_sip_msg({
+                $rm: 'INVITE',
+                hdr_supported: 'timer',
+                hdr_min_se: '180',
+                hdr_session_expires: '180;refresher=uac',
+            })),
             event: 'dialog_offer',
             dialog_id: m.collect('dialog_id'),
         },
@@ -107,8 +101,6 @@ async function test() {
 
     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}`,
@@ -116,7 +108,7 @@ async function test() {
             'Call-ID': sip_call_id,
             'Supported': 'timer',
             'Min-SE': '300',
-            'Session-Expires': '300',
+            'Session-Expires': '300;refresher=uac',
         },
     })
 
@@ -125,18 +117,12 @@ async function test() {
     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}`,
-                    },
-                },
-            }),
+            req: m.collect('req', sipjs_sip_msg({
+                $rm: 'INVITE',
+                hdr_supported: 'timer',
+                hdr_min_se: '300',
+                hdr_session_expires: '300;refresher=uac'
+            })),
             event: 'dialog_offer',
             dialog_id: m.collect('dialog_id'),
         },
@@ -154,6 +140,36 @@ 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: 183,
+            reason: 'Session Progress',
+            headers: {
+                'content-type': 'application/sdp',
+            },
+            content: sdp_answer,
+        }
+    )
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '183',
+                $rr: 'Session Progress',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+    ], 1000)
+
     dialog.send_reply(
         z.store.dialog_id,
         z.store.req,
@@ -199,14 +215,16 @@ a=ptime:20`.replace(/\n/g, "\r\n")
         },
     ], 1000)
 
-
     for(var i=0 ; i<5 ; i++) {
 
+        // sleep here as much as you like
+        await z.sleep(0)
+
         sip.call.update(oc.id, {
             headers: {
                 'Supported': 'timer',
                 'Min-SE': '300',
-                'Session-Expires': '300',
+                'Session-Expires': '300;refresher=uac',
             },
         })
 
@@ -215,14 +233,12 @@ a=ptime:20`.replace(/\n/g, "\r\n")
         await z.wait([
             {
                 source: 'sip_endpoint',
-                req: m.collect('req', {
-                    method: 'UPDATE',
-                    headers: {
-                        'supported': 'timer',
-                        'min-se': '300',
-                        'session-expires': '300',
-                    },
-                }),
+                req: m.collect('req', sipjs_sip_msg({
+                    $rm: 'UPDATE',
+                    hdr_supported: 'timer',
+                    hdr_min_se: '300',
+                    hdr_session_expires: '300;refresher=uac'
+                })),
                 event: 'in_dialog_request',
                 dialog_id: z.store.dialog_id
             },
@@ -266,9 +282,9 @@ a=ptime:20`.replace(/\n/g, "\r\n")
     await z.wait([
         {                                                                                                 
             source: 'sip_endpoint',
-            req: m.collect('req', { 
-              method: 'BYE',
-            }),
+            req: m.collect('req', sipjs_sip_msg({ 
+              $rm: 'BYE',
+            })),
         },
     ], 1000)
 
@@ -302,6 +318,7 @@ a=ptime:20`.replace(/\n/g, "\r\n")
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/simple.js

@@ -170,6 +170,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/sip_cancel.js

@@ -104,6 +104,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 test()

package/samples/speech_synth_and_recog.speex16000.js

@@ -154,6 +154,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }
 
 

package/samples/srtp.js

@@ -330,6 +330,7 @@ async function test() {
     console.log("Success")
 
     sip.stop()
+    process.exit(0)
 }