@io-orkes/conductor-javascript 1.2.1-rc.1 → 1.2.1-rc.3

package/dist/index.mjs

@@ -2188,14 +2188,17 @@ var BaseHttpRequest = class {
 
 // src/task/Poller.ts
 var Poller = class {
-  constructor(pollFunction, pollerOptions, logger) {
-    this.concurrentCalls = [];
-    this.pollFunction = async () => {
+  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: 100,
+      concurrency: 1,
+      warnAtO: 100
     };
     this.logger = noopLogger;
     /**
@@ -2205,78 +2208,69 @@ var Poller = class {
       if (this.polling) {
         throw new Error("Runner is already started");
       }
-      return this.poll();
+      this._tasksInProcess = 0;
+      this.polling = true;
+      this.poll();
     };
     /**
      * Stops Polling for work
      */
     this.stopPolling = async () => {
-      await Promise.all(this.concurrentCalls.map((call) => call.stop()));
       this.polling = false;
+      clearTimeout(this.timeoutHandler);
     };
-    this.poll = async () => {
-      if (!this.polling) {
-        this.polling = true;
-        for (let i = 0; i < this.options.concurrency; i++) {
-          this.concurrentCalls.push(this.singlePoll());
-        }
-      }
+    this.performWork = async (work) => {
+      await this.performWorkFunction(work);
+      this._tasksInProcess--;
     };
-    this.singlePoll = () => {
-      let poll = this.polling;
-      let timeout;
-      const pollingCall = async () => {
-        while (poll) {
-          await this.pollFunction();
-          await new Promise(
-            (r) => poll ? timeout = setTimeout(() => r(true), this.options.pollInterval) : r(true)
+    this.poll = async () => {
+      while (this.isPolling) {
+        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);
         }
-      };
-      return {
-        promise: pollingCall(),
-        stop: () => new Promise((r) => {
-          clearTimeout(timeout);
-          poll = false;
-          this.logger.debug("stopping single poll call");
-          r(true);
-        })
-      };
+        await new Promise(
+          (r) => this.isPolling ? this.timeoutHandler = setTimeout(
+            () => r(true),
+            this.options.pollInterval
+          ) : r(true)
+        );
+      }
     };
+    this._pollerId = pollerId;
     this.pollFunction = pollFunction;
+    this.performWorkFunction = performWorkFunction;
     this.options = { ...this.options, ...pollerOptions };
     this.logger = logger || noopLogger;
   }
   get isPolling() {
     return this.polling;
   }
-  /**
-   * adds or shuts down concurrent calls based on the concurrency setting
-   * @param concurrency
-   */
-  updateConcurrency(concurrency) {
-    if (concurrency > 0 && concurrency !== this.options.concurrency) {
-      if (concurrency < this.options.concurrency) {
-        const result = this.concurrentCalls.splice(
-          0,
-          this.options.concurrency - concurrency
-        );
-        result.forEach((call) => {
-          call.stop();
-          this.logger.debug("stopping some spawned calls");
-        });
-      } else {
-        for (let i = 0; i < concurrency - this.options.concurrency; i++) {
-          this.concurrentCalls.push(this.singlePoll());
-          this.logger.debug("spawning additional poll calls");
-        }
-      }
-      this.options.concurrency = concurrency;
-    }
+  get tasksInProcess() {
+    return this._tasksInProcess;
   }
   updateOptions(options) {
     const newOptions = { ...this.options, ...options };
-    this.updateConcurrency(newOptions.concurrency);
     this.options = newOptions;
   }
 };
@@ -2286,6 +2280,13 @@ var DEFAULT_ERROR_MESSAGE = "An unknown error occurred";
 var MAX_RETRIES = 3;
 var noopErrorHandler = (__error) => {
 };
+var defaultRunnerOptions = {
+  workerID: "",
+  pollInterval: 100,
+  domain: void 0,
+  concurrency: 1,
+  batchPollingTimeout: 100
+};
 var TaskRunner = class {
   constructor({
     worker,
@@ -2299,6 +2300,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
@@ -2306,23 +2310,17 @@ var TaskRunner = class {
     this.stopPolling = async () => {
       await this.poller.stopPolling();
     };
-    this.pollAndExecute = async () => {
-      try {
-        const { workerID } = this.options;
-        const task = await this.taskResource.poll(
-          this.worker.taskDefName,
-          workerID,
-          this.worker.domain ?? this.options.domain
-        );
-        if (task && task.taskId) {
-          await this.executeTask(task);
-        } else {
-          this.logger.debug(`No tasks for ${this.worker.taskDefName}`);
-        }
-      } catch (unknownError) {
-        this.handleUnknownError(unknownError);
-        this.errorHandler(unknownError);
-      }
+    this.batchPoll = async (count) => {
+      const { workerID } = this.options;
+      const tasks = await this.taskResource.batchPoll(
+        this.worker.taskDefName,
+        workerID,
+        this.worker.domain ?? this.options.domain,
+        count,
+        this.options.batchPollingTimeout ?? 100
+        // default batch poll defined in the method
+      );
+      return tasks;
     };
     this.updateTaskWithRetry = async (task, taskResult) => {
       let retryCount = 0;
@@ -2381,11 +2379,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(
-      this.pollAndExecute,
-      { concurrency: options.concurrency, pollInterval: options.pollInterval },
+      worker.taskDefName,
+      this.batchPoll,
+      this.executeTask,
+      {
+        concurrency: worker.concurrency ?? options.concurrency,
+        pollInterval: worker.pollInterval ?? options.pollInterval
+      },
       this.logger
     );
   }
@@ -2398,6 +2401,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() {
@@ -2409,24 +2415,36 @@ var TaskRunner = class {
 import os from "os";
 var defaultManagerOptions = {
   workerID: "",
-  pollInterval: 1e3,
+  pollInterval: 100,
   domain: void 0,
-  concurrency: 1
+  concurrency: 1,
+  batchPollingTimeout: 100
 };
 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
@@ -2437,24 +2455,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,
@@ -2463,7 +2487,7 @@ var TaskManager = class {
           onError: this.errorHandler
         });
         runner.startPolling();
-        this.tasks[worker.taskDefName].push(runner);
+        this.workerRunners.set(worker.taskDefName, runner);
       });
       this.polling = true;
     };
@@ -2471,11 +2495,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;
     };