@io-orkes/conductor-javascript 1.2.1-rc.2 → 1.2.1-rc.4

package/dist/index.mjs

@@ -2186,16 +2186,25 @@ var BaseHttpRequest = class {
   }
 };
 
+// src/task/constants.ts
+var DEFAULT_POLL_INTERVAL = 100;
+var DEFAULT_CONCURRENCY = 1;
+var DEFAULT_WARN_AT_O = 100;
+var DEFAULT_BATCH_POLLING_TIMEOUT = 100;
+
 // src/task/Poller.ts
 var Poller = class {
-  constructor(pollFunction, performWorkFunction, pollerOptions, logger) {
+  constructor(pollerId, pollFunction, performWorkFunction, pollerOptions, logger) {
     this.performWorkFunction = async () => {
     };
     this.polling = false;
     this._tasksInProcess = 0;
+    this._counterAtO = 0;
+    this._pollerId = "";
     this.options = {
-      pollInterval: 1e3,
-      concurrency: 1
+      pollInterval: DEFAULT_POLL_INTERVAL,
+      concurrency: DEFAULT_CONCURRENCY,
+      warnAtO: DEFAULT_WARN_AT_O
     };
     this.logger = noopLogger;
     /**
@@ -2222,10 +2231,30 @@ var Poller = class {
     };
     this.poll = async () => {
       while (this.isPolling) {
-        const count = this.options.concurrency > this._tasksInProcess ? this.options.concurrency - this._tasksInProcess : this._tasksInProcess;
-        const taskResult = await this.pollFunction(count);
-        this._tasksInProcess = taskResult.length;
-        taskResult.forEach(this.performWork);
+        try {
+          const count = Math.max(
+            0,
+            this.options.concurrency - this._tasksInProcess
+          );
+          if (count === 0) {
+            this.logger.debug(
+              "Max in process reached, Will skip polling for " + this._pollerId
+            );
+            this._counterAtO++;
+            if (this._counterAtO > (this.options.warnAtO ?? 100)) {
+              this.logger.info(
+                `Not polling anything because in process tasks is maxed as concurrency level. ${this._pollerId}`
+              );
+            }
+          } else {
+            this._counterAtO = 0;
+            const tasksResult = await this.pollFunction(count);
+            this._tasksInProcess = this._tasksInProcess + (tasksResult ?? []).length;
+            tasksResult.forEach(this.performWork);
+          }
+        } catch (e) {
+          this.logger.error(`Error polling for tasks: ${e.message}`, e);
+        }
         await new Promise(
           (r) => this.isPolling ? this.timeoutHandler = setTimeout(
             () => r(true),
@@ -2234,6 +2263,7 @@ var Poller = class {
         );
       }
     };
+    this._pollerId = pollerId;
     this.pollFunction = pollFunction;
     this.performWorkFunction = performWorkFunction;
     this.options = { ...this.options, ...pollerOptions };
@@ -2256,6 +2286,13 @@ var DEFAULT_ERROR_MESSAGE = "An unknown error occurred";
 var MAX_RETRIES = 3;
 var noopErrorHandler = (__error) => {
 };
+var defaultRunnerOptions = {
+  workerID: "",
+  pollInterval: DEFAULT_POLL_INTERVAL,
+  domain: void 0,
+  concurrency: DEFAULT_CONCURRENCY,
+  batchPollingTimeout: DEFAULT_BATCH_POLLING_TIMEOUT
+};
 var TaskRunner = class {
   constructor({
     worker,
@@ -2269,6 +2306,9 @@ var TaskRunner = class {
      */
     this.startPolling = () => {
       this.poller.startPolling();
+      this.logger.info(
+        `TaskWorker ${this.worker.taskDefName} initialized with concurrency of ${this.poller.options.concurrency} and poll interval of ${this.poller.options.pollInterval}`
+      );
     };
     /**
      * Stops Polling for work
@@ -2278,13 +2318,15 @@ var TaskRunner = class {
     };
     this.batchPoll = async (count) => {
       const { workerID } = this.options;
-      const task = await this.taskResource.batchPoll(
+      const tasks = await this.taskResource.batchPoll(
         this.worker.taskDefName,
         workerID,
         this.worker.domain ?? this.options.domain,
-        count
+        count,
+        this.options.batchPollingTimeout ?? 100
+        // default batch poll defined in the method
       );
-      return task;
+      return tasks;
     };
     this.updateTaskWithRetry = async (task, taskResult) => {
       let retryCount = 0;
@@ -2314,7 +2356,7 @@ var TaskRunner = class {
           workflowInstanceId: task.workflowInstanceId,
           taskId: task.taskId
         });
-        this.logger.debug(`Finished polling for task ${task.taskId}`);
+        this.logger.debug(`Task has executed successfully ${task.taskId}`);
       } catch (error) {
         await this.updateTaskWithRetry(task, {
           workflowInstanceId: task.workflowInstanceId,
@@ -2343,12 +2385,16 @@ var TaskRunner = class {
     this.taskResource = taskResource;
     this.logger = logger;
     this.worker = worker;
-    this.options = options;
+    this.options = { ...defaultRunnerOptions, ...options };
     this.errorHandler = errorHandler;
     this.poller = new Poller(
+      worker.taskDefName,
       this.batchPoll,
       this.executeTask,
-      { concurrency: options.concurrency, pollInterval: options.pollInterval },
+      {
+        concurrency: worker.concurrency ?? options.concurrency,
+        pollInterval: worker.pollInterval ?? options.pollInterval
+      },
       this.logger
     );
   }
@@ -2361,6 +2407,9 @@ var TaskRunner = class {
       concurrency: newOptions.concurrency,
       pollInterval: newOptions.pollInterval
     });
+    this.logger.info(
+      `TaskWorker ${this.worker.taskDefName} configuration updated with concurrency of ${this.poller.options.concurrency} and poll interval of ${this.poller.options.pollInterval}`
+    );
     this.options = newOptions;
   }
   get getOptions() {
@@ -2372,24 +2421,36 @@ var TaskRunner = class {
 import os from "os";
 var defaultManagerOptions = {
   workerID: "",
-  pollInterval: 1e3,
+  pollInterval: DEFAULT_POLL_INTERVAL,
   domain: void 0,
-  concurrency: 1
+  concurrency: DEFAULT_CONCURRENCY,
+  batchPollingTimeout: DEFAULT_BATCH_POLLING_TIMEOUT
 };
 function workerId(options) {
   return options.workerID ?? os.hostname();
 }
 var TaskManager = class {
   constructor(client, workers, config = {}) {
-    this.tasks = {};
+    this.workerRunners = /* @__PURE__ */ new Map();
     this.polling = false;
     this.workerManagerWorkerOptions = (worker) => {
       return {
         ...this.options,
         concurrency: worker.concurrency ?? this.options.concurrency,
+        pollInterval: worker.pollInterval ?? this.options.pollInterval,
         domain: worker.domain ?? this.options.domain
       };
     };
+    this.updatePollingOptionForWorker = (workerTaskDefName, options) => {
+      const maybeRunner = this.workerRunners.get(workerTaskDefName);
+      if (maybeRunner != null) {
+        maybeRunner.updateOptions(options);
+      } else {
+        this.logger.info(
+          `No runner found for worker with taskDefName: ${workerTaskDefName}`
+        );
+      }
+    };
     /**
      * new options will get merged to existing options
      * @param options new options to update polling options
@@ -2400,24 +2461,30 @@ var TaskManager = class {
           ...this.workerManagerWorkerOptions(worker),
           ...options
         };
-        const runners = this.tasks[worker.taskDefName];
-        runners.forEach((runner) => {
-          runner.updateOptions(newOptions);
-        });
+        this.updatePollingOptionForWorker(worker.taskDefName, newOptions);
       });
       this.options.concurrency = options.concurrency ?? this.options.concurrency;
       this.options.pollInterval = options.pollInterval ?? this.options.pollInterval;
     };
+    this.sanityCheck = () => {
+      if (this.workers.length === 0) {
+        throw new Error("No workers supplied to TaskManager");
+      }
+      const workerIDs = /* @__PURE__ */ new Set();
+      for (const item of this.workers) {
+        if (workerIDs.has(item.taskDefName)) {
+          throw new Error(`Duplicate worker taskDefName: ${item.taskDefName}`);
+        }
+        workerIDs.add(item.taskDefName);
+      }
+    };
     /**
      * Start polling for tasks
      */
     this.startPolling = () => {
+      this.sanityCheck();
       this.workers.forEach((worker) => {
-        this.tasks[worker.taskDefName] = [];
         const options = this.workerManagerWorkerOptions(worker);
-        this.logger.debug(
-          `Starting taskDefName=${worker.taskDefName} concurrency=${options.concurrency} domain=${options.domain}`
-        );
         const runner = new TaskRunner({
           worker,
           options,
@@ -2426,7 +2493,7 @@ var TaskManager = class {
           onError: this.errorHandler
         });
         runner.startPolling();
-        this.tasks[worker.taskDefName].push(runner);
+        this.workerRunners.set(worker.taskDefName, runner);
       });
       this.polling = true;
     };
@@ -2434,11 +2501,10 @@ var TaskManager = class {
      * Stops polling for tasks
      */
     this.stopPolling = async () => {
-      for (const taskType in this.tasks) {
-        await Promise.all(
-          this.tasks[taskType].map((runner) => runner.stopPolling())
-        );
-        this.tasks[taskType] = [];
+      for (const [workerTaskDefName, runner] of this.workerRunners) {
+        this.logger.debug(`Stopping taskDefName=${workerTaskDefName}`);
+        await runner.stopPolling();
+        this.workerRunners.delete(workerTaskDefName);
       }
       this.polling = false;
     };