organize, fix passing of apify token

Author: MQ37

src/actor/server.ts

@@ -9,7 +9,7 @@ import express from 'express';
 import log from '@apify/log';
 
 import { HEADER_READINESS_PROBE, Routes } from './const.js';
-import { type ActorsMcpServer } from '../mcp/mcp-server.js';
+import { type ActorsMcpServer } from '../mcp/server.js';
 import { getActorRunData } from './utils.js';
 import { processParamsGetTools } from '../mcp/utils.js';
 

src/tools/mcp-apify-client.ts renamed to src/apify-client.ts

@@ -3,7 +3,7 @@ import type { ApifyClientOptions } from 'apify';
 import { ApifyClient as _ApifyClient } from 'apify-client';
 import type { AxiosRequestConfig } from 'axios';
 
-import { USER_AGENT_ORIGIN } from '../const.js';
+import { USER_AGENT_ORIGIN } from './const.js';
 
 /**
  * Adds a User-Agent header to the request config.

src/index.ts

@@ -1,7 +1,8 @@
+
 /*
  This file provides essential functions and tools for MCP servers, serving as a library.
  The ActorsMcpServer should be the only class exported from the package
 */
 
-import { ActorsMcpServer } from './mcp/mcp-server.js';
+import { ActorsMcpServer } from './mcp/server.js';
 export default ActorsMcpServer;

src/main.ts

@@ -1,3 +1,4 @@
+
 /**
  * Serves as an Actor MCP SSE server entry point.
  * This file needs to be named `main.ts` to be recognized by the Apify platform.
@@ -11,7 +12,7 @@ import log from '@apify/log';
 import { processInput } from './input.js';
 import { createExpressApp } from './actor/server.js';
 import type { Input } from './types.js';
-import { ActorsMcpServer } from './mcp/mcp-server.js';
+import { ActorsMcpServer } from './mcp/server.js';
 import { actorDefinitionTool, addTool, removeTool, searchTool, callActorGetDataset } from './tools/index.js';
 
 const STANDBY_MODE = Actor.getEnv().metaOrigin === 'STANDBY';

src/mcp/mcp-server.ts renamed to src/mcp/server.ts

@@ -18,7 +18,7 @@ import minimist from 'minimist';
 import log from '@apify/log';
 
 import { defaults } from './const.js';
-import { ActorsMcpServer } from './mcp/mcp-server.js';
+import { ActorsMcpServer } from './mcp/server.js';
 import { addTool, removeTool, getActorsAsTools } from './tools/index.js';
 
 // Configure logging, set to ERROR

src/stdio.ts

@@ -6,7 +6,7 @@ import log from '@apify/log';
 import type { ToolWrap } from '../types.js';
 import { getActorDefinition } from './build.js';
 import { ACTOR_ADDITIONAL_INSTRUCTIONS, ACTOR_MAX_MEMORY_MBYTES } from '../const.js';
-import { ApifyClient } from './mcp-apify-client.js';
+import { ApifyClient } from '../apify-client.js';
 import {
     actorNameToToolName,
     addEnumsToDescriptionsWithExamples,
@@ -79,9 +79,16 @@ export async function callActorGetDataset(
  * @param {string[]} actors - An array of actor IDs or Actor full names.
  * @returns {Promise<Tool[]>} - A promise that resolves to an array of MCP tools.
  */
-export async function getNormalActorsAsTools(actors: string[]): Promise<ToolWrap[]> {
+export async function getNormalActorsAsTools(
+    actors: string[],
+    apifyToken: string,
+): Promise<ToolWrap[]> {
     const ajv = new Ajv({ coerceTypes: 'array', strict: false });
-    const results = await Promise.all(actors.map(getActorDefinition));
+    const getActorDefinitionWithToken = async (actorId: string) => {
+        const actor = await getActorDefinition(actorId, apifyToken);
+        return actor;
+    };
+    const results = await Promise.all(actors.map(getActorDefinitionWithToken));
     const tools: ToolWrap[] = [];
     for (const result of results) {
         if (result) {
@@ -153,7 +160,7 @@ export async function getActorsAsTools(
     console.log('toolActors', toolActors);
 
     // Normal Actors as a tool
-    const normalTools = await getNormalActorsAsTools(toolActors);
+    const normalTools = await getNormalActorsAsTools(toolActors, apifyToken);
 
     // Tools from Actorized MCP servers
     const mcpServerTools = await getMCPServersAsTools(actorsMCPServer, apifyToken);

src/tools/actor.ts

@@ -1,5 +1,5 @@
 import { Ajv } from 'ajv';
-import { ApifyClient } from 'apify-client';
+import { ApifyClient } from '../apify-client.js';
 import { z } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 
@@ -19,8 +19,12 @@ const ajv = new Ajv({ coerceTypes: 'array', strict: false });
  * @param {number} limit - Truncate the README to this limit.
  * @returns {Promise<ActorDefinitionWithDesc | null>} - The actor definition with description or null if not found.
  */
-export async function getActorDefinition(actorIdOrName: string, limit: number = ACTOR_README_MAX_LENGTH): Promise<ActorDefinitionPruned | null> {
-    const client = new ApifyClient({ token: process.env.APIFY_TOKEN });
+export async function getActorDefinition(
+    actorIdOrName: string,
+    apifyToken: string,
+    limit: number = ACTOR_README_MAX_LENGTH
+): Promise<ActorDefinitionPruned | null> {
+    const client = new ApifyClient({ token: apifyToken });
     const actorClient = client.actor(actorIdOrName);
     try {
         // Fetch actor details
@@ -114,10 +118,10 @@ export const actorDefinitionTool: ToolWrap = {
         inputSchema: zodToJsonSchema(GetActorDefinitionArgsSchema),
         ajvValidate: ajv.compile(zodToJsonSchema(GetActorDefinitionArgsSchema)),
         call: async (toolArgs) => {
-            const { args } = toolArgs;
+            const { args, apifyToken } = toolArgs;
 
             const parsed = GetActorDefinitionArgsSchema.parse(args);
-            const v = await getActorDefinition(parsed.actorName, parsed.limit);
+            const v = await getActorDefinition(parsed.actorName, apifyToken, parsed.limit);
             if (v && v.input && 'properties' in v.input && v.input) {
                 const properties = filterSchemaProperties(v.input.properties as { [key: string]: ISchemaProperties });
                 v.input.properties = shortenProperties(properties);

src/tools/build.ts

@@ -1,6 +1,6 @@
 import { Ajv } from 'ajv';
 import type { ActorStoreList } from 'apify-client';
-import { ApifyClient } from 'apify-client';
+import { ApifyClient } from '../apify-client.js';
 import { z } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 
@@ -35,10 +35,11 @@ function pruneActorStoreInfo(response: ActorStoreList): ActorStorePruned {
 
 export async function searchActorsByKeywords(
     search: string,
+    apifyToken: string,
     limit: number | undefined = undefined,
     offset: number | undefined = undefined,
 ): Promise<ActorStorePruned[] | null> {
-    const client = new ApifyClient({ token: process.env.APIFY_TOKEN });
+    const client = new ApifyClient({ token: apifyToken });
     const results = await client.store().list({ search, limit, offset });
     return results.items.map((x) => pruneActorStoreInfo(x));
 }
@@ -80,10 +81,11 @@ export const searchTool: ToolWrap = {
         inputSchema: zodToJsonSchema(SearchToolArgsSchema),
         ajvValidate: ajv.compile(zodToJsonSchema(SearchToolArgsSchema)),
         call: async (toolArgs) => {
-            const { args } = toolArgs;
+            const { args, apifyToken } = toolArgs;
             const parsed = SearchToolArgsSchema.parse(args);
             const actors = await searchActorsByKeywords(
                 parsed.search,
+                apifyToken,
                 parsed.limit,
                 parsed.offset,
             );

src/tools/store_collection.ts

@@ -3,7 +3,7 @@ import type { Server } from '@modelcontextprotocol/sdk/server/index.js';
 import type { ValidateFunction } from 'ajv';
 import type { ActorDefaultRunOptions, ActorDefinition } from 'apify-client';
 
-import type { ActorsMcpServer } from './mcp/mcp-server.js';
+import type { ActorsMcpServer } from './mcp/server.js';
 
 export interface ISchemaProperties {
     type: string;