drachtio-srf 4.5.29 → 4.5.31

package/lib/sip-parser/parser.js

@@ -224,7 +224,10 @@ 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?\;]+)?)*)(?:\?(([^\s&=>]+=[^\s&=>]+)(&[^\s&=>]+=[^\s&=>]+)*))?$/;
+
 
   const r = re.exec(s);
 

package/lib/srf.js

@@ -28,9 +28,9 @@ DialogDirection.Recipient = 'recipient';
 const sleepFor = async(ms) => await new Promise((resolve) => setTimeout(resolve, ms));
 
 const noncopyableHdrs = ['via', 'from', 'to', 'call-id', 'cseq', 'contact', 'content-length', 'content-type'];
-function copyAllHeaders(msg, obj) {
-  if (msg) Object.keys(msg.headers).forEach((h) => {
-    if (!noncopyableHdrs.includes(h) && !obj[h]) obj[h] = msg.headers[h];});
+function copyAllHeaders(headers, obj) {
+  if (headers) Object.keys(headers).forEach((h) => {
+    if (!noncopyableHdrs.includes(h) && !obj[h]) obj[h] = headers[h];});
 }
 function possiblyRemoveHeaders(hdrList, obj) {
   hdrList.forEach((h) => {
@@ -811,8 +811,9 @@ class Srf extends Emitter {
 
     // pass specified headers on to the B leg
     if (proxyRequestHeaders[0] === 'all') {
-      copyAllHeaders(req, opts.headers);
-      possiblyRemoveHeaders(proxyRequestHeaders.slice(1), opts.headers);
+      const reqHeaders = req.headers;
+      possiblyRemoveHeaders(proxyRequestHeaders.slice(1), reqHeaders);
+      copyAllHeaders(reqHeaders, opts.headers);
     }
     else proxyRequestHeaders.forEach((hdr) => { if (req.has(hdr)) opts.headers[hdr] = req.get(hdr);}) ;
 
@@ -904,8 +905,9 @@ class Srf extends Emitter {
       }
 
       if (proxyResponseHeaders[0] === 'all') {
-        copyAllHeaders(uacRes, headers);
-        possiblyRemoveHeaders(proxyResponseHeaders.slice(1), headers);
+        const resHeaders = uacRes.headers;
+        possiblyRemoveHeaders(proxyRequestHeaders.slice(1), resHeaders);
+        copyAllHeaders(resHeaders, headers);
       }
       else {
         proxyResponseHeaders.forEach((hdr) => {

package/package.json

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

package/test/unit-tests/parser.js

@@ -127,6 +127,13 @@ describe('Parser', function () {
     uri.user.should.eql('116751x0');
     uri.scheme.should.eql('sips');
   });
+  it('should parse a sip uri with host part being simple label', function () {
+    var uri = parseUri('sip:116751@feature-server');
+    uri.family.should.eql('ipv4');
+    uri.host.should.eql('feature-server');
+    uri.user.should.eql('116751');
+    uri.scheme.should.eql('sip');
+  });
   it('should parse a multi-part header', function () {
     var msg = new SipMessage(examples('siprec'));
     msg.payload.length.should.eql(2);