Skip to content

Commit c51488e

Browse files
budgetpreneurdavidnub
budgetpreneur
authored and
davidnub
committed
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
1 parent 69fba7e commit c51488e

File tree

18 files changed

+298
-127
lines changed

18 files changed

+298
-127
lines changed

‎.pubnub.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
---
22
changelog:
3+
-
4+
changes:
5+
-
6+
text: "Added try catch block to handle exception for JSON.parse function"
7+
type: improvement
8+
-
9+
text: "Updated default origin to ps.pndsn.com"
10+
type: improvement
11+
date: 2019-06-13
12+
version: v4.24.2
313
-
414
changes:
515
-
@@ -646,4 +656,4 @@ supported-platforms:
646656
- "Ubuntu 14.04 and above"
647657
- "Windows 7, 8, 10"
648658
version: "Pubnub Javascript for Node"
649-
version: "4.24.1"
659+
version: "4.24.2"

‎CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
## [v4.24.2](https://github.com/pubnub/javascript/tree/v4.24.2)
2+
June-13-2019
3+
4+
5+
[Full Changelog](https://github.com/pubnub/javascript/compare/v4.24.0...v4.24.2)
6+
7+
8+
9+
- ⭐ Added try catch block to handle exception for JSON.parse function
10+
- ⭐ Changed default origin to ps.pndsn.com
11+
12+
13+
114
## [v4.24.1](https://github.com/pubnub/javascript/tree/v4.24.1)
215
June-06-2019
316

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
2222

2323

2424

25-
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.1.min.js
26-
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.1.js
25+
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.2.min.js
26+
* https://cdn.pubnub.com/sdk/javascript/pubnub.4.24.2.js

‎dist/titanium/pubnub.js

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 4.24.1 / Consumer */
1+
/*! 4.24.2 / Consumer */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -450,7 +450,7 @@ return /******/ (function(modules) { // webpackBootstrap
450450

451451
this.setFilterExpression(setup.filterExpression);
452452

453-
this.origin = setup.origin || 'pubsub.pndsn.com';
453+
this.origin = setup.origin || 'ps.pndsn.com';
454454
this.secure = setup.ssl || false;
455455
this.restore = setup.restore || false;
456456
this.proxy = setup.proxy;
@@ -598,7 +598,7 @@ return /******/ (function(modules) { // webpackBootstrap
598598
}, {
599599
key: 'getVersion',
600600
value: function getVersion() {
601-
return '4.24.1';
601+
return '4.24.2';
602602
}
603603
}, {
604604
key: '_decideUUID',
@@ -4660,7 +4660,7 @@ return /******/ (function(modules) { // webpackBootstrap
46604660
}, {
46614661
key: 'nextOrigin',
46624662
value: function nextOrigin() {
4663-
if (this._providedFQDN.indexOf('pubsub.') === -1) {
4663+
if (this._providedFQDN.indexOf('ps.') === -1) {
46644664
return this._providedFQDN;
46654665
}
46664666

@@ -4674,7 +4674,7 @@ return /******/ (function(modules) { // webpackBootstrap
46744674

46754675
newSubDomain = this._currentSubDomain.toString();
46764676

4677-
return this._providedFQDN.replace('pubsub', 'ps' + newSubDomain);
4677+
return this._providedFQDN.replace('ps.', 'ps' + newSubDomain + '.');
46784678
}
46794679
}, {
46804680
key: 'hasModule',
@@ -4713,19 +4713,35 @@ return /******/ (function(modules) { // webpackBootstrap
47134713
}, {
47144714
key: '_detectErrorCategory',
47154715
value: function _detectErrorCategory(err) {
4716-
if (err.code === 'ENOTFOUND') return _categories2.default.PNNetworkIssuesCategory;
4717-
if (err.code === 'ECONNREFUSED') return _categories2.default.PNNetworkIssuesCategory;
4718-
if (err.code === 'ECONNRESET') return _categories2.default.PNNetworkIssuesCategory;
4719-
if (err.code === 'EAI_AGAIN') return _categories2.default.PNNetworkIssuesCategory;
4716+
if (err.code === 'ENOTFOUND') {
4717+
return _categories2.default.PNNetworkIssuesCategory;
4718+
}
4719+
if (err.code === 'ECONNREFUSED') {
4720+
return _categories2.default.PNNetworkIssuesCategory;
4721+
}
4722+
if (err.code === 'ECONNRESET') {
4723+
return _categories2.default.PNNetworkIssuesCategory;
4724+
}
4725+
if (err.code === 'EAI_AGAIN') {
4726+
return _categories2.default.PNNetworkIssuesCategory;
4727+
}
47204728

4721-
if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') return _categories2.default.PNNetworkIssuesCategory;
4729+
if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') {
4730+
return _categories2.default.PNNetworkIssuesCategory;
4731+
}
47224732
if (err.timeout) return _categories2.default.PNTimeoutCategory;
47234733

4724-
if (err.code === 'ETIMEDOUT') return _categories2.default.PNNetworkIssuesCategory;
4734+
if (err.code === 'ETIMEDOUT') {
4735+
return _categories2.default.PNNetworkIssuesCategory;
4736+
}
47254737

47264738
if (err.response) {
4727-
if (err.response.badRequest) return _categories2.default.PNBadRequestCategory;
4728-
if (err.response.forbidden) return _categories2.default.PNAccessDeniedCategory;
4739+
if (err.response.badRequest) {
4740+
return _categories2.default.PNBadRequestCategory;
4741+
}
4742+
if (err.response.forbidden) {
4743+
return _categories2.default.PNAccessDeniedCategory;
4744+
}
47294745
}
47304746

47314747
return _categories2.default.PNUnknownCategory;

‎dist/titanium/pubnub.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/web/pubnub.js

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! 4.24.1 / Consumer */
1+
/*! 4.24.2 / Consumer */
22
(function webpackUniversalModuleDefinition(root, factory) {
33
if(typeof exports === 'object' && typeof module === 'object')
44
module.exports = factory();
@@ -472,7 +472,7 @@ return /******/ (function(modules) { // webpackBootstrap
472472

473473
this.setFilterExpression(setup.filterExpression);
474474

475-
this.origin = setup.origin || 'pubsub.pndsn.com';
475+
this.origin = setup.origin || 'ps.pndsn.com';
476476
this.secure = setup.ssl || false;
477477
this.restore = setup.restore || false;
478478
this.proxy = setup.proxy;
@@ -620,7 +620,7 @@ return /******/ (function(modules) { // webpackBootstrap
620620
}, {
621621
key: 'getVersion',
622622
value: function getVersion() {
623-
return '4.24.1';
623+
return '4.24.2';
624624
}
625625
}, {
626626
key: '_decideUUID',
@@ -4682,7 +4682,7 @@ return /******/ (function(modules) { // webpackBootstrap
46824682
}, {
46834683
key: 'nextOrigin',
46844684
value: function nextOrigin() {
4685-
if (this._providedFQDN.indexOf('pubsub.') === -1) {
4685+
if (this._providedFQDN.indexOf('ps.') === -1) {
46864686
return this._providedFQDN;
46874687
}
46884688

@@ -4696,7 +4696,7 @@ return /******/ (function(modules) { // webpackBootstrap
46964696

46974697
newSubDomain = this._currentSubDomain.toString();
46984698

4699-
return this._providedFQDN.replace('pubsub', 'ps' + newSubDomain);
4699+
return this._providedFQDN.replace('ps.', 'ps' + newSubDomain + '.');
47004700
}
47014701
}, {
47024702
key: 'hasModule',
@@ -4735,19 +4735,35 @@ return /******/ (function(modules) { // webpackBootstrap
47354735
}, {
47364736
key: '_detectErrorCategory',
47374737
value: function _detectErrorCategory(err) {
4738-
if (err.code === 'ENOTFOUND') return _categories2.default.PNNetworkIssuesCategory;
4739-
if (err.code === 'ECONNREFUSED') return _categories2.default.PNNetworkIssuesCategory;
4740-
if (err.code === 'ECONNRESET') return _categories2.default.PNNetworkIssuesCategory;
4741-
if (err.code === 'EAI_AGAIN') return _categories2.default.PNNetworkIssuesCategory;
4738+
if (err.code === 'ENOTFOUND') {
4739+
return _categories2.default.PNNetworkIssuesCategory;
4740+
}
4741+
if (err.code === 'ECONNREFUSED') {
4742+
return _categories2.default.PNNetworkIssuesCategory;
4743+
}
4744+
if (err.code === 'ECONNRESET') {
4745+
return _categories2.default.PNNetworkIssuesCategory;
4746+
}
4747+
if (err.code === 'EAI_AGAIN') {
4748+
return _categories2.default.PNNetworkIssuesCategory;
4749+
}
47424750

4743-
if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') return _categories2.default.PNNetworkIssuesCategory;
4751+
if (err.status === 0 || err.hasOwnProperty('status') && typeof err.status === 'undefined') {
4752+
return _categories2.default.PNNetworkIssuesCategory;
4753+
}
47444754
if (err.timeout) return _categories2.default.PNTimeoutCategory;
47454755

4746-
if (err.code === 'ETIMEDOUT') return _categories2.default.PNNetworkIssuesCategory;
4756+
if (err.code === 'ETIMEDOUT') {
4757+
return _categories2.default.PNNetworkIssuesCategory;
4758+
}
47474759

47484760
if (err.response) {
4749-
if (err.response.badRequest) return _categories2.default.PNBadRequestCategory;
4750-
if (err.response.forbidden) return _categories2.default.PNAccessDeniedCategory;
4761+
if (err.response.badRequest) {
4762+
return _categories2.default.PNBadRequestCategory;
4763+
}
4764+
if (err.response.forbidden) {
4765+
return _categories2.default.PNAccessDeniedCategory;
4766+
}
47514767
}
47524768

47534769
return _categories2.default.PNUnknownCategory;
@@ -4849,6 +4865,7 @@ return /******/ (function(modules) { // webpackBootstrap
48494865
}
48504866

48514867
return superagentConstruct.timeout(endpoint.timeout).end(function (err, resp) {
4868+
var parsedResponse = void 0;
48524869
var status = {};
48534870
status.error = err !== null;
48544871
status.operation = endpoint.operation;
@@ -4871,7 +4888,13 @@ return /******/ (function(modules) { // webpackBootstrap
48714888
return callback(status, null);
48724889
}
48734890

4874-
var parsedResponse = JSON.parse(resp.text);
4891+
try {
4892+
parsedResponse = JSON.parse(resp.text);
4893+
} catch (e) {
4894+
status.errorData = resp;
4895+
status.error = true;
4896+
return callback(status, null);
4897+
}
48754898

48764899
if (parsedResponse.error && parsedResponse.error === 1 && parsedResponse.status && parsedResponse.message && parsedResponse.service) {
48774900
status.errorData = parsedResponse;

‎dist/web/pubnub.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/core/components/config.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)