0.6.3: Properly cancel when only '100 trying' has been received

versatica · Jan 17, 2015 · 2a32bbb · 2a32bbb
1 parent 8d8df0c
commit 2a32bbb
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 33 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 CHANGELOG
 =========
 
+Version 0.6.3 (released in 2015-01-17)
+--------------------------------------
+
+* Bug fix. Properly cancel when only '100 trying' has been received.
+
+
 Version 0.6.2 (released in 2015-01-16)
 --------------------------------------
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "jssip",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "description": "the Javascript SIP library",
   "main": "dist/jssip.js",
   "homepage": "http://jssip.net",

diff --git a/dist/jssip.js b/dist/jssip.js
@@ -1,5 +1,5 @@
 /*
- * JsSIP.js 0.6.2
+ * JsSIP.js 0.6.3
  * the Javascript SIP library
  * Copyright 2012-2015 José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)
  * Homepage: http://jssip.net
@@ -14208,8 +14208,6 @@ RTCSession.prototype.terminate = function(options) {
         ended.call(this, 'local', null, cause);
       }
   }
-
-  this.close();
 };
 
 
@@ -15292,13 +15290,10 @@ function receiveInviteResponse(response) {
 
   switch(true) {
     case /^100$/.test(response.status_code):
+      this.status = C.STATUS_1XX_RECEIVED;
       break;
 
     case /^1[0-9]{2}$/.test(response.status_code):
-      if (this.status !== C.STATUS_INVITE_SENT && this.status !== C.STATUS_1XX_RECEIVED) {
-        break;
-      }
-
       // Do nothing with 1xx responses without To tag.
       if (!response.to_tag) {
         debug('1xx response received without to tag');
@@ -21704,6 +21699,7 @@ var attachMediaStream = null;
 var browserVersion = Number(browser.version) || 0;
 var isDesktop = !!(! browser.mobile || ! browser.tablet);
 var hasWebRTC = false;
+var _navigator = global.navigator || {};  // Don't fail in Node.
 
 
 function Adapter(options) {
@@ -21715,10 +21711,10 @@ function Adapter(options) {
 		(isDesktop && browser.opera && browserVersion >= 27) ||
 		(browser.android && browser.opera && browserVersion >= 24) ||
 		(browser.android && browser.webkit && ! browser.chrome && browserVersion >= 37) ||
-		(navigator.webkitGetUserMedia && global.webkitRTCPeerConnection)
+		(_navigator.webkitGetUserMedia && global.webkitRTCPeerConnection)
 	) {
 		hasWebRTC = true;
-		getUserMedia = navigator.webkitGetUserMedia.bind(navigator);
+		getUserMedia = _navigator.webkitGetUserMedia.bind(_navigator);
 		RTCPeerConnection = global.webkitRTCPeerConnection;
 		RTCSessionDescription = global.RTCSessionDescription;
 		RTCIceCandidate = global.RTCIceCandidate;
@@ -21733,10 +21729,10 @@ function Adapter(options) {
 	else if (
 		(isDesktop && browser.firefox && browserVersion >= 22) ||
 		(browser.android && browser.firefox && browserVersion >= 33) ||
-		(navigator.mozGetUserMedia && global.mozRTCPeerConnection)
+		(_navigator.mozGetUserMedia && global.mozRTCPeerConnection)
 	) {
 		hasWebRTC = true;
-		getUserMedia = navigator.mozGetUserMedia.bind(navigator);
+		getUserMedia = _navigator.mozGetUserMedia.bind(_navigator);
 		RTCPeerConnection = global.mozRTCPeerConnection;
 		RTCSessionDescription = global.mozRTCSessionDescription;
 		RTCIceCandidate = global.mozRTCIceCandidate;
@@ -21767,9 +21763,9 @@ function Adapter(options) {
 	}
 
 	// Best effort (may be adater.js is loaded).
-	else if (navigator.getUserMedia && global.RTCPeerConnection) {
+	else if (_navigator.getUserMedia && global.RTCPeerConnection) {
 		hasWebRTC = true;
-		getUserMedia = navigator.getUserMedia.bind(navigator);
+		getUserMedia = _navigator.getUserMedia.bind(_navigator);
 		RTCPeerConnection = global.RTCPeerConnection;
 		RTCSessionDescription = global.RTCSessionDescription;
 		RTCIceCandidate = global.RTCIceCandidate;
@@ -23018,7 +23014,7 @@ module.exports = require('../package.json').version;
 },{}],38:[function(require,module,exports){
 module.exports={
   "name": "rtcninja",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "WebRTC API wrapper to deal with different browsers",
   "author": {
     "name": "Iñaki Baz Castillo",
@@ -23043,8 +23039,7 @@ module.exports={
     "merge": "^1.2.0"
   },
   "devDependencies": {
-    "browserify": "^8.1.0",
-    "fs-extra": "^0.14.0",
+    "browserify": "^8.1.1",
     "gulp": "git+https://github.com/gulpjs/gulp.git#4.0",
     "gulp-expect-file": "0.0.7",
     "gulp-filelog": "^0.4.1",
@@ -23055,16 +23050,33 @@ module.exports={
     "jshint-stylish": "^1.0.0",
     "vinyl-transform": "^1.0.0"
   },
-  "readme": "# rtcninja.js\n\nWebRTC API wrapper to deal with different browsers.\n\n\n## Installation\n\n* With **npm**:\n\n```bash\n$ npm install rtcninja\n```\n\n* With **bower**:\n\n```bash\n$ bower install rtcninja\n```\n\n## Usage in Node\n\n```javascript\nvar rtcninja = require('rtcninja');\n```\n\n\n## Browserified library\n\nTake a browserified version of the library from the `dist/` folder:\n\n* `dist/rtcninja-X.Y.Z.js`: The uncompressed version.\n* `dist/rtcninja-X.Y.Z.min.js`: The compressed production-ready version.\n* `dist/rtcninja.js`: A copy of the uncompressed version.\n* `dist/rtcninja.min.js`: A copy of the compressed version.\n\nThey expose the global `window.rtcninja` module.\n\n```html\n<script src='rtcninja-X.Y.Z.js'></script>\n```\n\n\n## Usage Example\n\n```javascript\n// Must first call it.\nrtcninja();\n\n// Then check.\nif (rtcninja.hasWebRTC()) {\n    // Do something.\n}\nelse {\n    // Do something.\n}\n```\n\n\n## Documentation\n\nYou can read the full [API documentation](docs/index.md) in the docs folder.\n\n\n## Debugging\n\nThe library includes the Node [debug](https://github.com/visionmedia/debug) module. In order to enable debugging:\n\nIn Node set the `DEBUG=rtcninja*` environment variable before running the application, or set it at the top of the script:\n\n```javascript\nprocess.env.DEBUG = 'rtcninja*';\n```\n\nIn the browser run `rtcninja.debug.enable('rtcninja*');` and reload the page. Note that the debugging settings are stored into the browser LocalStorage. To disable it run `rtcninja.debug.disable('rtcninja*');`.\n\n\n## Author\n\nIñaki Baz Castillo at [eFace2Face](http://eface2face.com).\n\n\n## License\n\nISC.\n",
-  "readmeFilename": "README.md",
-  "gitHead": "74b2c6085d035291340ac3655797eca1d6f613a8",
+  "gitHead": "1ffa5f09184e3575ad5313784fe615c8f293da3b",
   "bugs": {
     "url": "https://github.com/ibc/rtcninja.js/issues"
   },
-  "_id": "rtcninja@0.2.8",
+  "_id": "rtcninja@0.2.9",
   "scripts": {},
-  "_shasum": "7025b1f31b3a17222b1cb225a41116b03345faf1",
-  "_from": "rtcninja@>=0.2.8 <0.3.0"
+  "_shasum": "9c71e12e12c9ac8f5ba87a6f23d5688b1ac2f328",
+  "_from": "rtcninja@>=0.2.9 <0.3.0",
+  "_npmVersion": "2.1.6",
+  "_nodeVersion": "0.10.33",
+  "_npmUser": {
+    "name": "ibc",
+    "email": "ibc@aliax.net"
+  },
+  "maintainers": [
+    {
+      "name": "ibc",
+      "email": "ibc@aliax.net"
+    }
+  ],
+  "dist": {
+    "shasum": "9c71e12e12c9ac8f5ba87a6f23d5688b1ac2f328",
+    "tarball": "http://registry.npmjs.org/rtcninja/-/rtcninja-0.2.9.tgz"
+  },
+  "directories": {},
+  "_resolved": "https://registry.npmjs.org/rtcninja/-/rtcninja-0.2.9.tgz",
+  "readme": "ERROR: No README data found!"
 }
 
 },{}],39:[function(require,module,exports){
@@ -23579,7 +23591,7 @@ module.exports={
     "email": "brian@worlize.com",
     "url": "https://www.worlize.com/"
   },
-  "version": "1.0.15",
+  "version": "1.0.16",
   "repository": {
     "type": "git",
     "url": "https://github.com/theturtle32/WebSocket-Node.git"
@@ -23613,13 +23625,13 @@ module.exports={
     "lib": "./lib"
   },
   "browser": "lib/browser.js",
-  "gitHead": "7cd99112b319c9c52069a13c1c80a3b67167d513",
+  "gitHead": "191ef055705fcc65c4bf56a83010ff9bf1faf398",
   "bugs": {
     "url": "https://github.com/theturtle32/WebSocket-Node/issues"
   },
-  "_id": "websocket@1.0.15",
-  "_shasum": "cf9f0f9ce08bf20a7f2acac3980ee84b4abb58e1",
-  "_from": "websocket@>=1.0.15 <2.0.0",
+  "_id": "websocket@1.0.16",
+  "_shasum": "6c96a1d68dcfdc445688d50c676b7fa493ef5b2a",
+  "_from": "websocket@>=1.0.16 <2.0.0",
   "_npmVersion": "1.4.28",
   "_npmUser": {
     "name": "theturtle32",
@@ -23632,18 +23644,19 @@ module.exports={
     }
   ],
   "dist": {
-    "shasum": "cf9f0f9ce08bf20a7f2acac3980ee84b4abb58e1",
-    "tarball": "http://registry.npmjs.org/websocket/-/websocket-1.0.15.tgz"
+    "shasum": "6c96a1d68dcfdc445688d50c676b7fa493ef5b2a",
+    "tarball": "http://registry.npmjs.org/websocket/-/websocket-1.0.16.tgz"
   },
-  "_resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.15.tgz"
+  "_resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.16.tgz",
+  "readme": "ERROR: No README data found!"
 }
 
 },{}],46:[function(require,module,exports){
 module.exports={
   "name": "jssip",
   "title": "JsSIP",
   "description": "the Javascript SIP library",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "homepage": "http://jssip.net",
   "author": "José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)",
   "contributors": [

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "jssip",
   "title": "JsSIP",
   "description": "the Javascript SIP library",
-  "version": "0.6.2",
+  "version": "0.6.3",
   "homepage": "http://jssip.net",
   "author": "José Luis Millán <jmillan@aliax.net> (https://github.com/jmillan)",
   "contributors": [