develop to master (#149)

* Update package-lock.json after npm install - David * Fix eslint and prettier errors and typo - David * Setting the default presence heartbeat to false on subscribe - David * Update ESLint rules and fix others - David * Formatting and fixing broken tests - David * Format subscription_manager.test.js and fix tests - David * Format reconnection_manager.test.js and fix tests - David * Update versions and include the build - David * Fix linting errors and rules for Codacy checks - David * Fix broken tests for no longer specified pubnub.yml version - David * Update the date to now - David * Missed version update - David * Subscribe endpoint will send `state` query parameter now. (#147) * fix(subscribe): return 'state' query parameter back Return 'state' back for subscribe endpoint, so client will maintain state information even when heartbeat disabled. * Prettier formatting for Codacy happiness - David * Bumped version to 4.24.1 - David * added try catch * auto gen files * removed category assignment for exception * version update * build files * readme file * updated default origin * minor refactor * build files * refactor per codacy * build files * minor change * build files * build files after conflicts resolved * Fix code formatting/linting and update .pubnub.yml version Includes re-compile - David
pubnub · Jun 13, 2019 · c51488e · c51488e
1 parent 69fba7e
commit c51488e
Show file tree

Hide file tree

Showing 18 changed files with 298 additions and 127 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,5 +1,15 @@
 --- 
 changelog: 
+  - 
+    changes: 
+      - 
+        text: "Added try catch block to handle exception for JSON.parse function"
+        type: improvement
+      - 
+        text: "Updated default origin to ps.pndsn.com"
+        type: improvement
+    date: 2019-06-13
+    version: v4.24.2
   - 
     changes: 
       - 
@@ -646,4 +656,4 @@ supported-platforms:
       - "Ubuntu 14.04 and above"
       - "Windows 7, 8, 10"
     version: "Pubnub Javascript for Node"
-version: "4.24.1"
+version: "4.24.2"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [v4.24.2](https://github.com/pubnub/javascript/tree/v4.24.2)
+  June-13-2019
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.24.0...v4.24.2)
+
+
+
+- ⭐ Added try catch block to handle exception for JSON.parse function
+- ⭐ Changed default origin to ps.pndsn.com
+
+
+
 ## [v4.24.1](https://github.com/pubnub/javascript/tree/v4.24.1)
   June-06-2019
 

diff --git a/README.md b/README.md
@@ -22,5 +22,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
 
 
 
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.1.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.1.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.2.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.2.js
diff --git a/dist/titanium/pubnub.js b/dist/titanium/pubnub.js
@@ -1,4 +1,4 @@
-/*! 4.24.1 / Consumer  */
+/*! 4.24.2 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -450,7 +450,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    this.setFilterExpression(setup.filterExpression);
 
-	    this.origin = setup.origin || 'pubsub.pndsn.com';
+	    this.origin = setup.origin || 'ps.pndsn.com';
 	    this.secure = setup.ssl || false;
 	    this.restore = setup.restore || false;
 	    this.proxy = setup.proxy;
@@ -598,7 +598,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.24.1';
+	      return '4.24.2';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -4660,7 +4660,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'nextOrigin',
 	    value: function nextOrigin() {
-	      if (this._providedFQDN.indexOf('pubsub.') === -1) {
+	      if (this._providedFQDN.indexOf('ps.') === -1) {
 	        return this._providedFQDN;
 	      }
 
@@ -4674,7 +4674,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      newSubDomain = this._currentSubDomain.toString();
 
-	      return this._providedFQDN.replace('pubsub', 'ps' + newSubDomain);
+	      return this._providedFQDN.replace('ps.', 'ps' + newSubDomain + '.');
 	    }
 	  }, {
 	    key: 'hasModule',
@@ -4713,19 +4713,35 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: '_detectErrorCategory',
 	    value: function _detectErrorCategory(err) {
-	      if (err.code === 'ENOTFOUND') return _categories2.default.PNNetworkIssuesCategory;
-	      if (err.code === 'ECONNREFUSED') return _categories2.default.PNNetworkIssuesCategory;
-	      if (err.code === 'ECONNRESET') return _categories2.default.PNNetworkIssuesCategory;
-	      if (err.code === 'EAI_AGAIN') return _categories2.default.PNNetworkIssuesCategory;
+	      if (err.code === 'ENOTFOUND') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
+	      if (err.code === 'ECONNREFUSED') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
+	      if (err.code === 'ECONNRESET') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
+	      if (err.code === 'EAI_AGAIN') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
 
-	      if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') return _categories2.default.PNNetworkIssuesCategory;
+	      if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
 	      if (err.timeout) return _categories2.default.PNTimeoutCategory;
 
-	      if (err.code === 'ETIMEDOUT') return _categories2.default.PNNetworkIssuesCategory;
+	      if (err.code === 'ETIMEDOUT') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
 
 	      if (err.response) {
-	        if (err.response.badRequest) return _categories2.default.PNBadRequestCategory;
-	        if (err.response.forbidden) return _categories2.default.PNAccessDeniedCategory;
+	        if (err.response.badRequest) {
+	          return _categories2.default.PNBadRequestCategory;
+	        }
+	        if (err.response.forbidden) {
+	          return _categories2.default.PNAccessDeniedCategory;
+	        }
 	      }
 
 	      return _categories2.default.PNUnknownCategory;

diff --git a/dist/titanium/pubnub.min.js b/dist/titanium/pubnub.min.js
diff --git a/dist/web/pubnub.js b/dist/web/pubnub.js
@@ -1,4 +1,4 @@
-/*! 4.24.1 / Consumer  */
+/*! 4.24.2 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -472,7 +472,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	    this.setFilterExpression(setup.filterExpression);
 
-	    this.origin = setup.origin || 'pubsub.pndsn.com';
+	    this.origin = setup.origin || 'ps.pndsn.com';
 	    this.secure = setup.ssl || false;
 	    this.restore = setup.restore || false;
 	    this.proxy = setup.proxy;
@@ -620,7 +620,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.24.1';
+	      return '4.24.2';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -4682,7 +4682,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'nextOrigin',
 	    value: function nextOrigin() {
-	      if (this._providedFQDN.indexOf('pubsub.') === -1) {
+	      if (this._providedFQDN.indexOf('ps.') === -1) {
 	        return this._providedFQDN;
 	      }
 
@@ -4696,7 +4696,7 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	      newSubDomain = this._currentSubDomain.toString();
 
-	      return this._providedFQDN.replace('pubsub', 'ps' + newSubDomain);
+	      return this._providedFQDN.replace('ps.', 'ps' + newSubDomain + '.');
 	    }
 	  }, {
 	    key: 'hasModule',
@@ -4735,19 +4735,35 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: '_detectErrorCategory',
 	    value: function _detectErrorCategory(err) {
-	      if (err.code === 'ENOTFOUND') return _categories2.default.PNNetworkIssuesCategory;
-	      if (err.code === 'ECONNREFUSED') return _categories2.default.PNNetworkIssuesCategory;
-	      if (err.code === 'ECONNRESET') return _categories2.default.PNNetworkIssuesCategory;
-	      if (err.code === 'EAI_AGAIN') return _categories2.default.PNNetworkIssuesCategory;
+	      if (err.code === 'ENOTFOUND') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
+	      if (err.code === 'ECONNREFUSED') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
+	      if (err.code === 'ECONNRESET') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
+	      if (err.code === 'EAI_AGAIN') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
 
-	      if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') return _categories2.default.PNNetworkIssuesCategory;
+	      if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
 	      if (err.timeout) return _categories2.default.PNTimeoutCategory;
 
-	      if (err.code === 'ETIMEDOUT') return _categories2.default.PNNetworkIssuesCategory;
+	      if (err.code === 'ETIMEDOUT') {
+	        return _categories2.default.PNNetworkIssuesCategory;
+	      }
 
 	      if (err.response) {
-	        if (err.response.badRequest) return _categories2.default.PNBadRequestCategory;
-	        if (err.response.forbidden) return _categories2.default.PNAccessDeniedCategory;
+	        if (err.response.badRequest) {
+	          return _categories2.default.PNBadRequestCategory;
+	        }
+	        if (err.response.forbidden) {
+	          return _categories2.default.PNAccessDeniedCategory;
+	        }
 	      }
 
 	      return _categories2.default.PNUnknownCategory;
@@ -4849,6 +4865,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }
 
 	  return superagentConstruct.timeout(endpoint.timeout).end(function (err, resp) {
+	    var parsedResponse = void 0;
 	    var status = {};
 	    status.error = err !== null;
 	    status.operation = endpoint.operation;
@@ -4871,7 +4888,13 @@ return /******/ (function(modules) { // webpackBootstrap
 	      return callback(status, null);
 	    }
 
-	    var parsedResponse = JSON.parse(resp.text);
+	    try {
+	      parsedResponse = JSON.parse(resp.text);
+	    } catch (e) {
+	      status.errorData = resp;
+	      status.error = true;
+	      return callback(status, null);
+	    }
 
 	    if (parsedResponse.error && parsedResponse.error === 1 && parsedResponse.status && parsedResponse.message && parsedResponse.service) {
 	      status.errorData = parsedResponse;

diff --git a/dist/web/pubnub.min.js b/dist/web/pubnub.min.js
diff --git a/lib/core/components/config.js b/lib/core/components/config.js