move cache to top, rename var and add clarification, add search

integration test

Author: MQ37

src/mcp/actors.ts

@@ -56,7 +56,6 @@ export async function getActorStandbyURL(actorID: string, apifyToken: string, st
     return `https://${actorRealID}.${standbyBaseUrl}`;
 }
 
-// TODO: optimize this to only use /builds/default endpoint with Actor name replacing / with ~
 export async function getActorDefinition(actorID: string, apifyToken: string): Promise<ActorDefinition> {
     const apifyClient = new ApifyClient({ token: apifyToken });
     const actor = apifyClient.actor(actorID);

src/tools/actor.ts

@@ -21,6 +21,12 @@ import {
     shortenProperties,
 } from './utils.js';
 
+
+// Cache for normal Actor tools
+const normalActorToolsCache = new LruCache<ToolCacheEntry>({
+    maxLength: TOOL_CACHE_MAX_SIZE,
+});
+
 /**
  * Calls an Apify actor and retrieves the dataset items.
  *
@@ -59,10 +65,6 @@ export async function callActorGetDataset(
     }
 }
 
-// Cache for normal Actor tools
-const normalActorToolsCache = new LruCache<ToolCacheEntry>({
-    maxLength: TOOL_CACHE_MAX_SIZE,
-});
 /**
  * This function is used to fetch normal non-MCP server Actors as a tool.
  *
@@ -111,7 +113,11 @@ export async function getNormalActorsAsTools(
     // Zip the results with their corresponding actorIDs
     for (let i = 0; i < results.length; i++) {
         const result = results[i];
-        const actorID = actorsToLoad[i];
+        // We need to get the orignal input from the user
+        // sonce the user can input real Actor ID like '3ox4R101TgZz67sLr' instead of
+        // 'username/actorName' even though we encourage that.
+        // And the getActorDefinition does not return the original input it received, just the actorFullName or actorID
+        const actorIDOrName = actorsToLoad[i];
 
         if (result) {
             if (result.input && 'properties' in result.input && result.input) {
@@ -135,7 +141,7 @@ export async function getNormalActorsAsTools(
                     },
                 };
                 tools.push(tool);
-                normalActorToolsCache.add(actorID, {
+                normalActorToolsCache.add(actorIDOrName, {
                     tool,
                     expiresAt: Date.now() + TOOL_CACHE_TTL_SECS * 1000,
                 });

tests/integration/suite.ts

@@ -167,6 +167,27 @@ export function createIntegrationTestsSuite(
             await client.close();
         });
 
+        it('should search for Actor successfully', async () => {
+            const query = 'python-example';
+            const actorName = 'apify/python-example';
+            const client = await createClientFn({
+                enableAddingActors: false,
+            });
+
+            // Remove the actor
+            const result = await client.callTool({
+                name: HelperTools.SEARCH_ACTORS,
+                arguments: {
+                    search: query,
+                    limit: 5,
+                },
+            });
+            const content = result.content as {text: string}[];
+            expect(content.some((item) => item.text.includes(actorName))).toBe(true);
+
+            await client.close();
+        });
+
         it('should remove Actor from tools list', async () => {
             const actor = 'apify/python-example';
             const selectedToolName = actorNameToToolName(actor);

vitest.config.ts

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