sip-lab 1.29.0 → 1.30.0

package/build_deps.sh

@@ -56,7 +56,8 @@ then
     #git checkout 797088ed133c98492519b7d042b75735f6f9388c # updated as part of #21
     #git checkout 651df5b50129b7c5a5feec8336dda4468d53d2b0 # updated to latest to see of crash issues improve
     #git checkout 043926a5846963a2c99378e8daa495230923eaab # updated to try to solve #49 (but issue remains)
-    git checkout c36802585ddefb3ca477d1f6d773d179510c5412 # updated to try to solve #83 (but issue remains)
+    #git checkout c36802585ddefb3ca477d1f6d773d179510c5412 # updated to try to solve #83 (but issue remains)
+    git checkout 9543a1bcf50be721d030be99afeeb63bd8cf2013 # updated to latest commit to permit to report https://github.com/pjsip/pjproject/issues/4082
 
     cat > user.mak <<EOF
     export CFLAGS += -fPIC -g

package/package.json

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

package/samples/send_and_receive_bfsk.js.future

@@ -0,0 +1,171 @@
+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)
+
+    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")
+    sip.set_codecs("pcma/8000/1:128")
+
+    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"),
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '100',
+                $rr: 'Trying',
+                '$hdr(call-id)': m.collect('sip_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'})
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+                local: {
+                  port: 10000,
+                  mode: 'sendrecv'
+                },
+                remote: {
+                  port: 10002,
+                  mode: 'sendrecv'
+                },
+              },
+            ],
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'audio',
+                local: {
+                  port: 10002,
+                  mode: 'sendrecv'
+                },
+                remote: {
+                  port: 10000,
+                  mode: 'sendrecv'
+                },
+              }
+            ],
+        },
+    ], 1000)
+
+    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})
+
+    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)
+
+    sip.call.stop_record_wav(oc.id)
+    sip.call.stop_record_wav(ic.id)
+
+    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_extra/ws_speech_server.bfsk.js

@@ -0,0 +1,154 @@
+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(6)
+    sip.dtmf_aggregation_on(500)
+
+    sip.set_codecs("PCMU/8000/1:128")
+
+    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: 'tcp'})
+    t2 = sip.transport.create({address: "127.0.0.1", type: 'tcp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    oc = sip.call.create(t1.id, {
+        from_uri: '"abc"<sip:alice@test.com>',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+    })
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            msg: sip_msg({
+                $rm: 'INVITE',
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+            }),
+        },
+        {
+            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',
+    })
+
+    await z.wait([
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+    ], 1000)
+
+    sip.call.start_record_wav(oc.id, {file: './oc.wav'})
+    sip.call.start_record_wav(ic.id, {file: './ic.wav'})
+
+    sip.call.start_speech_recog(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-sr', language: '500:2000'})
+    sip.call.start_speech_recog(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-sr', language: '500:2000'})
+
+    sip.call.start_speech_synth(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-ss', voice: '5', language: '500:2000', text: 'abcdefgh', times: 1})
+    sip.call.start_speech_synth(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-ss', voice: '5', language: '500:2000', text: 'hgfedcba', times: 1})
+
+    await z.wait([
+        {
+            event: 'speech_synth_complete',
+            call_id: ic.id,
+        },
+        {
+            event: 'speech_synth_complete',
+            call_id: oc.id,
+        },
+        {
+            event: 'speech',
+            call_id: oc.id,
+            transcript: 'hgfedcba'
+        },
+        {
+            event: 'speech',
+            call_id: ic.id,
+            transcript: 'abcdefgh'
+        }
+    ], 3000)
+
+    sip.call.stop_record_wav(oc.id)
+    sip.call.stop_record_wav(ic.id)
+
+    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)
+
+    await z.sleep(50)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/samples_extra/ws_speech_server.dtmf.js

@@ -86,11 +86,11 @@ async function test() {
     sip.call.start_record_wav(oc.id, {file: './oc.wav'})
     sip.call.start_record_wav(ic.id, {file: './ic.wav'})
 
-    sip.call.start_speech_recog(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-det', language: 'dtmf'})
-    sip.call.start_speech_recog(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-det', language: 'dtmf'})
+    sip.call.start_speech_recog(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-sr', language: 'dtmf'})
+    sip.call.start_speech_recog(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-sr', language: 'dtmf'})
 
-    sip.call.start_speech_synth(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-gen', voice: 'dtmf', language: 'dtmf', text: 'abcd', times: 1})
-    sip.call.start_speech_synth(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-gen', voice: 'dtmf', language: 'dtmf', text: 'dcba', times: 1})
+    sip.call.start_speech_synth(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-ss', voice: 'dtmf', language: 'dtmf', text: 'abcd', times: 1})
+    sip.call.start_speech_synth(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'dtmf-ss', voice: 'dtmf', language: 'dtmf', text: 'dcba', times: 1})
 
     await z.wait([
         {
@@ -101,20 +101,6 @@ async function test() {
             event: 'speech_synth_complete',
             call_id: oc.id,
         },
-        {
-            event: 'dtmf',
-            call_id: oc.id,
-            digits: 'dcba',
-            mode: 1,
-            media_id: 0
-        },
-        {
-            event: 'dtmf',
-            call_id: ic.id,
-            digits: 'abcd',
-            mode: 1,
-            media_id: 0
-        },
         {
             event: 'speech',
             call_id: oc.id,
@@ -127,8 +113,6 @@ async function test() {
         },
     ], 3000)
 
-    await z.sleep(1000)
-
     sip.call.stop_record_wav(oc.id)
     sip.call.stop_record_wav(ic.id)
 
@@ -154,7 +138,7 @@ async function test() {
         },
     ], 1000)
 
-    await z.sleep(100)
+    await z.sleep(50)
 
     console.log("Success")
 

package/samples_extra/ws_speech_server.google.js

@@ -83,16 +83,16 @@ async function test() {
         },
     ], 1000)
 
-    await z.sleep(200)
-
     sip.call.start_record_wav(oc.id, {file: './oc.wav'})
     sip.call.start_record_wav(ic.id, {file: './ic.wav'})
 
-    sip.call.start_speech_recog(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'gsr', language: 'en-US'})
-    sip.call.start_speech_recog(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'gsr', language: 'en-US'})
+    sip.call.start_speech_recog(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'google-sr', language: 'en-US'})
+    sip.call.start_speech_recog(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'google-sr', language: 'en-US'})
+
+    await z.sleep(100)
 
-    sip.call.start_speech_synth(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'gss', voice: 'en-US-Standard-E', language: 'en-US', text: 'hello world', times: 1})
-    sip.call.start_speech_synth(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'gss', voice: 'en-US-Standard-F', language: 'en-US', text: '<speak>Good morning<break time="2s"/>Good Afternoon</speak>', times: 1})
+    sip.call.start_speech_synth(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'google-ss', voice: 'en-US-Standard-E', language: 'en-US', text: 'hello world', times: 1})
+    sip.call.start_speech_synth(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'google-ss', voice: 'en-US-Standard-F', language: 'en-US', text: '<speak>Good morning<break time="2s"/>Good Afternoon</speak>', times: 1})
 
     await z.wait([
         {
@@ -113,7 +113,7 @@ async function test() {
             call_id: ic.id,
             transcript: 'hello world',
         },
-    ], 4000)
+    ], 8000)
 
     await z.wait([
         {
@@ -123,8 +123,6 @@ async function test() {
         },
     ], 4000)
 
-    await z.sleep(1000)
-
     sip.call.stop_record_wav(oc.id)
     sip.call.stop_record_wav(ic.id)
 
@@ -150,7 +148,7 @@ async function test() {
         },
     ], 1000)
 
-    await z.sleep(100)
+    await z.sleep(50)
 
     console.log("Success")
 

package/samples_extra/ws_speech_server.send_bfsk.js

@@ -0,0 +1,156 @@
+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')
+
+function stringToBinary(str) {
+  return str.split('').map(char => {
+    return char.charCodeAt(0).toString(2).padStart(8, '0');
+  }).join('');
+}
+
+async function test() {
+    //sip.set_log_level(6)
+    sip.dtmf_aggregation_on(500)
+
+    sip.set_codecs("PCMU/8000/1:128")
+
+    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: 'tcp'})
+    t2 = sip.transport.create({address: "127.0.0.1", type: 'tcp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    oc = sip.call.create(t1.id, {
+        from_uri: '"abc"<sip:alice@test.com>',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+    })
+
+    await z.wait([
+        {
+            event: "incoming_call",
+            call_id: m.collect("call_id"),
+            msg: sip_msg({
+                $rm: 'INVITE',
+                $fU: 'alice',
+                $fd: 'test.com',
+                $tU: 'bob',
+            }),
+        },
+        {
+            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',
+    })
+
+    await z.wait([
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+        },
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+            }),
+        },
+    ], 1000)
+
+    sip.call.start_record_wav(oc.id, {file: './oc.wav'})
+    sip.call.start_record_wav(ic.id, {file: './ic.wav'})
+
+    sip.call.start_speech_recog(oc.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-sr', language: '500:2000'})
+    sip.call.start_speech_recog(ic.id, {server_url: 'ws://0.0.0.0:8080', engine: 'bfsk-sr', language: '500:2000'})
+
+    await z.sleep(100)
+
+    sip.call.send_bfsk(oc.id, {bits: stringToBinary('abcd'), freq_zero: 500, freq_one: 2000})
+    sip.call.send_bfsk(ic.id, {bits: stringToBinary('dcba'), freq_zero: 500, freq_one: 2000})
+
+    await z.wait([
+        {
+            event: 'speech',
+            call_id: oc.id,
+            transcript: 'dcba'
+        },
+        {
+            event: 'speech',
+            call_id: ic.id,
+            transcript: 'abcd'
+        },
+    ], 2000)
+
+    await z.sleep(1000)
+
+    sip.call.stop_record_wav(oc.id)
+    sip.call.stop_record_wav(ic.id)
+
+    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)
+
+    await z.sleep(100)
+
+    console.log("Success")
+
+    sip.stop()
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+