@utcp/http 1.0.12 → 1.0.13

package/dist/index.cjs

@@ -4241,6 +4241,7 @@ var import_sdk8 = require("@utcp/sdk");
 var OpenApiConverter = class {
   spec;
   spec_url;
+  base_url;
   auth_tools;
   placeholder_counter = 0;
   call_template_name;
@@ -4248,14 +4249,16 @@ var OpenApiConverter = class {
    * Initializes the OpenAPI converter.
    *
    * @param openapi_spec Parsed OpenAPI specification as a dictionary.
-   * @param options Optional settings including spec_url, call_template_name, and auth_tools.
+   * @param options Optional settings including spec_url, call_template_name, auth_tools, and baseUrl.
    *     - specUrl: URL where the specification was retrieved from.
    *     - callTemplateName: Custom name for the call_template if spec title not provided.
    *     - authTools: Optional auth configuration for generated tools.
+   *     - baseUrl: Optional base URL override for all API endpoints.
    */
   constructor(openapi_spec, options) {
     this.spec = openapi_spec;
     this.spec_url = options?.specUrl;
+    this.base_url = options?.baseUrl;
     this.auth_tools = options?.authTools;
     this.placeholder_counter = 0;
     let callTemplateName = options?.callTemplateName;
@@ -4290,10 +4293,15 @@ var OpenApiConverter = class {
     this.placeholder_counter = 0;
     const tools = [];
     let baseUrl = "/";
-    const servers = this.spec.servers;
-    if (servers && Array.isArray(servers) && servers.length > 0 && servers[0].url) {
-      baseUrl = servers[0].url;
-    } else if (this.spec_url) {
+    if (this.base_url) {
+      baseUrl = this.base_url;
+    } else if (this.spec.servers && Array.isArray(this.spec.servers) && this.spec.servers.length > 0 && this.spec.servers[0].url) {
+      baseUrl = this.spec.servers[0].url;
+    } else if (this.spec.host) {
+      const scheme = this.spec.schemes?.[0] || "https";
+      const basePath = this.spec.basePath || "";
+      baseUrl = `${scheme}://${this.spec.host}${basePath}`;
+    } else if (this.spec_url && (this.spec_url.startsWith("http://") || this.spec_url.startsWith("https://"))) {
       try {
         const parsedUrl = new URL(this.spec_url);
         baseUrl = `${parsedUrl.protocol}//${parsedUrl.host}`;
@@ -4301,7 +4309,7 @@ var OpenApiConverter = class {
         console.error(`[OpenApiConverter] Invalid spec_url provided: ${this.spec_url}`);
       }
     } else {
-      console.warn("[OpenApiConverter] No server info or spec URL provided. Using fallback base URL: '/'");
+      console.warn("[OpenApiConverter] No server info found in OpenAPI spec. Using fallback base URL: '/'. Tools may not work correctly without a valid base URL.");
     }
     const paths = this.spec.paths || {};
     for (const [path, pathItem] of Object.entries(paths)) {
@@ -4871,11 +4879,12 @@ var HttpCommunicationProtocol = class {
         if (!apiKeyAuth.api_key) {
           throw new Error("API key for ApiKeyAuth is empty.");
         }
-        if (apiKeyAuth.location === "header") {
+        const location = apiKeyAuth.location || "header";
+        if (location === "header") {
           requestConfig.headers = { ...requestConfig.headers, [apiKeyAuth.var_name]: apiKeyAuth.api_key };
-        } else if (apiKeyAuth.location === "query") {
+        } else if (location === "query") {
           requestConfig.params = { ...requestConfig.params, [apiKeyAuth.var_name]: apiKeyAuth.api_key };
-        } else if (apiKeyAuth.location === "cookie") {
+        } else if (location === "cookie") {
           cookies[apiKeyAuth.var_name] = apiKeyAuth.api_key;
         }
       } else if (httpCallTemplate.auth.auth_type === "basic") {
@@ -5016,11 +5025,12 @@ var StreamableHttpCommunicationProtocol = class {
       if ("api_key" in provider.auth) {
         const apiKeyAuth = provider.auth;
         if (apiKeyAuth.api_key) {
-          if (apiKeyAuth.location === "header") {
+          const location = apiKeyAuth.location || "header";
+          if (location === "header") {
             headers[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === "query") {
+          } else if (location === "query") {
             queryParams[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === "cookie") {
+          } else if (location === "cookie") {
             cookies[apiKeyAuth.var_name] = apiKeyAuth.api_key;
           }
         } else {
@@ -5147,11 +5157,12 @@ var SseCommunicationProtocol = class {
       if ("api_key" in provider.auth) {
         const apiKeyAuth = provider.auth;
         if (apiKeyAuth.api_key) {
-          if (apiKeyAuth.location === "header") {
+          const location = apiKeyAuth.location || "header";
+          if (location === "header") {
             headers[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === "query") {
+          } else if (location === "query") {
             queryParams[apiKeyAuth.var_name] = apiKeyAuth.api_key;
-          } else if (apiKeyAuth.location === "cookie") {
+          } else if (location === "cookie") {
             cookies[apiKeyAuth.var_name] = apiKeyAuth.api_key;
           }
         } else {