Merge branch 'master' of github.com:versatica/JsSIP

# Conflicts: # dist/jssip.min.js
versatica · Nov 19, 2016 · de722a2 · de722a2
2 parents 766cb2e + 90ac049
commit de722a2
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ Version 3.0.0 (released in 2016-11-19)
 * `RTCSession:`: Emit WebRTC related events when internal calls to `getUserMedia()`, `createOffer()`, etc. fail.
 * Use debug NPM fixed "2.0.0" version (until a pending bug in such a library is fixed).
 * `UA`: Remove `ws_servers` option.
+* `UA`: Allow immediate restart
 
 
 Version 2.0.6 (released in 2016-09-30)

diff --git a/THANKS.md b/THANKS.md
@@ -11,6 +11,7 @@ Here the list of contributors with code and patches to JsSIP project. Thanks a l
 * [Gavin Llewellyn](https://github.com/gavllew)
 * [Julian Scheid](https://github.com/jscheid)
 * [James Mortensen](https://github.com/jamesmortensen)
+* [Steve Davies](https://github.com/davies147)
 
 
 JsSIP Debian and Ubuntu packaging

diff --git a/dist/jssip.js b/dist/jssip.js
@@ -19195,6 +19195,8 @@ function UA(configuration) {
   // Custom UA empty object for high level use
   this.data = {};
 
+  this.closeTimer = null;
+
   Object.defineProperties(this, {
     transactionsCount: {
       get: function() {
@@ -19271,22 +19273,21 @@ util.inherits(UA, events.EventEmitter);
 UA.prototype.start = function() {
   debug('start()');
 
-  var self = this;
-
-  function connect() {
-    debug('restarting UA');
-    self.status = C.STATUS_READY;
-    self.transport.connect();
-  }
-
   if (this.status === C.STATUS_INIT) {
     this.transport.connect();
   } else if(this.status === C.STATUS_USER_CLOSED) {
-    if (!this.isConnected()) {
-      connect();
-    } else {
-      this.once('disconnected', connect);
+    debug('restarting UA');
+
+    // disconnect
+    if (this.closeTimer !== null) {
+      clearTimeout(this.closeTimer);
+      this.closeTimer = null;
+      this.transport.disconnect();
     }
+
+    // reconnect
+    this.status = C.STATUS_INIT;
+    this.transport.connect();
   } else if (this.status === C.STATUS_READY) {
     debug('UA is in READY status, not restarted');
   } else {
@@ -19442,7 +19443,8 @@ UA.prototype.stop = function() {
     ua.transport.disconnect();
   }
   else {
-    setTimeout(function() {
+    this.closeTimer = setTimeout(function() {
+      ua.closeTimer = null;
       ua.transport.disconnect();
     }, 2000);
   }
@@ -21056,7 +21058,7 @@ WebSocketInterface.prototype.connect = function () {
   }
 
   if (this.ws) {
-    this.ws.close();
+    this.disconnect();
   }
 
   debug('connecting to WebSocket ' + this.url);
@@ -21079,6 +21081,12 @@ WebSocketInterface.prototype.disconnect = function() {
   debug('disconnect()');
 
   if (this.ws) {
+    // unbind websocket event callbacks
+    this.ws.onopen    = function() {};
+    this.ws.onclose   = function() {};
+    this.ws.onmessage = function() {};
+    this.ws.onerror   = function() {};
+
     this.ws.close();
     this.ws = null;
   }

diff --git a/dist/jssip.min.js b/dist/jssip.min.js
diff --git a/lib/UA.js b/lib/UA.js
@@ -80,6 +80,8 @@ function UA(configuration) {
   // Custom UA empty object for high level use
   this.data = {};
 
+  this.closeTimer = null;
+
   Object.defineProperties(this, {
     transactionsCount: {
       get: function() {
@@ -156,22 +158,21 @@ util.inherits(UA, events.EventEmitter);
 UA.prototype.start = function() {
   debug('start()');
 
-  var self = this;
-
-  function connect() {
-    debug('restarting UA');
-    self.status = C.STATUS_READY;
-    self.transport.connect();
-  }
-
   if (this.status === C.STATUS_INIT) {
     this.transport.connect();
   } else if(this.status === C.STATUS_USER_CLOSED) {
-    if (!this.isConnected()) {
-      connect();
-    } else {
-      this.once('disconnected', connect);
+    debug('restarting UA');
+
+    // disconnect
+    if (this.closeTimer !== null) {
+      clearTimeout(this.closeTimer);
+      this.closeTimer = null;
+      this.transport.disconnect();
     }
+
+    // reconnect
+    this.status = C.STATUS_INIT;
+    this.transport.connect();
   } else if (this.status === C.STATUS_READY) {
     debug('UA is in READY status, not restarted');
   } else {
@@ -327,7 +328,8 @@ UA.prototype.stop = function() {
     ua.transport.disconnect();
   }
   else {
-    setTimeout(function() {
+    this.closeTimer = setTimeout(function() {
+      ua.closeTimer = null;
       ua.transport.disconnect();
     }, 2000);
   }

diff --git a/lib/WebSocketInterface.js b/lib/WebSocketInterface.js
@@ -55,7 +55,7 @@ WebSocketInterface.prototype.connect = function () {
   }
 
   if (this.ws) {
-    this.ws.close();
+    this.disconnect();
   }
 
   debug('connecting to WebSocket ' + this.url);
@@ -78,6 +78,12 @@ WebSocketInterface.prototype.disconnect = function() {
   debug('disconnect()');
 
   if (this.ws) {
+    // unbind websocket event callbacks
+    this.ws.onopen    = function() {};
+    this.ws.onclose   = function() {};
+    this.ws.onmessage = function() {};
+    this.ws.onerror   = function() {};
+
     this.ws.close();
     this.ws = null;
   }