@loaders.gl/worker-utils 3.1.8 → 3.2.0-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es5/lib/env-utils/version.js +3 -3
- package/dist/es5/lib/env-utils/version.js.map +1 -1
- package/dist/es5/lib/library-utils/library-utils.js +2 -2
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/node/worker_threads-browser.js +35 -0
- package/dist/es5/lib/node/worker_threads-browser.js.map +1 -0
- package/dist/es5/lib/worker-api/create-worker.js +1 -1
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +2 -2
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-body.js +67 -22
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-farm.js +4 -2
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-job.js +3 -9
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +5 -0
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +36 -2
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +3 -3
- package/dist/esm/lib/env-utils/version.js.map +1 -1
- package/dist/esm/lib/library-utils/library-utils.js +2 -2
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/node/worker_threads-browser.js +10 -0
- package/dist/esm/lib/node/worker_threads-browser.js.map +1 -0
- package/dist/esm/lib/worker-api/create-worker.js +1 -1
- package/dist/esm/lib/worker-api/create-worker.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +2 -2
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-body.js +57 -18
- package/dist/esm/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-farm.js +4 -2
- package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-job.js +3 -9
- package/dist/esm/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +4 -0
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +31 -2
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/lib/env-utils/version.js +1 -1
- package/dist/lib/library-utils/library-utils.js +1 -1
- package/dist/lib/node/worker_threads-browser.d.ts +7 -0
- package/dist/lib/node/worker_threads-browser.d.ts.map +1 -0
- package/dist/lib/node/worker_threads-browser.js +14 -0
- package/dist/lib/worker-api/create-worker.d.ts.map +1 -1
- package/dist/lib/worker-api/create-worker.js +1 -2
- package/dist/lib/worker-api/get-worker-url.js +1 -1
- package/dist/lib/worker-farm/worker-body.d.ts +2 -0
- package/dist/lib/worker-farm/worker-body.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-body.js +62 -18
- package/dist/lib/worker-farm/worker-farm.d.ts +6 -2
- package/dist/lib/worker-farm/worker-farm.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-farm.js +4 -3
- package/dist/lib/worker-farm/worker-job.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-job.js +2 -2
- package/dist/lib/worker-farm/worker-pool.d.ts +2 -0
- package/dist/lib/worker-farm/worker-pool.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-pool.js +4 -0
- package/dist/lib/worker-farm/worker-thread.d.ts +10 -2
- package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-thread.js +40 -5
- package/dist/lib/worker-utils/get-loadable-worker-url.js +0 -2
- package/dist/null-worker.js +45 -14
- package/dist/null-worker.js.map +2 -2
- package/package.json +3 -2
- package/src/lib/env-utils/version.ts +1 -1
- package/src/lib/library-utils/library-utils.ts +1 -1
- package/src/lib/node/worker_threads-browser.js +11 -0
- package/src/lib/worker-api/create-worker.ts +1 -2
- package/src/lib/worker-api/get-worker-url.ts +1 -1
- package/src/lib/worker-farm/worker-body.ts +61 -19
- package/src/lib/worker-farm/worker-farm.ts +10 -5
- package/src/lib/worker-farm/worker-job.ts +3 -6
- package/src/lib/worker-farm/worker-pool.ts +5 -0
- package/src/lib/worker-farm/worker-thread.ts +41 -7
- package/src/lib/worker-utils/get-loadable-worker-url.ts +0 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"names":["assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"names":["Worker","NodeWorker","isBrowser","assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","constructor","props","name","source","url","onMessage","onError","error","console","log","worker","_createBrowserWorker","_createNodeWorker","destroy","terminate","terminated","isRunning","Boolean","postMessage","data","transferList","_getErrorFromErrorEvent","event","message","lineno","colno","Error","_loadableURL","onmessage","onerror","onmessageerror","absolute","includes","startsWith","eval","on","code"],"mappings":"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","sourcesContent":["import {Worker as NodeWorker} from 'worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorker;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return typeof Worker !== 'undefined' && isBrowser;\n // || typeof NodeWorker !== undefined;\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorker {\n let worker: NodeWorker;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"file":"worker-thread.js"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-utils/get-loadable-worker-url.ts"],"names":["assert","workerURLCache","Map","getLoadableWorkerURL","props","source","url","workerURL","get","getLoadableWorkerURLFromURL","set","getLoadableWorkerURLFromSource","startsWith","workerSource","buildScriptSource","blob","Blob","type","URL","createObjectURL","workerUrl"],"mappings":"AAAA,SAAQA,MAAR,QAAqB,qBAArB;AAEA,MAAMC,cAAc,GAAG,IAAIC,GAAJ,EAAvB;AAWA,OAAO,SAASC,oBAAT,CAA8BC,KAA9B,EAAsE;AAC3EJ,EAAAA,MAAM,CAAEI,KAAK,CAACC,MAAN,IAAgB,CAACD,KAAK,CAACE,GAAxB,IAAiC,CAACF,KAAK,CAACC,MAAP,IAAiBD,KAAK,CAACE,GAAzD,CAAN;AAEA,MAAIC,SAAS,GAAGN,cAAc,CAACO,GAAf,CAAmBJ,KAAK,CAACC,MAAN,IAAgBD,KAAK,CAACE,GAAzC,CAAhB;;AACA,MAAI,CAACC,SAAL,EAAgB;AAEd,QAAIH,KAAK,CAACE,GAAV,EAAe;AACbC,MAAAA,SAAS,GAAGE,2BAA2B,CAACL,KAAK,CAACE,GAAP,CAAvC;AACAL,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACE,GAAzB,EAA8BC,SAA9B;AACD;;AAED,QAAIH,KAAK,CAACC,MAAV,EAAkB;AAChBE,MAAAA,SAAS,GAAGI,8BAA8B,CAACP,KAAK,CAACC,MAAP,CAA1C;AACAJ,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACC,MAAzB,EAAiCE,SAAjC;AACD;AACF;;AAEDP,EAAAA,MAAM,CAACO,SAAD,CAAN;AACA,SAAOA,SAAP;AACD;;AAOD,SAASE,2BAAT,CAAqCH,GAArC,EAA0D;AAExD,MAAI,CAACA,GAAG,CAACM,UAAJ,CAAe,MAAf,CAAL,EAA6B;AAC3B,WAAON,GAAP;AACD;;AAGD,QAAMO,YAAY,GAAGC,iBAAiB,CAACR,GAAD,CAAtC;AACA,SAAOK,8BAA8B,CAACE,YAAD,CAArC;AACD;;AAOD,SAASF,8BAAT,CAAwCE,YAAxC,EAAsE;
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-utils/get-loadable-worker-url.ts"],"names":["assert","workerURLCache","Map","getLoadableWorkerURL","props","source","url","workerURL","get","getLoadableWorkerURLFromURL","set","getLoadableWorkerURLFromSource","startsWith","workerSource","buildScriptSource","blob","Blob","type","URL","createObjectURL","workerUrl"],"mappings":"AAAA,SAAQA,MAAR,QAAqB,qBAArB;AAEA,MAAMC,cAAc,GAAG,IAAIC,GAAJ,EAAvB;AAWA,OAAO,SAASC,oBAAT,CAA8BC,KAA9B,EAAsE;AAC3EJ,EAAAA,MAAM,CAAEI,KAAK,CAACC,MAAN,IAAgB,CAACD,KAAK,CAACE,GAAxB,IAAiC,CAACF,KAAK,CAACC,MAAP,IAAiBD,KAAK,CAACE,GAAzD,CAAN;AAEA,MAAIC,SAAS,GAAGN,cAAc,CAACO,GAAf,CAAmBJ,KAAK,CAACC,MAAN,IAAgBD,KAAK,CAACE,GAAzC,CAAhB;;AACA,MAAI,CAACC,SAAL,EAAgB;AAEd,QAAIH,KAAK,CAACE,GAAV,EAAe;AACbC,MAAAA,SAAS,GAAGE,2BAA2B,CAACL,KAAK,CAACE,GAAP,CAAvC;AACAL,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACE,GAAzB,EAA8BC,SAA9B;AACD;;AAED,QAAIH,KAAK,CAACC,MAAV,EAAkB;AAChBE,MAAAA,SAAS,GAAGI,8BAA8B,CAACP,KAAK,CAACC,MAAP,CAA1C;AACAJ,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACC,MAAzB,EAAiCE,SAAjC;AACD;AACF;;AAEDP,EAAAA,MAAM,CAACO,SAAD,CAAN;AACA,SAAOA,SAAP;AACD;;AAOD,SAASE,2BAAT,CAAqCH,GAArC,EAA0D;AAExD,MAAI,CAACA,GAAG,CAACM,UAAJ,CAAe,MAAf,CAAL,EAA6B;AAC3B,WAAON,GAAP;AACD;;AAGD,QAAMO,YAAY,GAAGC,iBAAiB,CAACR,GAAD,CAAtC;AACA,SAAOK,8BAA8B,CAACE,YAAD,CAArC;AACD;;AAOD,SAASF,8BAAT,CAAwCE,YAAxC,EAAsE;AACpE,QAAME,IAAI,GAAG,IAAIC,IAAJ,CAAS,CAACH,YAAD,CAAT,EAAyB;AAACI,IAAAA,IAAI,EAAE;AAAP,GAAzB,CAAb;AACA,SAAOC,GAAG,CAACC,eAAJ,CAAoBJ,IAApB,CAAP;AACD;;AAUD,SAASD,iBAAT,CAA2BM,SAA3B,EAAsD;AACpD,2CAEiBA,SAFjB;AAOD","sourcesContent":["import {assert} from '../env-utils/assert';\n\nconst workerURLCache = new Map();\n\n/**\n * Creates a loadable URL from worker source or URL\n * that can be used to create `Worker` instances.\n * Due to CORS issues it may be necessary to wrap a URL in a small importScripts\n * @param props\n * @param props.source Worker source\n * @param props.url Worker URL\n * @returns loadable url\n */\nexport function getLoadableWorkerURL(props: {source?: string; url?: string}) {\n assert((props.source && !props.url) || (!props.source && props.url)); // Either source or url must be defined\n\n let workerURL = workerURLCache.get(props.source || props.url);\n if (!workerURL) {\n // Differentiate worker urls from worker source code\n if (props.url) {\n workerURL = getLoadableWorkerURLFromURL(props.url);\n workerURLCache.set(props.url, workerURL);\n }\n\n if (props.source) {\n workerURL = getLoadableWorkerURLFromSource(props.source);\n workerURLCache.set(props.source, workerURL);\n }\n }\n\n assert(workerURL);\n return workerURL;\n}\n\n/**\n * Build a loadable worker URL from worker URL\n * @param url\n * @returns loadable URL\n */\nfunction getLoadableWorkerURLFromURL(url: string): string {\n // A local script url, we can use it to initialize a Worker directly\n if (!url.startsWith('http')) {\n return url;\n }\n\n // A remote script, we need to use `importScripts` to load from different origin\n const workerSource = buildScriptSource(url);\n return getLoadableWorkerURLFromSource(workerSource);\n}\n\n/**\n * Build a loadable worker URL from worker source\n * @param workerSource\n * @returns loadable url\n */\nfunction getLoadableWorkerURLFromSource(workerSource: string): string {\n const blob = new Blob([workerSource], {type: 'application/javascript'});\n return URL.createObjectURL(blob);\n}\n\n/**\n * Per spec, worker cannot be initialized with a script from a different origin\n * However a local worker script can still import scripts from other origins,\n * so we simply build a wrapper script.\n *\n * @param workerUrl\n * @returns source\n */\nfunction buildScriptSource(workerUrl: string): string {\n return `\\\ntry {\n importScripts('${workerUrl}');\n} catch (error) {\n console.error(error);\n throw error;\n}`;\n}\n"],"file":"get-loadable-worker-url.js"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.VERSION = void 0;
|
|
6
6
|
// Change to `latest` on production branches
|
|
7
|
-
const DEFAULT_VERSION = '
|
|
7
|
+
const DEFAULT_VERSION = 'beta';
|
|
8
8
|
exports.VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;
|
|
9
9
|
if (typeof __VERSION__ === 'undefined') {
|
|
10
10
|
// eslint-disable-next-line
|
|
@@ -26,7 +26,7 @@ const node = __importStar(require("../node/require-utils.node"));
|
|
|
26
26
|
const assert_1 = require("../env-utils/assert");
|
|
27
27
|
const version_1 = require("../env-utils/version");
|
|
28
28
|
// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
|
|
29
|
-
const LATEST = '
|
|
29
|
+
const LATEST = 'beta';
|
|
30
30
|
const VERSION = typeof version_1.VERSION !== 'undefined' ? version_1.VERSION : LATEST;
|
|
31
31
|
const loadLibraryPromises = {}; // promises
|
|
32
32
|
/**
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"worker_threads-browser.d.ts","sourceRoot":"","sources":["../../../src/lib/node/worker_threads-browser.js"],"names":[],"mappings":"AAIA;IACE,gCAAkB;IAClB,kCAAuB;IACvB,kBAAc;CACf;AAED,8BAA+B"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.parentPort = exports.Worker = void 0;
|
|
4
|
+
// Browser fills for Node.js built-in `worker_threads` module.
|
|
5
|
+
// These fills are non-functional, and just intended to ensure that
|
|
6
|
+
// `import 'worker_threads` doesn't break browser builds.
|
|
7
|
+
// The replacement is done in package.json browser field
|
|
8
|
+
class Worker {
|
|
9
|
+
on(message, cb) { }
|
|
10
|
+
postMessage(...args) { }
|
|
11
|
+
terminate() { }
|
|
12
|
+
}
|
|
13
|
+
exports.Worker = Worker;
|
|
14
|
+
exports.parentPort = null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/create-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,aAAa,EACb,OAAO,EACP,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAUrB,oBAAY,mBAAmB,GAAG,CAChC,IAAI,EAAE,GAAG,EACT,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAC9B,OAAO,CAAC,EAAE,aAAa,KACpB,GAAG,CAAC;AAET;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"create-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/create-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,aAAa,EACb,OAAO,EACP,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAUrB,oBAAY,mBAAmB,GAAG,CAChC,IAAI,EAAE,GAAG,EACT,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAC9B,OAAO,CAAC,EAAE,aAAa,KACpB,GAAG,CAAC;AAET;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAiDxF"}
|
|
@@ -15,8 +15,7 @@ let options;
|
|
|
15
15
|
* Set up a WebWorkerGlobalScope to talk with the main thread
|
|
16
16
|
*/
|
|
17
17
|
function createWorker(process, processInBatches) {
|
|
18
|
-
|
|
19
|
-
if (typeof self === 'undefined') {
|
|
18
|
+
if (!worker_body_1.default.inWorkerThread()) {
|
|
20
19
|
return;
|
|
21
20
|
}
|
|
22
21
|
const context = {
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getWorkerURL = exports.getWorkerName = void 0;
|
|
4
4
|
const assert_1 = require("../env-utils/assert");
|
|
5
5
|
const version_1 = require("../env-utils/version");
|
|
6
|
-
const NPM_TAG = '
|
|
6
|
+
const NPM_TAG = 'beta'; // Change to 'latest' on release-branch
|
|
7
7
|
const VERSION = typeof version_1.VERSION !== 'undefined' ? version_1.VERSION : NPM_TAG;
|
|
8
8
|
/**
|
|
9
9
|
* Gets worker object's name (for debugging in Chrome thread inspector window)
|
|
@@ -3,6 +3,8 @@ import type { WorkerMessageType, WorkerMessagePayload } from '../../types';
|
|
|
3
3
|
* Type safe wrapper for worker code
|
|
4
4
|
*/
|
|
5
5
|
export default class WorkerBody {
|
|
6
|
+
/** Check that we are actually in a worker thread */
|
|
7
|
+
static inWorkerThread(): boolean;
|
|
6
8
|
static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any);
|
|
7
9
|
static addEventListener(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any): void;
|
|
8
10
|
static removeEventListener(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-body.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-body.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-body.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,iBAAiB,EAAE,oBAAoB,EAAC,MAAM,aAAa,CAAC;AAkB5F;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,oDAAoD;IACpD,MAAM,CAAC,cAAc,IAAI,OAAO;IAOhC,MAAM,KAAK,SAAS,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,GAAG,EAqB9F;IAED,MAAM,CAAC,gBAAgB,CACrB,SAAS,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,GAAG;IAyB5E,MAAM,CAAC,mBAAmB,CACxB,SAAS,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,GAAG;IAY5E;;;;OAIG;IACH,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,IAAI;CAcjF"}
|
|
@@ -1,24 +1,52 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
const get_transfer_list_1 = require("../worker-utils/get-transfer-list");
|
|
4
|
+
/** Vile hack to defeat over-zealous bundlers from stripping out the require */
|
|
5
|
+
function getParentPort() {
|
|
6
|
+
// const isNode = globalThis.process;
|
|
7
|
+
let parentPort;
|
|
8
|
+
try {
|
|
9
|
+
// prettier-ignore
|
|
10
|
+
eval('globalThis.parentPort = require(\'worker_threads\').parentPort'); // eslint-disable-line no-eval
|
|
11
|
+
parentPort = globalThis.parentPort;
|
|
12
|
+
// eslint-disable-next-line no-empty
|
|
13
|
+
}
|
|
14
|
+
catch { }
|
|
15
|
+
return parentPort;
|
|
16
|
+
}
|
|
4
17
|
const onMessageWrapperMap = new Map();
|
|
5
18
|
/**
|
|
6
19
|
* Type safe wrapper for worker code
|
|
7
20
|
*/
|
|
8
21
|
class WorkerBody {
|
|
22
|
+
/** Check that we are actually in a worker thread */
|
|
23
|
+
static inWorkerThread() {
|
|
24
|
+
return typeof self !== 'undefined' || Boolean(getParentPort());
|
|
25
|
+
}
|
|
9
26
|
/*
|
|
10
27
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
11
28
|
*/
|
|
12
29
|
static set onmessage(onMessage) {
|
|
13
|
-
|
|
14
|
-
self.onmessage = (message) => {
|
|
15
|
-
if (!isKnownMessage(message)) {
|
|
16
|
-
return;
|
|
17
|
-
}
|
|
30
|
+
function handleMessage(message) {
|
|
18
31
|
// Confusingly the message itself also has a 'type' field which is always set to 'message'
|
|
19
|
-
const
|
|
32
|
+
const parentPort = getParentPort();
|
|
33
|
+
const { type, payload } = parentPort ? message : message.data;
|
|
34
|
+
// if (!isKnownMessage(message)) {
|
|
35
|
+
// return;
|
|
36
|
+
// }
|
|
20
37
|
onMessage(type, payload);
|
|
21
|
-
}
|
|
38
|
+
}
|
|
39
|
+
const parentPort = getParentPort();
|
|
40
|
+
if (parentPort) {
|
|
41
|
+
parentPort.on('message', handleMessage);
|
|
42
|
+
// if (message == 'exit') { parentPort.unref(); }
|
|
43
|
+
// eslint-disable-next-line
|
|
44
|
+
parentPort.on('exit', () => console.debug('Node worker closing'));
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
// eslint-disable-next-line no-restricted-globals
|
|
48
|
+
globalThis.onmessage = handleMessage;
|
|
49
|
+
}
|
|
22
50
|
}
|
|
23
51
|
static addEventListener(onMessage) {
|
|
24
52
|
let onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
@@ -27,19 +55,30 @@ class WorkerBody {
|
|
|
27
55
|
if (!isKnownMessage(message)) {
|
|
28
56
|
return;
|
|
29
57
|
}
|
|
30
|
-
// Confusingly the message itself also has a 'type' field which is always set to 'message'
|
|
31
|
-
const
|
|
58
|
+
// Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'
|
|
59
|
+
const parentPort = getParentPort();
|
|
60
|
+
const { type, payload } = parentPort ? message : message.data;
|
|
32
61
|
onMessage(type, payload);
|
|
33
62
|
};
|
|
34
63
|
}
|
|
35
|
-
|
|
36
|
-
|
|
64
|
+
const parentPort = getParentPort();
|
|
65
|
+
if (parentPort) {
|
|
66
|
+
console.error('not implemented'); // eslint-disable-line
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
globalThis.addEventListener('message', onMessageWrapper);
|
|
70
|
+
}
|
|
37
71
|
}
|
|
38
72
|
static removeEventListener(onMessage) {
|
|
39
73
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
40
74
|
onMessageWrapperMap.delete(onMessage);
|
|
41
|
-
|
|
42
|
-
|
|
75
|
+
const parentPort = getParentPort();
|
|
76
|
+
if (parentPort) {
|
|
77
|
+
console.error('not implemented'); // eslint-disable-line
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
globalThis.removeEventListener('message', onMessageWrapper);
|
|
81
|
+
}
|
|
43
82
|
}
|
|
44
83
|
/**
|
|
45
84
|
* Send a message from a worker to creating thread (main thread)
|
|
@@ -47,12 +86,17 @@ class WorkerBody {
|
|
|
47
86
|
* @param payload
|
|
48
87
|
*/
|
|
49
88
|
static postMessage(type, payload) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
89
|
+
const data = { source: 'loaders.gl', type, payload };
|
|
90
|
+
// console.log('posting message', data);
|
|
91
|
+
const transferList = (0, get_transfer_list_1.getTransferList)(payload);
|
|
92
|
+
const parentPort = getParentPort();
|
|
93
|
+
if (parentPort) {
|
|
94
|
+
parentPort.postMessage(data, transferList);
|
|
95
|
+
// console.log('posted message', data);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
54
98
|
// @ts-ignore
|
|
55
|
-
|
|
99
|
+
globalThis.postMessage(data, transferList);
|
|
56
100
|
}
|
|
57
101
|
}
|
|
58
102
|
}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import WorkerPool from './worker-pool';
|
|
2
2
|
/**
|
|
3
|
-
* @param maxConcurrency
|
|
3
|
+
* @param maxConcurrency - max count of workers
|
|
4
|
+
* @param maxMobileConcurrency - max count of workers on mobile
|
|
5
|
+
* @param maxConcurrency - max count of workers
|
|
6
|
+
* @param reuseWorkers - if false, destroys workers when task is completed
|
|
7
|
+
* @param onDebug - callback intended to allow application to log worker pool activity
|
|
4
8
|
*/
|
|
5
9
|
export declare type WorkerFarmProps = {
|
|
6
10
|
maxConcurrency?: number;
|
|
@@ -15,7 +19,7 @@ export default class WorkerFarm {
|
|
|
15
19
|
private props;
|
|
16
20
|
private workerPools;
|
|
17
21
|
private static _workerFarm?;
|
|
18
|
-
/**
|
|
22
|
+
/** Checks if workers are supported on this platform */
|
|
19
23
|
static isSupported(): boolean;
|
|
20
24
|
/** Get the singleton instance of the global worker farm */
|
|
21
25
|
static getWorkerFarm(props?: WorkerFarmProps): WorkerFarm;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-farm.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-farm.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,eAAe,CAAC;AAGvC
|
|
1
|
+
{"version":3,"file":"worker-farm.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-farm.ts"],"names":[],"mappings":"AAAA,OAAO,UAAU,MAAM,eAAe,CAAC;AAGvC;;;;;;GAMG;AACH,oBAAY,eAAe,GAAG;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AASF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,OAAO,CAAC,KAAK,CAAkB;IAC/B,OAAO,CAAC,WAAW,CAAiC;IAEpD,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAa;IAExC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;IAI7B,2DAA2D;IAC3D,MAAM,CAAC,aAAa,CAAC,KAAK,GAAE,eAAoB,GAAG,UAAU;IAM7D,0DAA0D;IAC1D,OAAO;IAOP;;;OAGG;IACH,OAAO,IAAI,IAAI;IAOf;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,eAAe,GAAG,IAAI;IAQtC;;;;;;;;OAQG;IACH,aAAa,CAAC,OAAO,EAAE;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAC,GAAG,UAAU;IAejF,mBAAmB;;;;;;CAQpB"}
|
|
@@ -8,8 +8,8 @@ const worker_thread_1 = __importDefault(require("./worker-thread"));
|
|
|
8
8
|
const DEFAULT_PROPS = {
|
|
9
9
|
maxConcurrency: 3,
|
|
10
10
|
maxMobileConcurrency: 1,
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
reuseWorkers: true,
|
|
12
|
+
onDebug: () => { }
|
|
13
13
|
};
|
|
14
14
|
/**
|
|
15
15
|
* Process multiple jobs with a "farm" of different workers in worker pools.
|
|
@@ -23,7 +23,7 @@ class WorkerFarm {
|
|
|
23
23
|
/** @type Map<string, WorkerPool>} */
|
|
24
24
|
this.workerPools = new Map();
|
|
25
25
|
}
|
|
26
|
-
/**
|
|
26
|
+
/** Checks if workers are supported on this platform */
|
|
27
27
|
static isSupported() {
|
|
28
28
|
return worker_thread_1.default.isSupported();
|
|
29
29
|
}
|
|
@@ -41,6 +41,7 @@ class WorkerFarm {
|
|
|
41
41
|
for (const workerPool of this.workerPools.values()) {
|
|
42
42
|
workerPool.destroy();
|
|
43
43
|
}
|
|
44
|
+
this.workerPools = new Map();
|
|
44
45
|
}
|
|
45
46
|
/**
|
|
46
47
|
* Set props used when initializing worker pools
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-job.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-job.ts"],"names":[],"mappings":"AAAA,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,
|
|
1
|
+
{"version":3,"file":"worker-job.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-job.ts"],"names":[],"mappings":"AAAA,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"}
|
|
@@ -6,11 +6,11 @@ const assert_1 = require("../env-utils/assert");
|
|
|
6
6
|
*/
|
|
7
7
|
class WorkerJob {
|
|
8
8
|
constructor(jobName, workerThread) {
|
|
9
|
-
this.name = jobName;
|
|
10
|
-
this.workerThread = workerThread;
|
|
11
9
|
this.isRunning = true;
|
|
12
10
|
this._resolve = () => { };
|
|
13
11
|
this._reject = () => { };
|
|
12
|
+
this.name = jobName;
|
|
13
|
+
this.workerThread = workerThread;
|
|
14
14
|
this.result = new Promise((resolve, reject) => {
|
|
15
15
|
this._resolve = resolve;
|
|
16
16
|
this._reject = reject;
|
|
@@ -39,6 +39,8 @@ export default class WorkerPool {
|
|
|
39
39
|
private idleQueue;
|
|
40
40
|
private count;
|
|
41
41
|
private isDestroyed;
|
|
42
|
+
/** Checks if workers are supported on this platform */
|
|
43
|
+
static isSupported(): boolean;
|
|
42
44
|
/**
|
|
43
45
|
* @param processor - worker function
|
|
44
46
|
* @param maxConcurrency - max count of workers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-pool.ts"],"names":[],"mappings":"AAAA,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,aAAK,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,oBAAY,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,aAAK,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAClG,aAAK,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;;;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;IAyCtC;;;;;;;OAOG;IACH,mBAAmB,CAAC,MAAM,EAAE,YAAY;IAgBxC;;OAEG;IACH,mBAAmB,IAAI,YAAY,GAAG,IAAI;IAiB1C,kBAAkB;CAGnB"}
|
|
1
|
+
{"version":3,"file":"worker-pool.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-pool.ts"],"names":[],"mappings":"AAAA,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,aAAK,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,oBAAY,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,aAAK,SAAS,GAAG,CAAC,GAAG,EAAE,SAAS,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,IAAI,CAAC;AAClG,aAAK,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;IAyCtC;;;;;;;OAOG;IACH,mBAAmB,CAAC,MAAM,EAAE,YAAY;IAgBxC;;OAEG;IACH,mBAAmB,IAAI,YAAY,GAAG,IAAI;IAiB1C,kBAAkB;CAGnB"}
|
|
@@ -29,6 +29,10 @@ class WorkerPool {
|
|
|
29
29
|
this.url = props.url;
|
|
30
30
|
this.setProps(props);
|
|
31
31
|
}
|
|
32
|
+
/** Checks if workers are supported on this platform */
|
|
33
|
+
static isSupported() {
|
|
34
|
+
return worker_thread_1.default.isSupported();
|
|
35
|
+
}
|
|
32
36
|
/**
|
|
33
37
|
* Terminates all workers in the pool
|
|
34
38
|
* @note Can free up significant memory
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
/// <reference types="node" />
|
|
2
|
+
import { Worker as NodeWorker } from 'worker_threads';
|
|
1
3
|
export declare type WorkerThreadProps = {
|
|
2
4
|
name: string;
|
|
3
5
|
source?: string;
|
|
@@ -11,10 +13,11 @@ export default class WorkerThread {
|
|
|
11
13
|
readonly source: string | undefined;
|
|
12
14
|
readonly url: string | undefined;
|
|
13
15
|
terminated: boolean;
|
|
14
|
-
worker: Worker;
|
|
16
|
+
worker: Worker | NodeWorker;
|
|
15
17
|
onMessage: (message: any) => void;
|
|
16
18
|
onError: (error: Error) => void;
|
|
17
19
|
private _loadableURL;
|
|
20
|
+
/** Checks if workers are supported on this platform */
|
|
18
21
|
static isSupported(): boolean;
|
|
19
22
|
constructor(props: WorkerThreadProps);
|
|
20
23
|
/**
|
|
@@ -31,12 +34,17 @@ export default class WorkerThread {
|
|
|
31
34
|
postMessage(data: any, transferList?: any[]): void;
|
|
32
35
|
/**
|
|
33
36
|
* Generate a standard Error from an ErrorEvent
|
|
34
|
-
* @param
|
|
37
|
+
* @param event
|
|
35
38
|
*/
|
|
36
39
|
_getErrorFromErrorEvent(event: ErrorEvent): Error;
|
|
37
40
|
/**
|
|
38
41
|
* Creates a worker thread on the browser
|
|
39
42
|
*/
|
|
40
43
|
_createBrowserWorker(): Worker;
|
|
44
|
+
/**
|
|
45
|
+
* Creates a worker thread in node.js
|
|
46
|
+
* @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
|
|
47
|
+
*/
|
|
48
|
+
_createNodeWorker(): NodeWorker;
|
|
41
49
|
}
|
|
42
50
|
//# sourceMappingURL=worker-thread.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAQpD,oBAAY,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,UAAU,CAAC;IAC5B,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;gBAKjB,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,UAAU;CA0BhC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const worker_threads_1 = require("worker_threads");
|
|
4
|
+
const globals_1 = require("../env-utils/globals");
|
|
3
5
|
const assert_1 = require("../env-utils/assert");
|
|
4
6
|
const get_loadable_worker_url_1 = require("../worker-utils/get-loadable-worker-url");
|
|
5
7
|
const get_transfer_list_1 = require("../worker-utils/get-transfer-list");
|
|
@@ -18,10 +20,12 @@ class WorkerThread {
|
|
|
18
20
|
this.url = url;
|
|
19
21
|
this.onMessage = NOOP;
|
|
20
22
|
this.onError = (error) => console.log(error); // eslint-disable-line
|
|
21
|
-
this.worker = this._createBrowserWorker();
|
|
23
|
+
this.worker = globals_1.isBrowser ? this._createBrowserWorker() : this._createNodeWorker();
|
|
22
24
|
}
|
|
25
|
+
/** Checks if workers are supported on this platform */
|
|
23
26
|
static isSupported() {
|
|
24
|
-
return typeof Worker !== 'undefined';
|
|
27
|
+
return typeof Worker !== 'undefined' && globals_1.isBrowser;
|
|
28
|
+
// || typeof NodeWorker !== undefined;
|
|
25
29
|
}
|
|
26
30
|
/**
|
|
27
31
|
* Terminate this worker thread
|
|
@@ -30,8 +34,7 @@ class WorkerThread {
|
|
|
30
34
|
destroy() {
|
|
31
35
|
this.onMessage = NOOP;
|
|
32
36
|
this.onError = NOOP;
|
|
33
|
-
// @
|
|
34
|
-
this.worker.terminate();
|
|
37
|
+
this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises
|
|
35
38
|
this.terminated = true;
|
|
36
39
|
}
|
|
37
40
|
get isRunning() {
|
|
@@ -50,7 +53,7 @@ class WorkerThread {
|
|
|
50
53
|
// PRIVATE
|
|
51
54
|
/**
|
|
52
55
|
* Generate a standard Error from an ErrorEvent
|
|
53
|
-
* @param
|
|
56
|
+
* @param event
|
|
54
57
|
*/
|
|
55
58
|
_getErrorFromErrorEvent(event) {
|
|
56
59
|
// Note Error object does not have the expected fields if loading failed completely
|
|
@@ -91,5 +94,37 @@ class WorkerThread {
|
|
|
91
94
|
worker.onmessageerror = (event) => console.error(event); // eslint-disable-line
|
|
92
95
|
return worker;
|
|
93
96
|
}
|
|
97
|
+
/**
|
|
98
|
+
* Creates a worker thread in node.js
|
|
99
|
+
* @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
|
|
100
|
+
*/
|
|
101
|
+
_createNodeWorker() {
|
|
102
|
+
let worker;
|
|
103
|
+
if (this.url) {
|
|
104
|
+
// Make sure relative URLs start with './'
|
|
105
|
+
const absolute = this.url.includes(':/') || this.url.startsWith('/');
|
|
106
|
+
const url = absolute ? this.url : `./${this.url}`;
|
|
107
|
+
// console.log('Starting work from', url);
|
|
108
|
+
worker = new worker_threads_1.Worker(url, { eval: false });
|
|
109
|
+
}
|
|
110
|
+
else if (this.source) {
|
|
111
|
+
worker = new worker_threads_1.Worker(this.source, { eval: true });
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
throw new Error('no worker');
|
|
115
|
+
}
|
|
116
|
+
worker.on('message', (data) => {
|
|
117
|
+
// console.error('message', data);
|
|
118
|
+
this.onMessage(data);
|
|
119
|
+
});
|
|
120
|
+
worker.on('error', (error) => {
|
|
121
|
+
// console.error('error', error);
|
|
122
|
+
this.onError(error);
|
|
123
|
+
});
|
|
124
|
+
worker.on('exit', (code) => {
|
|
125
|
+
// console.error('exit', code);
|
|
126
|
+
});
|
|
127
|
+
return worker;
|
|
128
|
+
}
|
|
94
129
|
}
|
|
95
130
|
exports.default = WorkerThread;
|
|
@@ -50,8 +50,6 @@ function getLoadableWorkerURLFromURL(url) {
|
|
|
50
50
|
* @returns loadable url
|
|
51
51
|
*/
|
|
52
52
|
function getLoadableWorkerURLFromSource(workerSource) {
|
|
53
|
-
// NOTE: webworkify was previously used
|
|
54
|
-
// const blob = webworkify(workerSource, {bare: true});
|
|
55
53
|
const blob = new Blob([workerSource], { type: 'application/javascript' });
|
|
56
54
|
return URL.createObjectURL(blob);
|
|
57
55
|
}
|
package/dist/null-worker.js
CHANGED
|
@@ -93,16 +93,33 @@
|
|
|
93
93
|
}
|
|
94
94
|
|
|
95
95
|
// src/lib/worker-farm/worker-body.ts
|
|
96
|
+
function getParentPort() {
|
|
97
|
+
let parentPort;
|
|
98
|
+
try {
|
|
99
|
+
eval("globalThis.parentPort = require('worker_threads').parentPort");
|
|
100
|
+
parentPort = globalThis.parentPort;
|
|
101
|
+
} catch {
|
|
102
|
+
}
|
|
103
|
+
return parentPort;
|
|
104
|
+
}
|
|
96
105
|
var onMessageWrapperMap = new Map();
|
|
97
106
|
var WorkerBody = class {
|
|
107
|
+
static inWorkerThread() {
|
|
108
|
+
return typeof self !== "undefined" || Boolean(getParentPort());
|
|
109
|
+
}
|
|
98
110
|
static set onmessage(onMessage) {
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
}
|
|
103
|
-
const { type, payload } = message.data;
|
|
111
|
+
function handleMessage(message) {
|
|
112
|
+
const parentPort3 = getParentPort();
|
|
113
|
+
const { type, payload } = parentPort3 ? message : message.data;
|
|
104
114
|
onMessage(type, payload);
|
|
105
|
-
}
|
|
115
|
+
}
|
|
116
|
+
const parentPort2 = getParentPort();
|
|
117
|
+
if (parentPort2) {
|
|
118
|
+
parentPort2.on("message", handleMessage);
|
|
119
|
+
parentPort2.on("exit", () => console.debug("Node worker closing"));
|
|
120
|
+
} else {
|
|
121
|
+
globalThis.onmessage = handleMessage;
|
|
122
|
+
}
|
|
106
123
|
}
|
|
107
124
|
static addEventListener(onMessage) {
|
|
108
125
|
let onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
@@ -111,22 +128,36 @@
|
|
|
111
128
|
if (!isKnownMessage(message)) {
|
|
112
129
|
return;
|
|
113
130
|
}
|
|
114
|
-
const
|
|
131
|
+
const parentPort3 = getParentPort();
|
|
132
|
+
const { type, payload } = parentPort3 ? message : message.data;
|
|
115
133
|
onMessage(type, payload);
|
|
116
134
|
};
|
|
117
135
|
}
|
|
118
|
-
|
|
136
|
+
const parentPort2 = getParentPort();
|
|
137
|
+
if (parentPort2) {
|
|
138
|
+
console.error("not implemented");
|
|
139
|
+
} else {
|
|
140
|
+
globalThis.addEventListener("message", onMessageWrapper);
|
|
141
|
+
}
|
|
119
142
|
}
|
|
120
143
|
static removeEventListener(onMessage) {
|
|
121
144
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
122
145
|
onMessageWrapperMap.delete(onMessage);
|
|
123
|
-
|
|
146
|
+
const parentPort2 = getParentPort();
|
|
147
|
+
if (parentPort2) {
|
|
148
|
+
console.error("not implemented");
|
|
149
|
+
} else {
|
|
150
|
+
globalThis.removeEventListener("message", onMessageWrapper);
|
|
151
|
+
}
|
|
124
152
|
}
|
|
125
153
|
static postMessage(type, payload) {
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
154
|
+
const data = { source: "loaders.gl", type, payload };
|
|
155
|
+
const transferList = getTransferList(payload);
|
|
156
|
+
const parentPort2 = getParentPort();
|
|
157
|
+
if (parentPort2) {
|
|
158
|
+
parentPort2.postMessage(data, transferList);
|
|
159
|
+
} else {
|
|
160
|
+
globalThis.postMessage(data, transferList);
|
|
130
161
|
}
|
|
131
162
|
}
|
|
132
163
|
};
|
|
@@ -140,7 +171,7 @@
|
|
|
140
171
|
var inputBatches;
|
|
141
172
|
var options;
|
|
142
173
|
function createWorker(process, processInBatches) {
|
|
143
|
-
if (
|
|
174
|
+
if (!WorkerBody.inWorkerThread()) {
|
|
144
175
|
return;
|
|
145
176
|
}
|
|
146
177
|
const context = {
|