updated

Author: utkarshx

src/index.ts

@@ -58,35 +58,36 @@ class Codebolt  { // Extend EventEmitter
      * @description Waits for the WebSocket connection to open.
      * @returns {Promise<void>} A promise that resolves when the WebSocket connection is open.
      */
-    async waitForConnection() {
-        return new Promise<void>((resolve, reject) => {
-            if (!this.websocket) {
-                reject(new Error('WebSocket is not initialized'));
-                return;
-            }
+    // async waitForConnection() {
+    //     return new Promise<void>((resolve, reject) => {
+    //         if (!this.websocket) {
+    //             reject(new Error('WebSocket is not initialized'));
+    //             return;
+    //         }
 
-            if (this.websocket.readyState === WebSocket.OPEN) {
-                resolve();
-                return;
-            }
+    //         if (this.websocket.readyState === WebSocket.OPEN) {
+    //             resolve();
+    //             return;
+    //         }
 
-            this.websocket.addEventListener('open', () => {
-                resolve();
-            });
+    //         this.websocket.addEventListener('open', () => {
+    //             resolve();
+    //         });
 
-            this.websocket.addEventListener('error', (error) => {
-                reject(error);
-            });
+    //         this.websocket.addEventListener('error', (error) => {
+    //             reject(error);
+    //         });
 
-        });
-    }
+    //     });
+    // }
 
     async connect() {
         await this.wsManager.connect();
     }
 
     async disconnect() {
         await this.wsManager.disconnect();
+        this.wsManager = null;
     }
 
     websocket: WebSocket | null = null;

src/modules/websocket.ts

@@ -6,19 +6,27 @@ import yaml from 'js-yaml';
  * Class representing a WebSocket connection.
  */
 class cbws {
-    websocket: WebSocket;
+   private websocket: WebSocket | null = null;
 
     /**
      * Constructs a new cbws instance and initializes the WebSocket connection.
      */
-    constructor() {
+    async connect(): Promise<WebSocket> {
+        if (this.websocket && this.websocket.readyState === WebSocket.OPEN) {
+            return this.websocket;
+        }
+
         const uniqueConnectionId = this.getUniqueConnectionId();
         const initialMessage = this.getInitialMessage();
-        console.log(uniqueConnectionId)
         this.websocket = new WebSocket(`ws://localhost:${process.env.SOCKET_PORT}/codebolt?id=${uniqueConnectionId}`);
-        this.initializeWebSocket(initialMessage).catch(error => {
-            console.error("WebSocket connection failed:", error);
-        });
+        return this.initializeWebSocket(initialMessage);
+    }
+
+    async disconnect(): Promise<void> {
+        if (this.websocket) {
+            this.websocket.close();
+            this.websocket = null;
+        }
     }
     private getUniqueConnectionId(): string {
         try {
@@ -49,20 +57,18 @@ class cbws {
      */
     private async initializeWebSocket(initialMessage: string): Promise<WebSocket> {
         return new Promise((resolve, reject) => {
+            if (!this.websocket) {
+                reject(new Error('WebSocket is not initialized'));
+                return;
+            }
             this.websocket.on('error', (error: Error) => {
                 console.log('WebSocket error:', error);
                 reject(error);
             });
 
             this.websocket.on('open', () => {
                 console.log('WebSocket connected');
-                // if (this.websocket) {
-                //     this.websocket.send(JSON.stringify({
-                //         "type": "sendMessage",
-                //         "message": initialMessage
-                //     }));
-                //     resolve(this.websocket);
-                // }
+                resolve(this.websocket!);
             });
 
             this.websocket.on('message', (data: WebSocket.Data) => {
@@ -77,13 +83,12 @@ class cbws {
      * @returns {WebSocket} The WebSocket instance.
      * @throws {Error} If the WebSocket is not open.
      */
-    get getWebsocket(): WebSocket {
-        if (!this.websocket.OPEN) {
+    getWebsocket(): WebSocket {
+        if (!this.websocket || this.websocket.readyState !== WebSocket.OPEN) {
             throw new Error('WebSocket is not open');
-        } else {
-            return this.websocket;
         }
+        return this.websocket;
     }
 }
 
-export default new cbws();
+export default cbws;