@adminforth/agent 1.26.12 → 1.26.14

package/apiBasedTools.ts

@@ -46,9 +46,11 @@ type GetResourceDataToolResponse = {
 };
 
 type DateTimeColumnType = AdminForthDataTypes.DATETIME | AdminForthDataTypes.TIME;
+type InternalApiOriginProvider = {
+  getInternalApiOrigin?: () => string | undefined;
+};
 
 const DEFAULT_USER_TIME_ZONE = 'UTC';
-const DEFAULT_REQUEST_PROTOCOL = process.env.NODE_ENV === 'production' ? 'https' : 'http';
 
 function getInputString(inputs: Record<string, unknown> | undefined, key: string) {
   const value = inputs?.[key];
@@ -580,22 +582,6 @@ const HEADERS_NOT_FORWARDED_TO_API_TOOL = new Set([
   'upgrade',
 ]);
 
-function getHeaderValue(
-  headers: Partial<HttpExtra>['headers'] | undefined,
-  headerName: string,
-) {
-  const normalizedHeaderName = headerName.toLowerCase();
-  const value = Object.entries(headers ?? {}).find(
-    ([name]) => name.toLowerCase() === normalizedHeaderName,
-  )?.[1];
-
-  if (typeof value !== 'string') {
-    return undefined;
-  }
-
-  return value.split(',')[0].trim();
-}
-
 function isAbsoluteHttpUrl(value: string) {
   try {
     const url = new URL(value);
@@ -605,42 +591,25 @@ function isAbsoluteHttpUrl(value: string) {
   }
 }
 
-function getRequestOrigin(httpExtra?: Partial<HttpExtra>) {
-  const requestUrl = httpExtra?.requestUrl;
-
-  if (requestUrl && isAbsoluteHttpUrl(requestUrl)) {
-    return new URL(requestUrl).origin;
-  }
-
-  const host = getHeaderValue(httpExtra?.headers, 'x-forwarded-host')
-    ?? getHeaderValue(httpExtra?.headers, 'host');
-
-  if (!host) {
-    return undefined;
-  }
-
-  const protocol = getHeaderValue(httpExtra?.headers, 'x-forwarded-proto') ?? DEFAULT_REQUEST_PROTOCOL;
-  return `${protocol}://${host}`;
-}
-
 function resolveOpenApiRequestUrl(params: {
-  httpExtra?: Partial<HttpExtra>;
+  adminforth: IAdminForth;
   path: string;
   toolName: string;
 }) {
-  if (isAbsoluteHttpUrl(params.path)) {
-    return params.path;
-  }
+  const internalApiOrigin = (params.adminforth.express as InternalApiOriginProvider)
+    .getInternalApiOrigin?.();
 
-  const origin = getRequestOrigin(params.httpExtra);
+  if (internalApiOrigin) {
+    const path = isAbsoluteHttpUrl(params.path)
+      ? `${new URL(params.path).pathname}${new URL(params.path).search}`
+      : params.path;
 
-  if (!origin) {
-    throw new Error(
-      `Tool "${params.toolName}" has relative OpenAPI path "${params.path}" but request host header is unavailable.`,
-    );
+    return new URL(path, internalApiOrigin).toString();
   }
 
-  return new URL(params.path, origin).toString();
+  throw new Error(
+    `Tool "${params.toolName}" cannot call OpenAPI path "${params.path}" because internal API origin is unavailable.`,
+  );
 }
 
 function createToolRequestHeaders(
@@ -736,7 +705,7 @@ async function callOpenApiSchema(params: {
     userTimeZone,
   );
   const requestUrl = resolveOpenApiRequestUrl({
-    httpExtra,
+    adminforth,
     path: schema.path,
     toolName,
   });

package/build.log

@@ -38,5 +38,5 @@ custom/skills/fetch_data/SKILL.md
 custom/skills/mutate_data/
 custom/skills/mutate_data/SKILL.md
 
-sent 207,924 bytes  received 562 bytes  416,972.00 bytes/sec
+sent 207,954 bytes  received 558 bytes  417,024.00 bytes/sec
 total size is 205,644  speedup is 0.99

package/dist/apiBasedTools.js

@@ -16,7 +16,6 @@ import YAML from 'yaml';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 const DEFAULT_USER_TIME_ZONE = 'UTC';
-const DEFAULT_REQUEST_PROTOCOL = process.env.NODE_ENV === 'production' ? 'https' : 'http';
 function getInputString(inputs, key) {
     const value = inputs === null || inputs === void 0 ? void 0 : inputs[key];
     return typeof value === 'string' && value ? value : undefined;
@@ -395,15 +394,6 @@ const HEADERS_NOT_FORWARDED_TO_API_TOOL = new Set([
     'transfer-encoding',
     'upgrade',
 ]);
-function getHeaderValue(headers, headerName) {
-    var _a;
-    const normalizedHeaderName = headerName.toLowerCase();
-    const value = (_a = Object.entries(headers !== null && headers !== void 0 ? headers : {}).find(([name]) => name.toLowerCase() === normalizedHeaderName)) === null || _a === void 0 ? void 0 : _a[1];
-    if (typeof value !== 'string') {
-        return undefined;
-    }
-    return value.split(',')[0].trim();
-}
 function isAbsoluteHttpUrl(value) {
     try {
         const url = new URL(value);
@@ -413,28 +403,16 @@ function isAbsoluteHttpUrl(value) {
         return false;
     }
 }
-function getRequestOrigin(httpExtra) {
-    var _a, _b;
-    const requestUrl = httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.requestUrl;
-    if (requestUrl && isAbsoluteHttpUrl(requestUrl)) {
-        return new URL(requestUrl).origin;
-    }
-    const host = (_a = getHeaderValue(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers, 'x-forwarded-host')) !== null && _a !== void 0 ? _a : getHeaderValue(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers, 'host');
-    if (!host) {
-        return undefined;
-    }
-    const protocol = (_b = getHeaderValue(httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.headers, 'x-forwarded-proto')) !== null && _b !== void 0 ? _b : DEFAULT_REQUEST_PROTOCOL;
-    return `${protocol}://${host}`;
-}
 function resolveOpenApiRequestUrl(params) {
-    if (isAbsoluteHttpUrl(params.path)) {
-        return params.path;
-    }
-    const origin = getRequestOrigin(params.httpExtra);
-    if (!origin) {
-        throw new Error(`Tool "${params.toolName}" has relative OpenAPI path "${params.path}" but request host header is unavailable.`);
+    var _a, _b;
+    const internalApiOrigin = (_b = (_a = params.adminforth.express).getInternalApiOrigin) === null || _b === void 0 ? void 0 : _b.call(_a);
+    if (internalApiOrigin) {
+        const path = isAbsoluteHttpUrl(params.path)
+            ? `${new URL(params.path).pathname}${new URL(params.path).search}`
+            : params.path;
+        return new URL(path, internalApiOrigin).toString();
     }
-    return new URL(params.path, origin).toString();
+    throw new Error(`Tool "${params.toolName}" cannot call OpenAPI path "${params.path}" because internal API origin is unavailable.`);
 }
 function createToolRequestHeaders(httpExtra, userTimeZone) {
     var _a;
@@ -499,7 +477,7 @@ function callOpenApiSchema(params) {
         const method = schema.method.toUpperCase();
         const body = normalizeDateTimeInputsToUtc(((_a = inputs !== null && inputs !== void 0 ? inputs : httpExtra === null || httpExtra === void 0 ? void 0 : httpExtra.body) !== null && _a !== void 0 ? _a : {}), adminforth, userTimeZone);
         const requestUrl = resolveOpenApiRequestUrl({
-            httpExtra,
+            adminforth,
             path: schema.path,
             toolName,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adminforth/agent",
-  "version": "1.26.12",
+  "version": "1.26.14",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",