unify default tools loading

Author: MQ37

src/const.ts

@@ -30,9 +30,7 @@ export enum HelperTools {
 
 export const defaults = {
     actors: [
-        'apify/instagram-scraper',
         'apify/rag-web-browser',
-        'lukaskrivka/google-maps-with-contact-details',
     ],
     helperTools: [
         HelperTools.SEARCH_ACTORS,
@@ -42,8 +40,6 @@ export const defaults = {
         HelperTools.ADD_ACTOR,
         HelperTools.REMOVE_ACTOR,
     ],
-    enableActorAutoLoading: false,
-    maxMemoryMbytes: 4096,
 };
 
 export const APIFY_USERNAME = 'apify';

tests/README.md

@@ -6,6 +6,11 @@ This directory contains **unit** and **integration** tests for the `actors-mcp-s
 
 Unit tests are located in the `tests/unit` directory.
 
+To run the unit tests, you can use the following command:
+```bash
+npm run test:unit
+```
+
 # Integration Tests
 
 Integration tests are located in the `tests/integration` directory.
@@ -17,3 +22,8 @@ apify/rag-web-browser
 apify/instagram-scraper
 apify/python-example
 ```
+
+To run the integration tests, you can use the following command:
+```bash
+APIFY_TOKEN=your_token npm run test:integration
+```

tests/helpers.ts

@@ -1,5 +1,6 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { SSEClientTransport } from '@modelcontextprotocol/sdk/client/sse.js';
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { StreamableHTTPClientTransport } from '@modelcontextprotocol/sdk/client/streamableHttp.js';
 
 export async function createMCPSSEClient(
@@ -79,3 +80,36 @@ export async function createMCPStreamableClient(
 
     return client;
 }
+
+export async function createMCPStdioClient(
+    options?: {
+        actors?: string[];
+        enableAddingActors?: boolean;
+    },
+): Promise<Client> {
+    if (!process.env.APIFY_TOKEN) {
+        throw new Error('APIFY_TOKEN environment variable is not set.');
+    }
+    const { actors, enableAddingActors } = options || {};
+    const args = ['dist/stdio.js'];
+    if (actors) {
+        args.push('--actors', actors.join(','));
+    }
+    if (enableAddingActors) {
+        args.push('--enable-adding-actors');
+    }
+    const transport = new StdioClientTransport({
+        command: 'node',
+        args,
+        env: {
+            APIFY_TOKEN: process.env.APIFY_TOKEN as string,
+        },
+    });
+    const client = new Client({
+        name: 'stdio-client',
+        version: '1.0.0',
+    });
+    await client.connect(transport);
+
+    return client;
+}

tests/integration/actor.server.test.ts

@@ -20,6 +20,7 @@ describe('Actors MCP Server SSE', {
     let httpServer: HttpServer;
     const testPort = 50000;
     const testHost = `http://localhost:${testPort}`;
+    const serverStartWaitTimeMillis = 100;
 
     beforeEach(async () => {
         // same as in main.ts
@@ -36,11 +37,12 @@ describe('Actors MCP Server SSE', {
 
         // Start test server
         await new Promise<void>((resolve) => {
-            httpServer = app.listen(testPort, () => resolve());
+            httpServer = app.listen(testPort, () => {
+                // Wait for the server to be fully initialized
+                // TODO: figure out why this is needed
+                setTimeout(() => resolve(), serverStartWaitTimeMillis);
+            });
         });
-
-        // TODO: figure out why this is needed
-        await new Promise<void>((resolve) => { setTimeout(resolve, 1000); });
     });
 
     afterEach(async () => {

tests/integration/stdio.test.ts

@@ -1,46 +1,12 @@
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { describe, expect, it } from 'vitest';
 
 import { defaults, HelperTools } from '../../src/const.js';
 import { actorNameToToolName } from '../../src/tools/utils.js';
-
-async function createMCPClient(
-    options?: {
-        actors?: string[];
-        enableAddingActors?: boolean;
-    },
-): Promise<Client> {
-    if (!process.env.APIFY_TOKEN) {
-        throw new Error('APIFY_TOKEN environment variable is not set.');
-    }
-    const { actors, enableAddingActors } = options || {};
-    const args = ['dist/stdio.js'];
-    if (actors) {
-        args.push('--actors', actors.join(','));
-    }
-    if (enableAddingActors) {
-        args.push('--enable-adding-actors');
-    }
-    const transport = new StdioClientTransport({
-        command: 'node',
-        args,
-        env: {
-            APIFY_TOKEN: process.env.APIFY_TOKEN as string,
-        },
-    });
-    const client = new Client({
-        name: 'stdio-client',
-        version: '1.0.0',
-    });
-    await client.connect(transport);
-
-    return client;
-}
+import { createMCPStdioClient } from '../helpers.js';
 
 describe('MCP STDIO', () => {
     it('list default tools', async () => {
-        const client = await createMCPClient();
+        const client = await createMCPStdioClient();
         const tools = await client.listTools();
         const names = tools.tools.map((tool) => tool.name);
 
@@ -57,7 +23,7 @@ describe('MCP STDIO', () => {
     it('use only apify/python-example Actor and call it', async () => {
         const actorName = 'apify/python-example';
         const selectedToolName = actorNameToToolName(actorName);
-        const client = await createMCPClient({
+        const client = await createMCPStdioClient({
             actors: [actorName],
             enableAddingActors: false,
         });
@@ -93,7 +59,7 @@ describe('MCP STDIO', () => {
 
     it('load Actors from parameters', async () => {
         const actors = ['apify/rag-web-browser', 'apify/instagram-scraper'];
-        const client = await createMCPClient({
+        const client = await createMCPStdioClient({
             actors,
             enableAddingActors: false,
         });
@@ -113,7 +79,7 @@ describe('MCP STDIO', () => {
     it('load Actor dynamically and call it', async () => {
         const actor = 'apify/python-example';
         const selectedToolName = actorNameToToolName(actor);
-        const client = await createMCPClient({
+        const client = await createMCPStdioClient({
             enableAddingActors: true,
         });
         const tools = await client.listTools();
@@ -168,7 +134,7 @@ describe('MCP STDIO', () => {
     it('should remove Actor from tools list', async () => {
         const actor = 'apify/python-example';
         const selectedToolName = actorNameToToolName(actor);
-        const client = await createMCPClient({
+        const client = await createMCPStdioClient({
             actors: [actor],
             enableAddingActors: true,
         });