Merge pull request #265 from GetStream/vishal/disconnect-ws-fix

Increment wsId when ws is disconnected manually

src/connection.js

@@ -111,6 +111,8 @@ export class StableWSConnection {
 			},
 		);
 
+		this.wsID += 1;
+
 		// start by removing all the listeners
 		if (this.healthCheckIntervalRef) {
 			clearInterval(this.healthCheckIntervalRef);
@@ -121,8 +123,6 @@ export class StableWSConnection {
 
 		this._removeConnectionListeners();
 
-		// reset the wsID;
-		this.wsID = 1;
 		this.isHealthy = false;
 
 		// remove ws handlers...
@@ -450,10 +450,14 @@ export class StableWSConnection {
 	 *
 	 */
 	_errorFromWSEvent = event => {
-		this.logger('error', `connection:onclose() - WS failed with code ${event.code}`, {
-			tags: ['connection'],
-			event,
-		});
+		this.logger(
+			'error',
+			`connection:_errorFromWSEvent() - WS failed with code ${event.code}`,
+			{
+				tags: ['connection'],
+				event,
+			},
+		);
 
 		const error = new Error(`WS failed with code ${event.code}`);
 		error.code = event.code;

test/test.js

@@ -292,6 +292,21 @@ describe('Chat', function() {
 			expect(updatedUser.book).to.equal('dune');
 		});
 
+		it.only('manual disconnect and reconnect flow', async () => {
+			const userID = uuidv4();
+			const client = getTestClient(false);
+			const token = createUserToken(userID);
+			await client.setUser({ id: userID }, token);
+
+			await client.wsConnection.disconnect();
+			expect(client.wsConnection.isHealthy).to.equal(false);
+			expect(client.wsConnection.wsID).to.equal(2);
+			expect(client.wsConnection.ws).to.equal(undefined);
+
+			await client._setupConnection();
+			expect(client.wsConnection.isHealthy).to.equal(true);
+			expect(client.wsConnection.ws).to.not.equal(undefined);
+		});
 		context('When user is banned', function() {
 			const banned = uuidv4();
 			const token = createUserToken(banned);