@blaxel/core 0.2.12-preview.18 → 0.2.12

package/dist/authentication/index.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authentication = authentication;
-const path_1 = require("path");
 const yaml_1 = __importDefault(require("yaml"));
 const env_js_1 = require("../common/env.js");
 const node_js_1 = require("../common/node.js");
@@ -25,12 +24,12 @@ function getCredentials() {
             workspace: env_js_1.env.BL_WORKSPACE,
         };
     }
-    if (node_js_1.os === null || node_js_1.fs === null) {
+    if (node_js_1.os === null || node_js_1.fs === null || node_js_1.path === null) {
         return null;
     }
     try {
         const homeDir = node_js_1.os.homedir();
-        const config = node_js_1.fs.readFileSync((0, path_1.join)(homeDir, ".blaxel/config.yaml"), "utf8");
+        const config = node_js_1.fs.readFileSync(node_js_1.path.join(homeDir, ".blaxel/config.yaml"), "utf8");
         const configJson = yaml_1.default.parse(config);
         const workspaceName = env_js_1.env.BL_WORKSPACE || configJson.context.workspace;
         const credentials = configJson.workspaces.find((wk) => wk.name === workspaceName)?.credentials;

package/dist/common/env.js

@@ -5,12 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.env = void 0;
 /* eslint-disable */
-const dotenv_1 = __importDefault(require("dotenv"));
 const toml_1 = __importDefault(require("toml"));
 const node_js_1 = require("./node.js");
 const secretEnv = {};
 const configEnv = {};
-if (node_js_1.fs !== null) {
+if (node_js_1.fs !== null && node_js_1.dotenv !== null) {
     try {
         const configFile = node_js_1.fs.readFileSync("blaxel.toml", "utf8");
         const configInfos = toml_1.default.parse(configFile);
@@ -21,7 +20,7 @@ if (node_js_1.fs !== null) {
     catch (error) { }
     try {
         const secretFile = node_js_1.fs.readFileSync(".env", "utf8");
-        const parsed = dotenv_1.default.parse(secretFile);
+        const parsed = node_js_1.dotenv.parse(secretFile);
         Object.assign(secretEnv, parsed);
     }
     catch (error) { }
@@ -34,7 +33,10 @@ const env = new Proxy({}, {
         if (configEnv[prop]) {
             return configEnv[prop];
         }
-        return process.env[prop];
+        if (typeof process !== "undefined" && process.env) {
+            return process.env[prop];
+        }
+        return undefined;
     },
 });
 exports.env = env;

package/dist/common/node.d.ts

@@ -1,5 +1,6 @@
 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 FormData: typeof import("form-data") | null;
-export { FormData, fs, os, path };
+export { dotenv, FormData, fs, os, path };

package/dist/common/node.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.path = exports.os = exports.fs = exports.FormData = void 0;
+exports.path = exports.os = exports.fs = exports.FormData = exports.dotenv = void 0;
 /* eslint-disable */
 const isNode = typeof process !== "undefined" &&
     process.versions != null &&
@@ -11,6 +11,8 @@ let os = null;
 exports.os = os;
 let path = null;
 exports.path = path;
+let dotenv = null;
+exports.dotenv = dotenv;
 let FormData = null;
 exports.FormData = FormData;
 if (isNode) {
@@ -18,6 +20,7 @@ if (isNode) {
         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.FormData = FormData = eval("require")("form-data");
     }
     catch (e) {

package/dist/mcp/client.d.ts

@@ -2,11 +2,13 @@ import { Transport } from "@modelcontextprotocol/sdk/shared/transport.js";
 import { JSONRPCMessage } from "@modelcontextprotocol/sdk/types.js";
 /**
  * Client transport for WebSocket: this will connect to a server over the WebSocket protocol.
+ * Works in both browser and Node.js environments.
  */
 export declare class BlaxelMcpClientTransport implements Transport {
     private _socket?;
     private _url;
     private _headers;
+    private _isBrowser;
     onclose?: () => void;
     onerror?: (error: Error) => void;
     onmessage?: (message: JSONRPCMessage) => void;

package/dist/mcp/client.js

@@ -1,12 +1,22 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlaxelMcpClientTransport = void 0;
 const types_js_1 = require("@modelcontextprotocol/sdk/types.js");
-const ws_1 = __importDefault(require("ws"));
 const logger_js_1 = require("../common/logger.js");
+const settings_js_1 = require("../common/settings.js");
+// Detect environment
+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
+        NodeWebSocket = require("ws");
+    }
+    catch (error) {
+        // ws is not available
+    }
+}
 //const SUBPROTOCOL = "mcp";
 const MAX_RETRIES = 3;
 const RETRY_DELAY_MS = 1000;
@@ -14,17 +24,20 @@ const RETRY_DELAY_MS = 1000;
 const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 /**
  * Client transport for WebSocket: this will connect to a server over the WebSocket protocol.
+ * Works in both browser and Node.js environments.
  */
 class BlaxelMcpClientTransport {
     _socket;
     _url;
     _headers;
+    _isBrowser;
     onclose;
     onerror;
     onmessage;
     constructor(url, headers) {
         this._url = new URL(url.replace("http", "ws"));
         this._headers = headers ?? {};
+        this._isBrowser = isBrowser;
     }
     async start() {
         if (this._socket) {
@@ -51,52 +64,93 @@ class BlaxelMcpClientTransport {
     }
     _connect() {
         return new Promise((resolve, reject) => {
-            this._socket = new ws_1.default(this._url, {
-                //protocols: SUBPROTOCOL,
-                headers: this._headers,
-            });
-            this._socket.onerror = (event) => {
-                const error = "error" in event
-                    ? event.error
-                    : new Error(`WebSocket error: ${JSON.stringify(event)}`);
-                reject(error);
-                this.onerror?.(error);
-            };
-            this._socket.onopen = () => {
-                resolve();
-            };
-            this._socket.onclose = () => {
-                this.onclose?.();
-                this._socket = undefined;
-            };
-            this._socket.onmessage = (event) => {
-                let message;
-                try {
-                    let dataString;
-                    if (typeof event.data === "string") {
-                        dataString = event.data;
-                    }
-                    else if (event.data instanceof Buffer) {
-                        dataString = event.data.toString("utf-8");
-                    }
-                    else {
-                        throw new Error("Unsupported data type for event.data");
+            try {
+                if (this._isBrowser) {
+                    // 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 (!NodeWebSocket) {
+                        throw new Error("WebSocket library not available in Node.js environment");
                     }
-                    message = types_js_1.JSONRPCMessageSchema.parse(JSON.parse(dataString));
+                    this._socket = new NodeWebSocket(this._url, {
+                        //protocols: SUBPROTOCOL,
+                        headers: this._headers,
+                    });
                 }
-                catch (error) {
-                    logger_js_1.logger.error(`Error parsing message: ${typeof event.data === "object"
-                        ? JSON.stringify(event.data)
-                        : event.data}`);
+                this._socket.onerror = (event) => {
+                    console.error(event);
+                    const error = this._isBrowser
+                        ? new Error(`WebSocket error: ${event.message}`)
+                        : "error" in event
+                            ? event.error
+                            : new Error(`WebSocket error: ${event.message}`);
+                    reject(error);
                     this.onerror?.(error);
-                    return;
+                };
+                this._socket.onopen = () => {
+                    resolve();
+                };
+                this._socket.onclose = () => {
+                    this.onclose?.();
+                    this._socket = undefined;
+                };
+                this._socket.onmessage = (event) => {
+                    let message;
+                    try {
+                        let dataString;
+                        if (this._isBrowser) {
+                            // Browser WebSocket MessageEvent
+                            const browserEvent = event;
+                            dataString = typeof browserEvent.data === "string"
+                                ? browserEvent.data
+                                : browserEvent.data.toString();
+                        }
+                        else {
+                            // Node.js WebSocket MessageEvent
+                            const nodeEvent = event;
+                            if (typeof nodeEvent.data === "string") {
+                                dataString = nodeEvent.data;
+                            }
+                            else if (nodeEvent.data instanceof Buffer) {
+                                dataString = nodeEvent.data.toString("utf-8");
+                            }
+                            else {
+                                throw new Error("Unsupported data type for event.data");
+                            }
+                        }
+                        message = types_js_1.JSONRPCMessageSchema.parse(JSON.parse(dataString));
+                    }
+                    catch (error) {
+                        logger_js_1.logger.error(`Error parsing message: ${typeof event.data === "object"
+                            ? JSON.stringify(event.data)
+                            : event.data}`);
+                        this.onerror?.(error);
+                        return;
+                    }
+                    this.onmessage?.(message);
+                };
+            }
+            catch (error) {
+                if (error instanceof Error && error.message.includes("ws does not work in the browser")) {
+                    this._isBrowser = true;
+                    return this._connect().then(resolve).catch(reject);
                 }
-                this.onmessage?.(message);
-            };
+                reject(error);
+            }
         });
     }
     get isConnected() {
-        return this._socket?.readyState === ws_1.default.OPEN;
+        if (!this._socket)
+            return false;
+        if (this._isBrowser) {
+            return this._socket.readyState === 1; // WebSocket.OPEN = 1
+        }
+        else {
+            return this._socket.readyState === 1; // WebSocket.OPEN = 1
+        }
     }
     async close() {
         this._socket?.close();
@@ -108,7 +162,7 @@ class BlaxelMcpClientTransport {
         let attempts = 0;
         while (attempts < MAX_RETRIES) {
             try {
-                if (!this._socket || this._socket.readyState !== ws_1.default.OPEN) {
+                if (!this._socket || !this.isConnected) {
                     if (!this._socket) {
                         // Only try to start if socket doesn't exist
                         await this.start();
@@ -119,14 +173,23 @@ class BlaxelMcpClientTransport {
                 }
                 await new Promise((resolve, reject) => {
                     try {
-                        this._socket?.send(JSON.stringify(message), (error) => {
-                            if (error) {
-                                reject(error);
-                            }
-                            else {
-                                resolve();
-                            }
-                        });
+                        const messageStr = JSON.stringify(message);
+                        if (this._isBrowser) {
+                            // Browser WebSocket
+                            this._socket?.send(messageStr);
+                            resolve();
+                        }
+                        else {
+                            // Node.js WebSocket
+                            this._socket?.send(messageStr, (error) => {
+                                if (error) {
+                                    reject(error);
+                                }
+                                else {
+                                    resolve();
+                                }
+                            });
+                        }
                     }
                     catch (error) {
                         reject(error);

package/dist/sandbox/action.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SandboxAction = exports.ResponseError = void 0;
 const client_fetch_1 = require("@hey-api/client-fetch");
-const process_1 = require("process");
+const env_js_1 = require("../common/env.js");
 const internal_js_1 = require("../common/internal.js");
 const settings_js_1 = require("../common/settings.js");
 const client_gen_js_1 = require("./client/client.gen.js");
@@ -66,8 +66,8 @@ class SandboxAction {
             return this.sandbox.forceUrl;
         const envVar = this.name.replace(/-/g, "_").toUpperCase();
         const envName = `BL_SANDBOX_${envVar}_URL`;
-        if (process_1.env[envName]) {
-            return process_1.env[envName];
+        if (env_js_1.env[envName]) {
+            return env_js_1.env[envName];
         }
         return null;
     }

package/package.json

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