Merge pull request #254 from GetStream/vishal/disconnect-fix

Fixing disconnect method

src/client.js

@@ -325,6 +325,8 @@ export class StreamChat {
 		if (this.wsConnection) {
 			return this.wsConnection.disconnect();
 		}
+
+		return Promise.resolve();
 	}
 
 	setAnonymousUser() {

src/connection.js

@@ -132,10 +132,10 @@ export class StableWSConnection {
 
 		let isClosedPromise;
 		// and finally close...
-		if (this.ws && this.ws.close) {
-			// Assigning to local here because we will remove it from this before the
-			// promise resolves.
-			const { ws } = this;
+		// Assigning to local here because we will remove it from this before the
+		// promise resolves.
+		const { ws } = this;
+		if (ws && ws.close && ws.readyState === ws.OPEN) {
 			isClosedPromise = new Promise(resolve => {
 				ws.onclose = () => {
 					this.logger(
@@ -148,7 +148,6 @@ export class StableWSConnection {
 					resolve();
 				};
 			});
-
 			this.logger(
 				'info',
 				`connection:disconnect() - Manually closed connection by calling client.disconnect()`,
@@ -158,6 +157,15 @@ export class StableWSConnection {
 			);
 
 			ws.close(1000, 'Manually closed connection by calling client.disconnect()');
+		} else {
+			this.logger(
+				'info',
+				`connection:disconnect() - ws connection doesn't exist or it is already closed.`,
+				{
+					tags: ['connection'],
+				},
+			);
+			isClosedPromise = Promise.resolve();
 		}
 
 		delete this.ws;

test/test.js

@@ -703,6 +703,23 @@ describe('Chat', function() {
 			p = anonClient.addDevice('deviceID', 'apn');
 			await expect(p).to.be.rejectedWith(errorMsg);
 		});
+
+		it('disconnect should always return promise irrespective of wsConnection status', async function() {
+			const client2 = await getTestClientForUser('bob');
+			const chan = client2.channel('messaging', uuidv4());
+			await chan.watch();
+			let disconnect = client2.disconnect();
+			await expect(disconnect).to.be.fulfilled;
+
+			// Lets try disconnect second time on same client.
+			disconnect = client2.disconnect();
+			await expect(disconnect).to.be.fulfilled;
+
+			// Lets try deleting websocket connection object.
+			client2.wsConnection = null;
+			disconnect = client2.disconnect();
+			await expect(disconnect).to.be.fulfilled;
+		});
 	});
 
 	describe('Permissions', function() {

types/stream-chat/index.d.ts

@@ -407,7 +407,7 @@ export class StableWSConnection {
     eventCallback: (event: ConnectionChangeEvent) => void,
   );
   connect(): Promise<void>;
-  disconnect(): void;
+  disconnect(): Promise<void>;
   onlineStatusChanged(event: OnlineStatusEvent): void;
   onopen(wsID: number): void;
   onmessage(wsID: number, event: WebSocket.MessageEvent): void;