drachtio-srf 4.5.33 → 4.5.35

package/lib/sip-parser/parser.js

@@ -224,7 +224,9 @@ function parseUri(s) {
   // eslint-disable-next-line max-len
   //const re = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)?([\w\-\.]+)(?::(\d+))?((?:;[^\s=\?>;]+(?:=[^\s?\;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/;
   // eslint-disable-next-line max-len
-  const re = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)?(?:(|(?:\[.*\])|(?:[0-9A-Za-z\-_]+\.)*[0-9A-Za-z\-_]+)|(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}))(?::(\d+))?((?:;[^\s=\?>;]+(?:=[^\s?\;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/;
+  // const re = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)?(?:(|(?:\[.*\])|(?:[0-9A-Za-z\-_]+\.)*[0-9A-Za-z\-_]+)|(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}))(?::(\d+))?((?:;[^\s=\?>;]+(?:=[^\s?\;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/;
+  // eslint-disable-next-line max-len
+  const re = /^(sips?):(?:([^\s@>:]*)(?::([^\s@>]*))?@)?((?:[0-9A-Za-z\-_]+\.)+[0-9A-Za-z\-_]+|(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|\[(?:[A-Fa-f0-9:]+)\]|[^@:]*)?(?::(\d+))?((?:;[^\s=\?>;]+(?:=[^\s?\;]+)?)*)(?:\?([^>]*))?$/;
   // eslint-disable-next-line max-len
   //const re = /^(sips?):(?:([^\s>:@]+)(?::([^\s@>]+))?@)?((?:[0-9A-Za-z\-_]+\.)?[0-9A-Za-z\-_]+|(?:\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})|\[(?:[A-Fa-f0-9:]+)\])(?::(\d+))?((?:;[^\s=\?>;]+(?:=[^\s?\;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/;
 
@@ -241,11 +243,15 @@ function parseUri(s) {
       port: +r[5],
       params: (r[6].match(/([^;=]+)(=([^;=]+))?/g) || [])
         .map(function(s) { return s.split('='); })
-        .reduce(function(params, x) { params[x[0]] = x[1] || null; return params;}, {}),
-      headers: ((r[7] || '').match(/[^&=]+=[^&=]+/g) || [])
-        .map(function(s) { return s.split('='); })
-        .reduce(function(params, x) { params[x[0]] = x[1]; return params; }, {})
-    } ;
+        .reduce(function(params, x) { params[x[0]] = x[1] || null; return params; }, {}),
+      headers: ((r[7] || '').split('&').filter((header) => header !== '').reduce((acc, header) => {
+        const index = header.indexOf('=');
+        const key = header.slice(0, index);
+        const value = header.slice(index + 1);
+        acc[key] = value;
+        return acc;
+      }, {}))
+    };
   } else {
     // try if this is tel format
     return parseTelUri(s);

package/package.json

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

package/test/utils.js

@@ -7,8 +7,22 @@ process.on('unhandledRejection', (reason, p) => {
 });
 
 test('utils', (t) => {
-  const uri = Srf.parseUri('sip:1234@10.101.10.1;transport=udp');
+  const uri1 = 'sip:1234@10.101.10.1;transport=udp';
+  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&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');
+  t.ok(uri.user === '+12345612341t2', ' Srf.parseUri can parse sip URI with param and headers');
+  t.ok(uri.password === undefined, ' Srf.parseUri can parse sip URI with param and headers');
+  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;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');
   t.ok(telUri.number === '+1-201-555-0123', 'Srf.parseUri can parse tel uri');