refactor mcp actor and utils, use real Actor ID as standby URL

Author: MQ37

src/mcp/actors.ts

@@ -1,6 +1,7 @@
 
 import { ActorDefinition } from "apify-client";
-import { getActorDefinition, getActorStandbyURL } from "./utils.js";
+import { ApifyClient } from "../apify-client.js";
+
 
 export async function isActorMCPServer(actorID: string, apifyToken: string): Promise<boolean> {
     const mcpPath = await getActorsMCPServerPath(actorID, apifyToken);
@@ -12,11 +13,64 @@ export async function getActorsMCPServerPath(actorID: string, apifyToken: string
     return (actorDefinition as any).webServerMcpPath;
 }
 
-export async function getActorsMCPServerURL(actorID: string, _apifyToken: string): Promise<string> {
+export async function getActorsMCPServerURL(actorID: string, apifyToken: string): Promise<string> {
     // TODO: get from API instead
     const standbyBaseUrl = process.env.HOSTNAME === 'mcp-securitybyobscurity.apify.com' ?
         'securitybyobscurity.apify.actor' : 'apify.actor';
-    const standbyUrl = getActorStandbyURL(actorID, standbyBaseUrl);
-    const mcpPath = await getActorsMCPServerPath(actorID, _apifyToken);
+    const standbyUrl = await getActorStandbyURL(actorID, apifyToken, standbyBaseUrl);
+    const mcpPath = await getActorsMCPServerPath(actorID, apifyToken);
     return `${standbyUrl}${mcpPath}`;
 }
+
+/**
+* Gets Actor ID from the Actor object.
+*
+* @param actorID
+*/
+export async function getRealActorID(actorID: string, apifyToken: string): Promise<string> {
+    const apifyClient = new ApifyClient({ token: apifyToken });
+
+    const actor = apifyClient.actor(actorID);
+    const info = await actor.get();
+    if (!info) {
+        throw new Error(`Actor ${actorID} not found`);
+    }
+    return info.id;
+}
+
+/**
+* Returns standby URL for given Actor ID.
+*
+* @param actorID
+* @param standbyBaseUrl
+* @returns
+*/
+export async function getActorStandbyURL(actorID: string, apifyToken: string, standbyBaseUrl = 'apify.actor'): Promise<string> {
+    const actorRealID = await getRealActorID(actorID, apifyToken);
+    return `https://${actorRealID}.${standbyBaseUrl}`;
+}
+
+export async function getActorDefinition(actorID: string, apifyToken: string): Promise<ActorDefinition> {
+    const apifyClient = new ApifyClient({ token: apifyToken
+     })
+    const actor = apifyClient.actor(actorID);
+    const info = await actor.get();
+    if (!info) {
+        throw new Error(`Actor ${actorID} not found`);
+    }
+    const latestBuildID = info.taggedBuilds?.['latest']?.buildId;
+    if (!latestBuildID) {
+        throw new Error(`Actor ${actorID} does not have a latest build`);
+    }
+    const build = apifyClient.build(latestBuildID);
+    const buildInfo = await build.get();
+    if (!buildInfo) {
+        throw new Error(`Build ${latestBuildID} not found`);
+    }
+    const actorDefinition = buildInfo.actorDefinition;
+    if (!actorDefinition) {
+        throw new Error(`Build ${latestBuildID} does not have an actor definition`);
+    }
+
+    return actorDefinition;
+}

src/mcp/utils.ts

@@ -8,9 +8,6 @@ import type { ToolWrap } from '../types.js';
 
 import { addTool, getActorsAsTools, removeTool } from '../tools/index.js';
 import { Input } from "../types.js";
-import { APIFY_USERNAME } from "../const.js";
-import { ActorDefinition } from "apify-client";
-import { ApifyClient } from "../apify-client.js";
 
 /**
  * Generates a unique server ID based on the provided URL.
@@ -63,52 +60,3 @@ export function parseInputParamsFromUrl(url: string): Input {
     const params = parse(query) as unknown as Input;
     return processInput(params);
 }
-
-/**
-* Returns standby URL for given Actor ID.
-*
-* @param actorID
-* @param standbyBaseUrl
-* @returns
-*/
-export function getActorStandbyURL(actorID: string, standbyBaseUrl = 'apify.actor'): string {
-    const actorOwner = actorID.split('/')[0];
-    const actorName = actorID.split('/')[1];
-    if (!actorOwner || !actorName) {
-        throw new Error(`Invalid actor ID: ${actorID}`);
-    }
-
-    // TODO: get from API
-    const actorOwnerDNSFriendly = actorOwner
-        .toLowerCase()
-        .replace(/[^a-z0-9-]/g, '-') // only alphanumeric chars and hyphens allowed
-        .replace(/-+/g, '-'); // replace multiple hyphens with one
-    const prefix = actorOwner === APIFY_USERNAME ? '' : `${actorOwnerDNSFriendly}--`;
-
-    return `https://${prefix}${actorName}.${standbyBaseUrl}`;
-}
-
-export async function getActorDefinition(actorID: string, apifyToken: string): Promise<ActorDefinition> {
-    const apifyClient = new ApifyClient({ token: apifyToken
-     })
-    const actor = apifyClient.actor(actorID);
-    const info = await actor.get();
-    if (!info) {
-        throw new Error(`Actor ${actorID} not found`);
-    }
-    const latestBuildID = info.taggedBuilds?.['latest']?.buildId;
-    if (!latestBuildID) {
-        throw new Error(`Actor ${actorID} does not have a latest build`);
-    }
-    const build = apifyClient.build(latestBuildID);
-    const buildInfo = await build.get();
-    if (!buildInfo) {
-        throw new Error(`Build ${latestBuildID} not found`);
-    }
-    const actorDefinition = buildInfo.actorDefinition;
-    if (!actorDefinition) {
-        throw new Error(`Build ${latestBuildID} does not have an actor definition`);
-    }
-
-    return actorDefinition;
-}