refactor: Relocate getMCPServerID and other utilities to proxy.ts, clean up utils.ts, and update imports

Author: jirispilka

package-lock.json

@@ -7,7 +7,7 @@ import log from '@apify/log';
 import { TimeoutError } from '../errors.js';
 import { getHttpStatusCode } from '../utils/logging.js';
 import { ACTORIZED_MCP_CONNECTION_TIMEOUT_MSEC } from './const.js';
-import { getMCPServerID } from './utils.js';
+import { getMCPServerID } from './proxy.js';
 
 /**
  * Creates and connects a ModelContextProtocol client.

src/mcp/client.ts

@@ -1,9 +1,38 @@
+import { createHash } from 'node:crypto';
+
 import type { Client } from '@modelcontextprotocol/sdk/client/index.js';
 
 import { fixedAjvCompile } from '../tools/utils.js';
 import type { ActorMcpTool, ToolEntry } from '../types.js';
 import { ajv } from '../utils/ajv.js';
-import { getMCPServerID, getProxyMCPServerToolName } from './utils.js';
+import { MAX_TOOL_NAME_LENGTH, SERVER_ID_LENGTH } from './const.js';
+
+/**
+ * Generates a unique server ID based on the provided URL.
+ *
+ * URL is used instead of Actor ID because one Actor may expose multiple servers - legacy SSE / streamable HTTP.
+ *
+ * @param url The URL to generate the server ID from.
+ * @returns A unique server ID.
+ */
+export function getMCPServerID(url: string): string {
+    const serverHashDigest = createHash('sha256').update(url).digest('hex');
+
+    return serverHashDigest.slice(0, SERVER_ID_LENGTH);
+}
+
+/**
+ * Generates a unique tool name based on the provided URL and tool name.
+ * @param url The URL to generate the tool name from.
+ * @param toolName The tool name to generate the tool name from.
+ * @returns A unique tool name.
+ */
+function getProxyMCPServerToolName(url: string, toolName: string): string {
+    const prefix = getMCPServerID(url);
+
+    const fullName = `${prefix}-${toolName}`;
+    return fullName.slice(0, MAX_TOOL_NAME_LENGTH);
+}
 
 export async function getMCPServerTools(
     actorID: string,

src/mcp/proxy.ts

@@ -1,4 +1,3 @@
-import { createHash } from 'node:crypto';
 import { parse } from 'node:querystring';
 
 import type { TaskStore } from '@modelcontextprotocol/sdk/experimental/tasks/interfaces.js';
@@ -7,34 +6,6 @@ import type { ApifyClient } from 'apify-client';
 import { processInput } from '../input.js';
 import type { ActorStore, Input, ServerMode } from '../types.js';
 import { loadToolsFromInput } from '../utils/tools_loader.js';
-import { MAX_TOOL_NAME_LENGTH, SERVER_ID_LENGTH } from './const.js';
-
-/**
- * Generates a unique server ID based on the provided URL.
- *
- * URL is used instead of Actor ID because one Actor may expose multiple servers - legacy SSE / streamable HTTP.
- *
- * @param url The URL to generate the server ID from.
- * @returns A unique server ID.
- */
-export function getMCPServerID(url: string): string {
-    const serverHashDigest = createHash('sha256').update(url).digest('hex');
-
-    return serverHashDigest.slice(0, SERVER_ID_LENGTH);
-}
-
-/**
- * Generates a unique tool name based on the provided URL and tool name.
- * @param url The URL to generate the tool name from.
- * @param toolName The tool name to generate the tool name from.
- * @returns A unique tool name.
- */
-export function getProxyMCPServerToolName(url: string, toolName: string): string {
-    const prefix = getMCPServerID(url);
-
-    const fullName = `${prefix}-${toolName}`;
-    return fullName.slice(0, MAX_TOOL_NAME_LENGTH);
-}
 
 /**
  * Process input parameters from URL and get tools

src/mcp/utils.ts

@@ -31,11 +31,9 @@ export type CallActorGetDatasetResult = {
  * It requires the `APIFY_TOKEN` environment variable to be set.
  * If the `APIFY_IS_AT_HOME` the dataset items are pushed to the Apify dataset.
  *
- * @param {string} actorName - The name of the Actor to call.
- * @param {unknown} input - The input to pass to the actor.
- * @param {ApifyClient} apifyClient - The Apify client to use for authentication.
  * @returns {Promise<CallActorGetDatasetResult | null>} - A promise that resolves to an object containing the actor run and dataset items.
  * @throws {Error} - Throws an error if the `APIFY_TOKEN` is not set
+ * @param options
  */
 export async function callActorGetDataset(options: {
     actorName: string;