remove double updateTools main.ts call, extend ApifyClient with MCP user agent request interceptor

Author: MQ37

src/main.ts

@@ -35,7 +35,6 @@ if (STANDBY_MODE) {
     const app = createExpressApp(HOST, mcpServer);
     log.info('Actor is running in the STANDBY mode.');
     const tools = [searchTool, actorDefinitionTool];
-    mcpServer.updateTools([searchTool, actorDefinitionTool]);
     if (input.enableActorAutoLoading) {
         tools.push(addTool, removeTool);
     }

src/tools/actor.ts

@@ -1,14 +1,12 @@
 import { Ajv } from 'ajv';
-import type { ApifyClientOptions } from 'apify';
 import type { ActorCallOptions } from 'apify-client';
-import { ApifyClient } from 'apify-client';
-import type { AxiosRequestConfig } from 'axios';
 
 import log from '@apify/log';
 
 import type { ToolWrap } from '../types.js';
 import { getActorDefinition } from './build.js';
-import { ACTOR_ADDITIONAL_INSTRUCTIONS, ACTOR_MAX_MEMORY_MBYTES, USER_AGENT_ORIGIN } from '../const.js';
+import { ACTOR_ADDITIONAL_INSTRUCTIONS, ACTOR_MAX_MEMORY_MBYTES } from '../const.js';
+import { ApifyClient } from './mcp-apify-client.js';
 import {
     actorNameToToolName,
     addEnumsToDescriptionsWithExamples,
@@ -18,18 +16,6 @@ import {
     shortenProperties,
 } from './utils.js';
 
-/**
- * Adds a User-Agent header to the request config.
- * @param config
- * @private
- */
-export function addUserAgent(config: AxiosRequestConfig): AxiosRequestConfig {
-    const updatedConfig = { ...config };
-    updatedConfig.headers = updatedConfig.headers ?? {};
-    updatedConfig.headers['User-Agent'] = `${updatedConfig.headers['User-Agent'] ?? ''}; ${USER_AGENT_ORIGIN}`;
-    return updatedConfig;
-}
-
 /**
  * Calls an Apify actor and retrieves the dataset items.
  *
@@ -54,8 +40,7 @@ export async function callActorGetDataset(
     try {
         log.info(`Calling Actor ${name} with input: ${JSON.stringify(input)}`);
 
-        const options: ApifyClientOptions = { requestInterceptors: [addUserAgent] };
-        const client = new ApifyClient({ ...options, token: apifyToken });
+        const client = new ApifyClient({ token: apifyToken });
         const actorClient = client.actor(name);
 
         const results = await actorClient.call(input, callOptions);

src/tools/mcp-apify-client.ts

@@ -0,0 +1,26 @@
+import type { ApifyClientOptions } from 'apify';
+import { ApifyClient as _ApifyClient } from 'apify-client';
+import type { AxiosRequestConfig } from 'axios';
+
+import { USER_AGENT_ORIGIN } from '../const.js';
+
+/**
+ * Adds a User-Agent header to the request config.
+ * @param config
+ * @private
+ */
+function addUserAgent(config: AxiosRequestConfig): AxiosRequestConfig {
+    const updatedConfig = { ...config };
+    updatedConfig.headers = updatedConfig.headers ?? {};
+    updatedConfig.headers['User-Agent'] = `${updatedConfig.headers['User-Agent'] ?? ''}; ${USER_AGENT_ORIGIN}`;
+    return updatedConfig;
+}
+
+export class ApifyClient extends _ApifyClient {
+    constructor(options: ApifyClientOptions) {
+        super({
+            ...options,
+            requestInterceptors: [addUserAgent],
+        });
+    }
+}