Merge pull request #129 from pubnub/develop

Develop
pubnub · Apr 27, 2018 · 95cb5ef · 95cb5ef
2 parents 9670064 + e903f30
commit 95cb5ef
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 22 deletions.
diff --git a/.pubnub.yml b/.pubnub.yml
@@ -1,11 +1,18 @@
 name: javascript
-version: 4.20.2
+version: 4.20.3
 schema: 1
 scm: github.com/pubnub/javascript
 files:
   - dist/web/pubnub.js
   - dist/web/pubnub.min.js
 changelog:
+  - version: v4.20.3
+    date: 2018-04-24
+    changes:
+      - type: bug
+        text: fix timetoken announces
+      - type: improvement
+        text: categorize ETIMEDOUT errors as PNNetworkIssuesCategory
   - version: v4.20.2
     date: 2018-02-28
     changes:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,18 @@
+## [v4.20.3](https://github.com/pubnub/javascript/tree/v4.20.3)
+  Abril-24-2018
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.20.2...v4.20.3)
+
+
+
+- 🐛fix timetoken announces
+
+
+- ⭐categorize ETIMEDOUT errors as PNNetworkIssuesCategory
+
+
+
 ## [v4.20.2](https://github.com/pubnub/javascript/tree/v4.20.2)
   February-28-2018
 

diff --git a/README.md b/README.md
@@ -20,5 +20,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
 
 ## CDN Links
 
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.20.2.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.20.2.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.20.3.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.20.3.js
diff --git a/dist/titanium/pubnub.js b/dist/titanium/pubnub.js
@@ -1,4 +1,4 @@
-/*! 4.20.2 / Consumer  */
+/*! 4.20.3 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -586,7 +586,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.20.2';
+	      return '4.20.3';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -1507,7 +1507,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        this._currentTimetoken = timetoken;
 	      }
 
-	      if (this._currentTimetoken !== '0') {
+	      if (this._currentTimetoken !== '0' && this._currentTimetoken !== 0) {
 	        this._storedTimetoken = this._currentTimetoken;
 	        this._currentTimetoken = 0;
 	      }
@@ -4573,6 +4573,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	      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.response) {
 	        if (err.response.badRequest) return _categories2.default.PNBadRequestCategory;
 	        if (err.response.forbidden) return _categories2.default.PNAccessDeniedCategory;

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.20.2 / Consumer  */
+/*! 4.20.3 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -608,7 +608,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.20.2';
+	      return '4.20.3';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -1529,7 +1529,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        this._currentTimetoken = timetoken;
 	      }
 
-	      if (this._currentTimetoken !== '0') {
+	      if (this._currentTimetoken !== '0' && this._currentTimetoken !== 0) {
 	        this._storedTimetoken = this._currentTimetoken;
 	        this._currentTimetoken = 0;
 	      }
@@ -4595,6 +4595,8 @@ return /******/ (function(modules) { // webpackBootstrap
 	      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.response) {
 	        if (err.response.badRequest) return _categories2.default.PNBadRequestCategory;
 	        if (err.response.forbidden) return _categories2.default.PNAccessDeniedCategory;

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
diff --git a/lib/core/components/config.js.map b/lib/core/components/config.js.map
diff --git a/lib/core/components/subscription_manager.js b/lib/core/components/subscription_manager.js
diff --git a/lib/core/components/subscription_manager.js.map b/lib/core/components/subscription_manager.js.map
diff --git a/lib/networking/index.js b/lib/networking/index.js
diff --git a/lib/networking/index.js.map b/lib/networking/index.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "4.20.2",
+  "version": "4.20.3",
   "author": "PubNub <[email protected]>",
   "description": "Publish & Subscribe Real-time Messaging with PubNub",
   "bin": {},

diff --git a/src/core/components/config.js b/src/core/components/config.js
@@ -228,7 +228,7 @@ export default class {
   setSendBeaconConfig(val: boolean): this { this._useSendBeacon = val; return this; }
 
   getVersion(): string {
-    return '4.20.2';
+    return '4.20.3';
   }
 
   _decideUUID(providedUUID: string): string {

diff --git a/src/core/components/subscription_manager.js b/src/core/components/subscription_manager.js
@@ -182,7 +182,7 @@ export default class {
     }
 
     // reset the current timetoken to get a connect event.
-    if (this._currentTimetoken !== '0') {
+    if (this._currentTimetoken !== '0' && this._currentTimetoken !== 0) {
       this._storedTimetoken = this._currentTimetoken;
       this._currentTimetoken = 0;
     }