@blaxel/core 0.2.49-preview.112 → 0.2.50-dev.215

package/dist/esm-browser/sandbox/websocket/client.js

@@ -0,0 +1,265 @@
+import { v4 as uuidv4 } from "uuid";
+import { getWebSocket } from "../../common/node.js";
+import { settings } from "../../common/settings.js";
+export class WebSocketClient {
+    ws = null;
+    WebSocketClass = null;
+    url;
+    reconnect;
+    reconnectInterval;
+    maxReconnectAttempts;
+    reconnectAttempts = 0;
+    pendingRequests = new Map();
+    streamHandlers = new Map();
+    isClosing = false;
+    connectionPromise = null;
+    heartbeatInterval = null;
+    reconnectTimeout = null;
+    lastPongReceived = Date.now();
+    constructor(options) {
+        this.url = options.url;
+        this.reconnect = options.reconnect ?? true;
+        this.reconnectInterval = options.reconnectInterval ?? 5000;
+        this.maxReconnectAttempts = options.maxReconnectAttempts ?? 5;
+    }
+    async connect() {
+        if (this.connectionPromise) {
+            return this.connectionPromise;
+        }
+        this.connectionPromise = this.initializeConnection();
+        return this.connectionPromise;
+    }
+    async initializeConnection() {
+        return new Promise((resolve, reject) => {
+            // Get WebSocket class and connect
+            void (async () => {
+                try {
+                    // Get WebSocket class if not already loaded
+                    if (!this.WebSocketClass) {
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+                        this.WebSocketClass = await getWebSocket();
+                    }
+                    // Convert http/https URL to ws/wss
+                    let wsUrl = this.url;
+                    if (wsUrl.startsWith("http://")) {
+                        wsUrl = wsUrl.replace("http://", "ws://");
+                    }
+                    else if (wsUrl.startsWith("https://")) {
+                        wsUrl = wsUrl.replace("https://", "wss://");
+                    }
+                    // Add /ws endpoint if not present
+                    if (!wsUrl.endsWith("/ws")) {
+                        wsUrl = `${wsUrl}/ws`;
+                    }
+                    wsUrl = `${wsUrl}?token=${settings.token}`;
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+                    this.ws = new this.WebSocketClass(wsUrl);
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                    this.ws.onopen = () => {
+                        this.reconnectAttempts = 0;
+                        this.startHeartbeat();
+                        resolve();
+                    };
+                    this.ws.onmessage = (event) => {
+                        this.handleMessage(event);
+                    };
+                    this.ws.onerror = (error) => {
+                        console.error("WebSocket error:", error);
+                        reject(new Error("WebSocket connection error"));
+                    };
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                    this.ws.onclose = () => {
+                        this.stopHeartbeat();
+                        this.connectionPromise = null;
+                        if (!this.isClosing && this.reconnect && this.reconnectAttempts < this.maxReconnectAttempts) {
+                            this.reconnectAttempts++;
+                            this.reconnectTimeout = setTimeout(() => {
+                                this.connect().catch(console.error);
+                            }, this.reconnectInterval);
+                            // Allow process to exit even if reconnect timeout is pending
+                            if (this.reconnectTimeout.unref) {
+                                this.reconnectTimeout.unref();
+                            }
+                        }
+                        else {
+                            // Reject all pending requests
+                            this.pendingRequests.forEach(({ reject }) => {
+                                reject(new Error("WebSocket connection closed"));
+                            });
+                            this.pendingRequests.clear();
+                        }
+                    };
+                    // Handle pong messages for heartbeat
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                    if (typeof this.ws.on === 'function') {
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+                        this.ws.on('pong', () => {
+                            this.lastPongReceived = Date.now();
+                        });
+                    }
+                }
+                catch (error) {
+                    reject(error instanceof Error ? error : new Error(String(error)));
+                }
+            })();
+        });
+    }
+    startHeartbeat() {
+        // Send ping every 30 seconds
+        this.heartbeatInterval = setInterval(() => {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            if (this.ws && this.WebSocketClass && this.ws.readyState === this.WebSocketClass.OPEN) {
+                // Check if we received a pong recently (within 60 seconds)
+                if (Date.now() - this.lastPongReceived > 60000) {
+                    console.warn("WebSocket heartbeat timeout, closing connection");
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+                    this.ws.close();
+                    return;
+                }
+                // Send ping
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                if (typeof this.ws.ping === 'function') {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+                    this.ws.ping();
+                }
+            }
+        }, 30000);
+        // Allow process to exit even if heartbeat interval is active
+        if (this.heartbeatInterval.unref) {
+            this.heartbeatInterval.unref();
+        }
+    }
+    stopHeartbeat() {
+        if (this.heartbeatInterval) {
+            clearInterval(this.heartbeatInterval);
+            this.heartbeatInterval = null;
+        }
+    }
+    handleMessage(event) {
+        try {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+            const response = JSON.parse(String(event.data));
+            // Check if this is a streaming response
+            if (response.stream) {
+                const streamHandler = this.streamHandlers.get(response.id);
+                if (streamHandler) {
+                    // Call the data handler with the response data
+                    streamHandler.onData(response.data);
+                    // If stream is done, call end handler and clean up
+                    if (response.done) {
+                        streamHandler.onEnd();
+                        this.streamHandlers.delete(response.id);
+                    }
+                }
+                return;
+            }
+            // Regular request-response handling
+            const pending = this.pendingRequests.get(response.id);
+            if (pending) {
+                this.pendingRequests.delete(response.id);
+                if (response.success) {
+                    pending.resolve(response.data);
+                }
+                else {
+                    pending.reject(new Error(response.error || "Unknown error"));
+                }
+            }
+        }
+        catch (error) {
+            console.error("Failed to parse WebSocket message:", error);
+        }
+    }
+    async send(operation, data = {}) {
+        // Ensure we're connected
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        if (!this.ws || !this.WebSocketClass || this.ws.readyState !== this.WebSocketClass.OPEN) {
+            await this.connect();
+        }
+        return new Promise((resolve, reject) => {
+            const id = uuidv4();
+            const message = {
+                id,
+                operation,
+                data,
+            };
+            // Store the promise handlers
+            this.pendingRequests.set(id, { resolve, reject });
+            // Set a timeout for the request (60 seconds)
+            setTimeout(() => {
+                if (this.pendingRequests.has(id)) {
+                    this.pendingRequests.delete(id);
+                    reject(new Error("Request timeout"));
+                }
+            }, 60000);
+            // Send the message
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            if (this.ws && this.WebSocketClass && this.ws.readyState === this.WebSocketClass.OPEN) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+                this.ws.send(JSON.stringify(message));
+            }
+            else {
+                this.pendingRequests.delete(id);
+                reject(new Error("WebSocket not connected"));
+            }
+        });
+    }
+    sendStream(operation, data, onData, onEnd) {
+        // Ensure we're connected
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        if (!this.ws || !this.WebSocketClass || this.ws.readyState !== this.WebSocketClass.OPEN) {
+            throw new Error("WebSocket not connected");
+        }
+        const id = uuidv4();
+        const message = {
+            id,
+            operation,
+            data,
+        };
+        // Store the stream handlers
+        this.streamHandlers.set(id, { onData, onEnd });
+        // Send the message
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+        this.ws.send(JSON.stringify(message));
+        return id;
+    }
+    cancelStream(id) {
+        this.streamHandlers.delete(id);
+    }
+    close() {
+        this.isClosing = true;
+        this.reconnect = false;
+        this.stopHeartbeat();
+        // Clear reconnect timeout if any
+        if (this.reconnectTimeout) {
+            clearTimeout(this.reconnectTimeout);
+            this.reconnectTimeout = null;
+        }
+        if (this.ws) {
+            // In Node.js (ws package), use terminate() to forcefully close the connection
+            // This immediately closes the socket without waiting for the close handshake
+            // In browser, terminate() doesn't exist, so we fall back to close()
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            if (typeof this.ws.terminate === 'function') {
+                // Node.js ws package - force immediate close
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+                this.ws.terminate();
+            }
+            else {
+                // Browser WebSocket - graceful close
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+                this.ws.close();
+            }
+            this.ws = null;
+        }
+        // Reject all pending requests
+        this.pendingRequests.forEach(({ reject }) => {
+            reject(new Error("WebSocket client closed"));
+        });
+        this.pendingRequests.clear();
+        this.connectionPromise = null;
+    }
+    get isConnected() {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        return this.ws !== null && this.WebSocketClass !== null && this.ws.readyState === this.WebSocketClass.OPEN;
+    }
+}

package/dist/esm-browser/sandbox/websocket/index.js

@@ -0,0 +1 @@
+export * from "./client.js";

package/dist/esm-browser/tools/mcpTool.js

@@ -1,6 +1,6 @@
 import { Client as ModelContextProtocolClient } from "@modelcontextprotocol/sdk/client/index.js";
 import { env } from "../common/env.js";
-import { getForcedUrl, getGlobalUniqueHash } from "../common/internal.js";
+import { generateInternalUrl, getForcedUrl } from "../common/internal.js";
 import { logger } from "../common/logger.js";
 import { settings } from "../common/settings.js";
 import { authenticate } from "../index.js";
@@ -51,8 +51,8 @@ export class McpTool {
         return new URL(`${settings.runUrl}/${settings.workspace}/${this.pluralType}/${this.name}`);
     }
     get internalUrl() {
-        const hash = getGlobalUniqueHash(settings.workspace, this.type, this.name);
-        return new URL(`${settings.runInternalProtocol}://bl-${settings.env}-${hash}.${settings.runInternalHostname}`);
+        const url = generateInternalUrl(settings.workspace, this.type, this.name, settings.env, settings.runInternalProtocol, settings.runInternalHostname, settings.blCloud, settings.workspaceId);
+        return new URL(url);
     }
     get forcedUrl() {
         return getForcedUrl(this.type, this.name);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaxel/core",
-  "version": "0.2.49-preview.112",
+  "version": "0.2.50-dev.215",
   "description": "Blaxel Core SDK for TypeScript",
   "license": "MIT",
   "author": "Blaxel, INC (https://blaxel.ai)",
@@ -74,7 +74,7 @@
     "vite": "^5.2.0",
     "vitest": "^1.5.0"
   },
-  "commit": "d50dddc5a1963abd22bad3b294e9f6096c3e8287",
+  "commit": "833c34cbba3735060a62bdd3594fa917160f3d3c",
   "scripts": {
     "lint": "eslint src/",
     "dev": "tsc --watch",