@blaxel/core 0.2.42-preview.92 → 0.2.43-dev.194

package/dist/cjs/authentication/index.js

@@ -6,7 +6,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.authentication = authentication;
 const yaml_1 = __importDefault(require("yaml"));
 const env_js_1 = require("../common/env.js");
-const node_js_1 = require("../common/node.js");
+let fs = null;
+let os = null;
+let path = null;
+try {
+    const proc = typeof process !== "undefined" ? process : undefined;
+    const gw = typeof globalThis !== "undefined" ? globalThis : undefined;
+    const hasNodeVersions = (p) => {
+        if (typeof p !== "object" || p === null)
+            return false;
+        const anyP = p;
+        if (!("versions" in anyP))
+            return false;
+        const v = anyP["versions"];
+        return !!v && typeof v["node"] === "string";
+    };
+    const isNode = hasNodeVersions(proc);
+    const isBrowser = typeof gw === "object" && gw !== null && typeof gw.window !== "undefined";
+    if (isNode && !isBrowser) {
+        const req = eval("require");
+        fs = req("fs");
+        os = req("os");
+        path = req("path");
+    }
+}
+catch {
+    // ignore
+}
 const apikey_js_1 = require("./apikey.js");
 const clientcredentials_js_1 = require("./clientcredentials.js");
 const credentials_js_1 = require("./credentials.js");
@@ -24,12 +50,12 @@ function getCredentials() {
             workspace: env_js_1.env.BL_WORKSPACE,
         };
     }
-    if (node_js_1.os === null || node_js_1.fs === null || node_js_1.path === null) {
+    if (os === null || fs === null || path === null) {
         return null;
     }
     try {
-        const homeDir = node_js_1.os.homedir();
-        const config = node_js_1.fs.readFileSync(node_js_1.path.join(homeDir, ".blaxel/config.yaml"), "utf8");
+        const homeDir = os.homedir();
+        const config = fs.readFileSync(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/cjs/cache/index.js

@@ -5,11 +5,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findFromCache = findFromCache;
 const yaml_1 = __importDefault(require("yaml"));
-const node_js_1 = require("../common/node.js");
+let fs = null;
+try {
+    const isNode = typeof process !== "undefined" && typeof process.versions?.node === "string";
+    const isBrowser = typeof globalThis !== "undefined" && typeof globalThis?.window !== "undefined";
+    if (isNode && !isBrowser) {
+        const req = eval("require");
+        const loaded = req("fs");
+        fs = loaded;
+    }
+}
+catch {
+    // ignore
+}
 const cache = new Map();
 try {
-    if (node_js_1.fs) {
-        const cacheString = node_js_1.fs.readFileSync(".cache.yaml", "utf8");
+    if (fs !== null) {
+        const cacheString = fs.readFileSync(".cache.yaml", "utf8");
         const cacheData = yaml_1.default.parseAllDocuments(cacheString);
         for (const doc of cacheData) {
             const jsonDoc = doc.toJSON();

package/dist/cjs/common/env.js

@@ -6,12 +6,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.env = void 0;
 /* eslint-disable */
 const toml_1 = __importDefault(require("toml"));
-const node_js_1 = require("./node.js");
+// Avoid importing Node built-ins in environments that don't support them (e.g., Next.js client build)
+const isNode = typeof process !== "undefined" && process.versions != null && process.versions.node != null;
+const isBrowser = typeof globalThis !== "undefined" && globalThis?.window !== undefined;
+let fs = null;
+let dotenv = null;
+if (isNode && !isBrowser) {
+    try {
+        // Use eval to avoid bundler static analysis of 'require(\"fs\")'
+        fs = eval("require")("fs");
+    }
+    catch { }
+    try {
+        dotenv = eval("require")("dotenv");
+    }
+    catch { }
+}
 const secretEnv = {};
 const configEnv = {};
-if (node_js_1.fs !== null) {
+if (fs !== null) {
     try {
-        const configFile = node_js_1.fs.readFileSync("blaxel.toml", "utf8");
+        const configFile = fs.readFileSync("blaxel.toml", "utf8");
         const configInfos = toml_1.default.parse(configFile);
         for (const key in configInfos.env) {
             configEnv[key] = configInfos.env[key];
@@ -19,9 +34,9 @@ if (node_js_1.fs !== null) {
     }
     catch (error) { }
     try {
-        const secretFile = node_js_1.fs.readFileSync(".env", "utf8");
-        if (node_js_1.dotenv) {
-            const parsed = node_js_1.dotenv.parse(secretFile);
+        const secretFile = fs.readFileSync(".env", "utf8");
+        if (dotenv) {
+            const parsed = dotenv.parse(secretFile);
             Object.assign(secretEnv, parsed);
         }
         else {

package/dist/cjs/common/internal.js

@@ -5,6 +5,8 @@ exports.getAlphanumericLimitedHash = getAlphanumericLimitedHash;
 exports.getGlobalUniqueHash = getGlobalUniqueHash;
 exports.pluralize = pluralize;
 exports.getForcedUrl = getForcedUrl;
+exports.getWorkloadTypeShort = getWorkloadTypeShort;
+exports.generateInternalUrl = generateInternalUrl;
 const env_js_1 = require("./env.js");
 // Pure JS MD5 implementation that matches standard crypto MD5
 function md5(input) {
@@ -186,3 +188,41 @@ function getForcedUrl(type, name) {
     }
     return null;
 }
+function getWorkloadTypeShort(type) {
+    const lowerType = type.toLowerCase();
+    switch (lowerType) {
+        case 'agent':
+        case 'agents':
+            return 'agt';
+        case 'mcp':
+        case 'mcps':
+        case 'function':
+        case 'functions':
+            return 'mcp';
+        case 'sandbox':
+        case 'sandboxes':
+            return 'sbx';
+        case 'job':
+        case 'jobs':
+            return 'job';
+        case 'model':
+        case 'models':
+            return 'mdl';
+        default:
+            // fallback to first 3 letters of type
+            return lowerType.substring(0, 3);
+    }
+}
+function generateInternalUrl(workspace, type, name, env, protocol, hostname, blCloud, workspaceId) {
+    if (blCloud && workspaceId) {
+        // New cloud format: bl-ENV-WORKLOAD_CALLED_NAME-WORKLOAD_TYPE_SHORT-WORKSPACE_ID
+        const workloadTypeShort = getWorkloadTypeShort(type);
+        const subdomain = `bl-${env}-${name}-${workloadTypeShort}-${workspaceId}`;
+        return `${protocol}://${subdomain}.${hostname}`;
+    }
+    else {
+        // Legacy format: bl-ENV-HASH.internalhostname
+        const hash = getGlobalUniqueHash(workspace, type, name);
+        return `${protocol}://bl-${env}-${hash}.${hostname}`;
+    }
+}

package/dist/cjs/common/settings.js

@@ -10,7 +10,7 @@ function getPackageVersion() {
         if (typeof require !== "undefined") {
             // Try to require package.json (Node.js only, gracefully fails in browser)
             // eslint-disable-next-line @typescript-eslint/no-require-imports
-            const packageJson = {"version":"0.2.42-preview.92","commit":"c4cffc4d7268f062ee0d043334e2d7a6908ea177"};
+            const packageJson = {"version":"0.2.43-dev.194","commit":"eaaada70f38d291b78d12e2a295e9987cfc3d09b"};
             return packageJson.version || "unknown";
         }
         else {
@@ -64,7 +64,7 @@ function getCommitHash() {
         if (typeof require !== "undefined") {
             // Try to require package.json and look for commit field (set during build)
             // eslint-disable-next-line @typescript-eslint/no-require-imports
-            const packageJson = {"version":"0.2.42-preview.92","commit":"c4cffc4d7268f062ee0d043334e2d7a6908ea177"};
+            const packageJson = {"version":"0.2.43-dev.194","commit":"eaaada70f38d291b78d12e2a295e9987cfc3d09b"};
             // Check for commit in various possible locations
             const commit = packageJson.commit || packageJson.buildInfo?.commit;
             if (commit) {
@@ -167,6 +167,9 @@ class Settings {
     get blCloud() {
         return env_js_1.env.BL_CLOUD === "true";
     }
+    get workspaceId() {
+        return env_js_1.env.BL_WORKSPACE_ID || "";
+    }
     get generation() {
         return env_js_1.env.BL_GENERATION || "";
     }

package/dist/cjs/index.js

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getWebSocket = void 0;
 require("./common/autoload");
 __exportStar(require("./agents/index.js"), exports);
 __exportStar(require("./client/client.js"), exports);
@@ -23,8 +22,6 @@ __exportStar(require("./common/env.js"), exports);
 __exportStar(require("./common/errors.js"), exports);
 __exportStar(require("./common/internal.js"), exports);
 __exportStar(require("./common/logger.js"), exports);
-var node_js_1 = require("./common/node.js");
-Object.defineProperty(exports, "getWebSocket", { enumerable: true, get: function () { return node_js_1.getWebSocket; } });
 __exportStar(require("./common/settings.js"), exports);
 __exportStar(require("./jobs/index.js"), exports);
 __exportStar(require("./mcp/index.js"), exports);

package/dist/cjs/jobs/jobs.js

@@ -20,8 +20,8 @@ class BlJob {
         return new URL(`${settings_js_1.settings.runUrl}/${settings_js_1.settings.workspace}/jobs/${this.jobName}`);
     }
     get internalUrl() {
-        const hash = (0, internal_js_1.getGlobalUniqueHash)(settings_js_1.settings.workspace, "job", this.jobName);
-        return new URL(`${settings_js_1.settings.runInternalProtocol}://bl-${settings_js_1.settings.env}-${hash}.${settings_js_1.settings.runInternalHostname}`);
+        const url = (0, internal_js_1.generateInternalUrl)(settings_js_1.settings.workspace, "job", this.jobName, settings_js_1.settings.env, settings_js_1.settings.runInternalProtocol, settings_js_1.settings.runInternalHostname, settings_js_1.settings.blCloud, settings_js_1.settings.workspaceId);
+        return new URL(url);
     }
     get forcedUrl() {
         return (0, internal_js_1.getForcedUrl)('job', this.jobName);

package/dist/cjs/sandbox/action.js

@@ -48,8 +48,7 @@ class SandboxAction {
         return this.sandbox.metadata?.url ?? `${settings_js_1.settings.runUrl}/${settings_js_1.settings.workspace}/sandboxes/${this.name}`;
     }
     get internalUrl() {
-        const hash = (0, internal_js_1.getGlobalUniqueHash)(settings_js_1.settings.workspace, "sandbox", this.name);
-        return `${settings_js_1.settings.runInternalProtocol}://bl-${settings_js_1.settings.env}-${hash}.${settings_js_1.settings.runInternalHostname}`;
+        return (0, internal_js_1.generateInternalUrl)(settings_js_1.settings.workspace, "sandbox", this.name, settings_js_1.settings.env, settings_js_1.settings.runInternalProtocol, settings_js_1.settings.runInternalHostname, settings_js_1.settings.blCloud, settings_js_1.settings.workspaceId);
     }
     get client() {
         if (this.sandbox.forceUrl) {

package/dist/cjs/tools/mcpTool.js

@@ -58,8 +58,8 @@ class McpTool {
         return new URL(`${settings_js_1.settings.runUrl}/${settings_js_1.settings.workspace}/${this.pluralType}/${this.name}`);
     }
     get internalUrl() {
-        const hash = (0, internal_js_1.getGlobalUniqueHash)(settings_js_1.settings.workspace, this.type, this.name);
-        return new URL(`${settings_js_1.settings.runInternalProtocol}://bl-${settings_js_1.settings.env}-${hash}.${settings_js_1.settings.runInternalHostname}`);
+        const url = (0, internal_js_1.generateInternalUrl)(settings_js_1.settings.workspace, this.type, this.name, settings_js_1.settings.env, settings_js_1.settings.runInternalProtocol, settings_js_1.settings.runInternalHostname, settings_js_1.settings.blCloud, settings_js_1.settings.workspaceId);
+        return new URL(url);
     }
     get forcedUrl() {
         return (0, internal_js_1.getForcedUrl)(this.type, this.name);

package/dist/cjs/types/common/internal.d.ts

@@ -2,3 +2,5 @@ export declare function getAlphanumericLimitedHash(input: string, maxSize?: numb
 export declare function getGlobalUniqueHash(workspace: string, type: string, name: string): string;
 export declare function pluralize(type: string): string;
 export declare function getForcedUrl(type: string, name: string): import("url").URL | null;
+export declare function getWorkloadTypeShort(type: string): string;
+export declare function generateInternalUrl(workspace: string, type: string, name: string, env: string, protocol: string, hostname: string, blCloud: boolean, workspaceId: string): string;

package/dist/cjs/types/common/settings.d.ts

@@ -23,6 +23,7 @@ declare class Settings {
     get runInternalHostname(): string;
     get runInternalProtocol(): string;
     get blCloud(): boolean;
+    get workspaceId(): string;
     get generation(): string;
     get loggerType(): string;
     authenticate(): Promise<void>;

package/dist/cjs/types/index.d.ts

@@ -6,7 +6,6 @@ export * from "./common/env.js";
 export * from "./common/errors.js";
 export * from "./common/internal.js";
 export * from "./common/logger.js";
-export { getWebSocket } from "./common/node.js";
 export * from "./common/settings.js";
 export * from "./jobs/index.js";
 export * from "./mcp/index.js";