decouple processParamsAndUpdateTools

Author: MQ37

src/input.ts

@@ -5,13 +5,17 @@ import type { Input } from './types.js';
  * @param originalInput
  * @returns input
  */
-export async function processInput(originalInput: Partial<Input>): Promise<Input> {
+export function processInput(originalInput: Partial<Input>): Input {
     const input = originalInput as Input;
 
     // actors can be a string or an array of strings
     if (input.actors && typeof input.actors === 'string') {
         input.actors = input.actors.split(',').map((format: string) => format.trim()) as string[];
     }
+    // Convert string boolean to actual boolean
+    if (input.enableActorAutoLoading && typeof input.enableActorAutoLoading === 'string') {
+        input.enableActorAutoLoading = input.enableActorAutoLoading === 'true';
+    }
     if (!input.enableActorAutoLoading) {
         input.enableActorAutoLoading = false;
     }

src/main.ts

@@ -26,7 +26,7 @@ if (!process.env.APIFY_TOKEN) {
 
 const mcpServer = new ApifyMcpServer();
 
-const input = await processInput((await Actor.getInput<Partial<Input>>()) ?? ({} as Input));
+const input = processInput((await Actor.getInput<Partial<Input>>()) ?? ({} as Input));
 log.info(`Loaded input: ${JSON.stringify(input)} `);
 
 if (isActorStandby()) {

src/mcp-server.ts

@@ -1,8 +1,6 @@
 /**
  * Model Context Protocol (MCP) server for Apify Actors
  */
-import type { ParsedUrlQuery } from 'node:querystring';
-import { parse } from 'node:querystring';
 
 import { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import type { Transport } from '@modelcontextprotocol/sdk/shared/transport.js';
@@ -20,10 +18,10 @@ import {
     SERVER_NAME,
     SERVER_VERSION,
 } from './const.js';
-import { processInput } from './input.js';
 import { log } from './logger.js';
 import { getActorAutoLoadingTools } from './tools/index.js';
-import type { Input, ActorTool, ToolWrap, InternalTool } from './types.js';
+import type { ActorTool, ToolWrap, InternalTool } from './types.js';
+import { parseInputParamsFromUrl } from './utils.js';
 
 /**
  * Create Apify MCP server
@@ -84,24 +82,27 @@ export class ApifyMcpServer {
         });
     }
 
+    public enableActorAutoLoading() {
+        this.updateTools(getActorAutoLoadingTools());
+        log.debug('Enabled Actor auto-loading tools');
+    }
+
     /**
      * Process input parameters and update tools
      * If URL contains query parameter actors, add tools from actors, otherwise add tools from default actors
      * @param url
      */
     public async processParamsAndUpdateTools(url: string) {
-        const params = parse(url.split('?')[1] || '') as ParsedUrlQuery;
-        delete params.token;
-        log.debug(`Received input parameters: ${JSON.stringify(params)}`);
-        const input = await processInput(params as unknown as Input);
+        const input = parseInputParamsFromUrl(url);
         if (input.actors) {
             await this.addToolsFromActors(input.actors as string[]);
         }
         if (input.enableActorAutoLoading) {
-            this.updateTools(getActorAutoLoadingTools());
+            this.enableActorAutoLoading();
         }
-        log.debug(`Server is running in STANDBY mode with the following Actors (tools): ${this.getToolNames()}.
-        To use different Actors, provide them in query parameter "actors" or include them in the Actor Task input.`);
+
+        log.debug(`Server is running in STANDBY mode with Actors: ${this.getToolNames()}. `
+            + 'To use different Actors, provide them in "actors" query param or Actor Task input.');
     }
 
     private setupToolHandlers(): void {

src/utils.ts

@@ -1,6 +1,15 @@
+import { parse } from 'node:querystring';
+
 import { Actor } from 'apify';
 
-import type { ActorRunData } from './types';
+import { processInput } from './input.js';
+import type { ActorRunData, Input } from './types';
+
+export function parseInputParamsFromUrl(url: string): Input {
+    const query = url.split('?')[1] || '';
+    const params = parse(query) as unknown as Input;
+    return processInput(params);
+}
 
 export function isActorStandby(): boolean {
     return Actor.getEnv().metaOrigin === 'STANDBY';

tests/utils-test.ts

@@ -0,0 +1,35 @@
+import { describe, it, expect } from 'vitest';
+
+import { parseInputParamsFromUrl } from '../src/utils.js';
+
+describe('parseInputParamsFromUrl', () => {
+    it('should parse actors from URL query params', () => {
+        const url = 'https://actors-mcp-server.apify.actor?token=123&actors=apify/web-scraper';
+        const result = parseInputParamsFromUrl(url);
+        expect(result.actors).toEqual(['apify/web-scraper']);
+    });
+
+    it('should parse multiple actors from URL', () => {
+        const url = 'https://actors-mcp-server.apify.actor?actors=apify/instagram-scraper,lukaskrivka/google-maps';
+        const result = parseInputParamsFromUrl(url);
+        expect(result.actors).toEqual(['apify/instagram-scraper', 'lukaskrivka/google-maps']);
+    });
+
+    it('should handle URL without query params', () => {
+        const url = 'https://actors-mcp-server.apify.actor';
+        const result = parseInputParamsFromUrl(url);
+        expect(result.actors).toBeUndefined();
+    });
+
+    it('should parse enableActorAutoLoading flag', () => {
+        const url = 'https://actors-mcp-server.apify.actor?enableActorAutoLoading=true';
+        const result = parseInputParamsFromUrl(url);
+        expect(result.enableActorAutoLoading).toBe(true);
+    });
+
+    it('should handle actors as string parameter', () => {
+        const url = 'https://actors-mcp-server.apify.actor?actors=apify/rag-web-browser';
+        const result = parseInputParamsFromUrl(url);
+        expect(result.actors).toEqual(['apify/rag-web-browser']);
+    });
+});