fix: tests

Author: MichalKalita

src/mcp/server.ts

@@ -53,10 +53,7 @@ export class ActorsMcpServer {
     private sigintHandler: (() => Promise<void>) | undefined;
 
     constructor(options: ActorsMcpServerOptions, setupSigintHandler = true) {
-        this.options = {
-            enableDefaultActors: options.enableDefaultActors ?? false, // Default to true for backward compatibility
-            ...options,
-        };
+        this.options = options;
         this.server = new Server(
             {
                 name: SERVER_NAME,

src/mcp/utils.ts

@@ -1,7 +1,7 @@
 import { createHash } from 'node:crypto';
 import { parse } from 'node:querystring';
 
-import { McpOptions, processInput } from '../input.js';
+import { type McpOptions, processInput } from '../input.js';
 import { loadToolsFromInput } from '../utils/tools-loader.js';
 import { MAX_TOOL_NAME_LENGTH, SERVER_ID_LENGTH } from './const.js';
 

src/tools/build.ts

@@ -62,25 +62,23 @@ export function processActorDefinition(
     limit: number,
     fullActorSchema: boolean,
 ): ActorDefinitionPruned {
+    let input;
+    if (definition?.input && 'type' in definition.input && 'properties' in definition.input) {
+        input = {
+            ...definition.input,
+            type: definition.input.type as string,
+            properties: definition.input.properties as Record<string, ISchemaProperties>,
+        };
+        if (!fullActorSchema) {
+            input = separateAdvancedInputs(input);
+        }
+    }
     return {
         id: actor.id,
         actorFullName: `${actor.username}/${actor.name}`,
         buildTag: definition?.buildTag || '',
         readme: truncateActorReadme(definition.readme || '', limit),
-        input: definition?.input && 'type' in definition.input && 'properties' in definition.input
-            ? (!fullActorSchema
-                ? {
-                    ...definition.input,
-                    type: definition.input.type as string,
-                    properties: definition.input.properties as Record<string, ISchemaProperties>,
-                }
-                : separateAdvancedInputs({
-                    ...definition.input,
-                    type: definition.input.type as string,
-                    properties: definition.input.properties as Record<string, ISchemaProperties>,
-                })
-            )
-            : undefined,
+        input,
         description: actor.description || '',
         defaultRunOptions: actor.defaultRunOptions,
         webServerMcpPath: 'webServerMcpPath' in definition ? definition.webServerMcpPath as string : undefined,

tests/helpers.ts

@@ -5,23 +5,17 @@ import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/
 import { expect } from 'vitest';
 
 import { HelperTools } from '../src/const.js';
-import type { ToolCategory } from '../src/types.js';
-
-export interface McpClientOptions {
-    actors?: string[];
-    enableAddingActors?: boolean;
-    tools?: ToolCategory[]; // Tool categories to include
-}
+import type { McpOptions } from '../src/input.js';
 
 export async function createMcpSseClient(
     serverUrl: string,
-    options?: McpClientOptions,
+    options?: Partial<McpOptions>,
 ): Promise<Client> {
     if (!process.env.APIFY_TOKEN) {
         throw new Error('APIFY_TOKEN environment variable is not set.');
     }
     const url = new URL(serverUrl);
-    const { actors, enableAddingActors, tools } = options || {};
+    const { actors, enableAddingActors, tools, fullActorSchema } = options || {};
     if (actors) {
         url.searchParams.append('actors', actors.join(','));
     }
@@ -31,6 +25,9 @@ export async function createMcpSseClient(
     if (tools && tools.length > 0) {
         url.searchParams.append('tools', tools.join(','));
     }
+    if (fullActorSchema !== undefined) {
+        url.searchParams.append('fullActorSchema', fullActorSchema.toString());
+    }
 
     const transport = new SSEClientTransport(
         url,
@@ -54,13 +51,13 @@ export async function createMcpSseClient(
 
 export async function createMcpStreamableClient(
     serverUrl: string,
-    options?: McpClientOptions,
+    options?: Partial<McpOptions>,
 ): Promise<Client> {
     if (!process.env.APIFY_TOKEN) {
         throw new Error('APIFY_TOKEN environment variable is not set.');
     }
     const url = new URL(serverUrl);
-    const { actors, enableAddingActors, tools } = options || {};
+    const { actors, enableAddingActors, tools, fullActorSchema } = options || {};
     if (actors) {
         url.searchParams.append('actors', actors.join(','));
     }
@@ -70,6 +67,9 @@ export async function createMcpStreamableClient(
     if (tools && tools.length > 0) {
         url.searchParams.append('tools', tools.join(','));
     }
+    if (fullActorSchema !== undefined) {
+        url.searchParams.append('fullActorSchema', fullActorSchema.toString());
+    }
 
     const transport = new StreamableHTTPClientTransport(
         url,

tests/integration/suite.ts

@@ -73,7 +73,7 @@ export function createIntegrationTestsSuite(
         beforeAll(beforeAllFn);
     }
     if (afterAllFn) {
-        afterAll(afterAllFn);
+        afterAll(afterAllFn, 60000);
     }
     if (beforeEachFn) {
         beforeEach(beforeEachFn);
@@ -487,7 +487,7 @@ export function createIntegrationTestsSuite(
         });
 
         it(`should make ${ADVANCED_INPUT_KEY} in Actor properties available`, async () => {
-            const client = await createClientFn({ enableAddingActors: true, fullActorSchema: true });
+            const client = await createClientFn({ enableAddingActors: true, fullActorSchema: false });
             await client.callTool({ name: HelperTools.ACTOR_ADD, arguments: { actor: 'compass/crawler-google-places' } });
             // Get input type for actor 'compass-slash-crawler-google-places'
             const tools = await client.listTools();
@@ -508,7 +508,7 @@ export function createIntegrationTestsSuite(
         });
 
         it(`should not create ${ADVANCED_INPUT_KEY} if is disabled`, async () => {
-            const client = await createClientFn({ enableAddingActors: true, fullActorSchema: false });
+            const client = await createClientFn({ enableAddingActors: true, fullActorSchema: true });
             await client.callTool({ name: HelperTools.ACTOR_ADD, arguments: { actor: 'compass/crawler-google-places' } });
             const tools = await client.listTools();
             const googlePlacesTool = tools.tools.find((tool) => tool.name === 'compass-slash-crawler-google-places');