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

package/dist/browser.mjs

@@ -2188,11 +2188,11 @@ var BaseHttpRequest = class {
 
 // src/task/Poller.ts
 var Poller = class {
-  constructor(pollFunction, pollerOptions, logger) {
-    this.concurrentCalls = [];
-    this.pollFunction = async () => {
+  constructor(pollFunction, performWorkFunction, pollerOptions, logger) {
+    this.performWorkFunction = async () => {
     };
     this.polling = false;
+    this._tasksInProcess = 0;
     this.options = {
       pollInterval: 1e3,
       concurrency: 1
@@ -2205,78 +2205,48 @@ 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.performWork = async (work) => {
+      await this.performWorkFunction(work);
+      this._tasksInProcess--;
     };
     this.poll = async () => {
-      if (!this.polling) {
-        this.polling = true;
-        for (let i = 0; i < this.options.concurrency; i++) {
-          this.concurrentCalls.push(this.singlePoll());
-        }
+      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);
+        await new Promise(
+          (r) => this.isPolling ? this.timeoutHandler = setTimeout(
+            () => r(true),
+            this.options.pollInterval
+          ) : r(true)
+        );
       }
     };
-    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)
-          );
-        }
-      };
-      return {
-        promise: pollingCall(),
-        stop: () => new Promise((r) => {
-          clearTimeout(timeout);
-          poll = false;
-          this.logger.debug("stopping single poll call");
-          r(true);
-        })
-      };
-    };
     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;
   }
 };
@@ -2306,23 +2276,15 @@ 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 task = await this.taskResource.batchPoll(
+        this.worker.taskDefName,
+        workerID,
+        this.worker.domain ?? this.options.domain,
+        count
+      );
+      return task;
     };
     this.updateTaskWithRetry = async (task, taskResult) => {
       let retryCount = 0;
@@ -2384,7 +2346,8 @@ var TaskRunner = class {
     this.options = options;
     this.errorHandler = errorHandler;
     this.poller = new Poller(
-      this.pollAndExecute,
+      this.batchPoll,
+      this.executeTask,
       { concurrency: options.concurrency, pollInterval: options.pollInterval },
       this.logger
     );