drachtio-srf 4.4.60 → 4.4.63

package/.github/workflows/publish.yml

@@ -3,8 +3,6 @@ name: npm-publish
 # run when a tag is pushed or kick off manually
 on:
   push:
-    branches:
-      - main
     tags:
       - '*'
   workflow_dispatch:
@@ -17,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: '12.x'
+          node-version: '14.x'
           registry-url: 'https://registry.npmjs.org'
       - run: npm install
       - run: npm publish --access public

package/lib/dialog.js

@@ -4,7 +4,7 @@ const only = require('only') ;
 const methods = require('sip-methods') ;
 const debug = require('debug')('drachtio:srf') ;
 const SipError = require('./sip_error');
-const { parseUri } = require('drachtio-sip').parser ;
+const { parseUri } = require('./sip-parser/parser');
 const sdpTransform = require('sdp-transform');
 
 
@@ -12,7 +12,7 @@ const sdpTransform = require('sdp-transform');
  * Class representing a SIP Dialog.
  *
  * Note that instances of this class are not created directly by your code;
- * rather they are returned from the {@link Srf#createUAC}, {@link Srf#createUAC}, and {@link Srf#createB2BUA}
+ * rather they are returned from the {@link Srf#createUAC}, {@link Srf#createUAS}, and {@link Srf#createB2BUA}
  * @class
  * @extends EventEmitter
  */
@@ -34,6 +34,7 @@ class Dialog extends Emitter {
     this.type = type ;
     this.req = opts.req ;
     this.res = opts.res ;
+    this.auth = opts.auth;
     this.agent = this.res.agent ;
     this.onHold = false ;
     this.connected = true ;
@@ -171,7 +172,12 @@ class Dialog extends Emitter {
    * or NOTIFY (in the case of SUBSCRIBE)
    * @param {Object} [opts] configuration options
    * @param {Object} [opts.headers] SIP headers to add to the outgoing BYE or NOTIFY
-   * @param  {function} [callback] if provided, callback with signature <code>(err, msg)</code>
+   * @param {Object|Function} [opts.auth] sip credentials to use if challenged,
+   * or a function invoked with (req, res) and returning (err, username, password) where req is the
+   * request that was sent and res is the response that included the digest challenge
+   * @param {string} [opts.auth.username] sip username
+   * @param {string} [opts.auth.password] sip password
+   * @param {function} [callback] if provided, callback with signature <code>(err, msg)</code>
    * that provides the BYE or NOTIFY message that was sent to terminate the dialog
    * @return {Promise|Dialog} if no callback is supplied, otherwise a reference to the Dialog
    */
@@ -183,18 +189,29 @@ class Dialog extends Emitter {
     }
     this.queuedRequests = [];
 
+    const removeDialog = (err, res, callback) => {
+      this.connected = false ;
+      this.srf.removeDialog(this) ;
+      callback(err, res) ;
+      this.removeAllListeners();
+    };
+
     const __x = (callback) => {
       if (this.dialogType === 'INVITE') {
         this.agent.request({
           method: 'BYE',
           headers: opts.headers || {},
           stackDialogId: this.id,
+          auth: opts.auth || this.auth,
           _socket: this.socket
         }, (err, bye) => {
-          this.connected = false ;
-          this.srf.removeDialog(this) ;
-          callback(err, bye) ;
-          this.removeAllListeners();
+          if (err) {
+            return removeDialog(err, bye, callback);
+          }
+
+          bye.on('response', () => {
+            removeDialog(err, bye, callback);
+          });
         }) ;
         if (this._emitter) {
           Object.assign(this._state, {state: 'terminated'});
@@ -212,10 +229,7 @@ class Dialog extends Emitter {
           stackDialogId: this.id,
           _socket: this.socket
         }, (err, notify) => {
-          this.connected = false ;
-          this.srf.removeDialog(this) ;
-          callback(err, notify) ;
-          this.removeAllListeners();
+          removeDialog(err, notify, callback);
         }) ;
       }
     };
@@ -367,6 +381,11 @@ class Dialog extends Emitter {
    * @param {string} opts.method - SIP method to use for the request
    * @param {Object} [opts.headers] - SIP headers to apply to the request
    * @param {string} [opts.body] - body of the SIP request
+   * @param {Object|Function} [opts.auth] sip credentials to use if challenged,
+   * or a function invoked with (req, res) and returning (err, username, password) where req is the
+   * request that was sent and res is the response that included the digest challenge
+   * @param {string} [opts.auth.username] sip username
+   * @param {string} [opts.auth.password] sip password
    * @param {function} [callback]  - callback invoked with signature <code>(err, req)</code>
    * when operation has completed
    * @return {Promise|Dialog} if no callback is supplied a Promise that resolves to the response received,
@@ -383,7 +402,7 @@ class Dialog extends Emitter {
         method: method,
         stackDialogId: this.id,
         headers: opts.headers || {},
-        auth: opts.auth,
+        auth: opts.auth || this.auth,
         _socket: this.socket,
         body: opts.body
       }, (err, req) => {

package/lib/drachtio-agent.js

@@ -2,7 +2,7 @@ const Emitter = require('events');
 const debug = require('debug')('drachtio:agent');
 const debugSocket = require('debug')('drachtio:socket');
 const WireProtocol = require('./wire-protocol') ;
-const SipMessage = require('drachtio-sip').SipMessage ;
+const SipMessage = require('./sip-parser/message');
 const Request = require('./request') ;
 const Response = require('./response') ;
 const DigestClient = require('./digest-client') ;
@@ -658,6 +658,10 @@ class DrachtioAgent extends Emitter {
                 this.pendingSipAuthTxnIdUpdate.set(res.req.stackTxnId, {});
                 const client = new DigestClient(res) ;
                 client.authenticate((err, req) => {
+                  if (!req) {
+                    sr.req.emit('response', res, ack);
+                    return;
+                  }
                   // move all listeners from the old request to the new one we just generated
                   res.req.listeners('response').forEach((l) => { req.on('response', l) ; }) ;
                   res.req.emit('authenticate', req) ;

package/lib/request.js

@@ -1,9 +1,9 @@
 const Emitter = require('events').EventEmitter ;
-const sip = require('drachtio-sip') ;
 const delegate = require('delegates') ;
 const assert = require('assert') ;
 const noop = require('node-noop').noop;
 const debug = require('debug')('drachtio:request');
+const SipMessage = require('./sip-parser/message');
 
 class Request extends Emitter {
 
@@ -11,7 +11,7 @@ class Request extends Emitter {
     super() ;
 
     if (msg) {
-      assert(msg instanceof sip.SipMessage) ;
+      assert(msg instanceof SipMessage) ;
       this.msg = msg ;
       this.meta = meta ;
     }
@@ -148,7 +148,7 @@ class Request extends Emitter {
           //add a new response to the array
           const address = meta.address ;
           const port = +meta.port;
-          const msg = new sip.SipMessage(rawMsg) ;
+          const msg = new SipMessage(rawMsg) ;
           const obj = {
             time: meta.time,
             status: msg.status,

package/lib/response.js

@@ -1,17 +1,17 @@
 const Emitter = require('events').EventEmitter ;
-const sip = require('drachtio-sip') ;
 const delegate = require('delegates') ;
 const status_codes = require('sip-status') ;
 const only = require('only') ;
 const noop = require('node-noop').noop;
 const assert = require('assert') ;
 const debug = require('debug')('drachtio:response');
+const SipMessage = require('./sip-parser/message') ;
 class Response extends Emitter {
 
   constructor(agent) {
     super() ;
     this._agent = agent ;
-    this.msg = new sip.SipMessage() ;
+    this.msg = new SipMessage() ;
     this.finished = false ;
   }
 

package/lib/sip-parser/message.js

@@ -0,0 +1,103 @@
+const only = require('only') ;
+const parser = require('./parser') ;
+
+class SipMessage {
+  constructor(msg) {
+
+    this.headers = {};
+
+    if (msg) {
+      if (typeof msg === 'string') {
+        this.raw = msg ;
+        const obj = parser.parseSipMessage(msg, true) ;
+        if (!obj) throw new Error('failed to parse sip message');
+        msg = obj;
+      }
+      Object.assign(this.headers, msg.headers || {});
+      Object.assign(this, only(msg, 'body method version status reason uri payload'));
+    }
+  }
+
+  get type() {
+    if (this.method) return 'request' ;
+    else if (this.status) return 'response' ;
+  }
+
+  get calledNumber() {
+    const user = this.uri.match(/sips?:(.*?)@/) ;
+    if (user && user.length > 1) {
+      return user[1].split(';')[0] ;
+    }
+    return '' ;
+  }
+
+  get callingNumber() {
+    const header = this.has('p-asserted-identity') ? this.get('p-asserted-identity') : this.get('from') ;
+    const user  = header.match(/sips?:(.*?)@/) ;
+    if (user && user.length > 1) {
+      return user[1].split(';')[0] ;
+    }
+    return '' ;
+  }
+
+  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];
+    }
+    return '';
+  }
+
+  get canFormDialog() {
+    return ('INVITE' === this.method || 'SUBSCRIBE' === this.method) && !this.get('to').tag ;
+  }
+
+  set(hdr, value) {
+    const hdrs = {} ;
+    if (typeof hdr === 'string') hdrs[hdr] = value ;
+    else {
+      Object.assign(hdrs, hdr);
+    }
+
+    Object.keys(hdrs).forEach((key) => {
+      const name = parser.getHeaderName(key) ;
+      const newValue = hdrs[key] ;
+      let v = '' ;
+      if (name in this.headers) {
+        v += this.headers[name] ;
+        v += ',' ;
+      }
+      v += newValue ;
+      this.headers[name] = v;
+    });
+
+    return this ;
+  }
+
+  get(hdr) {
+    if (this.has(hdr)) { return this.headers[parser.getHeaderName(hdr)] ; }
+  }
+
+  has(hdr) {
+    const name = parser.getHeaderName(hdr) ;
+    return name in this.headers ;
+  }
+
+  getParsedHeader(hdr) {
+    const name = parser.getHeaderName(hdr) ;
+    const v =  this.headers[name] ;
+    const fn = parser.getParser(hdr.toLowerCase()) ;
+    return fn({s:v, i:0}) ;
+  }
+
+  toString() {
+    return parser.stringifySipMessage(this) ;
+  }
+
+}
+
+SipMessage.parseUri = parser.parseUri ;
+
+
+exports = module.exports = SipMessage ;