@loaders.gl/worker-utils 3.4.0-alpha.2 → 3.4.0-alpha.3
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/index.js +0 -1
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/async-queue/async-queue.js +5 -18
- package/dist/es5/lib/async-queue/async-queue.js.map +1 -1
- package/dist/es5/lib/env-utils/assert.js +0 -1
- package/dist/es5/lib/env-utils/assert.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +1 -7
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- package/dist/es5/lib/env-utils/version.js +2 -3
- package/dist/es5/lib/env-utils/version.js.map +1 -1
- package/dist/es5/lib/library-utils/library-utils.js +70 -83
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/node/require-utils.node.js +23 -26
- package/dist/es5/lib/node/require-utils.node.js.map +1 -1
- package/dist/es5/lib/node/worker_threads-browser.js +1 -2
- package/dist/es5/lib/node/worker_threads-browser.js.map +1 -1
- package/dist/es5/lib/node/worker_threads.js +0 -1
- package/dist/es5/lib/node/worker_threads.js.map +1 -1
- package/dist/es5/lib/process-utils/child-process-proxy.js +87 -96
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/es5/lib/process-utils/process-utils.js.map +1 -1
- package/dist/es5/lib/worker-api/create-worker.js +96 -103
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +1 -8
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +81 -87
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/validate-worker-version.js +0 -2
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-body.js +3 -10
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-farm.js +6 -18
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-job.js +3 -10
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +72 -89
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +7 -23
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +0 -6
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +2 -8
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/es5/workers/null-worker.js +6 -8
- package/dist/es5/workers/null-worker.js.map +1 -1
- package/dist/esm/index.js +0 -8
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/async-queue/async-queue.js +0 -8
- package/dist/esm/lib/async-queue/async-queue.js.map +1 -1
- package/dist/esm/lib/env-utils/assert.js +0 -2
- package/dist/esm/lib/env-utils/assert.js.map +1 -1
- package/dist/esm/lib/env-utils/globals.js +1 -9
- package/dist/esm/lib/env-utils/globals.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +2 -4
- package/dist/esm/lib/env-utils/version.js.map +1 -1
- package/dist/esm/lib/library-utils/library-utils.js +2 -14
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/node/require-utils.node.js +0 -5
- package/dist/esm/lib/node/require-utils.node.js.map +1 -1
- package/dist/esm/lib/node/worker_threads-browser.js +0 -1
- package/dist/esm/lib/node/worker_threads-browser.js.map +1 -1
- package/dist/esm/lib/node/worker_threads.js +0 -2
- package/dist/esm/lib/node/worker_threads.js.map +1 -1
- package/dist/esm/lib/process-utils/child-process-proxy.js +0 -6
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/esm/lib/process-utils/process-utils.js +0 -1
- package/dist/esm/lib/process-utils/process-utils.js.map +1 -1
- package/dist/esm/lib/worker-api/create-worker.js +0 -5
- package/dist/esm/lib/worker-api/create-worker.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +1 -9
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +1 -5
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/esm/lib/worker-api/validate-worker-version.js +0 -3
- package/dist/esm/lib/worker-api/validate-worker-version.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-body.js +0 -6
- package/dist/esm/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-farm.js +0 -8
- package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-job.js +0 -5
- package/dist/esm/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +0 -14
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +1 -10
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +0 -6
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-transfer-list.js +2 -9
- package/dist/esm/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +0 -1
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/lib/worker-api/create-worker.js +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-worker-url.js","names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-worker-url.js","names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","concat","name","getWorkerURL","options","arguments","length","undefined","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":"AAGA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,OAAO,IAAIC,WAAW,QAAO,sBAAsB;AAE3D,MAAMC,OAAO,GAAG,MAAM;AACtB,MAAMF,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiBE,OAAO;AAK1E,OAAO,SAASC,aAAaA,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKN,OAAO,qBAAAO,MAAA,CAAqBP,OAAO,SAAM,EAAE;EAC9E,UAAAO,MAAA,CAAUH,MAAM,CAACI,IAAI,OAAAD,MAAA,CAAIH,MAAM,CAACE,OAAO,EAAAC,MAAA,CAAGF,OAAO;AACnD;AASA,OAAO,SAASI,YAAYA,CAACL,MAAoB,EAAuC;EAAA,IAArCM,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,MAAMG,aAAa,GAAGJ,OAAO,CAACN,MAAM,CAACW,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,MAAAT,MAAA,CAAMH,MAAM,CAACW,EAAE,eAAY;EAE3C,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIb,MAAM,CAACW,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGP,OAAO,CAACQ,SAAS;EACzB;EAIA,IAAIR,OAAO,CAACS,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,cAAAV,MAAA,CAAcH,MAAM,CAACgB,MAAM,YAAAb,MAAA,CAASS,UAAU,CAAE;EACrD;EAGA,IAAI,CAACC,GAAG,EAAE;IAER,IAAIX,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGJ,OAAO;IACnB;IACA,MAAMmB,UAAU,GAAGf,OAAO,OAAAC,MAAA,CAAOD,OAAO,IAAK,EAAE;IAC/CW,GAAG,oCAAAV,MAAA,CAAoCH,MAAM,CAACgB,MAAM,EAAAb,MAAA,CAAGc,UAAU,YAAAd,MAAA,CAASS,UAAU,CAAE;EACxF;EAEAjB,MAAM,CAACkB,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
|
|
@@ -7,7 +7,6 @@ export function canProcessOnWorker(worker, options) {
|
|
|
7
7
|
}
|
|
8
8
|
return worker.worker && (options === null || options === void 0 ? void 0 : options.worker);
|
|
9
9
|
}
|
|
10
|
-
|
|
11
10
|
export async function processOnWorker(worker, data) {
|
|
12
11
|
let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
13
12
|
let context = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
|
|
@@ -25,9 +24,7 @@ export async function processOnWorker(worker, data) {
|
|
|
25
24
|
}
|
|
26
25
|
const workerPool = workerFarm.getWorkerPool(workerPoolProps);
|
|
27
26
|
const jobName = options.jobName || worker.name;
|
|
28
|
-
const job = await workerPool.startJob(jobName,
|
|
29
|
-
onMessage.bind(null, context));
|
|
30
|
-
|
|
27
|
+
const job = await workerPool.startJob(jobName, onMessage.bind(null, context));
|
|
31
28
|
const transferableOptions = getTransferListForWriter(options);
|
|
32
29
|
job.postMessage('process', {
|
|
33
30
|
input: data,
|
|
@@ -36,7 +33,6 @@ export async function processOnWorker(worker, data) {
|
|
|
36
33
|
const result = await job.result;
|
|
37
34
|
return result.result;
|
|
38
35
|
}
|
|
39
|
-
|
|
40
36
|
async function onMessage(context, job, type, payload) {
|
|
41
37
|
switch (type) {
|
|
42
38
|
case 'done':
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-on-worker.js","names":["WorkerFarm","getWorkerURL","getWorkerName","getTransferListForWriter","canProcessOnWorker","worker","options","isSupported","processOnWorker","data","context","name","workerFarm","getWorkerFarm","source","workerPoolProps","url","workerPool","getWorkerPool","jobName","job","startJob","onMessage","bind","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\nimport {getTransferListForWriter} from '../worker-utils/get-transfer-list';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const {source} = options;\n const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};\n if (!source) {\n workerPoolProps.url = getWorkerURL(worker, options);\n }\n const workerPool = workerFarm.getWorkerPool(workerPoolProps);\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = getTransferListForWriter(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"mappings":"AAQA,OAAOA,UAAU,MAAM,4BAA4B;AACnD,SAAQC,YAAY,EAAEC,aAAa,QAAO,kBAAkB;AAC5D,SAAQC,wBAAwB,QAAO,mCAAmC;AAa1E,OAAO,SAASC,
|
|
1
|
+
{"version":3,"file":"process-on-worker.js","names":["WorkerFarm","getWorkerURL","getWorkerName","getTransferListForWriter","canProcessOnWorker","worker","options","isSupported","processOnWorker","data","arguments","length","undefined","context","name","workerFarm","getWorkerFarm","source","workerPoolProps","url","workerPool","getWorkerPool","jobName","job","startJob","onMessage","bind","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn","concat"],"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\nimport {getTransferListForWriter} from '../worker-utils/get-transfer-list';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const {source} = options;\n const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};\n if (!source) {\n workerPoolProps.url = getWorkerURL(worker, options);\n }\n const workerPool = workerFarm.getWorkerPool(workerPoolProps);\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = getTransferListForWriter(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { assert } from '../env-utils/assert';
|
|
2
2
|
import { VERSION } from '../env-utils/version';
|
|
3
|
-
|
|
4
3
|
export function validateWorkerVersion(worker) {
|
|
5
4
|
let coreVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : VERSION;
|
|
6
5
|
assert(worker, 'no worker provided');
|
|
@@ -8,10 +7,8 @@ export function validateWorkerVersion(worker) {
|
|
|
8
7
|
if (!coreVersion || !workerVersion) {
|
|
9
8
|
return false;
|
|
10
9
|
}
|
|
11
|
-
|
|
12
10
|
return true;
|
|
13
11
|
}
|
|
14
|
-
|
|
15
12
|
function parseVersion(version) {
|
|
16
13
|
const parts = version.split('.').map(Number);
|
|
17
14
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-worker-version.js","names":["assert","VERSION","validateWorkerVersion","worker","coreVersion","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"sources":["../../../../src/lib/worker-api/validate-worker-version.ts"],"sourcesContent":["import type {WorkerObject} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\n/**\n * Check if worker is compatible with this library version\n * @param worker\n * @param libVersion\n * @returns `true` if the two versions are compatible\n */\nexport function validateWorkerVersion(\n worker: WorkerObject,\n coreVersion: string = VERSION\n): boolean {\n assert(worker, 'no worker provided');\n\n const workerVersion = worker.version;\n if (!coreVersion || !workerVersion) {\n return false;\n }\n\n // TODO enable when fix the __version__ injection\n // const coreVersions = parseVersion(coreVersion);\n // const workerVersions = parseVersion(workerVersion);\n // assert(\n // coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,\n // `worker: ${worker.name} is not compatible. ${coreVersion.major}.${\n // coreVersion.minor\n // }+ is required.`\n // );\n\n return true;\n}\n\n// @ts-ignore\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction parseVersion(version) {\n const parts = version.split('.').map(Number);\n return {major: parts[0], minor: parts[1]};\n}\n"],"mappings":"AACA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,OAAO,QAAO,sBAAsB
|
|
1
|
+
{"version":3,"file":"validate-worker-version.js","names":["assert","VERSION","validateWorkerVersion","worker","coreVersion","arguments","length","undefined","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"sources":["../../../../src/lib/worker-api/validate-worker-version.ts"],"sourcesContent":["import type {WorkerObject} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\n/**\n * Check if worker is compatible with this library version\n * @param worker\n * @param libVersion\n * @returns `true` if the two versions are compatible\n */\nexport function validateWorkerVersion(\n worker: WorkerObject,\n coreVersion: string = VERSION\n): boolean {\n assert(worker, 'no worker provided');\n\n const workerVersion = worker.version;\n if (!coreVersion || !workerVersion) {\n return false;\n }\n\n // TODO enable when fix the __version__ injection\n // const coreVersions = parseVersion(coreVersion);\n // const workerVersions = parseVersion(workerVersion);\n // assert(\n // coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,\n // `worker: ${worker.name} is not compatible. ${coreVersion.major}.${\n // coreVersion.minor\n // }+ is required.`\n // );\n\n return true;\n}\n\n// @ts-ignore\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction parseVersion(version) {\n const parts = version.split('.').map(Number);\n return {major: parts[0], minor: parts[1]};\n}\n"],"mappings":"AACA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,OAAO,QAAO,sBAAsB;AAQ5C,OAAO,SAASC,qBAAqBA,CACnCC,MAAoB,EAEX;EAAA,IADTC,WAAmB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAGJ,OAAO;EAE7BD,MAAM,CAACG,MAAM,EAAE,oBAAoB,CAAC;EAEpC,MAAMK,aAAa,GAAGL,MAAM,CAACM,OAAO;EACpC,IAAI,CAACL,WAAW,IAAI,CAACI,aAAa,EAAE;IAClC,OAAO,KAAK;EACd;EAYA,OAAO,IAAI;AACb;AAIA,SAASE,YAAYA,CAACD,OAAO,EAAE;EAC7B,MAAME,KAAK,GAAGF,OAAO,CAACG,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EAC5C,OAAO;IAACC,KAAK,EAAEJ,KAAK,CAAC,CAAC,CAAC;IAAEK,KAAK,EAAEL,KAAK,CAAC,CAAC;EAAC,CAAC;AAC3C"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { getTransferList } from '../worker-utils/get-transfer-list';
|
|
2
|
-
|
|
3
2
|
function getParentPort() {
|
|
4
3
|
let parentPort;
|
|
5
4
|
try {
|
|
@@ -9,12 +8,10 @@ function getParentPort() {
|
|
|
9
8
|
return parentPort;
|
|
10
9
|
}
|
|
11
10
|
const onMessageWrapperMap = new Map();
|
|
12
|
-
|
|
13
11
|
export default class WorkerBody {
|
|
14
12
|
static inWorkerThread() {
|
|
15
13
|
return typeof self !== 'undefined' || Boolean(getParentPort());
|
|
16
14
|
}
|
|
17
|
-
|
|
18
15
|
static set onmessage(onMessage) {
|
|
19
16
|
function handleMessage(message) {
|
|
20
17
|
const parentPort = getParentPort();
|
|
@@ -39,7 +36,6 @@ export default class WorkerBody {
|
|
|
39
36
|
if (!isKnownMessage(message)) {
|
|
40
37
|
return;
|
|
41
38
|
}
|
|
42
|
-
|
|
43
39
|
const parentPort = getParentPort();
|
|
44
40
|
const {
|
|
45
41
|
type,
|
|
@@ -65,7 +61,6 @@ export default class WorkerBody {
|
|
|
65
61
|
globalThis.removeEventListener('message', onMessageWrapper);
|
|
66
62
|
}
|
|
67
63
|
}
|
|
68
|
-
|
|
69
64
|
static postMessage(type, payload) {
|
|
70
65
|
const data = {
|
|
71
66
|
source: 'loaders.gl',
|
|
@@ -81,7 +76,6 @@ export default class WorkerBody {
|
|
|
81
76
|
}
|
|
82
77
|
}
|
|
83
78
|
}
|
|
84
|
-
|
|
85
79
|
function isKnownMessage(message) {
|
|
86
80
|
const {
|
|
87
81
|
type,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-body.js","names":["getTransferList","getParentPort","parentPort","eval","globalThis","onMessageWrapperMap","Map","WorkerBody","inWorkerThread","self","Boolean","onmessage","onMessage","handleMessage","message","type","payload","data","on","console","debug","addEventListener","onMessageWrapper","get","isKnownMessage","error","removeEventListener","delete","postMessage","source","transferList","startsWith"],"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"sourcesContent":["import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\n/** Vile hack to defeat over-zealous bundlers from stripping out the require */\nfunction getParentPort() {\n // const isNode = globalThis.process;\n let parentPort;\n try {\n // prettier-ignore\n eval('globalThis.parentPort = require(\\'worker_threads\\').parentPort'); // eslint-disable-line no-eval\n parentPort = globalThis.parentPort;\n // eslint-disable-next-line no-empty\n } catch {}\n return parentPort;\n}\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /** Check that we are actually in a worker thread */\n static inWorkerThread(): boolean {\n return typeof self !== 'undefined' || Boolean(getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n function handleMessage(message) {\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.on('message', handleMessage);\n // if (message == 'exit') { parentPort.unref(); }\n // eslint-disable-next-line\n parentPort.on('exit', () => console.debug('Node worker closing'));\n } else {\n // eslint-disable-next-line no-restricted-globals\n globalThis.onmessage = handleMessage;\n }\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.removeEventListener('message', onMessageWrapper);\n }\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n // console.log('posting message', data);\n const transferList = getTransferList(payload);\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.postMessage(data, transferList);\n // console.log('posted message', data);\n } else {\n // @ts-ignore\n globalThis.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n"],"mappings":"AACA,SAAQA,eAAe,QAAO,mCAAmC
|
|
1
|
+
{"version":3,"file":"worker-body.js","names":["getTransferList","getParentPort","parentPort","eval","globalThis","onMessageWrapperMap","Map","WorkerBody","inWorkerThread","self","Boolean","onmessage","onMessage","handleMessage","message","type","payload","data","on","console","debug","addEventListener","onMessageWrapper","get","isKnownMessage","error","removeEventListener","delete","postMessage","source","transferList","startsWith"],"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"sourcesContent":["import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\n/** Vile hack to defeat over-zealous bundlers from stripping out the require */\nfunction getParentPort() {\n // const isNode = globalThis.process;\n let parentPort;\n try {\n // prettier-ignore\n eval('globalThis.parentPort = require(\\'worker_threads\\').parentPort'); // eslint-disable-line no-eval\n parentPort = globalThis.parentPort;\n // eslint-disable-next-line no-empty\n } catch {}\n return parentPort;\n}\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /** Check that we are actually in a worker thread */\n static inWorkerThread(): boolean {\n return typeof self !== 'undefined' || Boolean(getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n function handleMessage(message) {\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.on('message', handleMessage);\n // if (message == 'exit') { parentPort.unref(); }\n // eslint-disable-next-line\n parentPort.on('exit', () => console.debug('Node worker closing'));\n } else {\n // eslint-disable-next-line no-restricted-globals\n globalThis.onmessage = handleMessage;\n }\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.removeEventListener('message', onMessageWrapper);\n }\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n // console.log('posting message', data);\n const transferList = getTransferList(payload);\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.postMessage(data, transferList);\n // console.log('posted message', data);\n } else {\n // @ts-ignore\n globalThis.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n"],"mappings":"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"}
|
|
@@ -1,27 +1,22 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
2
|
import WorkerPool from './worker-pool';
|
|
3
3
|
import WorkerThread from './worker-thread';
|
|
4
|
-
|
|
5
4
|
const DEFAULT_PROPS = {
|
|
6
5
|
maxConcurrency: 3,
|
|
7
6
|
maxMobileConcurrency: 1,
|
|
8
7
|
reuseWorkers: true,
|
|
9
8
|
onDebug: () => {}
|
|
10
9
|
};
|
|
11
|
-
|
|
12
10
|
export default class WorkerFarm {
|
|
13
|
-
|
|
14
11
|
static isSupported() {
|
|
15
12
|
return WorkerThread.isSupported();
|
|
16
13
|
}
|
|
17
|
-
|
|
18
14
|
static getWorkerFarm() {
|
|
19
15
|
let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
|
|
20
16
|
WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});
|
|
21
17
|
WorkerFarm._workerFarm.setProps(props);
|
|
22
18
|
return WorkerFarm._workerFarm;
|
|
23
19
|
}
|
|
24
|
-
|
|
25
20
|
constructor(props) {
|
|
26
21
|
_defineProperty(this, "props", void 0);
|
|
27
22
|
_defineProperty(this, "workerPools", new Map());
|
|
@@ -31,14 +26,12 @@ export default class WorkerFarm {
|
|
|
31
26
|
this.setProps(props);
|
|
32
27
|
this.workerPools = new Map();
|
|
33
28
|
}
|
|
34
|
-
|
|
35
29
|
destroy() {
|
|
36
30
|
for (const workerPool of this.workerPools.values()) {
|
|
37
31
|
workerPool.destroy();
|
|
38
32
|
}
|
|
39
33
|
this.workerPools = new Map();
|
|
40
34
|
}
|
|
41
|
-
|
|
42
35
|
setProps(props) {
|
|
43
36
|
this.props = {
|
|
44
37
|
...this.props,
|
|
@@ -48,7 +41,6 @@ export default class WorkerFarm {
|
|
|
48
41
|
workerPool.setProps(this._getWorkerPoolProps());
|
|
49
42
|
}
|
|
50
43
|
}
|
|
51
|
-
|
|
52
44
|
getWorkerPool(options) {
|
|
53
45
|
const {
|
|
54
46
|
name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-farm.js","names":["WorkerPool","WorkerThread","DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","WorkerFarm","isSupported","getWorkerFarm","props","_workerFarm","setProps","constructor","Map","workerPools","destroy","workerPool","values","_getWorkerPoolProps","getWorkerPool","options","name","source","url","get","set"],"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"sourcesContent":["import WorkerPool from './worker-pool';\nimport WorkerThread from './worker-thread';\n\n/**\n * @param maxConcurrency - max count of workers\n * @param maxMobileConcurrency - max count of workers on mobile\n * @param maxConcurrency - max count of workers\n * @param reuseWorkers - if false, destroys workers when task is completed\n * @param onDebug - callback intended to allow application to log worker pool activity\n */\nexport type WorkerFarmProps = {\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n reuseWorkers?: boolean;\n onDebug?: () => void;\n};\n\nconst DEFAULT_PROPS: Required<WorkerFarmProps> = {\n maxConcurrency: 3,\n maxMobileConcurrency: 1,\n reuseWorkers: true,\n onDebug: () => {}\n};\n\n/**\n * Process multiple jobs with a \"farm\" of different workers in worker pools.\n */\nexport default class WorkerFarm {\n private props: WorkerFarmProps;\n private workerPools = new Map<string, WorkerPool>();\n // singleton\n private static _workerFarm?: WorkerFarm;\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /** Get the singleton instance of the global worker farm */\n static getWorkerFarm(props: WorkerFarmProps = {}): WorkerFarm {\n WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});\n WorkerFarm._workerFarm.setProps(props);\n return WorkerFarm._workerFarm;\n }\n\n /** get global instance with WorkerFarm.getWorkerFarm() */\n private constructor(props: WorkerFarmProps) {\n this.props = {...DEFAULT_PROPS};\n this.setProps(props);\n /** @type Map<string, WorkerPool>} */\n this.workerPools = new Map();\n }\n\n /**\n * Terminate all workers in the farm\n * @note Can free up significant memory\n */\n destroy(): void {\n for (const workerPool of this.workerPools.values()) {\n workerPool.destroy();\n }\n this.workerPools = new Map<string, WorkerPool>();\n }\n\n /**\n * Set props used when initializing worker pools\n * @param props\n */\n setProps(props: WorkerFarmProps): void {\n this.props = {...this.props, ...props};\n // Update worker pool props\n for (const workerPool of this.workerPools.values()) {\n workerPool.setProps(this._getWorkerPoolProps());\n }\n }\n\n /**\n * Returns a worker pool for the specified worker\n * @param options - only used first time for a specific worker name\n * @param options.name - the name of the worker - used to identify worker pool\n * @param options.url -\n * @param options.source -\n * @example\n * const job = WorkerFarm.getWorkerFarm().getWorkerPool({name, url}).startJob(...);\n */\n getWorkerPool(options: {name: string; source?: string; url?: string}): WorkerPool {\n const {name, source, url} = options;\n let workerPool = this.workerPools.get(name);\n if (!workerPool) {\n workerPool = new WorkerPool({\n name,\n source,\n url\n });\n workerPool.setProps(this._getWorkerPoolProps());\n this.workerPools.set(name, workerPool);\n }\n return workerPool;\n }\n\n _getWorkerPoolProps() {\n return {\n maxConcurrency: this.props.maxConcurrency,\n maxMobileConcurrency: this.props.maxMobileConcurrency,\n reuseWorkers: this.props.reuseWorkers,\n onDebug: this.props.onDebug\n };\n }\n}\n"],"mappings":";AAAA,OAAOA,UAAU,MAAM,eAAe;AACtC,OAAOC,YAAY,MAAM,iBAAiB
|
|
1
|
+
{"version":3,"file":"worker-farm.js","names":["WorkerPool","WorkerThread","DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","WorkerFarm","isSupported","getWorkerFarm","props","arguments","length","undefined","_workerFarm","setProps","constructor","_defineProperty","Map","workerPools","destroy","workerPool","values","_getWorkerPoolProps","getWorkerPool","options","name","source","url","get","set"],"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"sourcesContent":["import WorkerPool from './worker-pool';\nimport WorkerThread from './worker-thread';\n\n/**\n * @param maxConcurrency - max count of workers\n * @param maxMobileConcurrency - max count of workers on mobile\n * @param maxConcurrency - max count of workers\n * @param reuseWorkers - if false, destroys workers when task is completed\n * @param onDebug - callback intended to allow application to log worker pool activity\n */\nexport type WorkerFarmProps = {\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n reuseWorkers?: boolean;\n onDebug?: () => void;\n};\n\nconst DEFAULT_PROPS: Required<WorkerFarmProps> = {\n maxConcurrency: 3,\n maxMobileConcurrency: 1,\n reuseWorkers: true,\n onDebug: () => {}\n};\n\n/**\n * Process multiple jobs with a \"farm\" of different workers in worker pools.\n */\nexport default class WorkerFarm {\n private props: WorkerFarmProps;\n private workerPools = new Map<string, WorkerPool>();\n // singleton\n private static _workerFarm?: WorkerFarm;\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /** Get the singleton instance of the global worker farm */\n static getWorkerFarm(props: WorkerFarmProps = {}): WorkerFarm {\n WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});\n WorkerFarm._workerFarm.setProps(props);\n return WorkerFarm._workerFarm;\n }\n\n /** get global instance with WorkerFarm.getWorkerFarm() */\n private constructor(props: WorkerFarmProps) {\n this.props = {...DEFAULT_PROPS};\n this.setProps(props);\n /** @type Map<string, WorkerPool>} */\n this.workerPools = new Map();\n }\n\n /**\n * Terminate all workers in the farm\n * @note Can free up significant memory\n */\n destroy(): void {\n for (const workerPool of this.workerPools.values()) {\n workerPool.destroy();\n }\n this.workerPools = new Map<string, WorkerPool>();\n }\n\n /**\n * Set props used when initializing worker pools\n * @param props\n */\n setProps(props: WorkerFarmProps): void {\n this.props = {...this.props, ...props};\n // Update worker pool props\n for (const workerPool of this.workerPools.values()) {\n workerPool.setProps(this._getWorkerPoolProps());\n }\n }\n\n /**\n * Returns a worker pool for the specified worker\n * @param options - only used first time for a specific worker name\n * @param options.name - the name of the worker - used to identify worker pool\n * @param options.url -\n * @param options.source -\n * @example\n * const job = WorkerFarm.getWorkerFarm().getWorkerPool({name, url}).startJob(...);\n */\n getWorkerPool(options: {name: string; source?: string; url?: string}): WorkerPool {\n const {name, source, url} = options;\n let workerPool = this.workerPools.get(name);\n if (!workerPool) {\n workerPool = new WorkerPool({\n name,\n source,\n url\n });\n workerPool.setProps(this._getWorkerPoolProps());\n this.workerPools.set(name, workerPool);\n }\n return workerPool;\n }\n\n _getWorkerPoolProps() {\n return {\n maxConcurrency: this.props.maxConcurrency,\n maxMobileConcurrency: this.props.maxMobileConcurrency,\n reuseWorkers: this.props.reuseWorkers,\n onDebug: this.props.onDebug\n };\n }\n}\n"],"mappings":";AAAA,OAAOA,UAAU,MAAM,eAAe;AACtC,OAAOC,YAAY,MAAM,iBAAiB;AAgB1C,MAAMC,aAAwC,GAAG;EAC/CC,cAAc,EAAE,CAAC;EACjBC,oBAAoB,EAAE,CAAC;EACvBC,YAAY,EAAE,IAAI;EAClBC,OAAO,EAAEA,CAAA,KAAM,CAAC;AAClB,CAAC;AAKD,eAAe,MAAMC,UAAU,CAAC;EAO9B,OAAOC,WAAWA,CAAA,EAAY;IAC5B,OAAOP,YAAY,CAACO,WAAW,EAAE;EACnC;EAGA,OAAOC,aAAaA,CAAA,EAA0C;IAAA,IAAzCC,KAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;IAC9CJ,UAAU,CAACO,WAAW,GAAGP,UAAU,CAACO,WAAW,IAAI,IAAIP,UAAU,CAAC,CAAC,CAAC,CAAC;IACrEA,UAAU,CAACO,WAAW,CAACC,QAAQ,CAACL,KAAK,CAAC;IACtC,OAAOH,UAAU,CAACO,WAAW;EAC/B;EAGQE,WAAWA,CAACN,KAAsB,EAAE;IAAAO,eAAA;IAAAA,eAAA,sBAjBtB,IAAIC,GAAG,EAAsB;IAkBjD,IAAI,CAACR,KAAK,GAAG;MAAC,GAAGR;IAAa,CAAC;IAC/B,IAAI,CAACa,QAAQ,CAACL,KAAK,CAAC;IAEpB,IAAI,CAACS,WAAW,GAAG,IAAID,GAAG,EAAE;EAC9B;EAMAE,OAAOA,CAAA,EAAS;IACd,KAAK,MAAMC,UAAU,IAAI,IAAI,CAACF,WAAW,CAACG,MAAM,EAAE,EAAE;MAClDD,UAAU,CAACD,OAAO,EAAE;IACtB;IACA,IAAI,CAACD,WAAW,GAAG,IAAID,GAAG,EAAsB;EAClD;EAMAH,QAAQA,CAACL,KAAsB,EAAQ;IACrC,IAAI,CAACA,KAAK,GAAG;MAAC,GAAG,IAAI,CAACA,KAAK;MAAE,GAAGA;IAAK,CAAC;IAEtC,KAAK,MAAMW,UAAU,IAAI,IAAI,CAACF,WAAW,CAACG,MAAM,EAAE,EAAE;MAClDD,UAAU,CAACN,QAAQ,CAAC,IAAI,CAACQ,mBAAmB,EAAE,CAAC;IACjD;EACF;EAWAC,aAAaA,CAACC,OAAsD,EAAc;IAChF,MAAM;MAACC,IAAI;MAAEC,MAAM;MAAEC;IAAG,CAAC,GAAGH,OAAO;IACnC,IAAIJ,UAAU,GAAG,IAAI,CAACF,WAAW,CAACU,GAAG,CAACH,IAAI,CAAC;IAC3C,IAAI,CAACL,UAAU,EAAE;MACfA,UAAU,GAAG,IAAIrB,UAAU,CAAC;QAC1B0B,IAAI;QACJC,MAAM;QACNC;MACF,CAAC,CAAC;MACFP,UAAU,CAACN,QAAQ,CAAC,IAAI,CAACQ,mBAAmB,EAAE,CAAC;MAC/C,IAAI,CAACJ,WAAW,CAACW,GAAG,CAACJ,IAAI,EAAEL,UAAU,CAAC;IACxC;IACA,OAAOA,UAAU;EACnB;EAEAE,mBAAmBA,CAAA,EAAG;IACpB,OAAO;MACLpB,cAAc,EAAE,IAAI,CAACO,KAAK,CAACP,cAAc;MACzCC,oBAAoB,EAAE,IAAI,CAACM,KAAK,CAACN,oBAAoB;MACrDC,YAAY,EAAE,IAAI,CAACK,KAAK,CAACL,YAAY;MACrCC,OAAO,EAAE,IAAI,CAACI,KAAK,CAACJ;IACtB,CAAC;EACH;AACF;AAACW,eAAA,CAjFoBV,UAAU"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
2
|
import { assert } from '../env-utils/assert';
|
|
3
|
-
|
|
4
3
|
export default class WorkerJob {
|
|
5
|
-
|
|
6
4
|
constructor(jobName, workerThread) {
|
|
7
5
|
_defineProperty(this, "name", void 0);
|
|
8
6
|
_defineProperty(this, "workerThread", void 0);
|
|
@@ -17,7 +15,6 @@ export default class WorkerJob {
|
|
|
17
15
|
this._reject = reject;
|
|
18
16
|
});
|
|
19
17
|
}
|
|
20
|
-
|
|
21
18
|
postMessage(type, payload) {
|
|
22
19
|
this.workerThread.postMessage({
|
|
23
20
|
source: 'loaders.gl',
|
|
@@ -25,13 +22,11 @@ export default class WorkerJob {
|
|
|
25
22
|
payload
|
|
26
23
|
});
|
|
27
24
|
}
|
|
28
|
-
|
|
29
25
|
done(value) {
|
|
30
26
|
assert(this.isRunning);
|
|
31
27
|
this.isRunning = false;
|
|
32
28
|
this._resolve(value);
|
|
33
29
|
}
|
|
34
|
-
|
|
35
30
|
error(error) {
|
|
36
31
|
assert(this.isRunning);
|
|
37
32
|
this.isRunning = false;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-job.js","names":["assert","WorkerJob","constructor","jobName","workerThread","name","result","Promise","resolve","reject","_resolve","_reject","postMessage","type","payload","source","done","value","isRunning","error"],"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport WorkerThread from './worker-thread';\nimport {assert} from '../env-utils/assert';\n\n/**\n * Represents one Job handled by a WorkerPool or WorkerFarm\n */\nexport default class WorkerJob {\n readonly name: string;\n readonly workerThread: WorkerThread;\n isRunning: boolean = true;\n /** Promise that resolves when Job is done */\n readonly result: Promise<any>;\n\n private _resolve: (value: any) => void = () => {};\n private _reject: (reason?: any) => void = () => {};\n\n constructor(jobName: string, workerThread: WorkerThread) {\n this.name = jobName;\n this.workerThread = workerThread;\n this.result = new Promise((resolve, reject) => {\n this._resolve = resolve;\n this._reject = reject;\n });\n }\n\n /**\n * Send a message to the job's worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n */\n postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n this.workerThread.postMessage({\n source: 'loaders.gl', // Lets worker ignore unrelated messages\n type,\n payload\n });\n }\n\n /**\n * Call to resolve the `result` Promise with the supplied value\n */\n done(value: any): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._resolve(value);\n }\n\n /**\n * Call to reject the `result` Promise with the supplied error\n */\n error(error: Error): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._reject(error);\n }\n}\n"],"mappings":";AAEA,SAAQA,MAAM,QAAO,qBAAqB
|
|
1
|
+
{"version":3,"file":"worker-job.js","names":["assert","WorkerJob","constructor","jobName","workerThread","_defineProperty","name","result","Promise","resolve","reject","_resolve","_reject","postMessage","type","payload","source","done","value","isRunning","error"],"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport WorkerThread from './worker-thread';\nimport {assert} from '../env-utils/assert';\n\n/**\n * Represents one Job handled by a WorkerPool or WorkerFarm\n */\nexport default class WorkerJob {\n readonly name: string;\n readonly workerThread: WorkerThread;\n isRunning: boolean = true;\n /** Promise that resolves when Job is done */\n readonly result: Promise<any>;\n\n private _resolve: (value: any) => void = () => {};\n private _reject: (reason?: any) => void = () => {};\n\n constructor(jobName: string, workerThread: WorkerThread) {\n this.name = jobName;\n this.workerThread = workerThread;\n this.result = new Promise((resolve, reject) => {\n this._resolve = resolve;\n this._reject = reject;\n });\n }\n\n /**\n * Send a message to the job's worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n */\n postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n this.workerThread.postMessage({\n source: 'loaders.gl', // Lets worker ignore unrelated messages\n type,\n payload\n });\n }\n\n /**\n * Call to resolve the `result` Promise with the supplied value\n */\n done(value: any): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._resolve(value);\n }\n\n /**\n * Call to reject the `result` Promise with the supplied error\n */\n error(error: Error): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._reject(error);\n }\n}\n"],"mappings":";AAEA,SAAQA,MAAM,QAAO,qBAAqB;AAK1C,eAAe,MAAMC,SAAS,CAAC;EAU7BC,WAAWA,CAACC,OAAe,EAAEC,YAA0B,EAAE;IAAAC,eAAA;IAAAA,eAAA;IAAAA,eAAA,oBAPpC,IAAI;IAAAA,eAAA;IAAAA,eAAA,mBAIgB,MAAM,CAAC,CAAC;IAAAA,eAAA,kBACP,MAAM,CAAC,CAAC;IAGhD,IAAI,CAACC,IAAI,GAAGH,OAAO;IACnB,IAAI,CAACC,YAAY,GAAGA,YAAY;IAChC,IAAI,CAACG,MAAM,GAAG,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MAC7C,IAAI,CAACC,QAAQ,GAAGF,OAAO;MACvB,IAAI,CAACG,OAAO,GAAGF,MAAM;IACvB,CAAC,CAAC;EACJ;EAMAG,WAAWA,CAACC,IAAuB,EAAEC,OAA6B,EAAQ;IACxE,IAAI,CAACX,YAAY,CAACS,WAAW,CAAC;MAC5BG,MAAM,EAAE,YAAY;MACpBF,IAAI;MACJC;IACF,CAAC,CAAC;EACJ;EAKAE,IAAIA,CAACC,KAAU,EAAQ;IACrBlB,MAAM,CAAC,IAAI,CAACmB,SAAS,CAAC;IACtB,IAAI,CAACA,SAAS,GAAG,KAAK;IACtB,IAAI,CAACR,QAAQ,CAACO,KAAK,CAAC;EACtB;EAKAE,KAAKA,CAACA,KAAY,EAAQ;IACxBpB,MAAM,CAAC,IAAI,CAACmB,SAAS,CAAC;IACtB,IAAI,CAACA,SAAS,GAAG,KAAK;IACtB,IAAI,CAACP,OAAO,CAACQ,KAAK,CAAC;EACrB;AACF"}
|
|
@@ -2,13 +2,10 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
|
2
2
|
import { isMobile } from '../env-utils/globals';
|
|
3
3
|
import WorkerThread from './worker-thread';
|
|
4
4
|
import WorkerJob from './worker-job';
|
|
5
|
-
|
|
6
5
|
export default class WorkerPool {
|
|
7
|
-
|
|
8
6
|
static isSupported() {
|
|
9
7
|
return WorkerThread.isSupported();
|
|
10
8
|
}
|
|
11
|
-
|
|
12
9
|
constructor(props) {
|
|
13
10
|
_defineProperty(this, "name", 'unnamed');
|
|
14
11
|
_defineProperty(this, "source", void 0);
|
|
@@ -26,7 +23,6 @@ export default class WorkerPool {
|
|
|
26
23
|
this.url = props.url;
|
|
27
24
|
this.setProps(props);
|
|
28
25
|
}
|
|
29
|
-
|
|
30
26
|
destroy() {
|
|
31
27
|
this.idleQueue.forEach(worker => worker.destroy());
|
|
32
28
|
this.isDestroyed = true;
|
|
@@ -67,7 +63,6 @@ export default class WorkerPool {
|
|
|
67
63
|
this._startQueuedJob();
|
|
68
64
|
return await startPromise;
|
|
69
65
|
}
|
|
70
|
-
|
|
71
66
|
async _startQueuedJob() {
|
|
72
67
|
if (!this.jobQueue.length) {
|
|
73
68
|
return;
|
|
@@ -76,7 +71,6 @@ export default class WorkerPool {
|
|
|
76
71
|
if (!workerThread) {
|
|
77
72
|
return;
|
|
78
73
|
}
|
|
79
|
-
|
|
80
74
|
const queuedJob = this.jobQueue.shift();
|
|
81
75
|
if (queuedJob) {
|
|
82
76
|
this.onDebug({
|
|
@@ -85,14 +79,10 @@ export default class WorkerPool {
|
|
|
85
79
|
workerThread,
|
|
86
80
|
backlog: this.jobQueue.length
|
|
87
81
|
});
|
|
88
|
-
|
|
89
82
|
const job = new WorkerJob(queuedJob.name, workerThread);
|
|
90
|
-
|
|
91
83
|
workerThread.onMessage = data => queuedJob.onMessage(job, data.type, data.payload);
|
|
92
84
|
workerThread.onError = error => queuedJob.onError(job, error);
|
|
93
|
-
|
|
94
85
|
queuedJob.onStart(job);
|
|
95
|
-
|
|
96
86
|
try {
|
|
97
87
|
await job.result;
|
|
98
88
|
} finally {
|
|
@@ -100,7 +90,6 @@ export default class WorkerPool {
|
|
|
100
90
|
}
|
|
101
91
|
}
|
|
102
92
|
}
|
|
103
|
-
|
|
104
93
|
returnWorkerToQueue(worker) {
|
|
105
94
|
const shouldDestroyWorker = this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();
|
|
106
95
|
if (shouldDestroyWorker) {
|
|
@@ -113,12 +102,10 @@ export default class WorkerPool {
|
|
|
113
102
|
this._startQueuedJob();
|
|
114
103
|
}
|
|
115
104
|
}
|
|
116
|
-
|
|
117
105
|
_getAvailableWorker() {
|
|
118
106
|
if (this.idleQueue.length > 0) {
|
|
119
107
|
return this.idleQueue.shift() || null;
|
|
120
108
|
}
|
|
121
|
-
|
|
122
109
|
if (this.count < this._getMaxConcurrency()) {
|
|
123
110
|
this.count++;
|
|
124
111
|
const name = "".concat(this.name.toLowerCase(), " (#").concat(this.count, " of ").concat(this.maxConcurrency, ")");
|
|
@@ -128,7 +115,6 @@ export default class WorkerPool {
|
|
|
128
115
|
url: this.url
|
|
129
116
|
});
|
|
130
117
|
}
|
|
131
|
-
|
|
132
118
|
return null;
|
|
133
119
|
}
|
|
134
120
|
_getMaxConcurrency() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-pool.js","names":["isMobile","WorkerThread","WorkerJob","WorkerPool","isSupported","constructor","props","source","url","setProps","destroy","idleQueue","forEach","worker","isDestroyed","name","undefined","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","startJob","onMessage","job","type","data","done","onError","error","startPromise","Promise","onStart","jobQueue","push","_startQueuedJob","length","workerThread","_getAvailableWorker","queuedJob","shift","message","backlog","payload","result","returnWorkerToQueue","shouldDestroyWorker","count","_getMaxConcurrency","toLowerCase"],"sources":["../../../../src/lib/worker-farm/worker-pool.ts"],"sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {isMobile} from '../env-utils/globals';\nimport WorkerThread from './worker-thread';\nimport WorkerJob from './worker-job';\n\n/** WorkerPool onDebug Callback Parameters */\ntype OnDebugParameters = {\n message: string;\n worker: string;\n name: string;\n job: string;\n backlog: number;\n workerThread: WorkerThread;\n};\n\n/** WorkerPool Properties */\nexport type WorkerPoolProps = {\n name?: string;\n source?: string; // | Function;\n url?: string;\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n onDebug?: (options: OnDebugParameters) => any;\n reuseWorkers?: boolean;\n};\n\n/** Private helper types */\ntype OnMessage = (job: WorkerJob, type: WorkerMessageType, payload: WorkerMessagePayload) => void;\ntype OnError = (job: WorkerJob, error: Error) => void;\n\ntype QueuedJob = {\n name: string;\n onMessage: OnMessage;\n onError: OnError;\n onStart: (value: any) => void; // Resolve job start promise\n};\n\n/**\n * Process multiple data messages with small pool of identical workers\n */\nexport default class WorkerPool {\n name: string = 'unnamed';\n source?: string; // | Function;\n url?: string;\n maxConcurrency: number = 1;\n maxMobileConcurrency: number = 1;\n onDebug: (options: OnDebugParameters) => any = () => {};\n reuseWorkers: boolean = true;\n\n private props: WorkerPoolProps = {};\n private jobQueue: QueuedJob[] = [];\n private idleQueue: WorkerThread[] = [];\n private count = 0;\n private isDestroyed = false;\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /**\n * @param processor - worker function\n * @param maxConcurrency - max count of workers\n */\n constructor(props: WorkerPoolProps) {\n this.source = props.source;\n this.url = props.url;\n this.setProps(props);\n }\n\n /**\n * Terminates all workers in the pool\n * @note Can free up significant memory\n */\n destroy(): void {\n // Destroy idle workers, active Workers will be destroyed on completion\n this.idleQueue.forEach((worker) => worker.destroy());\n this.isDestroyed = true;\n }\n\n setProps(props: WorkerPoolProps) {\n this.props = {...this.props, ...props};\n\n if (props.name !== undefined) {\n this.name = props.name;\n }\n if (props.maxConcurrency !== undefined) {\n this.maxConcurrency = props.maxConcurrency;\n }\n if (props.maxMobileConcurrency !== undefined) {\n this.maxMobileConcurrency = props.maxMobileConcurrency;\n }\n if (props.reuseWorkers !== undefined) {\n this.reuseWorkers = props.reuseWorkers;\n }\n if (props.onDebug !== undefined) {\n this.onDebug = props.onDebug;\n }\n }\n\n async startJob(\n name: string,\n onMessage: OnMessage = (job, type, data) => job.done(data),\n onError: OnError = (job, error) => job.error(error)\n ): Promise<WorkerJob> {\n // Promise resolves when thread starts working on this job\n const startPromise = new Promise<WorkerJob>((onStart) => {\n // Promise resolves when thread completes or fails working on this job\n this.jobQueue.push({name, onMessage, onError, onStart});\n return this;\n });\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n return await startPromise;\n }\n\n // PRIVATE\n\n /**\n * Starts first queued job if worker is available or can be created\n * Called when job is started and whenever a worker returns to the idleQueue\n */\n async _startQueuedJob(): Promise<void> {\n if (!this.jobQueue.length) {\n return;\n }\n\n const workerThread = this._getAvailableWorker();\n if (!workerThread) {\n return;\n }\n\n // We have a worker, dequeue and start the job\n const queuedJob = this.jobQueue.shift();\n if (queuedJob) {\n // Emit a debug event\n // @ts-ignore\n this.onDebug({\n message: 'Starting job',\n name: queuedJob.name,\n workerThread,\n backlog: this.jobQueue.length\n });\n\n // Create a worker job to let the app access thread and manage job completion\n const job = new WorkerJob(queuedJob.name, workerThread);\n\n // Set the worker thread's message handlers\n workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);\n workerThread.onError = (error) => queuedJob.onError(job, error);\n\n // Resolve the start promise so that the app can start sending messages to worker\n queuedJob.onStart(job);\n\n // Wait for the app to signal that the job is complete, then return worker to queue\n try {\n await job.result;\n } finally {\n this.returnWorkerToQueue(workerThread);\n }\n }\n }\n\n /**\n * Returns a worker to the idle queue\n * Destroys the worker if\n * - pool is destroyed\n * - if this pool doesn't reuse workers\n * - if maxConcurrency has been lowered\n * @param worker\n */\n returnWorkerToQueue(worker: WorkerThread) {\n const shouldDestroyWorker =\n this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();\n\n if (shouldDestroyWorker) {\n worker.destroy();\n this.count--;\n } else {\n this.idleQueue.push(worker);\n }\n\n if (!this.isDestroyed) {\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n /**\n * Returns idle worker or creates new worker if maxConcurrency has not been reached\n */\n _getAvailableWorker(): WorkerThread | null {\n // If a worker has completed and returned to the queue, it can be used\n if (this.idleQueue.length > 0) {\n return this.idleQueue.shift() || null;\n }\n\n // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source\n if (this.count < this._getMaxConcurrency()) {\n this.count++;\n const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;\n return new WorkerThread({name, source: this.source, url: this.url});\n }\n\n // No worker available, have to wait\n return null;\n }\n\n _getMaxConcurrency() {\n return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;\n }\n}\n"],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"worker-pool.js","names":["isMobile","WorkerThread","WorkerJob","WorkerPool","isSupported","constructor","props","_defineProperty","source","url","setProps","destroy","idleQueue","forEach","worker","isDestroyed","name","undefined","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","startJob","onMessage","arguments","length","job","type","data","done","onError","error","startPromise","Promise","onStart","jobQueue","push","_startQueuedJob","workerThread","_getAvailableWorker","queuedJob","shift","message","backlog","payload","result","returnWorkerToQueue","shouldDestroyWorker","count","_getMaxConcurrency","concat","toLowerCase"],"sources":["../../../../src/lib/worker-farm/worker-pool.ts"],"sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {isMobile} from '../env-utils/globals';\nimport WorkerThread from './worker-thread';\nimport WorkerJob from './worker-job';\n\n/** WorkerPool onDebug Callback Parameters */\ntype OnDebugParameters = {\n message: string;\n worker: string;\n name: string;\n job: string;\n backlog: number;\n workerThread: WorkerThread;\n};\n\n/** WorkerPool Properties */\nexport type WorkerPoolProps = {\n name?: string;\n source?: string; // | Function;\n url?: string;\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n onDebug?: (options: OnDebugParameters) => any;\n reuseWorkers?: boolean;\n};\n\n/** Private helper types */\ntype OnMessage = (job: WorkerJob, type: WorkerMessageType, payload: WorkerMessagePayload) => void;\ntype OnError = (job: WorkerJob, error: Error) => void;\n\ntype QueuedJob = {\n name: string;\n onMessage: OnMessage;\n onError: OnError;\n onStart: (value: any) => void; // Resolve job start promise\n};\n\n/**\n * Process multiple data messages with small pool of identical workers\n */\nexport default class WorkerPool {\n name: string = 'unnamed';\n source?: string; // | Function;\n url?: string;\n maxConcurrency: number = 1;\n maxMobileConcurrency: number = 1;\n onDebug: (options: OnDebugParameters) => any = () => {};\n reuseWorkers: boolean = true;\n\n private props: WorkerPoolProps = {};\n private jobQueue: QueuedJob[] = [];\n private idleQueue: WorkerThread[] = [];\n private count = 0;\n private isDestroyed = false;\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /**\n * @param processor - worker function\n * @param maxConcurrency - max count of workers\n */\n constructor(props: WorkerPoolProps) {\n this.source = props.source;\n this.url = props.url;\n this.setProps(props);\n }\n\n /**\n * Terminates all workers in the pool\n * @note Can free up significant memory\n */\n destroy(): void {\n // Destroy idle workers, active Workers will be destroyed on completion\n this.idleQueue.forEach((worker) => worker.destroy());\n this.isDestroyed = true;\n }\n\n setProps(props: WorkerPoolProps) {\n this.props = {...this.props, ...props};\n\n if (props.name !== undefined) {\n this.name = props.name;\n }\n if (props.maxConcurrency !== undefined) {\n this.maxConcurrency = props.maxConcurrency;\n }\n if (props.maxMobileConcurrency !== undefined) {\n this.maxMobileConcurrency = props.maxMobileConcurrency;\n }\n if (props.reuseWorkers !== undefined) {\n this.reuseWorkers = props.reuseWorkers;\n }\n if (props.onDebug !== undefined) {\n this.onDebug = props.onDebug;\n }\n }\n\n async startJob(\n name: string,\n onMessage: OnMessage = (job, type, data) => job.done(data),\n onError: OnError = (job, error) => job.error(error)\n ): Promise<WorkerJob> {\n // Promise resolves when thread starts working on this job\n const startPromise = new Promise<WorkerJob>((onStart) => {\n // Promise resolves when thread completes or fails working on this job\n this.jobQueue.push({name, onMessage, onError, onStart});\n return this;\n });\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n return await startPromise;\n }\n\n // PRIVATE\n\n /**\n * Starts first queued job if worker is available or can be created\n * Called when job is started and whenever a worker returns to the idleQueue\n */\n async _startQueuedJob(): Promise<void> {\n if (!this.jobQueue.length) {\n return;\n }\n\n const workerThread = this._getAvailableWorker();\n if (!workerThread) {\n return;\n }\n\n // We have a worker, dequeue and start the job\n const queuedJob = this.jobQueue.shift();\n if (queuedJob) {\n // Emit a debug event\n // @ts-ignore\n this.onDebug({\n message: 'Starting job',\n name: queuedJob.name,\n workerThread,\n backlog: this.jobQueue.length\n });\n\n // Create a worker job to let the app access thread and manage job completion\n const job = new WorkerJob(queuedJob.name, workerThread);\n\n // Set the worker thread's message handlers\n workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);\n workerThread.onError = (error) => queuedJob.onError(job, error);\n\n // Resolve the start promise so that the app can start sending messages to worker\n queuedJob.onStart(job);\n\n // Wait for the app to signal that the job is complete, then return worker to queue\n try {\n await job.result;\n } finally {\n this.returnWorkerToQueue(workerThread);\n }\n }\n }\n\n /**\n * Returns a worker to the idle queue\n * Destroys the worker if\n * - pool is destroyed\n * - if this pool doesn't reuse workers\n * - if maxConcurrency has been lowered\n * @param worker\n */\n returnWorkerToQueue(worker: WorkerThread) {\n const shouldDestroyWorker =\n this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();\n\n if (shouldDestroyWorker) {\n worker.destroy();\n this.count--;\n } else {\n this.idleQueue.push(worker);\n }\n\n if (!this.isDestroyed) {\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n /**\n * Returns idle worker or creates new worker if maxConcurrency has not been reached\n */\n _getAvailableWorker(): WorkerThread | null {\n // If a worker has completed and returned to the queue, it can be used\n if (this.idleQueue.length > 0) {\n return this.idleQueue.shift() || null;\n }\n\n // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source\n if (this.count < this._getMaxConcurrency()) {\n this.count++;\n const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;\n return new WorkerThread({name, source: this.source, url: this.url});\n }\n\n // No worker available, have to wait\n return null;\n }\n\n _getMaxConcurrency() {\n return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;\n }\n}\n"],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
-
|
|
3
2
|
import { NodeWorker } from '../node/worker_threads';
|
|
4
3
|
import { isBrowser } from '../env-utils/globals';
|
|
5
4
|
import { assert } from '../env-utils/assert';
|
|
@@ -30,10 +29,8 @@ export default class WorkerThread {
|
|
|
30
29
|
this.url = url;
|
|
31
30
|
this.onMessage = NOOP;
|
|
32
31
|
this.onError = error => console.log(error);
|
|
33
|
-
|
|
34
32
|
this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();
|
|
35
33
|
}
|
|
36
|
-
|
|
37
34
|
destroy() {
|
|
38
35
|
this.onMessage = NOOP;
|
|
39
36
|
this.onError = NOOP;
|
|
@@ -43,12 +40,10 @@ export default class WorkerThread {
|
|
|
43
40
|
get isRunning() {
|
|
44
41
|
return Boolean(this.onMessage);
|
|
45
42
|
}
|
|
46
|
-
|
|
47
43
|
postMessage(data, transferList) {
|
|
48
44
|
transferList = transferList || getTransferList(data);
|
|
49
45
|
this.worker.postMessage(data, transferList);
|
|
50
46
|
}
|
|
51
|
-
|
|
52
47
|
_getErrorFromErrorEvent(event) {
|
|
53
48
|
let message = 'Failed to load ';
|
|
54
49
|
message += "worker ".concat(this.name, " from ").concat(this.url, ". ");
|
|
@@ -60,7 +55,6 @@ export default class WorkerThread {
|
|
|
60
55
|
}
|
|
61
56
|
return new Error(message);
|
|
62
57
|
}
|
|
63
|
-
|
|
64
58
|
_createBrowserWorker() {
|
|
65
59
|
this._loadableURL = getLoadableWorkerURL({
|
|
66
60
|
source: this.source,
|
|
@@ -81,10 +75,8 @@ export default class WorkerThread {
|
|
|
81
75
|
this.terminated = true;
|
|
82
76
|
};
|
|
83
77
|
worker.onmessageerror = event => console.error(event);
|
|
84
|
-
|
|
85
78
|
return worker;
|
|
86
79
|
}
|
|
87
|
-
|
|
88
80
|
_createNodeWorker() {
|
|
89
81
|
let worker;
|
|
90
82
|
if (this.url) {
|
|
@@ -106,8 +98,7 @@ export default class WorkerThread {
|
|
|
106
98
|
worker.on('error', error => {
|
|
107
99
|
this.onError(error);
|
|
108
100
|
});
|
|
109
|
-
worker.on('exit', code => {
|
|
110
|
-
});
|
|
101
|
+
worker.on('exit', code => {});
|
|
111
102
|
return worker;
|
|
112
103
|
}
|
|
113
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-thread.js","names":["NodeWorker","isBrowser","assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","Worker","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"],"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {NodeWorker, NodeWorkerType} from '../node/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 | NodeWorkerType;\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 (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\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(): NodeWorkerType {\n let worker: NodeWorkerType;\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"],"mappings":"
|
|
1
|
+
{"version":3,"file":"worker-thread.js","names":["NodeWorker","isBrowser","assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","Worker","constructor","props","_defineProperty","name","source","url","onMessage","onError","error","console","log","worker","_createBrowserWorker","_createNodeWorker","destroy","terminate","terminated","isRunning","Boolean","postMessage","data","transferList","_getErrorFromErrorEvent","event","message","concat","lineno","colno","Error","_loadableURL","onmessage","onerror","onmessageerror","absolute","includes","startsWith","eval","on","code"],"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport {NodeWorker, NodeWorkerType} from '../node/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 | NodeWorkerType;\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 (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\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(): NodeWorkerType {\n let worker: NodeWorkerType;\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"],"mappings":"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"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
import { assert } from '../env-utils/assert';
|
|
2
2
|
const workerURLCache = new Map();
|
|
3
|
-
|
|
4
3
|
export function getLoadableWorkerURL(props) {
|
|
5
4
|
assert(props.source && !props.url || !props.source && props.url);
|
|
6
|
-
|
|
7
5
|
let workerURL = workerURLCache.get(props.source || props.url);
|
|
8
6
|
if (!workerURL) {
|
|
9
7
|
if (props.url) {
|
|
@@ -18,23 +16,19 @@ export function getLoadableWorkerURL(props) {
|
|
|
18
16
|
assert(workerURL);
|
|
19
17
|
return workerURL;
|
|
20
18
|
}
|
|
21
|
-
|
|
22
19
|
function getLoadableWorkerURLFromURL(url) {
|
|
23
20
|
if (!url.startsWith('http')) {
|
|
24
21
|
return url;
|
|
25
22
|
}
|
|
26
|
-
|
|
27
23
|
const workerSource = buildScriptSource(url);
|
|
28
24
|
return getLoadableWorkerURLFromSource(workerSource);
|
|
29
25
|
}
|
|
30
|
-
|
|
31
26
|
function getLoadableWorkerURLFromSource(workerSource) {
|
|
32
27
|
const blob = new Blob([workerSource], {
|
|
33
28
|
type: 'application/javascript'
|
|
34
29
|
});
|
|
35
30
|
return URL.createObjectURL(blob);
|
|
36
31
|
}
|
|
37
|
-
|
|
38
32
|
function buildScriptSource(workerUrl) {
|
|
39
33
|
return "try {\n importScripts('".concat(workerUrl, "');\n} catch (error) {\n console.error(error);\n throw error;\n}");
|
|
40
34
|
}
|