Merge 3b76a65 into de25bde

lib/player.js

@@ -38,7 +38,7 @@ module.exports = function (playerOptions, ensureAuthHeaders, self) {
 			playerOptions.secure;
 
 	if (settings.secure) {
-		protocol = 'https'
+		protocol = 'https';
 	} else {
 		protocol = 'http';
 	}
@@ -62,6 +62,11 @@ module.exports = function (playerOptions, ensureAuthHeaders, self) {
   			throw new Error('socketEventSubscriber must be an instance of event.EventEmitter');
 		}
 
+		let socketOptions = options.socket;
+		if (validation.isEmpty(options.socket)) {
+			socketOptions = {};
+		}
+
 		let
 			authHeaders = yield ensureAuthHeaders(),
 			authToken,
@@ -75,7 +80,8 @@ module.exports = function (playerOptions, ensureAuthHeaders, self) {
 		url = [protocol, '://', options.host || settings.host].join('');
 		query = ['clientId=', clientId, '&token=', authToken].join('');
 
-		socket = new io(url, { 'query' : query});
+		socketOptions.query = query;
+		socket = new io(url, socketOptions);
 
 		// fired after a successful connection
 		socket.on('connect', () => {

lib/request.js

@@ -138,12 +138,16 @@ module.exports = (function (self) {
 	}
 
 	function isRetry(options, startTime, tryCount) {
+		if (tryCount > options.maxRetries) {
+			return false;
+		}
+
 		if (options.totalTimeout) {
 			const timeElapsed = (new Date()) - startTime;
 			return timeElapsed < options.totalTimeout;
 		}
 
-		return tryCount <= options.maxRetries;
+		return true;
 	}
 
 	function Request (settings) {
@@ -370,9 +374,11 @@ module.exports = (function (self) {
 									// handle retry if error code is above threshhold
 									if (retry) {
 										tryCount += 1;
-										retryWait = retryWait * EXPONENT;
 										return delay(retryWait)
-											.then(makeRequest);
+											.then(makeRequest)
+											.then(() => {
+												retryWait *= EXPONENT;
+											});
 									}
 
 									// attempt to parse the body
@@ -412,10 +418,10 @@ module.exports = (function (self) {
 							// retry if below retry count threshhold
 							if (isRetry(options, startTime, tryCount)) {
 								tryCount += 1;
-								retryWait = retryWait * EXPONENT;
 								return delay(retryWait)
+									.then(makeRequest)
 									.then(() => {
-										return makeRequest();
+										retryWait *= EXPONENT;
 									});
 							}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "playnetwork-sdk",
-  "version": "1.4.9",
+  "version": "1.4.10",
   "contributors": [
     {
       "name": "Joshua Thomas",