run unit only by default, add more stdio tests, fix concurrency in actor server tests

Author: MQ37

package.json

@@ -66,7 +66,7 @@
     "build:watch": "tsc -b src -w",
     "type-check": "tsc --noEmit",
     "inspector": "npm run build && npx @modelcontextprotocol/inspector dist/stdio.js",
-    "test": "npm run build && vitest run",
+    "test": "npm run test:unit",
     "test:unit": "vitest run tests/unit",
     "test:integration": "npm run build && vitest run tests/integration",
     "clean": "tsc -b src --clean"

src/const.ts

@@ -34,6 +34,14 @@ export const defaults = {
         'apify/rag-web-browser',
         'lukaskrivka/google-maps-with-contact-details',
     ],
+    helperTools: [
+        HelperTools.SEARCH_ACTORS,
+        HelperTools.GET_ACTOR_DETAILS,
+    ],
+    actorAddingTools: [
+        HelperTools.ADD_ACTOR,
+        HelperTools.REMOVE_ACTOR,
+    ],
     enableActorAutoLoading: false,
     maxMemoryMbytes: 4096,
 };

tests/integration/actor-server-test.ts

@@ -9,7 +9,9 @@ import { createExpressApp } from '../../src/actor/server.js';
 import { HelperTools } from '../../src/const.js';
 import { ActorsMcpServer } from '../../src/mcp/server.js';
 
-describe('Actors MCP Server', () => {
+describe('Actors MCP Server', {
+    concurrent: false, // Run test serially to prevent port already in use
+}, () => {
     let app: Express;
     let server: ActorsMcpServer;
     let httpServer: HttpServer;

tests/integration/stdio.ts

@@ -1,11 +1,14 @@
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-import { afterEach, beforeEach, describe, expect, it } from 'vitest';
+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;
+        actors?: string[];
+        enableAddingActors?: boolean;
     },
 ): Promise<Client> {
     if (!process.env.APIFY_TOKEN) {
@@ -36,24 +39,129 @@ async function createMCPClient(
 }
 
 describe('MCP STDIO', () => {
-    let client: Client;
-    beforeEach(async () => {
-        client = await createMCPClient();
+    it('list default tools', async () => {
+        const client = await createMCPClient();
+        const tools = await client.listTools();
+        const names = tools.tools.map((tool) => tool.name);
+
+        expect(names.length).toEqual(defaults.actors.length + defaults.helperTools.length);
+        for (const tool of defaults.helperTools) {
+            expect(names).toContain(tool);
+        }
+        for (const actor of defaults.actors) {
+            expect(names).toContain(actorNameToToolName(actor));
+        }
+        await client.close();
     });
 
-    afterEach(async () => {
+    it('use only apify/python-example Actor and call it', async () => {
+        const actorName = 'apify/python-example';
+        const selectedToolName = actorNameToToolName(actorName);
+        const client = await createMCPClient({
+            actors: [actorName],
+            enableAddingActors: false,
+        });
+        const tools = await client.listTools();
+        const names = tools.tools.map((tool) => tool.name);
+        expect(names.length).toEqual(defaults.helperTools.length + 1);
+        for (const tool of defaults.helperTools) {
+            expect(names).toContain(tool);
+        }
+        expect(names).toContain(selectedToolName);
+
+        const result = await client.callTool({
+            name: selectedToolName,
+            arguments: {
+                first_number: 1,
+                second_number: 2,
+            },
+        });
+
+        expect(result).toEqual({
+            content: [{
+                text: JSON.stringify({
+                    first_number: 1,
+                    second_number: 2,
+                    sum: 3,
+                }),
+                type: 'text',
+            }],
+        });
+
         await client.close();
     });
 
-    it('list default tools', async () => {
+    it('load Actors from parameters', async () => {
+        const actors = ['apify/rag-web-browser', 'apify/instagram-scraper'];
+        const client = await createMCPClient({
+            actors,
+            enableAddingActors: false,
+        });
         const tools = await client.listTools();
         const names = tools.tools.map((tool) => tool.name);
+        expect(names.length).toEqual(defaults.helperTools.length + actors.length);
+        for (const tool of defaults.helperTools) {
+            expect(names).toContain(tool);
+        }
+        for (const actor of actors) {
+            expect(names).toContain(actorNameToToolName(actor));
+        }
 
-        expect(names.length).toEqual(5);
-        expect(names).toContain('search-actors');
-        expect(names).toContain('get-actor-details');
-        expect(names).toContain('apify-slash-rag-web-browser');
-        expect(names).toContain('apify-slash-instagram-scraper');
-        expect(names).toContain('lukaskrivka-slash-google-maps-with-contact-details');
+        await client.close();
+    });
+
+    it('load Actor dynamically and call it', async () => {
+        const actor = 'apify/python-example';
+        const selectedToolName = actorNameToToolName(actor);
+        const client = await createMCPClient({
+            enableAddingActors: true,
+        });
+        const tools = await client.listTools();
+        const names = tools.tools.map((tool) => tool.name);
+        expect(names.length).toEqual(defaults.helperTools.length + defaults.actorAddingTools.length + defaults.actors.length);
+        for (const tool of defaults.helperTools) {
+            expect(names).toContain(tool);
+        }
+        for (const tool of defaults.actorAddingTools) {
+            expect(names).toContain(tool);
+        }
+        for (const actorTool of defaults.actors) {
+            expect(names).toContain(actorNameToToolName(actorTool));
+        }
+
+        // Add Actor dynamically
+        await client.callTool({
+            name: HelperTools.ADD_ACTOR,
+            arguments: {
+                actorName: actor,
+            },
+        });
+
+        // Check if tools was added
+        const toolsAfterAdd = await client.listTools();
+        const namesAfterAdd = toolsAfterAdd.tools.map((tool) => tool.name);
+        expect(namesAfterAdd.length).toEqual(defaults.helperTools.length + defaults.actorAddingTools.length + defaults.actors.length + 1);
+        expect(namesAfterAdd).toContain(selectedToolName);
+
+        const result = await client.callTool({
+            name: selectedToolName,
+            arguments: {
+                first_number: 1,
+                second_number: 2,
+            },
+        });
+
+        expect(result).toEqual({
+            content: [{
+                text: JSON.stringify({
+                    first_number: 1,
+                    second_number: 2,
+                    sum: 3,
+                }),
+                type: 'text',
+            }],
+        });
+
+        await client.close();
     });
 });

vitest.config.ts

@@ -7,5 +7,6 @@ export default defineConfig({
         globals: true,
         environment: 'node',
         include: ['tests/**/*.ts'],
+        testTimeout: 60_000, // 1 minute
     },
 });