handle errors in runs

Author: MQ37

src/tools/run.ts

@@ -5,6 +5,8 @@ import zodToJsonSchema from 'zod-to-json-schema';
 import { ApifyClient } from '../apify-client.js';
 import { HelperTools } from '../const.js';
 import type { InternalTool, ToolEntry } from '../types.js';
+import { ApifyApiError } from 'apify-client';
+import log from '@apify/log';
 
 const ajv = new Ajv({ coerceTypes: 'array', strict: false });
 
@@ -38,6 +40,9 @@ export const getActorRun: ToolEntry = {
             }
             const client = new ApifyClient({ token: apifyToken });
             const v = await client.run(parsed.runId).get();
+            if (!v) {
+                return { content: [{ type: 'text', text: `Run with ID '${parsed.runId}' not found.` }] };
+            }
             return { content: [{ type: 'text', text: JSON.stringify(v) }] };
         },
     } as InternalTool,
@@ -99,8 +104,16 @@ export const abortActorRun: ToolEntry = {
                 return { content: [{ type: 'text', text: 'Run ID is required.' }] };
             }
             const client = new ApifyClient({ token: apifyToken });
-            const v = await client.run(parsed.runId).abort({ gracefully: parsed.gracefully });
-            return { content: [{ type: 'text', text: JSON.stringify(v) }] };
+            try {
+                const v = await client.run(parsed.runId).abort({ gracefully: parsed.gracefully });
+                return { content: [{ type: 'text', text: JSON.stringify(v) }] };
+            } catch (error) {
+                if (error instanceof ApifyApiError) {
+                    log.error(`[abortActorRun] Failed to abort run ${parsed.runId}: ${error.message}`);
+                    return { content: [{ type: 'text', text: `Failed to abort run: ${error.message}` }] };
+                }
+                throw error;
+            }
         },
     } as InternalTool,
 };

src/tools/run_collection.ts

@@ -1,4 +1,5 @@
 import { Ajv } from 'ajv';
+import { ApifyApiError } from 'apify-client';
 import { z } from 'zod';
 import zodToJsonSchema from 'zod-to-json-schema';
 
@@ -41,8 +42,15 @@ export const getUserRunsList: ToolEntry = {
             const { args, apifyToken } = toolArgs;
             const parsed = getUserRunsListArgs.parse(args);
             const client = new ApifyClient({ token: apifyToken });
-            const runs = await client.runs().list({ limit: parsed.limit, offset: parsed.offset, desc: parsed.desc, status: parsed.status });
-            return { content: [{ type: 'text', text: JSON.stringify(runs) }] };
+            try {
+                const runs = await client.runs().list({ limit: parsed.limit, offset: parsed.offset, desc: parsed.desc, status: parsed.status });
+                return { content: [{ type: 'text', text: JSON.stringify(runs) }] };
+            } catch (error) {
+                if (error instanceof ApifyApiError) {
+                    return { content: [{ type: 'text', text: `Failed to get runs list: ${error.message}` }] };
+                }
+                throw error;
+            }
         },
     } as InternalTool,
 };