sip-lab 1.38.0 → 1.39.0

package/DEV.md

@@ -6,7 +6,7 @@ Basic tasks for development:
 
 #### To build
 ```
-sudo apt install build-essential automake autoconf libtool libspeex-dev libopus-dev libsdl2-dev libavdevice-dev libswscale-dev libv4l-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libvo-amrwbenc-dev libboost-dev libtiff-dev libpcap-dev libssl-dev uuid-dev cmake
+sudo apt install build-essential automake autoconf libtool libspeex-dev libopus-dev libsdl2-dev libavdevice-dev libswscale-dev libv4l-dev libopencore-amrnb-dev libopencore-amrwb-dev libvo-amrwbenc-dev libvo-amrwbenc-dev libboost-dev libtiff-dev libpcap-dev libssl-dev uuid-dev cmake flite-dev
 
 npm install
 ```
@@ -73,7 +73,7 @@ If it fails due to proxy problems, check if you have proxy configured in ~/.dock
 
 ```
 
-After the message is built you can pass them to prebuildify-cross:
+After the image is built you can pass them to prebuildify-cross:
 ```
 nvm use v16.13.1
 npx prebuildify-cross -i mayamatakeshi/sip-lab-debian11:latest -t 15.0.0 -t 16.0.0 -t 17.0.0 -t 18.0.0 -t 19.0.0 -t 20.0.0 -t 21.0.0 --strip

package/package.json

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

package/samples/mrcp_and_audio.no_rest_between_msgs.js

@@ -0,0 +1,254 @@
+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')
+var mrcp = require('mrcp')
+var mrcp_msg = require('mrcp-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
+    })
+
+    console.log(sip.start((data) => { console.log(data)} ))
+
+    var t1 = sip.transport.create({address: "127.0.0.1", type: 'udp'})
+    var t2 = sip.transport.create({address: "127.0.0.1", type: 'udp'})
+
+    console.log("t1", t1)
+    console.log("t2", t2)
+
+    var client_media = [
+        {
+            type: 'mrcp', 
+            fields: [
+                'a=setup:active',
+                'a=connection:new',
+                'a=resource:speechsynth',
+                'a=cmid:1',
+            ],
+        },
+        {
+            type: 'audio',
+            fields: [
+                'a=recvonly',
+                'a=mid:1',
+            ],
+        },
+    ]
+
+    var server_media = [
+        {
+            type: 'mrcp', 
+            fields: [
+                'a=setup:passive',
+                'a=connection:new',
+                'a=channel:32AECB234338@speechsynth',
+                'a=cmid:1',
+            ],
+        },        
+        {
+            type: 'audio',
+            fields: [
+                'a=sendonly',
+            ],
+        },
+    ]
+
+    oc = sip.call.create(t1.id, {
+        from_uri: 'sip:alice@test.com',
+        to_uri: `sip:bob@${t2.address}:${t2.port}`,
+        media: client_media,
+    })
+
+    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.$call_id,
+        sip_call_id: z.$sip_call_id,
+    }
+
+    sip.call.respond(ic.id, {
+        code: 200,
+        reason: 'OK',
+        media: server_media,
+    })
+
+    await z.wait([
+        {
+            event: 'response',
+            call_id: oc.id,
+            method: 'INVITE',
+            msg: sip_msg({
+                $rs: '200',
+                $rr: 'OK',
+                '$hdr(content-type)': 'application/sdp',
+                $rb: sdp.jsonpath_matcher({
+                    '$.media[?(@.desc.type=="application")].val_attrs.channel': [m.collect('mrcp_channel')],
+                }),
+            }),
+        },
+        {
+            event: 'media_update',
+            call_id: oc.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'mrcp',
+                local: {
+                  port: 9
+                },
+                remote: {
+                  port: m.collect('mrcp_server_port'),
+                },
+              },
+              {
+                type: 'audio',
+                local: {
+                  mode: 'recvonly'
+                },
+                remote: {
+                  mode: 'sendonly'
+                }
+              }
+            ],
+        },
+        {
+            event: 'media_update',
+            call_id: ic.id,
+            status: 'ok',
+            media: [
+              {
+                type: 'mrcp',
+                local: {
+                  port: m.collect('mrcp_server_port'),
+                },
+                remote: {
+                  port: 9
+                }
+              },
+              {
+                type: 'audio',
+                local: {
+                  mode: 'sendonly'
+                },
+                remote: {
+                  mode: 'recvonly'
+                }
+              }
+            ],
+        },
+    ], 1000)
+
+    var mrcp_channel = z.$mrcp_channel
+    var request_id = 1;
+    var msg = mrcp.builder.build_request('SPEAK', request_id, {'channel-identifier': mrcp_channel, 'content-type': 'application/xml'}, "<root>test</root>")
+
+    sip.call.send_mrcp_msg(oc.id, {msg})
+
+    await z.wait([
+        {
+            event: 'mrcp_msg',
+            call_id: ic.id,
+            msg: mrcp_msg({
+                type: 'request',
+                version: '2.0',
+                method: 'SPEAK',
+                request_id: 1,
+                headers: {
+                    'content-type': 'application/xml',
+                },
+                body: '<root>test</root>',
+            }),
+        },
+    ], 1000)
+
+    msg = mrcp.builder.build_response(request_id, 200, 'IN-PROGRESS', {'channel-identifier': mrcp_channel})
+    sip.call.send_mrcp_msg(ic.id, {msg})
+
+    msg = mrcp.builder.build_event('SPEAK-COMPLETE', request_id, 'COMPLETE', {'channel-identifier': mrcp_channel})
+    sip.call.send_mrcp_msg(ic.id, {msg})
+
+    await z.wait([
+        {
+            event: 'mrcp_msg',
+            call_id: oc.id,
+            msg: mrcp_msg({
+                type: 'response',
+                version: '2.0',
+                request_id: 1,
+                status_code: 200,
+                request_state: 'IN-PROGRESS',
+            }),
+        },
+        {
+            event: 'mrcp_msg',
+            call_id: oc.id,
+            msg: mrcp_msg({
+                type: 'event',
+                version: '2.0',
+                request_id: 1,
+                event_name: 'SPEAK-COMPLETE',
+                request_state: 'COMPLETE',
+            }),
+        },
+    ], 1000)
+
+    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()
+    process.exit(0)
+}
+
+
+test()
+.catch(e => {
+    console.error(e)
+    process.exit(1)
+})
+

package/src/sip.cpp

@@ -1089,73 +1089,82 @@ static pj_activesock_cb activesock_cb = {&on_data_read, NULL,
 static pj_bool_t on_data_read(pj_activesock_t *asock, void *data,
                               pj_size_t size, pj_status_t status,
                               pj_size_t *remainder) {
-  printf("on_data_read\n");
-  if(status != PJ_SUCCESS) {
-    printf("on_data_read failed\n");
+  if (status != PJ_SUCCESS) {
     return PJ_FALSE;
   }
- 
-  AsockUserData *ud = (AsockUserData*)pj_activesock_get_user_data(asock);
-  if(!ud) return PJ_FALSE;
+
+  AsockUserData *ud = (AsockUserData *)pj_activesock_get_user_data(asock);
+  if (!ud)
+    return PJ_FALSE;
 
   if (size == 0) {
     // TODO: destroy the activesock.
     return PJ_FALSE;
   }
 
-  assert(size + ud->len + 1 < MAX_TCP_DATA);
+  if (size + ud->len + 1 >= MAX_TCP_DATA) {
+    addon_log(L_DBG, "tcp data: buffer overflow");
+    return PJ_FALSE;
+  }
 
   memcpy(&ud->buf[ud->len], data, size);
   ud->len = ud->len + size;
   ud->buf[ud->len] = '\0';
 
-  char *sep = strstr(ud->buf, "\r\n\r\n");
-  if(!sep) {
-    // msg incomplete
-    *remainder = 0;
-    return PJ_TRUE;
-  }
+  while (true) {
+    char *sep = strstr(ud->buf, "\r\n\r\n");
+    if (!sep) {
+      break;
+    }
 
-  int msg_size;
+    int msg_size;
 
-  char *hdr_cl = strcasestr(ud->buf, "content-length:");
-  if(!hdr_cl) {
-    // no body, only headers
-    msg_size = sep + 4 - ud->buf;
-  } else {
-    assert(hdr_cl < sep);
-    char *end_of_line = strstr(hdr_cl, "\r\n");
+    // Search Content-Length only in headers
+    *sep = '\0';
+    char *hdr_cl = strcasestr(ud->buf, "content-length:");
+    *sep = '\r';
 
-    char num_str[8];
-    char *start = hdr_cl+16;
-    int len = end_of_line - start;
-    strncpy(num_str, start, len);
-    num_str[len] = '\0';
-    int body_len = atoi(num_str);
+    if (!hdr_cl) {
+      // no body, only headers
+      msg_size = sep + 4 - ud->buf;
+    } else {
+      char *end_of_line = strstr(hdr_cl, "\r\n");
+      if (!end_of_line || end_of_line > sep) {
+        msg_size = sep + 4 - ud->buf;
+      } else {
+        char *start = strchr(hdr_cl, ':');
+        if (start) {
+          start++;
+          while (*start == ' ')
+            start++;
+          int body_len = atoi(start);
+
+          if (ud->len < (pj_size_t)(sep + 4 + body_len - ud->buf)) {
+            // msg incomplete
+            goto done;
+          }
+          msg_size = sep + 4 + body_len - ud->buf;
+        } else {
+          msg_size = sep + 4 - ud->buf;
+        }
+      }
+    }
 
-    assert(body_len > 0 && body_len < 4096);
+    char evt[MAX_TCP_DATA + 512];
+    make_evt_tcp_msg(evt, sizeof(evt), ud->call->id,
+                     media_type_id_to_media_type_name(ud->media_endpt->type),
+                     (char *)ud->buf, msg_size);
+    dispatch_event(evt);
 
-    if(ud->buf+ud->len < sep+4+body_len) {
-      //printf("tcp data: msg incomplete %i %i\n", ud->buf+ud->len, sep+4+body_len);
-      *remainder = 0;
-      return PJ_TRUE;
+    int remain_len = ud->len - msg_size;
+    if (remain_len > 0) {
+      memmove(ud->buf, &ud->buf[msg_size], remain_len);
     }
-
-    msg_size = sep+4+body_len - ud->buf;
+    ud->len = remain_len;
+    ud->buf[ud->len] = '\0';
   }
 
-  printf("on_data_read msg_size=%d\n", msg_size);
-
-  char evt[4096];
-  make_evt_tcp_msg(evt, sizeof(evt), ud->call->id, media_type_id_to_media_type_name(ud->media_endpt->type), (char*)ud->buf, msg_size);
-  printf("on_data_read msg=%s\n", evt);
-  dispatch_event(evt);
-
-  int remain_len = ud->len - msg_size;
-  memcpy(ud->buf, &ud->buf[msg_size], remain_len);
-  ud->len = remain_len;
-  ud->buf[ud->len] = '\0';
-  
+done:
   *remainder = 0;
   return PJ_TRUE;
 }