Merge pull request #56 from PlayNetwork/rt221

refresh token if expired on reconnect
PlayNetwork · Nov 16, 2017 · 6bd527b · 6bd527b
2 parents f61fa8d + d5264ce
commit 6bd527b
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 17 deletions.
diff --git a/lib/player.js b/lib/player.js
@@ -52,17 +52,13 @@ module.exports = function (playerOptions, ensureAuthHeaders, self) {
 				authHeaders = yield ensureAuthHeaders(),
 				authToken = authHeaders[AUTH_TOKEN],
 				clientId = authHeaders[CLIENT_ID],
+				query,
 				url;
 
-			url = [protocol,
-				'://',
-				settings.host,
-				'?clientId=',
-				clientId,
-				'&token=',
-				authToken].join('');
+			url = [protocol, '://', settings.host].join('');
+			query = ['clientId=', clientId, '&', 'token=', authToken].join('');
 
-			socket = io(url);
+			socket = new io(url, { 'query' : query});
 
 			// fired after a successful connection
 			socket.on('connect', () => {
@@ -113,12 +109,32 @@ module.exports = function (playerOptions, ensureAuthHeaders, self) {
 			socket.on('reconnecting', (attempt) => {
 				let connection = {
 					'connectionAttempt' : attempt,
+					'headerReset' : false,
 					'url' : url
 				};
 
 				socketEventSubscriber.emit('reconnecting', connection);
 			});
 
+			socket.on('reconnect_attempt', (attempt) => {
+				co(function *() {
+					let
+						authHeaders = yield ensureAuthHeaders(),
+						authToken = authHeaders[AUTH_TOKEN],
+						clientId = authHeaders[CLIENT_ID];
+
+					socket.io.opts.query = ['clientId=', clientId, '&', 'token=', authToken].join('');
+
+					let connection = {
+						'connectionAttempt' : attempt,
+						'headerReset' : true,
+						'url' : url
+					};
+
+					socketEventSubscriber.emit('reconnecting', connection);
+				});
+			});
+
 			// fired on reconnect error
 			socket.on('reconnect_error', (err) => {
 				socketEventSubscriber.emit('error', err);

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "playnetwork-sdk",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "contributors": [
     {
       "name": "Joshua Thomas",

diff --git a/test/Mocks/mockSocket.js b/test/Mocks/mockSocket.js
@@ -3,9 +3,10 @@ const events = require('events');
 module.exports = function (opts, self) {
 	self = self ? self : {};
 
-	let configOpts = opts ? opts : {
-		notifySubscriber : {}
-	};
+	let
+		configOpts = opts ? opts : {
+			notifySubscriber : {}
+		};
 
 	function MockSocket() {
 		Object.create(this);
@@ -42,7 +43,12 @@ module.exports = function (opts, self) {
 
 		if (configOpts.notifySubscriber.reconnecting) {
 			setTimeout(function() {
-				MockSocket.prototype.emit.call(self, 'reconnecting', configOpts.notifySubscriber.reconnecting.number);
+				if (configOpts.notifySubscriber.reconnecting.headerReset) {
+					MockSocket.prototype.emit.call(self, 'reconnect_attempt', configOpts.notifySubscriber.reconnecting.number);
+				} else {
+					MockSocket.prototype.emit.call(self, 'reconnecting', configOpts.notifySubscriber.reconnecting.number);
+				}
+
 			}, configOpts.notifySubscriber.reconnecting.occursAt);
 		}
 
@@ -60,5 +66,8 @@ module.exports = function (opts, self) {
 	};
 
 	self = new MockSocket(opts);
+
+	self.io = { 'opts': { 'query' : {} } };
+
 	return self;
 };
diff --git a/test/lib/player.js b/test/lib/player.js
@@ -207,25 +207,31 @@ describe('player', () => {
 					return done();
 				}
 
-				return done('Unexpected number arg expecting 5, actual ', number);
+				return done('Unexpected number arg expecting 5, actual ', connection.connectionAttempt);
 			});
 
 			player.connect(playerSubscriber);
 		}).timeout(5000);
 
-		it('#notify subscriber reconnecting', (done) => {
+		it('#notify subscriber reconnecting headerReset', (done) => {
 			let configOpts = {
 					notifySubscriber : {
 						reconnecting : {
+							headerReset : true,
+							number : 1,
 							occursAt : 2000
 						}
 					}
 				};
 
 			player = mockSocketIOClient.rewire('../../lib/player.js', configOpts)(null, ensureAuthHeaders);
 
-			playerSubscriber.on('reconnecting', () => {
-				return done();
+			playerSubscriber.on('reconnecting', (connection) => {
+				if (connection.headerReset) {
+					return done();
+				}
+
+				return done('Expected headerReset to be true, actual ', connection.headerReset);
 			});
 
 			player.connect(playerSubscriber);