Merge branch 'master' into develop

Author: Max Presman

.pubnub.yml

@@ -1,5 +1,5 @@
 name: javascript
-version: 4.13.0
+version: 4.15.0
 schema: 1
 scm: github.com/pubnub/javascript
 files:
@@ -13,6 +13,16 @@ changelog:
         text: fix issue with where now and invalid server response
       - type: improvement
         text: fix issue with here now and invalid server response
+  - version: v4.14.0
+    date:
+    changes:
+      - type: improvement
+        text: Allow disable of heartbeats by passing interval = 0
+  - version: v4.13.0
+    date:
+    changes:
+      - type: improvement
+        text: patch up 503 reporting
   - version: v4.12.0
     date:
     changes:

CHANGELOG.md

@@ -1,4 +1,24 @@
 
+## [v4.14.0](https://github.com/pubnub/javascript/tree/v4.14.0)
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.13.0...v4.14.0)
+
+
+- ⭐Allow disable of heartbeats by passing interval = 0
+
+
+
+## [v4.13.0](https://github.com/pubnub/javascript/tree/v4.13.0)
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.12.0...v4.13.0)
+
+
+- ⭐patch up 503 reporting
+
+
+
 ## [v4.12.0](https://github.com/pubnub/javascript/tree/v4.12.0)
 
 

README.md

@@ -19,5 +19,5 @@ please use the [master_3x](https://github.com/pubnub/javascript/tree/master_3x)
 - If you **need help** or have a **general question**, contact <[email protected]>
 
 ## CDN Links
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.13.0.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.13.0.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.15.0.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.15.0.js

dist/titanium/pubnub.js

@@ -1,4 +1,4 @@
-/*! 4.13.0 / Consumer  */
+/*! 4.15.0 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -786,7 +786,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.13.0';
+	      return '4.15.0';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -1677,6 +1677,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    key: '_registerHeartbeatTimer',
 	    value: function _registerHeartbeatTimer() {
 	      this._stopHeartbeatTimer();
+
+	      if (this._config.getHeartbeatInterval() === 0) {
+	        return;
+	      }
+
 	      this._performHeartbeatLoop();
 	      this._heartbeatTimer = setInterval(this._performHeartbeatLoop.bind(this), this._config.getHeartbeatInterval() * 1000);
 	    }

dist/titanium/pubnub.min.js

@@ -1,4 +1,4 @@
-/*! 4.13.0 / Consumer  */
+/*! 4.15.0 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -808,7 +808,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.13.0';
+	      return '4.15.0';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -1699,6 +1699,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    key: '_registerHeartbeatTimer',
 	    value: function _registerHeartbeatTimer() {
 	      this._stopHeartbeatTimer();
+
+	      if (this._config.getHeartbeatInterval() === 0) {
+	        return;
+	      }
+
 	      this._performHeartbeatLoop();
 	      this._heartbeatTimer = setInterval(this._performHeartbeatLoop.bind(this), this._config.getHeartbeatInterval() * 1000);
 	    }
@@ -4560,6 +4565,15 @@ return /******/ (function(modules) { // webpackBootstrap
 	    }
 
 	    var parsedResponse = JSON.parse(resp.text);
+
+	    if (parsedResponse.error && parsedResponse.error === 1 && parsedResponse.status && parsedResponse.message && parsedResponse.service) {
+	      status.errorData = parsedResponse;
+	      status.statusCode = parsedResponse.status;
+	      status.error = true;
+	      status.category = _this._detectErrorCategory(status);
+	      return callback(status, null);
+	    }
+
 	    return callback(status, parsedResponse);
 	  });
 	}

dist/web/pubnub.js

@@ -1,6 +1,6 @@
 {
   "name": "pubnub",
-  "version": "4.13.0",
+  "version": "4.15.0",
   "author": "PubNub <[email protected]>",
   "description": "Publish & Subscribe Real-time Messaging with PubNub",
   "bin": {},
@@ -45,7 +45,6 @@
     "eslint-plugin-flowtype": "^2.30.0",
     "eslint-plugin-import": "^2.2.0",
     "eslint-plugin-mocha": "^4.8.0",
-    "eslint-plugin-react": "^6.9.0",
     "flow-bin": "^0.46.0",
     "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
@@ -84,7 +83,6 @@
     "uglify-js": "^2.8.26",
     "underscore": "^1.8.3",
     "webpack": "^2.4.1",
-    "webpack-dev-server": "^2.4.5",
     "webpack-stream": "^3.2.0"
   },
   "bundleDependencies": [],

dist/web/pubnub.min.js

@@ -209,7 +209,7 @@ export default class {
   setSendBeaconConfig(val: boolean): this { this._useSendBeacon = val; return this; }
 
   getVersion(): string {
-    return '4.13.0';
+    return '4.15.0';
   }
 
   _decideUUID(providedUUID: string): string {

lib/core/components/config.js

@@ -218,6 +218,12 @@ export default class {
 
   _registerHeartbeatTimer() {
     this._stopHeartbeatTimer();
+
+    // if the interval is 0, do not queue up heartbeating
+    if (this._config.getHeartbeatInterval() === 0) {
+      return;
+    }
+
     this._performHeartbeatLoop();
     this._heartbeatTimer = setInterval(this._performHeartbeatLoop.bind(this), this._config.getHeartbeatInterval() * 1000);
   }

lib/core/components/config.js.map

@@ -60,6 +60,15 @@ function xdr(superagentConstruct: superagent, endpoint: EndpointDefinition, call
         }
 
         let parsedResponse = JSON.parse(resp.text);
+
+        if (parsedResponse.error && parsedResponse.error === 1 && parsedResponse.status && parsedResponse.message && parsedResponse.service) {
+          status.errorData = parsedResponse;
+          status.statusCode = parsedResponse.status;
+          status.error = true;
+          status.category = this._detectErrorCategory(status);
+          return callback(status, null);
+        }
+
         return callback(status, parsedResponse);
       });
 }