Merge pull request #17 from golemfactory/JST-751/combine-taskTimeout-…

…and-activityExecutionTimeout

JST-751: Combine `taskTimeout` and `activityExecuteTimeout`

examples/proxy/proxy.ts

@@ -17,8 +17,7 @@ import { TaskExecutor, pinoPrettyLogger } from "@golem-sdk/task-executor";
     maxTaskRetries: 5,
 
     // If you're using TaskExecutor, you want the "task" to last long in that case
-    taskTimeout: 60 * 60 * 1000,
-    activityExecuteTimeout: 60 * 60 * 1000,
+    taskTimeout: 60 * 60 * 1000, // 60 minutes
   });
 
   try {

src/config.ts

@@ -121,7 +121,8 @@ export class TaskConfig extends ActivityConfig {
   public readonly logger: Logger;
 
   constructor(options?: TaskServiceOptions) {
-    super(options);
+    const activityExecuteTimeout = options?.activityExecuteTimeout || options?.taskTimeout || DEFAULTS.taskTimeout;
+    super({ ...options, activityExecuteTimeout });
     this.maxParallelTasks = options?.maxParallelTasks || DEFAULTS.maxParallelTasks;
     this.taskRunningInterval = options?.taskRunningInterval || DEFAULTS.taskRunningInterval;
     this.taskTimeout = options?.taskTimeout || DEFAULTS.taskTimeout;

src/executor.ts

@@ -41,7 +41,7 @@ const terminatingSignals = ["SIGINT", "SIGTERM", "SIGBREAK", "SIGHUP"];
 export type ExecutorOptions = {
   /** Image hash or image tag as string, otherwise Package object */
   package?: string | Package;
-  /** Timeout for execute one task in ms */
+  /** Timeout for execute one task in ms. Default is 300_000 (5 minutes). */
   taskTimeout?: number;
   /** Subnet Tag */
   subnetTag?: string;