drachtio-srf 5.0.23 → 5.0.25

package/lib/drachtio-agent.js

@@ -278,12 +278,14 @@ class DrachtioAgent extends Emitter {
     // Validate socket type
     if (!typeSocket(params.socket)) {
       const err = new Error('provided socket is not a net.Socket or tls.TLSSocket');
+      err.code = 'EINVALIDSOCKET';
       return params.callback(err);
     }
 
     // Check if socket is destroyed
     if (params.socket.destroyed === true) {
       const err = new Error('provided socket has been destroyed');
+      err.code = 'ESOCKETDESTROYED';
       return params.callback(err);
     }
 
@@ -329,7 +331,13 @@ class DrachtioAgent extends Emitter {
 
       }
       else {
-        const err = new Error(token[1] || 'request failed');
+        const reason = token[1] || 'request failed';
+        const err = new Error(reason);
+        // Attach a stable, machine-readable code so callers can branch on the failure mode
+        // without string-matching the server's human-readable reason. The "dialog not found"
+        // case is a common, benign race: an in-dialog request (re-INVITE, UPDATE, BYE, etc.)
+        // is sent just as the dialog is torn down, so the server no longer has it (see #157).
+        err.code = /unable to find dialog/i.test(reason) ? 'ENODIALOG' : 'EDRACHTIO';
         params.callback(err);
       }
     });

package/lib/sip-parser/message.js

@@ -45,9 +45,10 @@ class SipMessage {
 
   get callingName() {
     const header = this.has('p-asserted-identity') ? this.get('p-asserted-identity') : this.get('from');
-    const user  = header.match(/^"(.+)"\s*<sips?:.+@/);
-    if (user && user.length > 1) {
-      return user[1];
+    const parts = header.split(/,\s*(?=")/);
+    for (const part of parts) {
+      const user = part.match(/^"([^"]+)"\s*<sips?:.+@/);
+      if (user) return user[1];
     }
     return '';
   }

package/lib/srf.js

@@ -9,7 +9,7 @@ const SipError = require('./sip_error');
 const debug = require('debug')('drachtio:srf');
 const Socket = require('net').Socket;
 const noop = () => {};
-const idgen = require('short-uuid')();
+const uid = require('short-uuid');
 const sdpTransform = require('sdp-transform');
 
 class DialogState {}
@@ -225,7 +225,7 @@ class Srf extends Emitter {
             aor: `${uri.user || 'unknown'}@${uri.host || 'unknown'}`,
             callId: req.get('Call-ID'),
             localTag: from.params.tag,
-            id: idgen.new()
+            id: uid.generate()
           };
           opts.dialogStateEmitter.emit('stateChange', req._dialogState);
         }
@@ -496,7 +496,7 @@ class Srf extends Emitter {
                 aor: `${uri.user || 'unknown'}@${uri.host || 'unknown'}`,
                 callId: req.get('Call-ID'),
                 localTag: from.params.tag,
-                id: idgen.new()
+                id: uid.generate()
               };
             }
             opts.dialogStateEmitter.emit('stateChange', req._dialogState);
@@ -1054,7 +1054,7 @@ class Srf extends Emitter {
             aor: `${uri.user || 'unknown'}@${uri.host || 'unknown'}`,
             callId: req.get('Call-ID'),
             remoteTag: from.params.tag,
-            id: idgen.new()
+            id: uid.generate()
           };
           opts.dialogStateEmitter.emit('stateChange', req._dialogState);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "5.0.23",
+  "version": "5.0.25",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "types": "lib/@types/index.d.ts",
@@ -29,7 +29,7 @@
     "node-noop": "^1.0.0",
     "only": "^0.0.2",
     "sdp-transform": "^2.15.0",
-    "short-uuid": "^5.2.0",
+    "short-uuid": "^6.0.3",
     "sip-methods": "^0.3.0",
     "sip-status": "^0.1.0",
     "utils-merge": "^1.0.1",

package/test/unit-tests/parser.js

@@ -167,11 +167,27 @@ describe('Parser', function () {
     msg.get('From').should.eql('"Dave" <sip:daveh@localhost>;tag=1234');
     msg.callingName.should.eql('Dave');
   });
-  it('should parse calling name', function () {
+  it('should parse calling name from multi-valued P-Asserted-Identity with tel and sip URIs', function () {
     var msg = new SipMessage();
-    msg.set('From', '"Dave" <sip:daveh@localhost>;tag=1234');
-    msg.get('From').should.eql('"Dave" <sip:daveh@localhost>;tag=1234');
-    msg.callingName.should.eql('Dave');
+    msg.set('P-Asserted-Identity', '"Cha Van" <tel:+17818955550>');
+    msg.set('P-Asserted-Identity', '"Cha Van" <sip:+17818955550@ims.lte.wal.verizon.com>');
+    msg.callingName.should.eql('Cha Van');
+  });
+  it('should parse calling name from single sip P-Asserted-Identity', function () {
+    var msg = new SipMessage();
+    msg.set('P-Asserted-Identity', '"Jane Doe" <sip:+15551234567@example.com>');
+    msg.callingName.should.eql('Jane Doe');
+  });
+  it('should return empty calling name when P-Asserted-Identity has only tel URI', function () {
+    var msg = new SipMessage();
+    msg.set('P-Asserted-Identity', '"Jane Doe" <tel:+15551234567>');
+    msg.callingName.should.eql('');
+  });
+  it('should parse calling name when sip URI comes first in multi-valued PAI', function () {
+    var msg = new SipMessage();
+    msg.set('P-Asserted-Identity', '"Bob Smith" <sip:+15559876543@carrier.net>');
+    msg.set('P-Asserted-Identity', '"Bob Smith" <tel:+15559876543>');
+    msg.callingName.should.eql('Bob Smith');
   });
 });