whio-api-sdk 1.1.4 → 1.1.5

package/dist/src/sdk/modules/websocket.module.js

@@ -50,7 +50,7 @@ export class WebSocketModule extends BaseClient {
                 const token = this.getAccessToken();
                 if (!token) {
                     this.emit('connection-error', new Error('No access token available for WebSocket connection'));
-                    return;
+                    throw new Error('No access token available for WebSocket connection');
                 }
                 this.socket = io(wsUrl, {
                     auth: {
@@ -60,9 +60,30 @@ export class WebSocketModule extends BaseClient {
                     timeout: 10000
                 });
                 this.setupEventHandlers();
+                // Wait for the socket to actually connect
+                yield new Promise((resolve, reject) => {
+                    const timeout = setTimeout(() => {
+                        reject(new Error('WebSocket connection timeout after 10 seconds'));
+                    }, 10000);
+                    const onConnect = () => {
+                        var _a;
+                        clearTimeout(timeout);
+                        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.off('connect_error', onError);
+                        resolve();
+                    };
+                    const onError = (error) => {
+                        var _a;
+                        clearTimeout(timeout);
+                        (_a = this.socket) === null || _a === void 0 ? void 0 : _a.off('connect', onConnect);
+                        reject(error);
+                    };
+                    this.socket.once('connect', onConnect);
+                    this.socket.once('connect_error', onError);
+                });
             }
             catch (error) {
                 this.emit('connection-error', error);
+                throw error;
             }
         });
     }
@@ -99,6 +120,7 @@ export class WebSocketModule extends BaseClient {
      * Reconnects with fresh token if current token is expired
      */
     ensureValidConnection() {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const currentToken = this.getAccessToken();
             // Check if we have a token and if it's expired
@@ -117,6 +139,11 @@ export class WebSocketModule extends BaseClient {
                     throw new Error('Authentication failed: Unable to refresh token for WebSocket streaming');
                 }
             }
+            else if (!((_a = this.socket) === null || _a === void 0 ? void 0 : _a.connected)) {
+                // Token is valid but not connected - establish connection
+                console.log('[WebSocket] Not connected, connecting...');
+                yield this.connect();
+            }
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "whio-api-sdk",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",

package/src/sdk/modules/websocket.module.ts

@@ -60,7 +60,7 @@ export class WebSocketModule extends BaseClient {
     }
 
     const wsUrl = this.getWebSocketUrl();
-    
+
     try {
       // Ensure we have a fresh token before connecting
       await this.getToken();
@@ -68,7 +68,7 @@ export class WebSocketModule extends BaseClient {
 
       if (!token) {
         this.emit('connection-error', new Error('No access token available for WebSocket connection'));
-        return;
+        throw new Error('No access token available for WebSocket connection');
       }
 
       this.socket = io(wsUrl, {
@@ -80,8 +80,31 @@ export class WebSocketModule extends BaseClient {
       });
 
       this.setupEventHandlers();
+
+      // Wait for the socket to actually connect
+      await new Promise<void>((resolve, reject) => {
+        const timeout = setTimeout(() => {
+          reject(new Error('WebSocket connection timeout after 10 seconds'));
+        }, 10000);
+
+        const onConnect = () => {
+          clearTimeout(timeout);
+          this.socket?.off('connect_error', onError);
+          resolve();
+        };
+
+        const onError = (error: Error) => {
+          clearTimeout(timeout);
+          this.socket?.off('connect', onConnect);
+          reject(error);
+        };
+
+        this.socket!.once('connect', onConnect);
+        this.socket!.once('connect_error', onError);
+      });
     } catch (error) {
       this.emit('connection-error', error as Error);
+      throw error;
     }
   }
 
@@ -123,24 +146,28 @@ export class WebSocketModule extends BaseClient {
    */
   private async ensureValidConnection(): Promise<void> {
     const currentToken = this.getAccessToken();
-    
+
     // Check if we have a token and if it's expired
     if (!currentToken || this.isTokenExpired(currentToken)) {
       console.log('[WebSocket] Token expired or missing, refreshing and reconnecting...');
-      
+
       try {
         // Refresh token
         await this.getToken();
-        
+
         // Disconnect current connection and reconnect with fresh token
         this.disconnect();
         await this.connect();
-        
+
         console.log('[WebSocket] Successfully reconnected with fresh token');
       } catch (error) {
         console.error('[WebSocket] Failed to refresh token and reconnect:', error);
         throw new Error('Authentication failed: Unable to refresh token for WebSocket streaming');
       }
+    } else if (!this.socket?.connected) {
+      // Token is valid but not connected - establish connection
+      console.log('[WebSocket] Not connected, connecting...');
+      await this.connect();
     }
   }