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

package/dist/agents/index.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAgentMetadata = exports.blAgent = void 0;
 const index_js_1 = require("../cache/index.js");
 const index_js_2 = require("../client/index.js");
-const env_js_1 = require("../common/env.js");
 const internal_js_1 = require("../common/internal.js");
 const logger_js_1 = require("../common/logger.js");
 const settings_js_1 = require("../common/settings.js");
@@ -27,11 +26,7 @@ class BlAgent {
         return new URL(`${settings_js_1.settings.runInternalProtocol}://bl-${settings_js_1.settings.env}-${hash}.${settings_js_1.settings.runInternalHostname}`);
     }
     get forcedUrl() {
-        const envVar = this.agentName.replace(/-/g, "_").toUpperCase();
-        if (env_js_1.env[`BL_AGENT_${envVar}_URL`]) {
-            return new URL(env_js_1.env[`BL_AGENT_${envVar}_URL`]);
-        }
-        return null;
+        return (0, internal_js_1.getForcedUrl)('function', this.agentName);
     }
     get url() {
         if (this.forcedUrl)

package/dist/common/internal.d.ts

@@ -1,2 +1,4 @@
 export declare function getAlphanumericLimitedHash(input: string, maxSize?: number): string;
 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;

package/dist/common/internal.js

@@ -1,8 +1,11 @@
 "use strict";
+/* eslint-disable */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAlphanumericLimitedHash = getAlphanumericLimitedHash;
 exports.getGlobalUniqueHash = getGlobalUniqueHash;
-/* eslint-disable */
+exports.pluralize = pluralize;
+exports.getForcedUrl = getForcedUrl;
+const core_1 = require("@blaxel/core");
 // Pure JS MD5 implementation that matches standard crypto MD5
 function md5(input) {
     function cmn(q, a, b, x, s, t) {
@@ -139,3 +142,47 @@ function getGlobalUniqueHash(workspace, type, name) {
     const globalUniqueName = `${workspace}-${type}-${name}`;
     return getAlphanumericLimitedHash(globalUniqueName, 48);
 }
+function pluralize(type) {
+    const word = type.toLowerCase();
+    // Words ending in s, ss, sh, ch, x, z - add 'es'
+    if (word.endsWith('s') || word.endsWith('ss') || word.endsWith('sh') ||
+        word.endsWith('ch') || word.endsWith('x') || word.endsWith('z')) {
+        return type + 'es';
+    }
+    // Words ending in consonant + y - change y to ies
+    if (word.endsWith('y') && word.length > 1) {
+        const beforeY = word[word.length - 2];
+        if (!'aeiou'.includes(beforeY)) {
+            return type.slice(0, -1) + 'ies';
+        }
+    }
+    // Words ending in f or fe - change to ves
+    if (word.endsWith('f')) {
+        return type.slice(0, -1) + 'ves';
+    }
+    if (word.endsWith('fe')) {
+        return type.slice(0, -2) + 'ves';
+    }
+    // Words ending in consonant + o - add 'es'
+    if (word.endsWith('o') && word.length > 1) {
+        const beforeO = word[word.length - 2];
+        if (!'aeiou'.includes(beforeO)) {
+            return type + 'es';
+        }
+    }
+    // Default case - just add 's'
+    return type + 's';
+}
+function getForcedUrl(type, name) {
+    const pluralType = pluralize(type);
+    const envVar = name.replace(/-/g, "_").toUpperCase();
+    // BL_FUNCTIONS_NAME_URL
+    if (core_1.env[`BL_${pluralType.toUpperCase()}_${envVar}_URL`]) {
+        return new URL(core_1.env[`BL_${pluralType.toUpperCase()}_${envVar}_URL`]);
+    }
+    // BL_FUNCTION_NAME_URL
+    if (core_1.env[`BL_${type.toUpperCase()}_${envVar}_URL`]) {
+        return new URL(core_1.env[`BL_${type.toUpperCase()}_${envVar}_URL`]);
+    }
+    return null;
+}

package/dist/jobs/jobs.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.blJob = void 0;
-const env_js_1 = require("../common/env.js");
 const internal_js_1 = require("../common/internal.js");
 const logger_js_1 = require("../common/logger.js");
 const settings_js_1 = require("../common/settings.js");
@@ -25,11 +24,7 @@ class BlJob {
         return new URL(`${settings_js_1.settings.runInternalProtocol}://bl-${settings_js_1.settings.env}-${hash}.${settings_js_1.settings.runInternalHostname}`);
     }
     get forcedUrl() {
-        const envVar = this.jobName.replace(/-/g, "_").toUpperCase();
-        if (env_js_1.env[`BL_JOB_${envVar}_URL`]) {
-            return new URL(env_js_1.env[`BL_JOB_${envVar}_URL`]);
-        }
-        return null;
+        return (0, internal_js_1.getForcedUrl)('job', this.jobName);
     }
     get url() {
         if (this.forcedUrl)

package/dist/sandbox/action.d.ts

@@ -13,7 +13,7 @@ export declare class SandboxAction {
     get externalUrl(): string;
     get internalUrl(): string;
     get client(): import("@hey-api/client-fetch").Client;
-    get forcedUrl(): string | null;
+    get forcedUrl(): string | import("url").URL | null;
     get url(): string;
     handleResponseError(response: Response, data: unknown, error: unknown): void;
 }

package/dist/sandbox/action.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SandboxAction = exports.ResponseError = void 0;
 const client_fetch_1 = require("@hey-api/client-fetch");
-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");
@@ -64,16 +63,11 @@ class SandboxAction {
     get forcedUrl() {
         if (this.sandbox.forceUrl)
             return this.sandbox.forceUrl;
-        const envVar = this.name.replace(/-/g, "_").toUpperCase();
-        const envName = `BL_SANDBOXES_${envVar}_URL`;
-        if (env_js_1.env[envName]) {
-            return env_js_1.env[envName];
-        }
-        return null;
+        return (0, internal_js_1.getForcedUrl)('sandbox', this.name);
     }
     get url() {
         if (this.forcedUrl)
-            return this.forcedUrl;
+            return this.forcedUrl.toString();
         // Uncomment and use this when agent and mcp are available in mk3
         // Update all requests made in this package to use fallbackUrl when internalUrl is not working
         // if (settings.runInternalHostname) return this.internalUrl;

package/dist/sandbox/filesystem/filesystem.js

@@ -56,7 +56,7 @@ class SandboxFileSystem extends action_js_1.SandboxAction {
         // Build URL
         let url = `${this.url}/filesystem/${path}`;
         if (this.forcedUrl) {
-            url = `${this.forcedUrl}/filesystem/${path}`;
+            url = `${this.forcedUrl.toString()}/filesystem/${path}`;
         }
         // Make the request using fetch instead of axios for better FormData handling
         const response = await fetch(url, {

package/dist/tools/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getToolMetadata = exports.blTool = exports.blTools = exports.BLTools = exports.getTool = void 0;
 const index_js_1 = require("../cache/index.js");
 const client_js_1 = require("../client/client.js");
-const env_js_1 = require("../common/env.js");
+const internal_js_1 = require("../common/internal.js");
 const mcpTool_js_1 = require("./mcpTool.js");
 const getTool = async (name, ms) => {
     return await (0, mcpTool_js_1.getMcpTool)(name, ms);
@@ -25,8 +25,8 @@ const blTool = (name) => {
 };
 exports.blTool = blTool;
 const getToolMetadata = async (tool) => {
-    const envVar = tool.replace(/-/g, "_").toUpperCase();
-    if (env_js_1.env[`BL_FUNCTION_${envVar}_URL`]) {
+    const forcedUrl = (0, internal_js_1.getForcedUrl)('function', tool);
+    if (forcedUrl) {
         return {
             metadata: {
                 name: tool,

package/dist/tools/mcpTool.js

@@ -58,11 +58,7 @@ class McpTool {
         return new URL(`${settings_js_1.settings.runInternalProtocol}://bl-${settings_js_1.settings.env}-${hash}.${settings_js_1.settings.runInternalHostname}`);
     }
     get forcedUrl() {
-        const envVar = this.name.replace(/-/g, "_").toUpperCase();
-        if (env_js_1.env[`BL_${this.pluralType.toUpperCase()}_${envVar}_URL`]) {
-            return new URL(env_js_1.env[`BL_${this.pluralType.toUpperCase()}_${envVar}_URL`]);
-        }
-        return null;
+        return (0, internal_js_1.getForcedUrl)(this.type, this.name);
     }
     get url() {
         if (this.forcedUrl)

package/package.json

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