@blaxel/core 0.2.16-dev.102 → 0.2.16-dev.103

package/dist/common/node.d.ts

@@ -2,5 +2,4 @@ declare let fs: typeof import("fs") | null;
 declare let os: typeof import("os") | null;
 declare let path: typeof import("path") | null;
 declare let dotenv: typeof import("dotenv") | null;
-declare let ws: typeof import("ws") | null;
-export { dotenv, fs, os, path, ws };
+export { dotenv, fs, os, path };

package/dist/common/node.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ws = exports.path = exports.os = exports.fs = exports.dotenv = void 0;
+exports.path = exports.os = exports.fs = exports.dotenv = void 0;
 /* eslint-disable */
 const isNode = typeof process !== "undefined" &&
     process.versions != null &&
@@ -13,17 +13,14 @@ let path = null;
 exports.path = path;
 let dotenv = null;
 exports.dotenv = dotenv;
-let ws = null;
-exports.ws = ws;
 if (isNode) {
     try {
         exports.fs = fs = eval("require")("fs");
         exports.os = os = eval("require")("os");
         exports.path = path = eval("require")("path");
         exports.dotenv = dotenv = eval("require")("dotenv");
-        exports.ws = ws = eval("require")("ws");
     }
     catch (e) {
-        console.warn("fs, os, path, dotenv, ws are not available in this environment");
+        console.warn("fs and os are not available in this environment");
     }
 }

package/dist/mcp/client.js

@@ -3,14 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlaxelMcpClientTransport = void 0;
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
 const logger_js_1 = require("../common/logger.js");
-const node_js_1 = require("../common/node.js");
 const settings_js_1 = require("../common/settings.js");
 // Detect environment
-const isBrowser = typeof globalThis !== "undefined" && globalThis && globalThis.window !== undefined;
-// Add Cloudflare detection
-const isCloudflare = typeof globalThis !== "undefined" &&
-    typeof globalThis.WebSocket !== "undefined" &&
-    !globalThis.window;
+// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+const isBrowser = typeof globalThis !== "undefined" && globalThis.window !== undefined;
+// Conditional import for Node.js WebSocket
+let NodeWebSocket;
+if (!isBrowser) {
+    try {
+        // Dynamic import for Node.js environment
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-require-imports
+        NodeWebSocket = require("ws");
+    }
+    catch {
+        console.warn("ws is not available in this environment");
+        // ws is not available
+    }
+}
 //const SUBPROTOCOL = "mcp";
 const MAX_RETRIES = 3;
 const RETRY_DELAY_MS = 1000;
@@ -57,22 +66,21 @@ class BlaxelMcpClientTransport {
         }
     }
     _connect() {
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
         return new Promise((resolve, reject) => {
             try {
-                let url = this._url.toString();
                 if (this._isBrowser) {
-                    url += `?token=${settings_js_1.settings.token}`;
-                }
-                if (isCloudflare || this._isBrowser) {
-                    // Use native WebSocket (works in both browser and Cloudflare)
+                    // Use native browser WebSocket
+                    const url = `${this._url.toString()}?token=${settings_js_1.settings.token}`;
                     this._socket = new WebSocket(url);
                 }
                 else {
                     // Use Node.js WebSocket
-                    if (!node_js_1.ws) {
+                    if (!NodeWebSocket) {
                         throw new Error("WebSocket library not available in Node.js environment");
                     }
-                    this._socket = new node_js_1.ws(this._url, {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+                    this._socket = new NodeWebSocket(this._url, {
                         //protocols: SUBPROTOCOL,
                         headers: this._headers,
                     });
@@ -80,9 +88,12 @@ class BlaxelMcpClientTransport {
                 this._socket.onerror = (event) => {
                     console.error(event);
                     const error = this._isBrowser
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                         ? new Error(`WebSocket error: ${event.message}`)
                         : "error" in event
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                             ? event.error
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                             : new Error(`WebSocket error: ${event.message}`);
                     reject(error);
                     this.onerror?.(error);
@@ -101,9 +112,11 @@ class BlaxelMcpClientTransport {
                         if (this._isBrowser) {
                             // Browser WebSocket MessageEvent
                             const browserEvent = event;
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                             dataString = typeof browserEvent.data === "string"
                                 ? browserEvent.data
-                                : String(browserEvent.data);
+                                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
+                                : browserEvent.data.toString();
                         }
                         else {
                             // Node.js WebSocket MessageEvent
@@ -121,10 +134,13 @@ class BlaxelMcpClientTransport {
                         message = types_js_1.JSONRPCMessageSchema.parse(JSON.parse(dataString));
                     }
                     catch (error) {
-                        const eventData = 'data' in event ? event.data : 'Unknown data';
-                        logger_js_1.logger.error(`Error parsing message: ${typeof eventData === "object" && eventData !== null
-                            ? JSON.stringify(eventData)
-                            : String(eventData)}`);
+                        logger_js_1.logger.error(`Error parsing message: ${
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                        typeof event.data === "object"
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                            ? JSON.stringify(event.data)
+                            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                            : event.data}`);
                         this.onerror?.(error);
                         return;
                     }
@@ -134,7 +150,7 @@ class BlaxelMcpClientTransport {
             catch (error) {
                 if (error instanceof Error && error.message.includes("ws does not work in the browser")) {
                     this._isBrowser = true;
-                    this._connect().then(resolve).catch(reject);
+                    return this._connect().then(resolve).catch(reject);
                 }
                 reject(error);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaxel/core",
-  "version": "0.2.16-dev.102",
+  "version": "0.2.16-dev.103",
   "description": "Blaxel Core SDK for TypeScript",
   "license": "MIT",
   "author": "Blaxel, INC (https://blaxel.ai)",