Merge pull request #114 from pubnub/develop

Release 4.18.0

Author: parfeon

.pubnub.yml

@@ -1,11 +1,18 @@
 name: javascript
-version: 4.17.0
+version: 4.18.0
 schema: 1
 scm: github.com/pubnub/javascript
 files:
   - dist/web/pubnub.js
   - dist/web/pubnub.min.js
 changelog:
+  - version: v4.18.0
+    date: 2017-11-20
+    changes:
+      - type: improvement
+        text: keepAlive is now initialized globally instead of per-call, allowing better connection reuse
+      - type: feature
+        text: added sdkName configuration parameter which allow completely override pnsdk in request query
   - version: v4.17.0
     date: 2017-10-19
     changes:

CHANGELOG.md

@@ -1,4 +1,16 @@
 
+## [v4.18.0](https://github.com/pubnub/javascript/tree/v4.18.0)
+  November-20-2017
+
+
+  [Full Changelog](https://github.com/pubnub/javascript/compare/v4.17.0...v4.18.0)
+
+
+- ⭐ keepAlive is now initialized globally instead of per-call, allowing better connection reuse
+- 🌟 added sdkName configuration parameter which allow completely override pnsdk in request query
+
+
+
 ## [v4.17.0](https://github.com/pubnub/javascript/tree/v4.17.0)
   October-19-2017
 

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.17.0.min.js
-* https://cdn.pubnub.com/sdk/javascript/pubnub.4.17.0.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.18.0.min.js
+* https://cdn.pubnub.com/sdk/javascript/pubnub.4.18.0.js

dist/titanium/pubnub.js

@@ -1,4 +1,4 @@
-/*! 4.17.0 / Consumer  */
+/*! 4.18.0 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -429,6 +429,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    this.secretKey = setup.secretKey || setup.secret_key;
 	    this.subscribeKey = setup.subscribeKey || setup.subscribe_key;
 	    this.publishKey = setup.publishKey || setup.publish_key;
+	    this.sdkName = setup.sdkName;
 	    this.sdkFamily = setup.sdkFamily;
 	    this.partnerId = setup.partnerId;
 	    this.setAuthKey(setup.authKey);
@@ -572,7 +573,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.17.0';
+	      return '4.18.0';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -2417,6 +2418,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function generatePNSDK(config) {
+	  if (config.sdkName) {
+	    return config.sdkName;
+	  }
+
 	  var base = 'PubNub-JS-' + config.sdkFamily;
 
 	  if (config.partnerId) {

dist/titanium/pubnub.min.js

@@ -1,4 +1,4 @@
-/*! 4.17.0 / Consumer  */
+/*! 4.18.0 / Consumer  */
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
 		module.exports = factory();
@@ -451,6 +451,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    this.secretKey = setup.secretKey || setup.secret_key;
 	    this.subscribeKey = setup.subscribeKey || setup.subscribe_key;
 	    this.publishKey = setup.publishKey || setup.publish_key;
+	    this.sdkName = setup.sdkName;
 	    this.sdkFamily = setup.sdkFamily;
 	    this.partnerId = setup.partnerId;
 	    this.setAuthKey(setup.authKey);
@@ -594,7 +595,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	  }, {
 	    key: 'getVersion',
 	    value: function getVersion() {
-	      return '4.17.0';
+	      return '4.18.0';
 	    }
 	  }, {
 	    key: '_decideUUID',
@@ -2439,6 +2440,10 @@ return /******/ (function(modules) { // webpackBootstrap
 	}
 
 	function generatePNSDK(config) {
+	  if (config.sdkName) {
+	    return config.sdkName;
+	  }
+
 	  var base = 'PubNub-JS-' + config.sdkFamily;
 
 	  if (config.partnerId) {