@blaxel/core 0.2.45 → 0.2.46-dev.204

package/dist/esm-browser/agents/index.js

@@ -1,6 +1,6 @@
 import { findFromCache } from "../cache/index.js";
 import { getAgent } from "../client/index.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 { startSpan } from '../telemetry/telemetry.js';
@@ -19,8 +19,8 @@ class BlAgent {
         return new URL(`${settings.runUrl}/${settings.workspace}/agents/${this.agentName}`);
     }
     get internalUrl() {
-        const hash = getGlobalUniqueHash(settings.workspace, "agent", this.agentName);
-        return new URL(`${settings.runInternalProtocol}://bl-${settings.env}-${hash}.${settings.runInternalHostname}`);
+        const url = generateInternalUrl(settings.workspace, "agent", this.agentName, settings.env, settings.runInternalProtocol, settings.runInternalHostname, settings.blCloud, settings.workspaceId);
+        return new URL(url);
     }
     get forcedUrl() {
         return getForcedUrl('function', this.agentName);

package/dist/esm-browser/authentication/clientcredentials.js

@@ -51,10 +51,13 @@ export class ClientCredentials extends Credentials {
         }
         catch (error) {
             if (retry > 0) {
+                console.error(`Authentication failed, retrying... (${4 - retry}/3)`, error);
                 await this.sleep(1000);
                 return this.processWithRetry(retry - 1);
             }
-            throw error;
+            this.currentPromise = null;
+            const originalMessage = error instanceof Error ? error.message : String(error);
+            throw new Error(`Authentication failed after 4 attempts: ${originalMessage}`, { cause: error });
         }
     }
     async process() {

package/dist/esm-browser/common/internal.js

@@ -180,3 +180,41 @@ export function getForcedUrl(type, name) {
     }
     return null;
 }
+export 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);
+    }
+}
+export 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/esm-browser/common/settings.js

@@ -7,7 +7,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.45","commit":"67097f3cb05bf06199eb26983384582a8b7101fe"};
+            const packageJson = {"version":"0.2.46-dev.204","commit":"6df4b9634c31339747c2d6a37c0810466e5114da"};
             return packageJson.version || "unknown";
         }
         else {
@@ -59,7 +59,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.45","commit":"67097f3cb05bf06199eb26983384582a8b7101fe"};
+            const packageJson = {"version":"0.2.46-dev.204","commit":"6df4b9634c31339747c2d6a37c0810466e5114da"};
             // Check for commit in various possible locations
             const commit = packageJson.commit || packageJson.buildInfo?.commit;
             if (commit) {
@@ -162,6 +162,9 @@ class Settings {
     get blCloud() {
         return env.BL_CLOUD === "true";
     }
+    get workspaceId() {
+        return env.BL_WORKSPACE_ID || "";
+    }
     get generation() {
         return env.BL_GENERATION || "";
     }

package/dist/esm-browser/jobs/jobs.js

@@ -1,4 +1,4 @@
-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 { startSpan } from '../telemetry/telemetry.js';
@@ -17,8 +17,8 @@ class BlJob {
         return new URL(`${settings.runUrl}/${settings.workspace}/jobs/${this.jobName}`);
     }
     get internalUrl() {
-        const hash = getGlobalUniqueHash(settings.workspace, "job", this.jobName);
-        return new URL(`${settings.runInternalProtocol}://bl-${settings.env}-${hash}.${settings.runInternalHostname}`);
+        const url = generateInternalUrl(settings.workspace, "job", this.jobName, settings.env, settings.runInternalProtocol, settings.runInternalHostname, settings.blCloud, settings.workspaceId);
+        return new URL(url);
     }
     get forcedUrl() {
         return getForcedUrl('job', this.jobName);

package/dist/esm-browser/sandbox/action.js

@@ -1,5 +1,5 @@
 import { createClient } from "@hey-api/client-fetch";
-import { getForcedUrl, getGlobalUniqueHash } from "../common/internal.js";
+import { generateInternalUrl, getForcedUrl } from "../common/internal.js";
 import { settings } from "../common/settings.js";
 import { client as defaultClient } from "./client/client.gen.js";
 export class ResponseError extends Error {
@@ -44,8 +44,7 @@ export class SandboxAction {
         return this.sandbox.metadata?.url ?? `${settings.runUrl}/${settings.workspace}/sandboxes/${this.name}`;
     }
     get internalUrl() {
-        const hash = getGlobalUniqueHash(settings.workspace, "sandbox", this.name);
-        return `${settings.runInternalProtocol}://bl-${settings.env}-${hash}.${settings.runInternalHostname}`;
+        return generateInternalUrl(settings.workspace, "sandbox", this.name, settings.env, settings.runInternalProtocol, settings.runInternalHostname, settings.blCloud, settings.workspaceId);
     }
     get client() {
         if (this.sandbox.forceUrl) {

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";
@@ -55,8 +55,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.45",
+  "version": "0.2.46-dev.204",
   "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": "67097f3cb05bf06199eb26983384582a8b7101fe",
+  "commit": "6df4b9634c31339747c2d6a37c0810466e5114da",
   "scripts": {
     "lint": "eslint src/",
     "dev": "tsc --watch",