drachtio-srf 4.5.0 → 4.5.1

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

@@ -872,7 +872,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);
@@ -908,7 +912,7 @@ class Srf extends Emitter {
             try {
               const sdpA = await generateSdpA(provisionalRes);
               opts.body = sdpA ;
-              return res.send(provisionalRes.status, provisionalRes.reason, opts) ;  
+              return res.send(provisionalRes.status, provisionalRes.reason, opts);
             } catch (err) {
               debug(`Srf#createB2BUA: failed in call to produceSdpForALeg: ${err.message}`);
               res.send(500) ;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drachtio-srf",
-  "version": "4.5.0",
+  "version": "4.5.1",
   "description": "drachtio signaling resource framework",
   "main": "lib/srf.js",
   "scripts": {