drachtio-srf 4.5.34 → 4.5.36

package/lib/sip-parser/parser.js

@@ -245,7 +245,9 @@ function parseUri(s) {
         .map(function(s) { return s.split('='); })
         .reduce(function(params, x) { params[x[0]] = x[1] || null; return params; }, {}),
       headers: ((r[7] || '').split('&').filter((header) => header !== '').reduce((acc, header) => {
-        const [key, value] = header.split('=');
+        const index = header.indexOf('=');
+        const key = header.slice(0, index);
+        const value = header.slice(index + 1);
         acc[key] = value;
         return acc;
       }, {}))

package/lib/wire-protocol.js

@@ -10,22 +10,19 @@ const DEFAULT_PING_INTERVAL = 15000;
 const MIN_PING_INTERVAL = 5000;
 const MAX_PING_INTERVAL = 300000;
 
-const containsEmoji = (str) => {
-  const regex = /[\uD800-\uDBFF][\uDC00-\uDFFF]/;
-  return regex.test(str);
-};
-
-const countSymbols = (text) => {
-  return containsEmoji(text) ? [...text].length : text.length;
-};
 
 const parseMessageLengthSpecifier = (str) => {
+  let start = -1;
   for (let i = 0; i < 5; i++) {
+    if (start === -1 && (str[i] === ' ' || str[i] == '\n' || str[i] === '\r')) {
+      continue;
+    }
+    if (start === -1) start = i;
     const x = str[i];
     if (i > 0 && x === '#') {
       return {
         numChars: i,
-        len: parseInt(str.slice(0, i))
+        len: parseInt(str.slice(start, i))
       };
     }
     if (x < '0' || x > '9') return;
@@ -33,7 +30,7 @@ const parseMessageLengthSpecifier = (str) => {
   return str[5] === '#' ?
     {
       numChars: 5,
-      len: parseInt(str.slice(0, 5))
+      len: parseInt(str.slice(start, 5))
     } : undefined;
 };
 
@@ -298,7 +295,7 @@ module.exports = class WireProtocol extends Emitter {
       if (arr) {
         length = parseInt(arr[1]);
         start =  arr[1].length + 1;
-        haveMsg = countSymbols(obj.incomingMsg) >= length + start;
+        haveMsg = [...obj.incomingMsg].length >= length + start;
       }
       else haveMsg = false;
     } while (haveMsg);
@@ -322,7 +319,7 @@ module.exports = class WireProtocol extends Emitter {
     // check if we have a full message to process
     const {numChars, len} = parseMessageLengthSpecifier(obj.incomingMsg) || {};
     if (len) {
-      if (countSymbols(obj.incomingMsg) >= len + numChars + 1) {
+      if ([...obj.incomingMsg].length >= len + numChars + 1) {
         this.processMessageBuffer(socket, obj, len, numChars + 1);
       }
       return;
@@ -332,7 +329,7 @@ module.exports = class WireProtocol extends Emitter {
       return;
     }
 
-    const err = new Error(`invalid message from server, did not start with length specifier: ${obj.incomingMsg}`);
+    const err = new Error(`invalid message, missing length specifier: '${obj.incomingMsg}'`);
     if (this.isServer) {
       console.error(`invalid client message, closing socket: ${err}`);
       this.disconnect(socket);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.5.34",
+  "version": "4.5.36",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "types": "lib/@types/index.d.ts",

package/test/utils.js

@@ -11,7 +11,7 @@ test('utils', (t) => {
   let uri = Srf.parseUri(uri1);
   t.ok(uri.params.transport === 'udp', 'exposes Srf.parseUri');
   t.ok(Srf.stringifyUri(uri) === uri1, 'exposes Srf.parseUri');
-  const uri2 = 'sip:+12345612341t2@sip.jambonz.xyz;param1=value1?User-To-User=XX12344321&encoding=ascii';
+  const uri2 = 'sip:+12345612341t2@sip.jambonz.xyz;param1=value1?User-To-User=XX12344321;encoding=ascii&baba=lala';
   uri = Srf.parseUri(uri2);
   t.ok(uri.family === 'ipv4', ' Srf.parseUri can parse sip URI with param and headers');
   t.ok(uri.scheme === 'sip', ' Srf.parseUri can parse sip URI with param and headers');
@@ -20,8 +20,8 @@ test('utils', (t) => {
   t.ok(uri.host === 'sip.jambonz.xyz', ' Srf.parseUri can parse sip URI with param and headers');
   // t.ok(uri.port === undefined, ' Srf.parseUri can parse sip URI with param and headers');
   t.ok(uri.params.param1 === 'value1', ' Srf.parseUri can parse sip URI with param and headers');
-  t.ok(uri.headers['User-To-User'] === 'XX12344321', ' Srf.parseUri can parse sip URI with param and headers');
-  t.ok(uri.headers.encoding === 'ascii', ' Srf.parseUri can parse sip URI with param and headers');
+  t.ok(uri.headers['User-To-User'] === 'XX12344321;encoding=ascii', ' Srf.parseUri can parse sip URI with param and headers');
+  t.ok(uri.headers.baba === 'lala', ' Srf.parseUri can parse sip URI with param and headers');
   t.ok(Srf.stringifyUri(uri) === uri2, ' Srf.parseUri can parse sip URI with param and headers');
   let telUri = Srf.parseUri('<tel:+1-201-555-0123;phone-context=drachtio.org;ext=1>');
   t.ok(telUri.scheme === 'tel', 'Srf.parseUri can parse tel uri');