@loaders.gl/worker-utils 4.2.0-alpha.3 → 4.2.0-alpha.5

package/dist/lib/worker-farm/worker-farm.js

@@ -1,71 +1,86 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import WorkerPool from "./worker-pool.js";
 import WorkerThread from "./worker-thread.js";
 const DEFAULT_PROPS = {
-  maxConcurrency: 3,
-  maxMobileConcurrency: 1,
-  reuseWorkers: true,
-  onDebug: () => {}
+    maxConcurrency: 3,
+    maxMobileConcurrency: 1,
+    reuseWorkers: true,
+    onDebug: () => { }
 };
+/**
+ * Process multiple jobs with a "farm" of different workers in worker pools.
+ */
 export default class WorkerFarm {
-  static isSupported() {
-    return WorkerThread.isSupported();
-  }
-  static getWorkerFarm() {
-    let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-    WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});
-    WorkerFarm._workerFarm.setProps(props);
-    return WorkerFarm._workerFarm;
-  }
-  constructor(props) {
-    this.props = void 0;
-    this.workerPools = new Map();
-    this.props = {
-      ...DEFAULT_PROPS
-    };
-    this.setProps(props);
-    this.workerPools = new Map();
-  }
-  destroy() {
-    for (const workerPool of this.workerPools.values()) {
-      workerPool.destroy();
+    /** Checks if workers are supported on this platform */
+    static isSupported() {
+        return WorkerThread.isSupported();
     }
-    this.workerPools = new Map();
-  }
-  setProps(props) {
-    this.props = {
-      ...this.props,
-      ...props
-    };
-    for (const workerPool of this.workerPools.values()) {
-      workerPool.setProps(this._getWorkerPoolProps());
+    /** Get the singleton instance of the global worker farm */
+    static getWorkerFarm(props = {}) {
+        WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});
+        WorkerFarm._workerFarm.setProps(props);
+        return WorkerFarm._workerFarm;
     }
-  }
-  getWorkerPool(options) {
-    const {
-      name,
-      source,
-      url
-    } = options;
-    let workerPool = this.workerPools.get(name);
-    if (!workerPool) {
-      workerPool = new WorkerPool({
-        name,
-        source,
-        url
-      });
-      workerPool.setProps(this._getWorkerPoolProps());
-      this.workerPools.set(name, workerPool);
+    /** get global instance with WorkerFarm.getWorkerFarm() */
+    constructor(props) {
+        this.workerPools = new Map();
+        this.props = { ...DEFAULT_PROPS };
+        this.setProps(props);
+        /** @type Map<string, WorkerPool>} */
+        this.workerPools = new Map();
+    }
+    /**
+     * Terminate all workers in the farm
+     * @note Can free up significant memory
+     */
+    destroy() {
+        for (const workerPool of this.workerPools.values()) {
+            workerPool.destroy();
+        }
+        this.workerPools = new Map();
+    }
+    /**
+     * Set props used when initializing worker pools
+     * @param props
+     */
+    setProps(props) {
+        this.props = { ...this.props, ...props };
+        // Update worker pool props
+        for (const workerPool of this.workerPools.values()) {
+            workerPool.setProps(this._getWorkerPoolProps());
+        }
+    }
+    /**
+     * Returns a worker pool for the specified worker
+     * @param options - only used first time for a specific worker name
+     * @param options.name - the name of the worker - used to identify worker pool
+     * @param options.url -
+     * @param options.source -
+     * @example
+     *   const job = WorkerFarm.getWorkerFarm().getWorkerPool({name, url}).startJob(...);
+     */
+    getWorkerPool(options) {
+        const { name, source, url } = options;
+        let workerPool = this.workerPools.get(name);
+        if (!workerPool) {
+            workerPool = new WorkerPool({
+                name,
+                source,
+                url
+            });
+            workerPool.setProps(this._getWorkerPoolProps());
+            this.workerPools.set(name, workerPool);
+        }
+        return workerPool;
+    }
+    _getWorkerPoolProps() {
+        return {
+            maxConcurrency: this.props.maxConcurrency,
+            maxMobileConcurrency: this.props.maxMobileConcurrency,
+            reuseWorkers: this.props.reuseWorkers,
+            onDebug: this.props.onDebug
+        };
     }
-    return workerPool;
-  }
-  _getWorkerPoolProps() {
-    return {
-      maxConcurrency: this.props.maxConcurrency,
-      maxMobileConcurrency: this.props.maxMobileConcurrency,
-      reuseWorkers: this.props.reuseWorkers,
-      onDebug: this.props.onDebug
-    };
-  }
 }
-WorkerFarm._workerFarm = void 0;
-//# sourceMappingURL=worker-farm.js.map

package/dist/lib/worker-farm/worker-job.d.ts

@@ -1,5 +1,5 @@
-import type { WorkerMessageType, WorkerMessagePayload } from '../../types';
-import WorkerThread from './worker-thread';
+import type { WorkerMessageType, WorkerMessagePayload } from "../../types.js";
+import WorkerThread from "./worker-thread.js";
 /**
  * Represents one Job handled by a WorkerPool or WorkerFarm
  */

package/dist/lib/worker-farm/worker-job.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-job.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-job.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,aAAa,CAAC;AACzE,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAG3C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,SAAS,EAAE,OAAO,CAAQ;IAC1B,6CAA6C;IAC7C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9B,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,OAAO,CAAoC;gBAEvC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IASvD;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI;IAQzE;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAMtB;;OAEG;IACH,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;CAK1B"}
+{"version":3,"file":"worker-job.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-job.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,oBAAoB,EAAC,uBAAoB;AACzE,OAAO,YAAY,2BAAwB;AAG3C;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,SAAS;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,YAAY,CAAC;IACpC,SAAS,EAAE,OAAO,CAAQ;IAC1B,6CAA6C;IAC7C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAE9B,OAAO,CAAC,QAAQ,CAAkC;IAClD,OAAO,CAAC,OAAO,CAAoC;gBAEvC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY;IASvD;;;OAGG;IACH,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI;IAQzE;;OAEG;IACH,IAAI,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAMtB;;OAEG;IACH,KAAK,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;CAK1B"}

package/dist/lib/worker-farm/worker-job.js

@@ -1,35 +1,47 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { assert } from "../env-utils/assert.js";
+/**
+ * Represents one Job handled by a WorkerPool or WorkerFarm
+ */
 export default class WorkerJob {
-  constructor(jobName, workerThread) {
-    this.name = void 0;
-    this.workerThread = void 0;
-    this.isRunning = true;
-    this.result = void 0;
-    this._resolve = () => {};
-    this._reject = () => {};
-    this.name = jobName;
-    this.workerThread = workerThread;
-    this.result = new Promise((resolve, reject) => {
-      this._resolve = resolve;
-      this._reject = reject;
-    });
-  }
-  postMessage(type, payload) {
-    this.workerThread.postMessage({
-      source: 'loaders.gl',
-      type,
-      payload
-    });
-  }
-  done(value) {
-    assert(this.isRunning);
-    this.isRunning = false;
-    this._resolve(value);
-  }
-  error(error) {
-    assert(this.isRunning);
-    this.isRunning = false;
-    this._reject(error);
-  }
+    constructor(jobName, workerThread) {
+        this.isRunning = true;
+        this._resolve = () => { };
+        this._reject = () => { };
+        this.name = jobName;
+        this.workerThread = workerThread;
+        this.result = new Promise((resolve, reject) => {
+            this._resolve = resolve;
+            this._reject = reject;
+        });
+    }
+    /**
+     * Send a message to the job's worker thread
+     * @param data any data structure, ideally consisting mostly of transferrable objects
+     */
+    postMessage(type, payload) {
+        this.workerThread.postMessage({
+            source: 'loaders.gl', // Lets worker ignore unrelated messages
+            type,
+            payload
+        });
+    }
+    /**
+     * Call to resolve the `result` Promise with the supplied value
+     */
+    done(value) {
+        assert(this.isRunning);
+        this.isRunning = false;
+        this._resolve(value);
+    }
+    /**
+     * Call to reject the `result` Promise with the supplied error
+     */
+    error(error) {
+        assert(this.isRunning);
+        this.isRunning = false;
+        this._reject(error);
+    }
 }
-//# sourceMappingURL=worker-job.js.map

package/dist/lib/worker-farm/worker-pool.d.ts

@@ -1,6 +1,6 @@
-import type { WorkerMessageType, WorkerMessagePayload } from '../../types';
-import WorkerThread from './worker-thread';
-import WorkerJob from './worker-job';
+import type { WorkerMessageType, WorkerMessagePayload } from "../../types.js";
+import WorkerThread from "./worker-thread.js";
+import WorkerJob from "./worker-job.js";
 /** WorkerPool onDebug Callback Parameters */
 type OnDebugParameters = {
     message: string;

package/dist/lib/worker-farm/worker-pool.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-pool.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-pool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,aAAa,CAAC;AAEzE,OAAO,YAAY,MAAM,iBAAiB,CAAC;AAC3C,OAAO,SAAS,MAAM,cAAc,CAAC;AAErC,6CAA6C;AAC7C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,GAAG,CAAC;IAC9C,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,2BAA2B;AAC3B,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAClG,KAAK,OAAO,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAStD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,IAAI,EAAE,MAAM,CAAa;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAK;IAC3B,oBAAoB,EAAE,MAAM,CAAK;IACjC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,GAAG,CAAY;IACxD,YAAY,EAAE,OAAO,CAAQ;IAE7B,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,WAAW,CAAS;IAE5B,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;IAI7B;;;OAGG;gBACS,KAAK,EAAE,eAAe;IAMlC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAMf,QAAQ,CAAC,KAAK,EAAE,eAAe;IAoBzB,QAAQ,CACZ,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,SAA+C,EAC1D,OAAO,GAAE,OAA0C,GAClD,OAAO,CAAC,SAAS,CAAC;IAarB;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CtC;;;;;;;OAOG;IACH,mBAAmB,CAAC,MAAM,EAAE,YAAY;IAwBxC;;OAEG;IACH,mBAAmB,IAAI,YAAY,GAAG,IAAI;IAiB1C,kBAAkB;CAGnB"}
+{"version":3,"file":"worker-pool.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-pool.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAC,iBAAiB,EAAE,oBAAoB,EAAC,uBAAoB;AAEzE,OAAO,YAAY,2BAAwB;AAC3C,OAAO,SAAS,wBAAqB;AAErC,6CAA6C;AAC7C,KAAK,iBAAiB,GAAG;IACvB,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,YAAY,EAAE,YAAY,CAAC;CAC5B,CAAC;AAEF,4BAA4B;AAC5B,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,GAAG,CAAC;IAC9C,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB,CAAC;AAEF,2BAA2B;AAC3B,KAAK,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAClG,KAAK,OAAO,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;AAStD;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,IAAI,EAAE,MAAM,CAAa;IACzB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,cAAc,EAAE,MAAM,CAAK;IAC3B,oBAAoB,EAAE,MAAM,CAAK;IACjC,OAAO,EAAE,CAAC,OAAO,EAAE,iBAAiB,KAAK,GAAG,CAAY;IACxD,YAAY,EAAE,OAAO,CAAQ;IAE7B,OAAO,CAAC,KAAK,CAAuB;IACpC,OAAO,CAAC,QAAQ,CAAmB;IACnC,OAAO,CAAC,SAAS,CAAsB;IACvC,OAAO,CAAC,KAAK,CAAK;IAClB,OAAO,CAAC,WAAW,CAAS;IAE5B,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;IAI7B;;;OAGG;gBACS,KAAK,EAAE,eAAe;IAMlC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAMf,QAAQ,CAAC,KAAK,EAAE,eAAe;IAoBzB,QAAQ,CACZ,IAAI,EAAE,MAAM,EACZ,SAAS,GAAE,SAA+C,EAC1D,OAAO,GAAE,OAA0C,GAClD,OAAO,CAAC,SAAS,CAAC;IAarB;;;OAGG;IACG,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CtC;;;;;;;OAOG;IACH,mBAAmB,CAAC,MAAM,EAAE,YAAY;IAwBxC;;OAEG;IACH,mBAAmB,IAAI,YAAY,GAAG,IAAI;IAiB1C,kBAAkB;CAGnB"}

package/dist/lib/worker-farm/worker-pool.js

@@ -1,125 +1,165 @@
+// loaders.gl
+// SPDX-License-Identifier: MIT
+// Copyright (c) vis.gl contributors
 import { isMobile, isBrowser } from "../env-utils/globals.js";
 import WorkerThread from "./worker-thread.js";
 import WorkerJob from "./worker-job.js";
+/**
+ * Process multiple data messages with small pool of identical workers
+ */
 export default class WorkerPool {
-  static isSupported() {
-    return WorkerThread.isSupported();
-  }
-  constructor(props) {
-    this.name = 'unnamed';
-    this.source = void 0;
-    this.url = void 0;
-    this.maxConcurrency = 1;
-    this.maxMobileConcurrency = 1;
-    this.onDebug = () => {};
-    this.reuseWorkers = true;
-    this.props = {};
-    this.jobQueue = [];
-    this.idleQueue = [];
-    this.count = 0;
-    this.isDestroyed = false;
-    this.source = props.source;
-    this.url = props.url;
-    this.setProps(props);
-  }
-  destroy() {
-    this.idleQueue.forEach(worker => worker.destroy());
-    this.isDestroyed = true;
-  }
-  setProps(props) {
-    this.props = {
-      ...this.props,
-      ...props
-    };
-    if (props.name !== undefined) {
-      this.name = props.name;
+    /** Checks if workers are supported on this platform */
+    static isSupported() {
+        return WorkerThread.isSupported();
     }
-    if (props.maxConcurrency !== undefined) {
-      this.maxConcurrency = props.maxConcurrency;
+    /**
+     * @param processor - worker function
+     * @param maxConcurrency - max count of workers
+     */
+    constructor(props) {
+        this.name = 'unnamed';
+        this.maxConcurrency = 1;
+        this.maxMobileConcurrency = 1;
+        this.onDebug = () => { };
+        this.reuseWorkers = true;
+        this.props = {};
+        this.jobQueue = [];
+        this.idleQueue = [];
+        this.count = 0;
+        this.isDestroyed = false;
+        this.source = props.source;
+        this.url = props.url;
+        this.setProps(props);
     }
-    if (props.maxMobileConcurrency !== undefined) {
-      this.maxMobileConcurrency = props.maxMobileConcurrency;
+    /**
+     * Terminates all workers in the pool
+     * @note Can free up significant memory
+     */
+    destroy() {
+        // Destroy idle workers, active Workers will be destroyed on completion
+        this.idleQueue.forEach((worker) => worker.destroy());
+        this.isDestroyed = true;
     }
-    if (props.reuseWorkers !== undefined) {
-      this.reuseWorkers = props.reuseWorkers;
+    setProps(props) {
+        this.props = { ...this.props, ...props };
+        if (props.name !== undefined) {
+            this.name = props.name;
+        }
+        if (props.maxConcurrency !== undefined) {
+            this.maxConcurrency = props.maxConcurrency;
+        }
+        if (props.maxMobileConcurrency !== undefined) {
+            this.maxMobileConcurrency = props.maxMobileConcurrency;
+        }
+        if (props.reuseWorkers !== undefined) {
+            this.reuseWorkers = props.reuseWorkers;
+        }
+        if (props.onDebug !== undefined) {
+            this.onDebug = props.onDebug;
+        }
     }
-    if (props.onDebug !== undefined) {
-      this.onDebug = props.onDebug;
+    async startJob(name, onMessage = (job, type, data) => job.done(data), onError = (job, error) => job.error(error)) {
+        // Promise resolves when thread starts working on this job
+        const startPromise = new Promise((onStart) => {
+            // Promise resolves when thread completes or fails working on this job
+            this.jobQueue.push({ name, onMessage, onError, onStart });
+            return this;
+        });
+        this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises
+        return await startPromise;
     }
-  }
-  async startJob(name) {
-    let onMessage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : (job, type, data) => job.done(data);
-    let onError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : (job, error) => job.error(error);
-    const startPromise = new Promise(onStart => {
-      this.jobQueue.push({
-        name,
-        onMessage,
-        onError,
-        onStart
-      });
-      return this;
-    });
-    this._startQueuedJob();
-    return await startPromise;
-  }
-  async _startQueuedJob() {
-    if (!this.jobQueue.length) {
-      return;
+    // PRIVATE
+    /**
+     * Starts first queued job if worker is available or can be created
+     * Called when job is started and whenever a worker returns to the idleQueue
+     */
+    async _startQueuedJob() {
+        if (!this.jobQueue.length) {
+            return;
+        }
+        const workerThread = this._getAvailableWorker();
+        if (!workerThread) {
+            return;
+        }
+        // We have a worker, dequeue and start the job
+        const queuedJob = this.jobQueue.shift();
+        if (queuedJob) {
+            // Emit a debug event
+            // @ts-ignore
+            this.onDebug({
+                message: 'Starting job',
+                name: queuedJob.name,
+                workerThread,
+                backlog: this.jobQueue.length
+            });
+            // Create a worker job to let the app access thread and manage job completion
+            const job = new WorkerJob(queuedJob.name, workerThread);
+            // Set the worker thread's message handlers
+            workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);
+            workerThread.onError = (error) => queuedJob.onError(job, error);
+            // Resolve the start promise so that the app can start sending messages to worker
+            queuedJob.onStart(job);
+            // Wait for the app to signal that the job is complete, then return worker to queue
+            try {
+                await job.result;
+            }
+            catch (error) {
+                // eslint-disable-next-line no-console
+                console.error(`Worker exception: ${error}`);
+            }
+            finally {
+                this.returnWorkerToQueue(workerThread);
+            }
+        }
     }
-    const workerThread = this._getAvailableWorker();
-    if (!workerThread) {
-      return;
+    /**
+     * Returns a worker to the idle queue
+     * Destroys the worker if
+     *  - pool is destroyed
+     *  - if this pool doesn't reuse workers
+     *  - if maxConcurrency has been lowered
+     * @param worker
+     */
+    returnWorkerToQueue(worker) {
+        const shouldDestroyWorker = 
+        // Workers on Node.js prevent the process from exiting.
+        // Until we figure out how to close them before exit, we always destroy them
+        !isBrowser ||
+            // If the pool is destroyed, there is no reason to keep the worker around
+            this.isDestroyed ||
+            // If the app has disabled worker reuse, any completed workers should be destroyed
+            !this.reuseWorkers ||
+            // If concurrency has been lowered, this worker might be surplus to requirements
+            this.count > this._getMaxConcurrency();
+        if (shouldDestroyWorker) {
+            worker.destroy();
+            this.count--;
+        }
+        else {
+            this.idleQueue.push(worker);
+        }
+        if (!this.isDestroyed) {
+            this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises
+        }
     }
-    const queuedJob = this.jobQueue.shift();
-    if (queuedJob) {
-      this.onDebug({
-        message: 'Starting job',
-        name: queuedJob.name,
-        workerThread,
-        backlog: this.jobQueue.length
-      });
-      const job = new WorkerJob(queuedJob.name, workerThread);
-      workerThread.onMessage = data => queuedJob.onMessage(job, data.type, data.payload);
-      workerThread.onError = error => queuedJob.onError(job, error);
-      queuedJob.onStart(job);
-      try {
-        await job.result;
-      } catch (error) {
-        console.error(`Worker exception: ${error}`);
-      } finally {
-        this.returnWorkerToQueue(workerThread);
-      }
+    /**
+     * Returns idle worker or creates new worker if maxConcurrency has not been reached
+     */
+    _getAvailableWorker() {
+        // If a worker has completed and returned to the queue, it can be used
+        if (this.idleQueue.length > 0) {
+            return this.idleQueue.shift() || null;
+        }
+        // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source
+        if (this.count < this._getMaxConcurrency()) {
+            this.count++;
+            const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;
+            return new WorkerThread({ name, source: this.source, url: this.url });
+        }
+        // No worker available, have to wait
+        return null;
     }
-  }
-  returnWorkerToQueue(worker) {
-    const shouldDestroyWorker = !isBrowser || this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();
-    if (shouldDestroyWorker) {
-      worker.destroy();
-      this.count--;
-    } else {
-      this.idleQueue.push(worker);
+    _getMaxConcurrency() {
+        return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;
     }
-    if (!this.isDestroyed) {
-      this._startQueuedJob();
-    }
-  }
-  _getAvailableWorker() {
-    if (this.idleQueue.length > 0) {
-      return this.idleQueue.shift() || null;
-    }
-    if (this.count < this._getMaxConcurrency()) {
-      this.count++;
-      const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;
-      return new WorkerThread({
-        name,
-        source: this.source,
-        url: this.url
-      });
-    }
-    return null;
-  }
-  _getMaxConcurrency() {
-    return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;
-  }
 }
-//# sourceMappingURL=worker-pool.js.map

package/dist/lib/worker-farm/worker-thread.d.ts

@@ -1,4 +1,4 @@
-import { NodeWorkerType } from '../node/worker_threads';
+import { NodeWorkerType } from "../node/worker_threads.js";
 export type WorkerThreadProps = {
     name: string;
     source?: string;

package/dist/lib/worker-farm/worker-thread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAQlE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC;IAChC,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;gBAOjB,KAAK,EAAE,iBAAiB;IAYpC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAOf,IAAI,SAAS,YAEZ;IAED;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAQlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK;IAiBjD;;OAEG;IACH,oBAAoB,IAAI,MAAM;IAsB9B;;;OAGG;IACH,iBAAiB,IAAI,cAAc;CA0BpC"}
+{"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":"AAIA,OAAO,EAAa,cAAc,EAAC,kCAA+B;AAQlE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,GAAG,cAAc,CAAC;IAChC,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;gBAOjB,KAAK,EAAE,iBAAiB;IAYpC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAOf,IAAI,SAAS,YAEZ;IAED;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAQlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK;IAiBjD;;OAEG;IACH,oBAAoB,IAAI,MAAM;IAsB9B;;;OAGG;IACH,iBAAiB,IAAI,cAAc;CA0BpC"}