improve

Author: MQ37

src/index.ts

@@ -2,3 +2,6 @@
  This file provides essential functions for constructing HTTP and MCP servers, effectively serving as a library.
  Acts as a library entrypoint.
 */
+
+export { createExpressApp } from './server.js';
+export { ApifyMcpServer } from './mcp-server.js';

src/main.ts

@@ -8,7 +8,7 @@ import type { ActorCallOptions } from 'apify-client';
 import { processInput } from './input.js';
 import { log } from './logger.js';
 import { ApifyMcpServer } from './mcp-server.js';
-import { createServerApp } from './server.js';
+import { createExpressApp } from './server.js';
 import { getActorDiscoveryTools, getActorAutoLoadingTools } from './tools.js';
 import type { Input } from './types.js';
 import { isActorStandby } from './utils.js';
@@ -52,7 +52,7 @@ const input = await processInput((await Actor.getInput<Partial<Input>>()) ?? ({}
 log.info(`Loaded input: ${JSON.stringify(input)} `);
 
 if (isActorStandby()) {
-    const app = createServerApp(HOST, mcpServer, actorRunData);
+    const app = createExpressApp(HOST, mcpServer, actorRunData);
     log.info('Actor is running in the STANDBY mode.');
     await mcpServer.addToolsFromDefaultActors();
     mcpServer.updateTools(getActorDiscoveryTools());

src/mcp-server.ts

@@ -149,6 +149,26 @@ export class ApifyMcpServer {
         });
     }
 
+    /**
+     * 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);
+        if (input.actors) {
+            await this.addToolsFromActors(input.actors as string[]);
+        }
+        if (input.enableActorAutoLoading) {
+            this.updateTools(getActorAutoLoadingTools());
+        }
+        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.`);
+    }
+
     private setupToolHandlers(): void {
         this.server.setRequestHandler(ListToolsRequestSchema, async () => {
             return { tools: Array.from(this.tools.values()) };
@@ -228,23 +248,3 @@ export class ApifyMcpServer {
         await this.server.connect(transport);
     }
 }
-
-/**
- * Process input parameters and update tools
- * If URL contains query parameter actors, add tools from actors, otherwise add tools from default actors
- * @param url
- */
-export async function processParamsAndUpdateTools(url: string, mcpServer: ApifyMcpServer) {
-    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);
-    if (input.actors) {
-        await mcpServer.addToolsFromActors(input.actors as string[]);
-    }
-    if (input.enableActorAutoLoading) {
-        mcpServer.updateTools(getActorAutoLoadingTools());
-    }
-    log.debug(`Server is running in STANDBY mode with the following Actors (tools): ${mcpServer.getToolNames()}.
-    To use different Actors, provide them in query parameter "actors" or include them in the Actor Task input.`);
-}

src/server.ts

@@ -4,9 +4,9 @@ import express from 'express';
 
 import { HEADER_READINESS_PROBE, Routes } from './const.js';
 import { log } from './logger.js';
-import { type ApifyMcpServer, processParamsAndUpdateTools } from './mcp-server.js';
+import { type ApifyMcpServer } from './mcp-server.js';
 
-export function createServerApp(host: string,
+export function createExpressApp(host: string,
     mcpServer: ApifyMcpServer,
     additionalData?: object): express.Express {
     const HELP_MESSAGE = `Connect to the server with GET request to ${host}/sse?token=YOUR-APIFY-TOKEN`
@@ -25,7 +25,7 @@ export function createServerApp(host: string,
             }
             try {
                 log.info(`Received GET message at: ${Routes.ROOT}`);
-                await processParamsAndUpdateTools(req.url, mcpServer);
+                await mcpServer.processParamsAndUpdateTools(req.url);
                 res.setHeader('Content-Type', 'text/event-stream');
                 res.setHeader('Cache-Control', 'no-cache');
                 res.setHeader('Connection', 'keep-alive');
@@ -43,7 +43,7 @@ export function createServerApp(host: string,
         .get(async (req: Request, res: Response) => {
             try {
                 log.info(`Received GET message at: ${Routes.SSE}`);
-                await processParamsAndUpdateTools(req.url, mcpServer);
+                await mcpServer.processParamsAndUpdateTools(req.url);
                 transport = new SSEServerTransport(Routes.MESSAGE, res);
                 await mcpServer.connect(transport);
             } catch (error) {