Refactoring

apps/api/src/services/fetch/fetch.service.ts

@@ -3,7 +3,7 @@ import { PropertyService } from '@ghostfolio/api/services/property/property.serv
 import {
   PROPERTY_API_KEY_OPENROUTER,
   PROPERTY_OPENROUTER_MODEL,
-  PROPERTY_WEB_FETCH_DOMAINS
+  PROPERTY_WEB_FETCH_ROUTES
 } from '@ghostfolio/common/config';
 
 import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
@@ -11,23 +11,21 @@ import { createOpenRouter } from '@openrouter/ai-sdk-provider';
 import { generateText, jsonSchema, tool } from 'ai';
 import ms from 'ms';
 
-import {
+import { WebFetchRoute } from './interfaces/web-fetch-route.interface';
-  HttpRequestMethod,
-  WebFetchDomain
-} from './interfaces/web-fetch-domain.interface';
 
 @Injectable()
 export class FetchService implements OnModuleInit {
   private static readonly REDACTED_QUERY_PARAM_NAMES = ['apikey', 'api_token'];
+  private static readonly WEB_FETCH_TIMEOUT = ms('30 seconds');
 
-  private webFetchDomains: WebFetchDomain[] = [];
+  private webFetchRoutes: WebFetchRoute[] = [];
 
   public constructor(private readonly propertyService: PropertyService) {}
 
   public async onModuleInit() {
-    this.webFetchDomains =
+    this.webFetchRoutes =
-      (await this.propertyService.getByKey<WebFetchDomain[]>(
+      (await this.propertyService.getByKey<WebFetchRoute[]>(
-        PROPERTY_WEB_FETCH_DOMAINS
+        PROPERTY_WEB_FETCH_ROUTES
       )) ?? [];
   }
 
@@ -39,27 +37,27 @@ export class FetchService implements OnModuleInit {
       init?.method ??
       (input instanceof Request ? input.method : undefined) ??
       'GET'
-    ).toUpperCase() as HttpRequestMethod;
+    ).toUpperCase();
 
     const url = input instanceof Request ? input.url : input.toString();
     const urlRedacted = this.redactUrl(url);
-    const matchedWebFetchDomain = this.getMatchingWebFetchDomain({
-      method,
-      url
-    });
 
     Logger.debug(`${method} ${urlRedacted}`, 'FetchService');
 
-    if (matchedWebFetchDomain) {
+    if (method === 'GET') {
+      const matchedWebFetchRoute = this.getMatchingWebFetchRoute(url);
+
+      if (matchedWebFetchRoute) {
         const response = await this.fetchViaWebFetchTool(
           url,
-        matchedWebFetchDomain
+          matchedWebFetchRoute
         );
 
         if (response) {
           return response;
         }
       }
+    }
 
     try {
       return await globalThis.fetch(input, init);
@@ -82,7 +80,7 @@ export class FetchService implements OnModuleInit {
 
   private async fetchViaWebFetchTool(
     url: string,
-    webFetchDomain: WebFetchDomain
+    webFetchRoute: WebFetchRoute
   ): Promise<Response | undefined> {
     const [openRouterApiKey, openRouterModel] = await Promise.all([
       this.propertyService.getByKey<string>(PROPERTY_API_KEY_OPENROUTER),
@@ -97,14 +95,18 @@ export class FetchService implements OnModuleInit {
       const openRouterService = createOpenRouter({ apiKey: openRouterApiKey });
 
       const { sources, text } = await generateText({
-        abortSignal: AbortSignal.timeout(ms('30 seconds')),
         model: openRouterService.chat(openRouterModel),
         prompt: [
           'You have access to a web_fetch tool. You MUST call it to retrieve the URL below, do not answer from prior knowledge.',
           'Return the fetched response body exactly as received: raw body only, no commentary, no Markdown, and no code fences.',
           `URL: ${url}`
         ].join('\n'),
+        timeout: FetchService.WEB_FETCH_TIMEOUT,
         tools: {
+          // Provider-defined tool: lets OpenRouter perform the actual web
+          // request server-side via its `web_fetch` engine. `id` and `args`
+          // are the OpenRouter-specific identifiers; the input schema is left
+          // open as the arguments are supplied by the model.
           web_fetch: tool({
             args: { engine: 'openrouter' },
             id: 'openrouter.web_fetch',
@@ -135,7 +137,7 @@ export class FetchService implements OnModuleInit {
           continue;
         }
 
-        if (webFetchDomain.responseContentType.includes('application/json')) {
+        if (webFetchRoute.responseContentType?.includes('application/json')) {
           try {
             JSON.parse(body);
           } catch {
@@ -149,7 +151,9 @@ export class FetchService implements OnModuleInit {
         );
 
         return new Response(body, {
-          headers: { 'content-type': webFetchDomain.responseContentType }
+          headers: webFetchRoute.responseContentType
+            ? { 'content-type': webFetchRoute.responseContentType }
+            : undefined
         });
       }
 
@@ -166,21 +170,12 @@ export class FetchService implements OnModuleInit {
     }
   }
 
-  private getMatchingWebFetchDomain({
+  private getMatchingWebFetchRoute(url: string) {
-    method,
-    url
-  }: {
-    method: HttpRequestMethod;
-    url: string;
-  }) {
     try {
       const { hostname } = new URL(url);
 
-      return this.webFetchDomains.find(({ domain, methods }) => {
+      return this.webFetchRoutes.find(({ domain }) => {
-        const matchesDomain =
+        return hostname === domain || hostname.endsWith(`.${domain}`);
-          hostname === domain || hostname.endsWith(`.${domain}`);
-
-        return matchesDomain && methods.includes(method);
       });
     } catch {
       return undefined;

apps/api/src/services/fetch/interfaces/web-fetch-domain.interface.ts

@@ -1,16 +0,0 @@
-export type HttpRequestMethod =
-  | 'CONNECT'
-  | 'DELETE'
-  | 'GET'
-  | 'HEAD'
-  | 'OPTIONS'
-  | 'PATCH'
-  | 'POST'
-  | 'PUT'
-  | 'TRACE';
-
-export interface WebFetchDomain {
-  domain: string;
-  methods: HttpRequestMethod[];
-  responseContentType: string;
-}

apps/api/src/services/fetch/interfaces/web-fetch-route.interface.ts

@@ -0,0 +1,16 @@
+/**
+ * Routes outgoing GET requests for a given domain through the OpenRouter
+ * `web_fetch` tool instead of a direct network request.
+ *
+ * Configured via the `WEB_FETCH_ROUTES` property as a JSON array, e.g.
+ *
+ * [
+ *   { "domain": "example.com", "responseContentType": "application/json" }
+ * ]
+ *
+ * Matches the domain itself and its subdomains (e.g. `api.example.com`).
+ */
+export interface WebFetchRoute {
+  domain: string;
+  responseContentType?: string;
+}

libs/common/src/lib/config.ts

@@ -256,7 +256,7 @@ export const PROPERTY_SLACK_COMMUNITY_USERS = 'SLACK_COMMUNITY_USERS';
 export const PROPERTY_STRIPE_CONFIG = 'STRIPE_CONFIG';
 export const PROPERTY_SYSTEM_MESSAGE = 'SYSTEM_MESSAGE';
 export const PROPERTY_UPTIME = 'UPTIME';
-export const PROPERTY_WEB_FETCH_DOMAINS = 'WEB_FETCH_DOMAINS';
+export const PROPERTY_WEB_FETCH_ROUTES = 'WEB_FETCH_ROUTES';
 
 export const QUEUE_JOB_STATUS_LIST = [
   'active',