drachtio-srf 4.4.64 → 4.5.2

package/.eslintrc.json

@@ -8,7 +8,7 @@
       "jsx": false,
       "modules": false
     },
-    "ecmaVersion": 2018
+    "ecmaVersion": 2020
   },
   "plugins": ["promise"],
   "rules": {

package/lib/dialog.js

@@ -198,21 +198,24 @@ class Dialog extends Emitter {
 
     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) => {
-          if (err || !bye) {
-            return removeDialog(err, bye, callback);
-          }
-
-          bye.on('response', () => {
-            removeDialog(err, bye, callback);
+        try {
+          this.agent.request({
+            method: 'BYE',
+            headers: opts.headers || {},
+            stackDialogId: this.id,
+            auth: opts.auth || this.auth,
+            _socket: this.socket
+          }, (err, bye) => {
+            if (err || !bye) {
+              return removeDialog(err, bye, callback);
+            }
+            bye.on('response', () => {
+              removeDialog(err, bye, callback);
+            });
           });
-        }) ;
+        } catch (err) {
+          removeDialog(err, null, callback);
+        }
         if (this._emitter) {
           Object.assign(this._state, {state: 'terminated'});
           this._emitter.emit('stateChange', this._state);
@@ -223,14 +226,18 @@ class Dialog extends Emitter {
         opts.headers = opts.headers || {} ;
         opts.headers['subscription-state'] = 'terminated';
         opts.headers['event'] = this.subscribeEvent ;
-        this.agent.request({
-          method: 'NOTIFY',
-          headers: opts.headers || {},
-          stackDialogId: this.id,
-          _socket: this.socket
-        }, (err, notify) => {
-          removeDialog(err, notify, callback);
-        }) ;
+        try {
+          this.agent.request({
+            method: 'NOTIFY',
+            headers: opts.headers || {},
+            stackDialogId: this.id,
+            _socket: this.socket
+          }, (err, notify) => {
+            removeDialog(err, notify, callback);
+          }) ;
+        } catch (err) {
+          removeDialog(err, null, callback);
+        }
       }
     };
 
@@ -318,43 +325,47 @@ class Dialog extends Emitter {
         if (opts.headers && !opts.headers['Contact']) {
           opts.headers['Contact'] = this.local.contact;
         }
-        this.agent.request({
-          method: 'INVITE',
-          stackDialogId: this.id,
-          body: this.local.sdp,
-          _socket: this.socket,
-          headers:
-            opts.headers ? opts.headers : {'Contact': this.local.contact}
-        }, (err, req) => {
-          if (err) {
-            this._reinvitesInProgress.count--;
-            const admitOne = this._reinvitesInProgress.admitOne.shift();
-            if (admitOne) setImmediate(admitOne);
-            return callback(err);
-          }
-          req.on('response', (res, ack) => {
-            debug(`Dialog#modifySession: received response to reINVITE with status ${res.status}`) ;
-            if (res.status >= 200) {
-              if (200 === res.status) {
-                this.remote.sdp = res.body ;
-                if (this.local.sdp || opts.noAck !== true) {
-                  ack() ;
-                  onReInviteComplete(this);
-                  return callback(null, res.body);
-                }
-                else {
-                  debug(`opts: ${JSON.stringify(opts)}`);
-                  debug('SipDialog#modify: go 200 OK to 3pcc INVITE with no sdp; ack is application responsibility');
-                  return callback(null, res.body, (sdp) => {
-                    ack({body: sdp});
+        try {
+          this.agent.request({
+            method: 'INVITE',
+            stackDialogId: this.id,
+            body: this.local.sdp,
+            _socket: this.socket,
+            headers:
+              opts.headers ? opts.headers : {'Contact': this.local.contact}
+          }, (err, req) => {
+            if (err) {
+              this._reinvitesInProgress.count--;
+              const admitOne = this._reinvitesInProgress.admitOne.shift();
+              if (admitOne) setImmediate(admitOne);
+              return callback(err);
+            }
+            req.on('response', (res, ack) => {
+              debug(`Dialog#modifySession: received response to reINVITE with status ${res.status}`) ;
+              if (res.status >= 200) {
+                if (200 === res.status) {
+                  this.remote.sdp = res.body ;
+                  if (this.local.sdp || opts.noAck !== true) {
+                    ack() ;
                     onReInviteComplete(this);
-                  });
+                    return callback(null, res.body);
+                  }
+                  else {
+                    debug(`opts: ${JSON.stringify(opts)}`);
+                    debug('SipDialog#modify: go 200 OK to 3pcc INVITE with no sdp; ack is application responsibility');
+                    return callback(null, res.body, (sdp) => {
+                      ack({body: sdp});
+                      onReInviteComplete(this);
+                    });
+                  }
                 }
+                callback(new SipError(res.status, res.reason)) ;
               }
-              callback(new SipError(res.status, res.reason)) ;
-            }
-          }) ;
-        });
+            }) ;
+          });
+        } catch (err) {
+          callback(err);
+        }
       });
     };
 
@@ -398,45 +409,48 @@ class Dialog extends Emitter {
     const __x = (callback) => {
       const method = opts.method.toUpperCase() ;
 
-      this.agent.request({
-        method: method,
-        stackDialogId: this.id,
-        headers: opts.headers || {},
-        auth: opts.auth || this.auth,
-        _socket: this.socket,
-        body: opts.body
-      }, (err, req) => {
-        if (err) {
-          return callback(err) ;
-        }
-
-        req.on('response', (res, ack) => {
-          if ('BYE' === method) {
-            this.srf.removeDialog(this) ;
+      try {
+        this.agent.request({
+          method: method,
+          stackDialogId: this.id,
+          headers: opts.headers || {},
+          auth: opts.auth || this.auth,
+          _socket: this.socket,
+          body: opts.body
+        }, (err, req) => {
+          if (err) {
+            return callback(err) ;
           }
-          if ('INVITE' === method && res.status >= 200) {
-            if (res.status > 200 || opts.body || opts.noAck !== true) ack() ;
-            else {
-              debug('SipDialog#request: received 200 OK to 3pcc INVITE sent with no sdp; deferring ack to application');
-              return callback(null, res, ack) ;
+
+          req.on('response', (res, ack) => {
+            if ('BYE' === method) {
+              this.srf.removeDialog(this) ;
+            }
+            if ('INVITE' === method && res.status >= 200) {
+              if (res.status > 200 || opts.body || opts.noAck !== true) ack() ;
+              else {
+                return callback(null, res, ack) ;
+              }
             }
-          }
 
-          if (this.dialogType === 'SUBSCRIBE' && 'NOTIFY' === method &&
-            /terminated/.test(req.get('Subscription-State'))) {
-            debug('received response to a NOTIFY we sent terminating final subscription; dialog is ended') ;
+            if (this.dialogType === 'SUBSCRIBE' && 'NOTIFY' === method &&
+              /terminated/.test(req.get('Subscription-State'))) {
+              debug('received response to a NOTIFY we sent terminating final subscription; dialog is ended') ;
 
-            const from = req.getParsedHeader('From');
-            if (this.removeSubscription(from.uri, req.get('Event')) === 0) {
-              this.connected = false ;
-              this.srf.removeDialog(this) ;
-              this.emit('destroy', req) ;
-              this.removeAllListeners();
+              const from = req.getParsedHeader('From');
+              if (this.removeSubscription(from.uri, req.get('Event')) === 0) {
+                this.connected = false ;
+                this.srf.removeDialog(this) ;
+                this.emit('destroy', req) ;
+                this.removeAllListeners();
+              }
             }
-          }
-          callback(null, res) ;
+            callback(null, res) ;
+          }) ;
         }) ;
-      }) ;
+      } catch (err) {
+        callback(err);
+      }
     } ;
 
     if (callback) {

package/lib/srf.js

@@ -6,8 +6,6 @@ const delegate = require('delegates') ;
 const parser = require('./sip-parser/parser');
 const methods = require('sip-methods') ;
 const SipError = require('./sip_error') ;
-const async = require('async') ;
-const deprecate = require('deprecate');
 const debug = require('debug')('drachtio:srf') ;
 const Socket = require('net').Socket;
 const noop = () => {};
@@ -27,6 +25,8 @@ DialogState.Cancelled = 'cancelled';
 DialogDirection.Initiator = 'initiator';
 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) => {
@@ -67,11 +67,6 @@ class Srf extends Emitter {
     // then ..
     // srf.connect(), or srf.listen()
     //
-    // the old ways:
-    // new Srf(connectArgs)
-    // or
-    // new Srf(app)
-    // are deprecated
 
     this._dialogs = new Map() ;
     this._tags = [];
@@ -209,10 +204,10 @@ class Srf extends Emitter {
   createUAS(req, res, opts = {}, callback) {
     opts.headers = opts.headers || {} ;
     const body = opts.body || opts.localSdp;
-    const generateSdp = typeof body === 'function' ?
-      opts.localSdp : () => { return Promise.resolve(opts.localSdp); };
+    const generateSdp = typeof body === 'function' ? body : () => opts.localSdp;
+    assert(typeof generateSdp === 'function');
 
-    const __fail = (callback, err) => {
+    const __fail = (err, callback) => {
       debug(`createUAS failed with ${err}`);
       callback(err);
     };
@@ -236,7 +231,7 @@ class Srf extends Emitter {
       }
     }
 
-    const __send = (callback, content) => {
+    const __send = (content, callback) => {
       let called = false;
       debug('createUAS sending');
 
@@ -297,18 +292,17 @@ class Srf extends Emitter {
             // should we emit some sort of event?
           }) ;
         }
-        else {
-          callback(null, dialog) ;
-        }
       });
     };
 
-    const __x = (callback) => {
-      const send = __send.bind(this, callback);
-      const fail = __fail.bind(this, callback);
-      generateSdp()
-        .then(send)
-        .catch(fail);
+    const __x = async(callback) => {
+      try {
+        const sdp = await generateSdp();
+        debug({sdp}, `createUAS - generateSdp returned ${sdp}`);
+        __send(sdp, callback);
+      } catch (err) {
+        __fail(err, callback);
+      }
     };
 
     if (callback) {
@@ -450,7 +444,7 @@ class Srf extends Emitter {
           from = `"${opts.callingName}" <${usingTls ? 'sips' : 'sip'}:${opts.callingNumber}@localhost>`;
         } else {
           from = `${usingTls ? 'sips' : 'sip'}:${opts.callingNumber}@localhost`;
-        }  
+        }
       }
 
       if (from) {
@@ -833,37 +827,42 @@ class Srf extends Emitter {
     let remoteSdpB, translatedRemoteSdpB ;
 
     /* returns a Promise that resolves with the sdp to use responding to the A leg */
-    function generateSdpA(res) {
+    const generateSdpA = async(res) => {
       debug('createB2BUA: generateSdpA');
 
       const sdpB = res.body ;
       if (res.getParsedHeader('CSeq').method === 'SUBSCRIBE' || !sdpB) {
-        return Promise.resolve(sdpB) ;
+        return sdpB ;
       }
 
       if (remoteSdpB && remoteSdpB === sdpB) {
         // called again with same remote SDP, return previous result
-        return Promise.resolve(translatedRemoteSdpB) ;
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+
+        /* race condition: we are still producing the translatedSdp from 183 */
+        await sleepFor(100);
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+        await sleepFor(500);
+        if (translatedRemoteSdpB) return translatedRemoteSdpB;
+        await sleepFor(1000);
+        return translatedRemoteSdpB;
       }
 
       remoteSdpB = sdpB ;
       if (!opts.localSdpA) {
         // passthru B leg SDP
-        return Promise.resolve(translatedRemoteSdpB = sdpB);
+        return translatedRemoteSdpB = sdpB;
       }
       else if ('function' === typeof opts.localSdpA) {
         // call function that returns either the sdp, or a Promise that resolves to the sdp
-        const p = opts.localSdpA(sdpB, res);
-        if (typeof p === 'string') return Promise.resolve(translatedRemoteSdpB = p);
-        return p
-          .then((sdpA) => translatedRemoteSdpB = sdpA)
-          .catch((err) => Promise.reject(err));
+        const sdpA = await opts.localSdpA(sdpB, res);
+        return translatedRemoteSdpB = sdpA;
       }
       else {
         // insert provided SDP
-        return Promise.resolve(translatedRemoteSdpB = opts.localSdpA) ;
+        return translatedRemoteSdpB = opts.localSdpA ;
       }
-    }
+    };
 
     /* uac request sent, set handler to propagate CANCEL from A leg if we get it */
     function handleUACSent(err, uacReq) {
@@ -883,7 +882,11 @@ class Srf extends Emitter {
 
     /* get headers from response on uac (B) leg and ready them for inclusion on our response on uas (A) leg */
     function copyUACHeadersToUAS(uacRes) {
-      const headers = {} ;
+      const headers = {};
+      if (!uacRes) {
+        return headers;
+      }
+
       if (proxyResponseHeaders[0] === 'all') {
         copyAllHeaders(uacRes, headers);
         possiblyRemoveHeaders(proxyResponseHeaders.slice(1), headers);
@@ -910,22 +913,21 @@ class Srf extends Emitter {
     }
 
     /* propagate any provisional responses from uac (B) leg to uas (A) leg */
-    function handleUACProvisionalResponse(provisionalRes, uacReq) {
+    const handleUACProvisionalResponse = async(provisionalRes, uacReq) => {
       if (provisionalRes.status > 101) {
         debug(`Srf#createB2BUA: received a provisional response ${provisionalRes.status}`) ;
         if (propagateProvisional) {
           const opts = { headers: copyUACHeadersToUAS(provisionalRes) } ;
           if (provisionalRes.body) {
-            generateSdpA(provisionalRes)
-              .then((sdpA) => {
-                opts.body = sdpA ;
-                return res.send(provisionalRes.status, provisionalRes.reason, opts) ;
-              })
-              .catch((err) => {
-                console.error(`Srf#createB2BUA: failed in call to produceSdpForALeg: ${err.message}`);
-                res.send(500) ;
-                uacReq.cancel() ;
-              });
+            try {
+              const sdpA = await generateSdpA(provisionalRes);
+              opts.body = sdpA ;
+              return res.send(provisionalRes.status, provisionalRes.reason, opts);
+            } catch (err) {
+              debug(`Srf#createB2BUA: failed in call to produceSdpForALeg: ${err.message}`);
+              res.send(500) ;
+              uacReq.cancel() ;
+            }
           }
           else {
             res.send(provisionalRes.status, provisionalRes.reason, opts) ;
@@ -936,9 +938,9 @@ class Srf extends Emitter {
         }
       }
       cbProvisional(provisionalRes);
-    }
+    };
 
-    const __x = (callback) => {
+    const __x = async(callback) => {
       debug(`createB2BUA: creating UAC, opts: ${JSON.stringify(opts)}`);
 
       opts._socket = req.socket ;
@@ -960,73 +962,75 @@ class Srf extends Emitter {
         }
       }
 
-      this.createUAC(opts, {cbRequest: handleUACSent, cbProvisional: handleUACProvisionalResponse})
-        .then((uac) => {
-          let finalResponse, ackFunction;
-          if (is3pcc) {
-            /* this is a 3pcc invite, will sdp in ACK from A leg */
-            const {sdp, ack, res} = uac;
-            finalResponse = res;
-            ackFunction = ack;
-          }
-          else {
-            finalResponse = uac.res;
-            /* success establishing uac (B) leg, now establish uas (A) leg */
-            debug('createB2BUA: successfully created UAC..queueing requests..');
+      /* ok, first create the UAC */
+      let uac;
+      try {
+        uac = await this.createUAC(opts, {cbRequest: handleUACSent, cbProvisional: handleUACProvisionalResponse});
+
+      } catch (err) {
+        debug(`createB2BUA: received non-success ${err.status || err} on uac leg`);
+        const opts = {headers: copyUACHeadersToUAS(err.res)} ;
+        if (propagateFailure && !res.finalResponseSent) {
+          // failed B: propagate failure to A
+          res.send(err.status || 500, opts);
+        }
+        return callback(err);
+      }
 
-            /* need to hold any reINVITEs etc on the B leg until we establish A */
-            uac.queueRequests = true;
-            cbFinalizedUac(uac);
-          }
+      let finalResponse, ackFunction;
+      if (is3pcc) {
+        /* this is a 3pcc invite, will sdp in ACK from A leg */
+        const {ack, res} = uac;
+        finalResponse = res;
+        ackFunction = ack;
+      }
+      else {
+        finalResponse = uac.res;
+        /* success establishing uac (B) leg, now establish uas (A) leg */
+        debug('createB2BUA: successfully created UAC..queueing requests..');
 
-          return this.createUAS(req, res, {
-            headers: copyUACHeadersToUAS(finalResponse),
-            localSdp: generateSdpA.bind(null, finalResponse),
-            dialogStateEmitter: opts.dialogStateEmitter
-          })
-            .then((uas) => {
-              if (is3pcc) {
-                debug('createB2BUA: successfully created UAS..but this is 3pcc, so a bit more work to do');
-                uas.once('ack', (ackRequest) => {
-                  debug(`createB2BUA: got ACK from UAS, pass on sdp: ${ackRequest.body}`);
-                  const p = typeof opts.localSdpB === 'function' ?
-                    opts.localSdpB(ackRequest.body) : Promise.resolve(ackRequest.body);
-                  p
-                    .then((sdp) => ackFunction(sdp))
-                    .then((uac) => {
-                      uac.other = uas;
-                      uas.other = uac;
-                      debug('createB2BUA: successfully created bot dialogs in 3pcc!');
-                      callback(null, {uac, uas});  // successfully connected!  resolve promise with both dialogs
-                    });
-                });
-                return
-              }
+        /* need to hold any reINVITEs etc on the B leg until we establish A */
+        uac.queueRequests = true;
+        cbFinalizedUac(uac);
+      }
 
-              debug('createB2BUA: successfully created UAS..done!');
-              uas.once('ack', () => {
-                debug('createB2BUA: got ACK from UAS, process any queued UAC requests');
-                uac.queueRequests = false;
-              });
-              uac.other = uas;
-              uas.other = uac;
-              return callback(null, {uac, uas});  // successfully connected!  resolve promise with both dialogs
-            })
-            .catch((err) => {
-              debug('createB2BUA: failed creating UAS..done!');
-              uac.destroy() ;       // failed A leg after success on B: tear down B
-              callback(err) ;
-            });
-        })
-        .catch((err) => {
-          debug(`createB2BUA: received non-success ${err.status || err} on uac leg`);
-          const opts = {headers: copyUACHeadersToUAS(err.res)} ;
-          if (propagateFailure && !res.finalResponseSent) {
-            // failed B: propagate failure to A
-            res.send(err.status || 500, opts);
-          }
-          callback(err);
+      /* now finalize the UAS */
+      let uas;
+      try {
+        uas = await this.createUAS(req, res, {
+          headers: copyUACHeadersToUAS(finalResponse),
+          localSdp: generateSdpA.bind(null, finalResponse),
+          dialogStateEmitter: opts.dialogStateEmitter
         });
+
+        if (is3pcc) {
+          debug('createB2BUA: successfully created UAS..but this is 3pcc, so a bit more work to do');
+          uas.once('ack', async(ackRequest) => {
+            debug(`createB2BUA: got ACK from UAS, pass on sdp: ${ackRequest.body}`);
+            const sdp = await (typeof opts.localSdpB === 'function' ?
+              opts.localSdpB(ackRequest.body) : Promise.resolve(ackRequest.body));
+            uac = await ackFunction(sdp);
+            uac.other = uas;
+            uas.other = uac;
+            debug('createB2BUA: successfully created bot dialogs in 3pcc!');
+            return callback(null, {uac, uas});  // successfully connected!  resolve promise with both dialogs
+          });
+          return;
+        }
+
+        debug('createB2BUA: successfully created UAS..done!');
+        uas.once('ack', () => {
+          debug('createB2BUA: got ACK from UAS, process any queued UAC requests');
+          uac.queueRequests = false;
+        });
+        uac.other = uas;
+        uas.other = uac;
+        return callback(null, {uac, uas});  // successfully connected!  resolve promise with both dialogs
+      } catch (err) {
+        debug({err}, 'createB2BUA: failed creating UAS..done!');
+        uac.destroy() ;       // failed A leg after success on B: tear down B
+        return callback(err) ;
+      }
     };
 
     if (callback) {
@@ -1185,396 +1189,6 @@ class Srf extends Emitter {
     return this._dialogs.get(stackDialogId);
   }
 
-  /* deprecated */
-  createUasDialog(req, res, opts, cb) {
-    deprecate('please consider migrating to createUAS, the promises-based version');
-
-    assert.ok(!!req.msg, 'argument \'req\' must be a drachtio Request') ;
-    assert.equal(typeof res.agent, 'object', 'argument \'res\' must be a drachtio Response') ;
-    assert.equal(typeof opts, 'object', 'argument \'opts\' must be provided with connection options') ;
-    if (req.method === 'INVITE') {
-      assert.equal(typeof opts.localSdp, 'string', 'argument \'opts.localSdp\' was not provided') ;
-    }
-    assert.equal(typeof cb, 'function', 'a callback function is required');
-
-    opts.headers = opts.headers || {} ;
-
-    res.send(req.method === 'INVITE'  ? 200 : 202, {
-      headers: opts.headers,
-      body: opts.localSdp
-    }, (err, response) => {
-      if (err) { return cb(err) ; }
-
-      const dialog = new Dialog(this, 'uas', {req: req, res: res, sent: response}) ;
-      this.addDialog(dialog);
-
-      if (req.method === 'INVITE') {
-        dialog.once('ack', () => {
-          cb(null, dialog) ;
-        }) ;
-      }
-      else {
-        cb(null, dialog) ;
-      }
-    });
-
-    req.on('cancel', () => {
-      debug('Srf#createUasDialog: received CANCEL from uac') ;
-      cb(new SipError(487, 'Request Terminated')) ;
-    }) ;
-  }
-
-  createUacDialog(uri, opts, cb, cbProvisional) {
-    deprecate('please consider migrating to createUAC, the promises-based version');
-
-    return new Promise((resolve, reject) => {
-      const method = opts.method || 'INVITE' ;
-
-      if (typeof uri === 'string') { opts.uri = uri ;}
-      else if (typeof uri === 'object') {
-        cbProvisional = cb ;
-        cb = opts ;
-        opts = uri ;
-      }
-      opts.headers = opts.headers || {} ;
-
-      assert.ok(method === 'INVITE' || method === 'SUBSCRIBE', 'method must be either INVITE or SUBSCRIBE') ;
-      assert.ok(!!opts.uri, 'uri must be specified') ;
-      assert.equal(typeof cb, 'function', 'a callback function is required') ;
-
-      const parsed = parser.parseUri(opts.uri) ;
-      if (!parsed) {
-        if (-1 === opts.uri.indexOf('@') && 0 !== opts.uri.indexOf('sip:')) {
-          const address = opts.uri ;
-          opts.uri = 'sip:' + (opts.calledNumber ? opts.calledNumber + '@' : '') + address ;
-        }
-        else if (0 !== opts.uri.indexOf('sip:')) {
-          opts.uri = 'sip:' + opts.uri ;
-        }
-      }
-
-      if (opts.callingNumber) {
-        opts.headers.from = 'sip:' + opts.callingNumber + '@localhost' ;
-        opts.headers.contact = 'sip:' + opts.callingNumber + '@localhost' ;
-      }
-
-      const is3pcc = !opts.localSdp && 'INVITE' === method ;
-
-
-      this._app.request({
-        uri: opts.uri,
-        method: method,
-        headers: opts.headers,
-        body: opts.localSdp,
-        auth: opts.auth
-      },
-      (err, req) => {
-        if (err) {
-          reject(err) ;
-          return cb(err) ;
-        }
-        resolve(req) ;
-        req.on('response', (res, ack) => {
-          if (res.status < 200) {
-            if (res.has('RSeq')) {
-              ack() ; // send PRACK
-            }
-            if (cbProvisional) {
-              cbProvisional(res) ;
-            }
-          }
-          else {
-            if (is3pcc && 200 === res.status && !!res.body) {
-
-              if (opts.noAck === true) {
-                // caller is responsible for sending ACK
-                return cb(null, res.body, function(localSdp, callback) {
-                  ack({body: localSdp}) ;
-
-                  const dialog = new Dialog(this, 'uac', {req: req, res: res}) ;
-                  dialog.local.sdp = localSdp ;
-                  this.addDialog(dialog) ;
-                  callback(null, dialog) ;
-                }.bind(this));
-              }
-              let bhSdp = res.body.replace(/c=IN\s+IP4\s+(\d+\.\d+\.\d+\.\d+)/, function(/* match, p1 */) {
-                return 'c=IN IP4 0.0.0.0' ;
-              }) ;
-              bhSdp = bhSdp.replace(/(o=[a-zA-Z0-9]+\s+\d+\s+\d+\s+IN\s+IP4\s+)(\d+\.\d+\.\d+\.\d+)/,
-                (match, p1) => { return p1 + '0.0.0.0' ;}
-              ) ;
-              ack({
-                body: bhSdp
-              }) ;
-            }
-            else if (method === 'INVITE') {
-              ack() ;
-            }
-
-            if ((200 === res.status && method === 'INVITE') ||
-                ((202 === res.status || 200 === res.status) && method === 'SUBSCRIBE')) {
-
-              const dialog = new Dialog(this, 'uac', {req: req, res: res}) ;
-              this.addDialog(dialog) ;
-              return cb(null, dialog) ;
-            }
-            const error = new SipError(res.status, res.reason) ;
-            error.res = res ;
-            cb(error) ;
-          }
-        }) ;
-      }) ;
-    });
-  }
-
-  createBackToBackDialogs(req, res, uri, opts, cb) {
-    deprecate('please consider migrating to createB2BUA, the promises-based version');
-
-    assert.ok(typeof uri === 'string' || Array.isArray(uri), 'argument \'uri\' must be either a string or an array') ;
-
-    if (typeof opts === 'function') {
-      cb = opts ;
-      opts = {} ;
-    }
-
-    assert.ok(!opts.onProvisional ||
-      typeof opts.onProvisional === 'function', 'argument \'opts.onProvisional\' must be a function') ;
-
-    let remoteSdpB, translatedRemoteSdpB ;
-
-    function produceSdpForALeg(sdpB, res, callback) {
-      const method = res.getParsedHeader('CSeq').method ;
-
-      if (method === 'SUBSCRIBE' || !sdpB) {
-        // no-op
-        return callback(null, sdpB) ;
-      }
-
-      if (remoteSdpB && remoteSdpB === sdpB) {
-        // called again with same remote SDP, return previous result
-        return callback(null, translatedRemoteSdpB) ;
-      }
-
-      remoteSdpB = sdpB ;
-      if (!opts.localSdpA) {
-        // no-op: caller does not want to do any substitution
-        callback(null, translatedRemoteSdpB = sdpB) ;
-      }
-      else if ('function' === typeof opts.localSdpA) {
-        // invoke provided callback to generate SDP
-        opts.localSdpA(sdpB, res, (err, sdp) => {
-          callback(err, translatedRemoteSdpB = sdp);
-        }) ;
-      }
-      else {
-        // insert provided SDP
-        callback(null, translatedRemoteSdpB = opts.localSdpA) ;
-      }
-    }
-
-    opts.method = req.method ;
-    const onProvisional = opts.onProvisional ;
-
-    const proxyRequestHeaders = opts.proxyRequestHeaders || [] ;
-    const proxyResponseHeaders = opts.proxyResponseHeaders || [] ;
-
-    // default From, To, and user part of uri if not provided
-    opts.headers = opts.headers || {} ;
-
-    // pass specified headers on to the B leg
-    proxyRequestHeaders.forEach((hdr) => {
-      if (req.has(hdr)) {
-        opts.headers[hdr] = req.get(hdr) ;
-      }
-    }) ;
-    /*
-    opts.headers.forEach(opts.headers, (value, hdr) => {
-      opts.headers[hdr] = value ;
-    }) ;
-    */
-    if (!opts.headers.from && !opts.callingNumber) { opts.callingNumber = req.callingNumber; }
-    if (!opts.headers.to && !opts.calledNumber) { opts.calledNumber = req.calledNumber; }
-
-    opts.localSdp = opts.localSdpB || req.body ;
-
-    uri = 'string' === typeof uri ? [uri] : uri ;
-
-    let finalUacFail ;
-    let finalUacSuccess ;
-    let receivedProvisional = false ;
-    let canceled = false ;
-    let uacBye, reqImmediateNotify, resImmediateNotify ;
-    let uacPromise ;
-
-    // DH: NOTE (possible TODO): callback signature changes in async 2.x for detectXXX
-    async.detectSeries(
-
-      // list of remote URIs to iterate
-      uri,
-
-      // truth test
-      (uri, callback) => {
-
-        if (receivedProvisional || canceled) {
-          // stop cranking back once we receive a provisional > 100 from somebody or the caller canceled
-          return callback(false);
-        }
-
-        // launch the next INVITE or SUBSCRIBE
-        debug('sending %s to %s', opts.method, uri) ;
-        uacPromise = this.createUacDialog(uri, opts,
-          (err, uacDialog) => {
-            if (err) {
-              //non-success: crank back to the next uri if we have one
-              finalUacFail = err ;
-              debug('got failure %d', err.status) ;
-              return callback(false) ;
-            }
-
-            // success - we're done
-            debug('got success! ') ;
-            finalUacSuccess = uacDialog ;
-
-            // for invites, we need to handle a very quick hangup coming before we establish the uas dialog
-            uacDialog.on('destroy', (msg) => {
-              debug('Srf#createBackToBackDialogs: got a BYE on B leg before A leg has ACK\'ed') ;
-              uacBye = msg ;
-            }) ;
-
-            //for subscribes, we need to handle the immediate notify that may come back
-            //from the B leg before we establish the uas dialog
-            if (uacDialog.dialogType === 'SUBSCRIBE') {
-              uacDialog.on('notify', function(reqNotify, resNotify) {
-                debug('Srf#createBackToBackDialogs: received immediate NOTIFY after SUBSCRIBE, ' +
-                  'queueing until we complete A leg dialog') ;
-                reqImmediateNotify = reqNotify ;
-                resImmediateNotify = resNotify ;
-              }) ;
-            }
-            callback(true) ;
-          },
-          (provisionalRes) => {
-            if (provisionalRes.status > 100) {
-              debug('Srf#createBackToBackDialogs: received a provisional response %d', provisionalRes.status) ;
-
-              const opts = { headers: {} } ;
-              proxyResponseHeaders.forEach((hdr) => {
-                if (provisionalRes.has(hdr)) { opts.headers[hdr] = provisionalRes.get(hdr) ; }
-              }) ;
-
-              if (provisionalRes.body) {
-                produceSdpForALeg(provisionalRes.body, provisionalRes, (err, sdp) => {
-                  if (err) {
-                    console.error(`Srf#createBackToBackDialogs: failed in call to produceSdpForALeg; ' + 
-                      'terminate dialog: ${err.message}`) ;
-
-                    //TODO: now we have to hang up B and return a 503 or something to A
-                  }
-                  opts.body = sdp ;
-                  res.send(provisionalRes.status, provisionalRes.reason, opts) ;
-                }) ;
-              }
-              else {
-                res.send(provisionalRes.status, provisionalRes.reason, opts) ;
-              }
-
-              if (onProvisional) {
-                onProvisional(provisionalRes) ;
-              }
-              // we're committed to this uac now
-              receivedProvisional = true ;
-            }
-          }
-        );
-        uacPromise.then((uacRequest) => {
-          req.on('cancel', () => {
-            debug('Srf#createBackToBackDialogs: received CANCEL as uas; sending CANCEL as uac') ;
-            canceled = true ;
-            finalUacFail = new SipError(487, 'Request Terminated') ;
-            uacRequest.cancel() ;
-          }) ;
-        }) ;
-      },
-
-      // final handler
-      (successUri) => {
-        const opts = { headers: {} } ;
-        if (typeof successUri === 'undefined') {
-          // all failed, send the final failure response back
-          // (TODO: should we be tracking the "best" failure to return?)
-
-          // pass specified headers back to the A leg
-          if (!finalUacFail.res) {
-            res.send(503);
-          }
-          else {
-            proxyResponseHeaders.forEach((hdr) => {
-              if (finalUacFail.res.has(hdr)) { opts.headers[hdr] = finalUacFail.res.get(hdr) ; } }) ;
-            res.send(finalUacFail.status, finalUacFail.reason, opts) ;
-          }
-          return cb(finalUacFail) ;
-        }
-
-        // success
-        proxyResponseHeaders.forEach((hdr) => {
-          if (finalUacSuccess.res.has(hdr)) {
-            opts.headers[hdr] = finalUacSuccess.res.get(hdr) ;
-          }
-        }) ;
-        produceSdpForALeg(finalUacSuccess.remote.sdp, finalUacSuccess.res, (err, sdp) => {
-          opts.localSdp = sdp ;
-
-          // pass specified headers back to the A leg
-          this.createUasDialog(req, res, opts, (err, uasDialog) => {
-            if (err) {
-              return cb(err);
-            }
-
-            finalUacSuccess.removeAllListeners('destroy') ;
-
-            // if B leg has already hung up, emit destroy event after caller has a chance to set up handlers
-            if (uacBye) {
-              setImmediate(() => {
-                finalUacSuccess.emit('destroy', uacBye) ;
-              }) ;
-            }
-
-            // for subscribe dialogs, stitch together the two dialogs
-            // so that we automatically forward NOTIFY and SUBSCRIBE requests down the other leg
-            // note: we don't currently do this for invite dialogs because it is trickier
-            // to know how the app wants to handle re-invites
-            if (uasDialog.dialogType === 'SUBSCRIBE') {
-
-              // remove listener for early / immediate notify and handle any such queued requests
-              finalUacSuccess.removeAllListeners('notify') ;
-              if (reqImmediateNotify) {
-                setImmediate(() => {
-                  debug('Srf#createBackToBackDialogs: processing immediate notify') ;
-                  this._b2bRequestWithinDialog(uasDialog, reqImmediateNotify, resImmediateNotify,
-                    ['Event', 'Subscription-State', 'Content-Type'], []) ;
-                });
-              }
-
-              // notify requests come from the B leg
-              finalUacSuccess.on('notify', (req, res) => {
-                this._b2bRequestWithinDialog(uasDialog, req, res, ['Event', 'Subscription-State', 'Content-Type'], []) ;
-              }) ;
-
-              // subscribes (to refresh or terminate) come from the A leg
-              uasDialog.on('subscribe', (req, res) => {
-                this._b2bRequestWithinDialog(finalUacSuccess, req, res, ['Event', 'Expires'],
-                  ['Expires', 'Subscription-State', 'Allow-Events', 'Allow']) ;
-              }) ;
-            }
-
-            cb(null, uasDialog, finalUacSuccess) ;
-          }) ;
-        }) ;
-      }
-    ) ;
-    return uacPromise ;
-  }
-
   addDialog(dialog) {
     this._dialogs.set(dialog.id, dialog) ;
     debug('Srf#addDialog: adding dialog with id %s type %s, dialog count is now %d ',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.4.64",
+  "version": "4.5.2",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "scripts": {
@@ -23,27 +23,25 @@
   },
   "homepage": "https://github.com/drachtio/drachtio-srf#readme",
   "dependencies": {
-    "async": "^1.4.2",
     "debug": "^3.2.7",
     "delegates": "^0.1.0",
-    "deprecate": "^1.1.1",
-    "node-noop": "0.0.1",
-    "only": "0.0.2",
+    "node-noop": "^0.0.1",
+    "only": "^0.0.2",
     "sdp-transform": "^2.14.1",
-    "short-uuid": "^4.1.0",
+    "short-uuid": "^4.2.0",
     "sip-methods": "^0.3.0",
     "sip-status": "^0.1.0",
-    "utils-merge": "1.0.0",
+    "utils-merge": "^1.0.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "config": "^3.3.3",
-    "eslint": "^7.18.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "mocha": "^9.2.0",
+    "config": "^3.3.7",
+    "eslint": "^7.32.0",
+    "eslint-plugin-promise": "^4.3.1",
+    "mocha": "^9.2.2",
     "nyc": "^15.1.0",
     "should": "^13.2.3",
-    "sip-message-examples": "0.0.6",
-    "tape": "^5.2.2"
+    "sip-message-examples": "^0.0.6",
+    "tape": "^5.5.3"
   }
 }