@salesforce/lds-utils-adapters 1.103.0 → 1.104.1

package/dist/AsyncWorkerPool.d.ts

@@ -1,9 +1,13 @@
+export interface Work<T> {
+    workFn: () => Promise<T>;
+    cancelFn?: () => Promise<void>;
+}
 export declare class AsyncWorkerPool {
     private concurrency;
     private queue;
-    private activeWorkers;
+    private activeWork;
     constructor(concurrency: number);
-    push<T>(workFn: () => Promise<T>): Promise<T>;
-    cancel(): void;
-    private work;
+    push<T>(work: Work<T>): Promise<T>;
+    cancel(): Promise<void>;
+    private doWork;
 }

package/dist/ldsAdapterUtils.js

@@ -306,33 +306,58 @@ function runAdapterWithReport(adapterName, adapter, adapterConfig, requestContex
 class AsyncWorkerPool {
     constructor(concurrency) {
         this.queue = [];
-        this.activeWorkers = 0;
+        this.activeWork = [];
         this.concurrency = concurrency;
     }
-    push(workFn) {
+    push(work) {
         return new Promise((resolve, reject) => {
-            this.queue.push(async () => {
-                return workFn().then(resolve).catch(reject);
+            this.queue.push({
+                ...work,
+                workFn: () => work.workFn().then(resolve).catch(reject),
             });
-            this.work();
+            this.doWork();
         });
     }
-    cancel() {
-        this.queue = [];
-        // TODO [W-12513105]: thread cancellation through to active workers
+    async cancel() {
+        const promises = [];
+        const cancellingWork = [
+            ...this.activeWork.splice(0, this.activeWork.length),
+            ...this.queue.splice(0, this.queue.length),
+        ];
+        cancellingWork.forEach((work) => {
+            const { cancelFn } = work;
+            if (cancelFn) {
+                promises.push(cancelFn());
+            }
+        });
+        await promiseAllSettled(promises);
     }
-    work() {
-        while (this.queue.length > 0 && this.activeWorkers < this.concurrency) {
-            this.activeWorkers += 1;
-            const next = this.queue.shift();
-            if (next) {
-                next().finally(() => {
-                    this.activeWorkers -= 1;
-                    this.work();
+    doWork() {
+        while (this.queue.length > 0 && this.activeWork.length < this.concurrency) {
+            const work = this.queue.shift();
+            if (work) {
+                this.activeWork.push(work);
+                const { workFn } = work;
+                workFn()
+                    .then()
+                    .finally(() => {
+                    this.activeWork = this.activeWork.filter((w) => w !== work);
+                    this.doWork();
                 });
             }
         }
     }
+}
+function promiseAllSettled(promises) {
+    return Promise.all(promises.map((promise) => promise
+        .then((value) => ({
+        status: 'fulfilled',
+        value,
+    }))
+        .catch((reason) => ({
+        status: 'rejected',
+        reason,
+    }))));
 }
 
 export { AsyncWorkerPool, runAdapterWithReport };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@salesforce/lds-utils-adapters",
-    "version": "1.103.0",
+    "version": "1.104.1",
     "license": "SEE LICENSE IN LICENSE.txt",
     "description": "LDS Adapter Utilities",
     "main": "dist/ldsAdapterUtils.js",