Merge pull request #9 from tallarium/fix-crash-op-in-progress-when-ws…

…-closing Fix crash when ws has an operation in progress while closing
tallarium · Sep 13, 2022 · acc86e4 · acc86e4
2 parents d266447 + b45ca31
commit acc86e4
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/Socket/socket.ts b/src/Socket/socket.ts
@@ -292,17 +292,19 @@ export const makeSocket = ({
 		clearInterval(keepAliveReq)
 		clearTimeout(qrTimer)
 
-		ws.removeAllListeners('close')
-		ws.removeAllListeners('error')
-		ws.removeAllListeners('open')
-		ws.removeAllListeners('message')
-
 		if(ws.readyState !== ws.CLOSED && ws.readyState !== ws.CLOSING) {
 			try {
 				ws.close()
 			} catch{ }
 		}
 
+		process.nextTick(() => {
+			ws.removeAllListeners('close')
+			ws.removeAllListeners('error')
+			ws.removeAllListeners('open')
+			ws.removeAllListeners('message')
+		});
+
 		ev.emit('connection.update', {
 			connection: 'close',
 			lastDisconnect: {