@loaders.gl/worker-utils 4.0.1 → 4.0.2
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/index.cjs +36 -24
- package/dist/lib/worker-api/create-worker.d.ts +1 -1
- package/dist/lib/worker-api/create-worker.d.ts.map +1 -1
- package/dist/lib/worker-api/create-worker.js +2 -2
- package/dist/lib/worker-api/create-worker.js.map +1 -1
- package/dist/lib/worker-api/get-worker-url.d.ts.map +1 -1
- package/dist/lib/worker-api/get-worker-url.js +5 -1
- package/dist/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/lib/worker-farm/worker-body.d.ts +4 -4
- package/dist/lib/worker-farm/worker-body.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-body.js +30 -21
- package/dist/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/null-worker-node.js +31 -23
- package/dist/null-worker-node.js.map +2 -2
- package/dist/null-worker.js +31 -23
- package/dist/null-worker.js.map +2 -2
- package/package.json +2 -2
- package/src/lib/worker-api/create-worker.ts +5 -2
- package/src/lib/worker-api/get-worker-url.ts +6 -1
- package/src/lib/worker-farm/worker-body.ts +34 -25
package/dist/index.cjs
CHANGED
|
@@ -581,61 +581,69 @@ var WorkerFarm = class {
|
|
|
581
581
|
};
|
|
582
582
|
|
|
583
583
|
// src/lib/worker-farm/worker-body.ts
|
|
584
|
-
function getParentPort() {
|
|
584
|
+
async function getParentPort() {
|
|
585
585
|
let parentPort;
|
|
586
586
|
try {
|
|
587
587
|
eval("globalThis.parentPort = require('worker_threads').parentPort");
|
|
588
588
|
parentPort = globalThis.parentPort;
|
|
589
589
|
} catch {
|
|
590
|
+
try {
|
|
591
|
+
eval("globalThis.workerThreadsPromise = import('worker_threads')");
|
|
592
|
+
const workerThreads = await globalThis.workerThreadsPromise;
|
|
593
|
+
parentPort = workerThreads.parentPort;
|
|
594
|
+
} catch (error) {
|
|
595
|
+
console.error(error.message);
|
|
596
|
+
}
|
|
590
597
|
}
|
|
591
598
|
return parentPort;
|
|
592
599
|
}
|
|
593
600
|
var onMessageWrapperMap = /* @__PURE__ */ new Map();
|
|
594
601
|
var WorkerBody = class {
|
|
595
602
|
/** Check that we are actually in a worker thread */
|
|
596
|
-
static inWorkerThread() {
|
|
597
|
-
return typeof self !== "undefined" || Boolean(getParentPort());
|
|
603
|
+
static async inWorkerThread() {
|
|
604
|
+
return typeof self !== "undefined" || Boolean(await getParentPort());
|
|
598
605
|
}
|
|
599
606
|
/*
|
|
600
607
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
601
608
|
*/
|
|
602
609
|
static set onmessage(onMessage2) {
|
|
603
|
-
function handleMessage(message) {
|
|
604
|
-
const
|
|
605
|
-
const { type, payload } =
|
|
610
|
+
async function handleMessage(message) {
|
|
611
|
+
const parentPort2 = await getParentPort();
|
|
612
|
+
const { type, payload } = parentPort2 ? message : message.data;
|
|
606
613
|
onMessage2(type, payload);
|
|
607
614
|
}
|
|
608
|
-
|
|
609
|
-
|
|
610
|
-
|
|
611
|
-
|
|
612
|
-
|
|
613
|
-
|
|
614
|
-
|
|
615
|
+
getParentPort().then((parentPort2) => {
|
|
616
|
+
if (parentPort2) {
|
|
617
|
+
parentPort2.on("message", handleMessage);
|
|
618
|
+
parentPort2.on("exit", () => console.debug("Node worker closing"));
|
|
619
|
+
} else {
|
|
620
|
+
globalThis.onmessage = handleMessage;
|
|
621
|
+
}
|
|
622
|
+
});
|
|
615
623
|
}
|
|
616
|
-
static addEventListener(onMessage2) {
|
|
624
|
+
static async addEventListener(onMessage2) {
|
|
617
625
|
let onMessageWrapper = onMessageWrapperMap.get(onMessage2);
|
|
618
626
|
if (!onMessageWrapper) {
|
|
619
|
-
onMessageWrapper = (message) => {
|
|
627
|
+
onMessageWrapper = async (message) => {
|
|
620
628
|
if (!isKnownMessage(message)) {
|
|
621
629
|
return;
|
|
622
630
|
}
|
|
623
|
-
const parentPort3 = getParentPort();
|
|
631
|
+
const parentPort3 = await getParentPort();
|
|
624
632
|
const { type, payload } = parentPort3 ? message : message.data;
|
|
625
633
|
onMessage2(type, payload);
|
|
626
634
|
};
|
|
627
635
|
}
|
|
628
|
-
const parentPort2 = getParentPort();
|
|
636
|
+
const parentPort2 = await getParentPort();
|
|
629
637
|
if (parentPort2) {
|
|
630
638
|
console.error("not implemented");
|
|
631
639
|
} else {
|
|
632
640
|
globalThis.addEventListener("message", onMessageWrapper);
|
|
633
641
|
}
|
|
634
642
|
}
|
|
635
|
-
static removeEventListener(onMessage2) {
|
|
643
|
+
static async removeEventListener(onMessage2) {
|
|
636
644
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage2);
|
|
637
645
|
onMessageWrapperMap.delete(onMessage2);
|
|
638
|
-
const parentPort2 = getParentPort();
|
|
646
|
+
const parentPort2 = await getParentPort();
|
|
639
647
|
if (parentPort2) {
|
|
640
648
|
console.error("not implemented");
|
|
641
649
|
} else {
|
|
@@ -647,10 +655,10 @@ var WorkerBody = class {
|
|
|
647
655
|
* @param type
|
|
648
656
|
* @param payload
|
|
649
657
|
*/
|
|
650
|
-
static postMessage(type, payload) {
|
|
658
|
+
static async postMessage(type, payload) {
|
|
651
659
|
const data = { source: "loaders.gl", type, payload };
|
|
652
660
|
const transferList = getTransferList(payload);
|
|
653
|
-
const parentPort2 = getParentPort();
|
|
661
|
+
const parentPort2 = await getParentPort();
|
|
654
662
|
if (parentPort2) {
|
|
655
663
|
parentPort2.postMessage(data, transferList);
|
|
656
664
|
} else {
|
|
@@ -676,7 +684,11 @@ function getWorkerURL(worker, options2 = {}) {
|
|
|
676
684
|
url = options2.workerUrl;
|
|
677
685
|
}
|
|
678
686
|
if (options2._workerType === "test") {
|
|
679
|
-
|
|
687
|
+
if (isBrowser) {
|
|
688
|
+
url = `modules/${worker.module}/dist/${workerFile}`;
|
|
689
|
+
} else {
|
|
690
|
+
url = `modules/${worker.module}/src/workers/${worker.id}-worker-node.ts`;
|
|
691
|
+
}
|
|
680
692
|
}
|
|
681
693
|
if (!url) {
|
|
682
694
|
let version = worker.version;
|
|
@@ -815,8 +827,8 @@ var AsyncQueue = class {
|
|
|
815
827
|
var requestId = 0;
|
|
816
828
|
var inputBatches;
|
|
817
829
|
var options;
|
|
818
|
-
function createWorker(process2, processInBatches) {
|
|
819
|
-
if (!WorkerBody.inWorkerThread()) {
|
|
830
|
+
async function createWorker(process2, processInBatches) {
|
|
831
|
+
if (!await WorkerBody.inWorkerThread()) {
|
|
820
832
|
return;
|
|
821
833
|
}
|
|
822
834
|
const context = {
|
|
@@ -5,5 +5,5 @@ export type ProcessOnMainThread = (data: any, options?: {
|
|
|
5
5
|
/**
|
|
6
6
|
* Set up a WebWorkerGlobalScope to talk with the main thread
|
|
7
7
|
*/
|
|
8
|
-
export declare function createWorker(process: Process, processInBatches?: ProcessInBatches): void
|
|
8
|
+
export declare function createWorker(process: Process, processInBatches?: ProcessInBatches): Promise<void>;
|
|
9
9
|
//# sourceMappingURL=create-worker.d.ts.map
|
|
@@ -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,MAAM,MAAM,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,
|
|
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,MAAM,MAAM,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,wBAAsB,YAAY,CAChC,OAAO,EAAE,OAAO,EAChB,gBAAgB,CAAC,EAAE,gBAAgB,GAClC,OAAO,CAAC,IAAI,CAAC,CAiDf"}
|
|
@@ -3,8 +3,8 @@ import WorkerBody from "../worker-farm/worker-body.js";
|
|
|
3
3
|
let requestId = 0;
|
|
4
4
|
let inputBatches;
|
|
5
5
|
let options;
|
|
6
|
-
export function createWorker(process, processInBatches) {
|
|
7
|
-
if (!WorkerBody.inWorkerThread()) {
|
|
6
|
+
export async function createWorker(process, processInBatches) {
|
|
7
|
+
if (!(await WorkerBody.inWorkerThread())) {
|
|
8
8
|
return;
|
|
9
9
|
}
|
|
10
10
|
const context = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-worker.js","names":["AsyncQueue","WorkerBody","requestId","inputBatches","options","createWorker","process","processInBatches","inWorkerThread","context","processOnMainThread","onmessage","type","payload","Error","result","input","postMessage","resultIterator","batch","push","close","error","message","arrayBuffer","arguments","length","undefined","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"sources":["../../../src/lib/worker-api/create-worker.ts"],"sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process
|
|
1
|
+
{"version":3,"file":"create-worker.js","names":["AsyncQueue","WorkerBody","requestId","inputBatches","options","createWorker","process","processInBatches","inWorkerThread","context","processOnMainThread","onmessage","type","payload","Error","result","input","postMessage","resultIterator","batch","push","close","error","message","arrayBuffer","arguments","length","undefined","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"sources":["../../../src/lib/worker-api/create-worker.ts"],"sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport async function createWorker(\n process: Process,\n processInBatches?: ProcessInBatches\n): Promise<void> {\n if (!(await WorkerBody.inWorkerThread())) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n"],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAK7D;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAG1D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAK7D;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAG1D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CA6CtF"}
|
|
@@ -14,7 +14,11 @@ export function getWorkerURL(worker) {
|
|
|
14
14
|
url = options.workerUrl;
|
|
15
15
|
}
|
|
16
16
|
if (options._workerType === 'test') {
|
|
17
|
-
|
|
17
|
+
if (isBrowser) {
|
|
18
|
+
url = `modules/${worker.module}/dist/${workerFile}`;
|
|
19
|
+
} else {
|
|
20
|
+
url = `modules/${worker.module}/src/workers/${worker.id}-worker-node.ts`;
|
|
21
|
+
}
|
|
18
22
|
}
|
|
19
23
|
if (!url) {
|
|
20
24
|
let version = worker.version;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-worker-url.js","names":["assert","isBrowser","VERSION","NPM_TAG","getWorkerName","worker","warning","version","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// Copyright (c) vis.gl contributors\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION, NPM_TAG} from '../env-utils/version';\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 = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.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":"SAIQA,MAAM;AAAA,SACNC,SAAS;AAAA,SACTC,OAAO,EAAEC,OAAO;AAKxB,OAAO,SAASC,aAAaA,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKL,OAAO,GAAI,kBAAiBA,OAAQ,GAAE,GAAG,EAAE;EAC9E,OAAQ,GAAEG,MAAM,CAACG,IAAK,IAAGH,MAAM,CAACE,OAAQ,GAAED,OAAQ,EAAC;AACrD;AASA,OAAO,SAASG,YAAYA,CAACJ,MAAoB,EAAuC;EAAA,IAArCK,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,MAAMG,aAAa,GAAGJ,OAAO,CAACL,MAAM,CAACU,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,GAAGf,SAAS,GAAI,GAAEI,MAAM,CAACU,EAAG,YAAW,GAAI,GAAEV,MAAM,CAACU,EAAG,iBAAgB;EAEvF,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIZ,MAAM,CAACU,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGP,OAAO,CAACQ,SAAS;EACzB;EAIA,IAAIR,OAAO,CAACS,WAAW,KAAK,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"get-worker-url.js","names":["assert","isBrowser","VERSION","NPM_TAG","getWorkerName","worker","warning","version","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// Copyright (c) vis.gl contributors\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION, NPM_TAG} from '../env-utils/version';\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 = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.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 if (isBrowser) {\n url = `modules/${worker.module}/dist/${workerFile}`;\n } else {\n // In the test environment the ts-node loader requires TypeScript code\n url = `modules/${worker.module}/src/workers/${worker.id}-worker-node.ts`;\n }\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":"SAIQA,MAAM;AAAA,SACNC,SAAS;AAAA,SACTC,OAAO,EAAEC,OAAO;AAKxB,OAAO,SAASC,aAAaA,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKL,OAAO,GAAI,kBAAiBA,OAAQ,GAAE,GAAG,EAAE;EAC9E,OAAQ,GAAEG,MAAM,CAACG,IAAK,IAAGH,MAAM,CAACE,OAAQ,GAAED,OAAQ,EAAC;AACrD;AASA,OAAO,SAASG,YAAYA,CAACJ,MAAoB,EAAuC;EAAA,IAArCK,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,MAAMG,aAAa,GAAGJ,OAAO,CAACL,MAAM,CAACU,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,GAAGf,SAAS,GAAI,GAAEI,MAAM,CAACU,EAAG,YAAW,GAAI,GAAEV,MAAM,CAACU,EAAG,iBAAgB;EAEvF,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIZ,MAAM,CAACU,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGP,OAAO,CAACQ,SAAS;EACzB;EAIA,IAAIR,OAAO,CAACS,WAAW,KAAK,MAAM,EAAE;IAClC,IAAIlB,SAAS,EAAE;MACbgB,GAAG,GAAI,WAAUZ,MAAM,CAACe,MAAO,SAAQJ,UAAW,EAAC;IACrD,CAAC,MAAM;MAELC,GAAG,GAAI,WAAUZ,MAAM,CAACe,MAAO,gBAAef,MAAM,CAACU,EAAG,iBAAgB;IAC1E;EACF;EAGA,IAAI,CAACE,GAAG,EAAE;IAER,IAAIV,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGJ,OAAO;IACnB;IACA,MAAMkB,UAAU,GAAGd,OAAO,GAAI,IAAGA,OAAQ,EAAC,GAAG,EAAE;IAC/CU,GAAG,GAAI,iCAAgCZ,MAAM,CAACe,MAAO,GAAEC,UAAW,SAAQL,UAAW,EAAC;EACxF;EAEAhB,MAAM,CAACiB,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
|
|
@@ -4,15 +4,15 @@ import type { WorkerMessageType, WorkerMessagePayload } from '../../types';
|
|
|
4
4
|
*/
|
|
5
5
|
export default class WorkerBody {
|
|
6
6
|
/** Check that we are actually in a worker thread */
|
|
7
|
-
static inWorkerThread(): boolean
|
|
7
|
+
static inWorkerThread(): Promise<boolean>;
|
|
8
8
|
static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any);
|
|
9
|
-
static addEventListener(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any): void
|
|
10
|
-
static removeEventListener(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any): void
|
|
9
|
+
static addEventListener(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any): Promise<void>;
|
|
10
|
+
static removeEventListener(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any): Promise<void>;
|
|
11
11
|
/**
|
|
12
12
|
* Send a message from a worker to creating thread (main thread)
|
|
13
13
|
* @param type
|
|
14
14
|
* @param payload
|
|
15
15
|
*/
|
|
16
|
-
static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void
|
|
16
|
+
static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): Promise<void>;
|
|
17
17
|
}
|
|
18
18
|
//# sourceMappingURL=worker-body.d.ts.map
|
|
@@ -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;AA0B5F;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,oDAAoD;WACvC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;IAO/C,MAAM,KAAK,SAAS,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,GAAG,EAsB9F;WAEY,gBAAgB,CAC3B,SAAS,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,GAAG;WAyB/D,mBAAmB,CAC9B,SAAS,EAAE,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,KAAK,GAAG;IAY5E;;;;OAIG;WACU,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,IAAI,CAAC;CAchG"}
|
|
@@ -1,42 +1,51 @@
|
|
|
1
1
|
import { getTransferList } from "../worker-utils/get-transfer-list.js";
|
|
2
|
-
function getParentPort() {
|
|
2
|
+
async function getParentPort() {
|
|
3
3
|
let parentPort;
|
|
4
4
|
try {
|
|
5
5
|
eval('globalThis.parentPort = require(\'worker_threads\').parentPort');
|
|
6
6
|
parentPort = globalThis.parentPort;
|
|
7
|
-
} catch {
|
|
7
|
+
} catch {
|
|
8
|
+
try {
|
|
9
|
+
eval('globalThis.workerThreadsPromise = import(\'worker_threads\')');
|
|
10
|
+
const workerThreads = await globalThis.workerThreadsPromise;
|
|
11
|
+
parentPort = workerThreads.parentPort;
|
|
12
|
+
} catch (error) {
|
|
13
|
+
console.error(error.message);
|
|
14
|
+
}
|
|
15
|
+
}
|
|
8
16
|
return parentPort;
|
|
9
17
|
}
|
|
10
18
|
const onMessageWrapperMap = new Map();
|
|
11
19
|
export default class WorkerBody {
|
|
12
|
-
static inWorkerThread() {
|
|
13
|
-
return typeof self !== 'undefined' || Boolean(getParentPort());
|
|
20
|
+
static async inWorkerThread() {
|
|
21
|
+
return typeof self !== 'undefined' || Boolean(await getParentPort());
|
|
14
22
|
}
|
|
15
23
|
static set onmessage(onMessage) {
|
|
16
|
-
function handleMessage(message) {
|
|
17
|
-
const parentPort = getParentPort();
|
|
24
|
+
async function handleMessage(message) {
|
|
25
|
+
const parentPort = await getParentPort();
|
|
18
26
|
const {
|
|
19
27
|
type,
|
|
20
28
|
payload
|
|
21
29
|
} = parentPort ? message : message.data;
|
|
22
30
|
onMessage(type, payload);
|
|
23
31
|
}
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
32
|
+
getParentPort().then(parentPort => {
|
|
33
|
+
if (parentPort) {
|
|
34
|
+
parentPort.on('message', handleMessage);
|
|
35
|
+
parentPort.on('exit', () => console.debug('Node worker closing'));
|
|
36
|
+
} else {
|
|
37
|
+
globalThis.onmessage = handleMessage;
|
|
38
|
+
}
|
|
39
|
+
});
|
|
31
40
|
}
|
|
32
|
-
static addEventListener(onMessage) {
|
|
41
|
+
static async addEventListener(onMessage) {
|
|
33
42
|
let onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
34
43
|
if (!onMessageWrapper) {
|
|
35
|
-
onMessageWrapper = message => {
|
|
44
|
+
onMessageWrapper = async message => {
|
|
36
45
|
if (!isKnownMessage(message)) {
|
|
37
46
|
return;
|
|
38
47
|
}
|
|
39
|
-
const parentPort = getParentPort();
|
|
48
|
+
const parentPort = await getParentPort();
|
|
40
49
|
const {
|
|
41
50
|
type,
|
|
42
51
|
payload
|
|
@@ -44,31 +53,31 @@ export default class WorkerBody {
|
|
|
44
53
|
onMessage(type, payload);
|
|
45
54
|
};
|
|
46
55
|
}
|
|
47
|
-
const parentPort = getParentPort();
|
|
56
|
+
const parentPort = await getParentPort();
|
|
48
57
|
if (parentPort) {
|
|
49
58
|
console.error('not implemented');
|
|
50
59
|
} else {
|
|
51
60
|
globalThis.addEventListener('message', onMessageWrapper);
|
|
52
61
|
}
|
|
53
62
|
}
|
|
54
|
-
static removeEventListener(onMessage) {
|
|
63
|
+
static async removeEventListener(onMessage) {
|
|
55
64
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
56
65
|
onMessageWrapperMap.delete(onMessage);
|
|
57
|
-
const parentPort = getParentPort();
|
|
66
|
+
const parentPort = await getParentPort();
|
|
58
67
|
if (parentPort) {
|
|
59
68
|
console.error('not implemented');
|
|
60
69
|
} else {
|
|
61
70
|
globalThis.removeEventListener('message', onMessageWrapper);
|
|
62
71
|
}
|
|
63
72
|
}
|
|
64
|
-
static postMessage(type, payload) {
|
|
73
|
+
static async postMessage(type, payload) {
|
|
65
74
|
const data = {
|
|
66
75
|
source: 'loaders.gl',
|
|
67
76
|
type,
|
|
68
77
|
payload
|
|
69
78
|
};
|
|
70
79
|
const transferList = getTransferList(payload);
|
|
71
|
-
const parentPort = getParentPort();
|
|
80
|
+
const parentPort = await getParentPort();
|
|
72
81
|
if (parentPort) {
|
|
73
82
|
parentPort.postMessage(data, transferList);
|
|
74
83
|
} else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-body.js","names":["getTransferList","getParentPort","parentPort","eval","globalThis","onMessageWrapperMap","Map","WorkerBody","inWorkerThread","self","Boolean","onmessage","onMessage","handleMessage","
|
|
1
|
+
{"version":3,"file":"worker-body.js","names":["getTransferList","getParentPort","parentPort","eval","globalThis","workerThreads","workerThreadsPromise","error","console","message","onMessageWrapperMap","Map","WorkerBody","inWorkerThread","self","Boolean","onmessage","onMessage","handleMessage","type","payload","data","then","on","debug","addEventListener","onMessageWrapper","get","isKnownMessage","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 */\nasync function 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 } catch {\n try {\n // prettier-ignore\n eval('globalThis.workerThreadsPromise = import(\\'worker_threads\\')'); // eslint-disable-line no-eval\n const workerThreads = await globalThis.workerThreadsPromise;\n parentPort = workerThreads.parentPort;\n } catch (error) {\n console.error((error as Error).message); // eslint-disable-line no-console\n }\n }\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 async inWorkerThread(): Promise<boolean> {\n return typeof self !== 'undefined' || Boolean(await getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n async function handleMessage(message) {\n const parentPort = await getParentPort();\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n getParentPort().then((parentPort) => {\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\n static async addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = async (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n const parentPort = await getParentPort();\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = await getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static async removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = await 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 async postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): Promise<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 = await 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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"}
|
package/dist/null-worker-node.js
CHANGED
|
@@ -103,61 +103,69 @@ function isTransferable(object) {
|
|
|
103
103
|
}
|
|
104
104
|
|
|
105
105
|
// src/lib/worker-farm/worker-body.ts
|
|
106
|
-
function getParentPort() {
|
|
106
|
+
async function getParentPort() {
|
|
107
107
|
let parentPort;
|
|
108
108
|
try {
|
|
109
109
|
eval("globalThis.parentPort = require('worker_threads').parentPort");
|
|
110
110
|
parentPort = globalThis.parentPort;
|
|
111
111
|
} catch {
|
|
112
|
+
try {
|
|
113
|
+
eval("globalThis.workerThreadsPromise = import('worker_threads')");
|
|
114
|
+
const workerThreads = await globalThis.workerThreadsPromise;
|
|
115
|
+
parentPort = workerThreads.parentPort;
|
|
116
|
+
} catch (error) {
|
|
117
|
+
console.error(error.message);
|
|
118
|
+
}
|
|
112
119
|
}
|
|
113
120
|
return parentPort;
|
|
114
121
|
}
|
|
115
122
|
var onMessageWrapperMap = /* @__PURE__ */ new Map();
|
|
116
123
|
var WorkerBody = class {
|
|
117
124
|
/** Check that we are actually in a worker thread */
|
|
118
|
-
static inWorkerThread() {
|
|
119
|
-
return typeof self !== "undefined" || Boolean(getParentPort());
|
|
125
|
+
static async inWorkerThread() {
|
|
126
|
+
return typeof self !== "undefined" || Boolean(await getParentPort());
|
|
120
127
|
}
|
|
121
128
|
/*
|
|
122
129
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
123
130
|
*/
|
|
124
131
|
static set onmessage(onMessage) {
|
|
125
|
-
function handleMessage(message) {
|
|
126
|
-
const
|
|
127
|
-
const { type, payload } =
|
|
132
|
+
async function handleMessage(message) {
|
|
133
|
+
const parentPort2 = await getParentPort();
|
|
134
|
+
const { type, payload } = parentPort2 ? message : message.data;
|
|
128
135
|
onMessage(type, payload);
|
|
129
136
|
}
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
+
getParentPort().then((parentPort2) => {
|
|
138
|
+
if (parentPort2) {
|
|
139
|
+
parentPort2.on("message", handleMessage);
|
|
140
|
+
parentPort2.on("exit", () => console.debug("Node worker closing"));
|
|
141
|
+
} else {
|
|
142
|
+
globalThis.onmessage = handleMessage;
|
|
143
|
+
}
|
|
144
|
+
});
|
|
137
145
|
}
|
|
138
|
-
static addEventListener(onMessage) {
|
|
146
|
+
static async addEventListener(onMessage) {
|
|
139
147
|
let onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
140
148
|
if (!onMessageWrapper) {
|
|
141
|
-
onMessageWrapper = (message) => {
|
|
149
|
+
onMessageWrapper = async (message) => {
|
|
142
150
|
if (!isKnownMessage(message)) {
|
|
143
151
|
return;
|
|
144
152
|
}
|
|
145
|
-
const parentPort3 = getParentPort();
|
|
153
|
+
const parentPort3 = await getParentPort();
|
|
146
154
|
const { type, payload } = parentPort3 ? message : message.data;
|
|
147
155
|
onMessage(type, payload);
|
|
148
156
|
};
|
|
149
157
|
}
|
|
150
|
-
const parentPort2 = getParentPort();
|
|
158
|
+
const parentPort2 = await getParentPort();
|
|
151
159
|
if (parentPort2) {
|
|
152
160
|
console.error("not implemented");
|
|
153
161
|
} else {
|
|
154
162
|
globalThis.addEventListener("message", onMessageWrapper);
|
|
155
163
|
}
|
|
156
164
|
}
|
|
157
|
-
static removeEventListener(onMessage) {
|
|
165
|
+
static async removeEventListener(onMessage) {
|
|
158
166
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
159
167
|
onMessageWrapperMap.delete(onMessage);
|
|
160
|
-
const parentPort2 = getParentPort();
|
|
168
|
+
const parentPort2 = await getParentPort();
|
|
161
169
|
if (parentPort2) {
|
|
162
170
|
console.error("not implemented");
|
|
163
171
|
} else {
|
|
@@ -169,10 +177,10 @@ var WorkerBody = class {
|
|
|
169
177
|
* @param type
|
|
170
178
|
* @param payload
|
|
171
179
|
*/
|
|
172
|
-
static postMessage(type, payload) {
|
|
180
|
+
static async postMessage(type, payload) {
|
|
173
181
|
const data = { source: "loaders.gl", type, payload };
|
|
174
182
|
const transferList = getTransferList(payload);
|
|
175
|
-
const parentPort2 = getParentPort();
|
|
183
|
+
const parentPort2 = await getParentPort();
|
|
176
184
|
if (parentPort2) {
|
|
177
185
|
parentPort2.postMessage(data, transferList);
|
|
178
186
|
} else {
|
|
@@ -189,8 +197,8 @@ function isKnownMessage(message) {
|
|
|
189
197
|
var requestId = 0;
|
|
190
198
|
var inputBatches;
|
|
191
199
|
var options;
|
|
192
|
-
function createWorker(process, processInBatches) {
|
|
193
|
-
if (!WorkerBody.inWorkerThread()) {
|
|
200
|
+
async function createWorker(process, processInBatches) {
|
|
201
|
+
if (!await WorkerBody.inWorkerThread()) {
|
|
194
202
|
return;
|
|
195
203
|
}
|
|
196
204
|
const context = {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/lib/async-queue/async-queue.ts", "../src/lib/worker-utils/get-transfer-list.ts", "../src/lib/worker-farm/worker-body.ts", "../src/lib/worker-api/create-worker.ts", "../src/workers/null-worker.ts"],
|
|
4
|
-
"sourcesContent": ["// From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license\n// http://2ality.com/2016/10/asynchronous-iteration.html\n\n/**\n * Async Queue\n * - AsyncIterable: An async iterator can be\n * - Values can be pushed onto the queue\n * @example\n * const asyncQueue = new AsyncQueue();\n * setTimeout(() => asyncQueue.enqueue('tick'), 1000);\n * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);\n * for await (const value of asyncQueue) {\n * console.log(value); // tick\n * }\n */\nexport default class AsyncQueue<T> {\n private _values: any[];\n private _settlers: any[];\n private _closed: boolean;\n\n constructor() {\n this._values = []; // enqueues > dequeues\n this._settlers = []; // dequeues > enqueues\n this._closed = false;\n }\n\n /** Return an async iterator for this queue */\n [Symbol.asyncIterator](): AsyncIterator<T> {\n return this;\n }\n\n /** Push a new value - the async iterator will yield a promise resolved to this value */\n push(value: T): void {\n return this.enqueue(value);\n }\n\n /**\n * Push a new value - the async iterator will yield a promise resolved to this value\n * Add an error - the async iterator will yield a promise rejected with this value\n */\n enqueue(value: T | Error): void {\n if (this._closed) {\n throw new Error('Closed');\n }\n\n if (this._settlers.length > 0) {\n if (this._values.length > 0) {\n throw new Error('Illegal internal state');\n }\n const settler = this._settlers.shift();\n if (value instanceof Error) {\n settler.reject(value);\n } else {\n settler.resolve({value});\n }\n } else {\n this._values.push(value);\n }\n }\n\n /** Indicate that we not waiting for more values - The async iterator will be done */\n close(): void {\n while (this._settlers.length > 0) {\n const settler = this._settlers.shift();\n settler.resolve({done: true});\n }\n this._closed = true;\n }\n\n // ITERATOR IMPLEMENTATION\n\n /** @returns a Promise for an IteratorResult */\n next(): Promise<IteratorResult<T, any>> {\n // If values in queue, yield the first value\n if (this._values.length > 0) {\n const value = this._values.shift();\n if (value instanceof Error) {\n return Promise.reject(value);\n }\n return Promise.resolve({done: false, value});\n }\n\n // If queue is closed, the iterator is done\n if (this._closed) {\n if (this._settlers.length > 0) {\n throw new Error('Illegal internal state');\n }\n return Promise.resolve({done: true, value: undefined});\n }\n\n // Yield a promise that waits for new values to be enqueued\n return new Promise((resolve, reject) => {\n this._settlers.push({resolve, reject});\n });\n }\n}\n", "// NOTE - there is a copy of this function is both in core and loader-utils\n// core does not need all the utils in loader-utils, just this one.\n\n/**\n * Returns an array of Transferrable objects that can be used with postMessage\n * https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage\n * @param object data to be sent via postMessage\n * @param recursive - not for application use\n * @param transfers - not for application use\n * @returns a transfer list that can be passed to postMessage\n */\nexport function getTransferList(\n object: any,\n recursive: boolean = true,\n transfers?: Set<any>\n): Transferable[] {\n // Make sure that items in the transfer list is unique\n const transfersSet = transfers || new Set();\n\n if (!object) {\n // ignore\n } else if (isTransferable(object)) {\n transfersSet.add(object);\n } else if (isTransferable(object.buffer)) {\n // Typed array\n transfersSet.add(object.buffer);\n } else if (ArrayBuffer.isView(object)) {\n // object is a TypeArray viewing into a SharedArrayBuffer (not transferable)\n // Do not iterate through the content in this case\n } else if (recursive && typeof object === 'object') {\n for (const key in object) {\n // Avoid perf hit - only go one level deep\n getTransferList(object[key], recursive, transfersSet);\n }\n }\n\n // If transfers is defined, is internal recursive call\n // Otherwise it's called by the user\n return transfers === undefined ? Array.from(transfersSet) : [];\n}\n\n// https://developer.mozilla.org/en-US/docs/Web/API/Transferable\nfunction isTransferable(object: unknown) {\n if (!object) {\n return false;\n }\n if (object instanceof ArrayBuffer) {\n return true;\n }\n if (typeof MessagePort !== 'undefined' && object instanceof MessagePort) {\n return true;\n }\n if (typeof ImageBitmap !== 'undefined' && object instanceof ImageBitmap) {\n return true;\n }\n // @ts-ignore\n if (typeof OffscreenCanvas !== 'undefined' && object instanceof OffscreenCanvas) {\n return true;\n }\n return false;\n}\n\n/**\n * Recursively drop non serializable values like functions and regexps.\n * @param object\n */\nexport function getTransferListForWriter(object: object | null): object {\n if (object === null) {\n return {};\n }\n const clone = Object.assign({}, object);\n\n Object.keys(clone).forEach((key) => {\n // Typed Arrays and Arrays are passed with no change\n if (\n typeof object[key] === 'object' &&\n !ArrayBuffer.isView(object[key]) &&\n !(object[key] instanceof Array)\n ) {\n clone[key] = getTransferListForWriter(object[key]);\n } else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {\n clone[key] = {};\n } else {\n clone[key] = object[key];\n }\n });\n\n return clone;\n}\n", "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", "import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n", "import {createWorker} from '../lib/worker-api/create-worker';\n\ncreateWorker(async (data) => {\n // @ts-ignore\n return data;\n});\n"],
|
|
5
|
-
"mappings": ";;;AAeA,IAAqB,aAArB,MAAmC;AAAA,EAKjC,cAAc;AACZ,SAAK,UAAU,CAAC;AAChB,SAAK,YAAY,CAAC;AAClB,SAAK,UAAU;AAAA,EACjB;AAAA;AAAA,EAGA,CAAC,OAAO,aAAa,IAAsB;AACzC,WAAO;AAAA,EACT;AAAA;AAAA,EAGA,KAAK,OAAgB;AACnB,WAAO,KAAK,QAAQ,KAAK;AAAA,EAC3B;AAAA;AAAA;AAAA;AAAA;AAAA,EAMA,QAAQ,OAAwB;AAC9B,QAAI,KAAK,SAAS;AAChB,YAAM,IAAI,MAAM,QAAQ;AAAA,IAC1B;AAEA,QAAI,KAAK,UAAU,SAAS,GAAG;AAC7B,UAAI,KAAK,QAAQ,SAAS,GAAG;AAC3B,cAAM,IAAI,MAAM,wBAAwB;AAAA,MAC1C;AACA,YAAM,UAAU,KAAK,UAAU,MAAM;AACrC,UAAI,iBAAiB,OAAO;AAC1B,gBAAQ,OAAO,KAAK;AAAA,MACtB,OAAO;AACL,gBAAQ,QAAQ,EAAC,MAAK,CAAC;AAAA,MACzB;AAAA,IACF,OAAO;AACL,WAAK,QAAQ,KAAK,KAAK;AAAA,IACzB;AAAA,EACF;AAAA;AAAA,EAGA,QAAc;AACZ,WAAO,KAAK,UAAU,SAAS,GAAG;AAChC,YAAM,UAAU,KAAK,UAAU,MAAM;AACrC,cAAQ,QAAQ,EAAC,MAAM,KAAI,CAAC;AAAA,IAC9B;AACA,SAAK,UAAU;AAAA,EACjB;AAAA;AAAA;AAAA,EAKA,OAAwC;AAEtC,QAAI,KAAK,QAAQ,SAAS,GAAG;AAC3B,YAAM,QAAQ,KAAK,QAAQ,MAAM;AACjC,UAAI,iBAAiB,OAAO;AAC1B,eAAO,QAAQ,OAAO,KAAK;AAAA,MAC7B;AACA,aAAO,QAAQ,QAAQ,EAAC,MAAM,OAAO,MAAK,CAAC;AAAA,IAC7C;AAGA,QAAI,KAAK,SAAS;AAChB,UAAI,KAAK,UAAU,SAAS,GAAG;AAC7B,cAAM,IAAI,MAAM,wBAAwB;AAAA,MAC1C;AACA,aAAO,QAAQ,QAAQ,EAAC,MAAM,MAAM,OAAO,OAAS,CAAC;AAAA,IACvD;AAGA,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,WAAK,UAAU,KAAK,EAAC,SAAS,OAAM,CAAC;AAAA,IACvC,CAAC;AAAA,EACH;AACF;;;ACpFO,SAAS,gBACd,QACA,YAAqB,MACrB,WACgB;AAEhB,QAAM,eAAe,aAAa,oBAAI,IAAI;AAE1C,MAAI,CAAC,QAAQ;AAAA,EAEb,WAAW,eAAe,MAAM,GAAG;AACjC,iBAAa,IAAI,MAAM;AAAA,EACzB,WAAW,eAAe,OAAO,MAAM,GAAG;AAExC,iBAAa,IAAI,OAAO,MAAM;AAAA,EAChC,WAAW,YAAY,OAAO,MAAM,GAAG;AAAA,EAGvC,WAAW,aAAa,OAAO,WAAW,UAAU;AAClD,eAAW,OAAO,QAAQ;AAExB,sBAAgB,OAAO,GAAG,GAAG,WAAW,YAAY;AAAA,IACtD;AAAA,EACF;AAIA,SAAO,cAAc,SAAY,MAAM,KAAK,YAAY,IAAI,CAAC;AAC/D;AAGA,SAAS,eAAe,QAAiB;AACvC,MAAI,CAAC,QAAQ;AACX,WAAO;AAAA,EACT;AACA,MAAI,kBAAkB,aAAa;AACjC,WAAO;AAAA,EACT;AACA,MAAI,OAAO,gBAAgB,eAAe,kBAAkB,aAAa;AACvE,WAAO;AAAA,EACT;AACA,MAAI,OAAO,gBAAgB,eAAe,kBAAkB,aAAa;AACvE,WAAO;AAAA,EACT;AAEA,MAAI,OAAO,oBAAoB,eAAe,kBAAkB,iBAAiB;AAC/E,WAAO;AAAA,EACT;AACA,SAAO;AACT;;;ACxDA,
|
|
4
|
+
"sourcesContent": ["// From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license\n// http://2ality.com/2016/10/asynchronous-iteration.html\n\n/**\n * Async Queue\n * - AsyncIterable: An async iterator can be\n * - Values can be pushed onto the queue\n * @example\n * const asyncQueue = new AsyncQueue();\n * setTimeout(() => asyncQueue.enqueue('tick'), 1000);\n * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);\n * for await (const value of asyncQueue) {\n * console.log(value); // tick\n * }\n */\nexport default class AsyncQueue<T> {\n private _values: any[];\n private _settlers: any[];\n private _closed: boolean;\n\n constructor() {\n this._values = []; // enqueues > dequeues\n this._settlers = []; // dequeues > enqueues\n this._closed = false;\n }\n\n /** Return an async iterator for this queue */\n [Symbol.asyncIterator](): AsyncIterator<T> {\n return this;\n }\n\n /** Push a new value - the async iterator will yield a promise resolved to this value */\n push(value: T): void {\n return this.enqueue(value);\n }\n\n /**\n * Push a new value - the async iterator will yield a promise resolved to this value\n * Add an error - the async iterator will yield a promise rejected with this value\n */\n enqueue(value: T | Error): void {\n if (this._closed) {\n throw new Error('Closed');\n }\n\n if (this._settlers.length > 0) {\n if (this._values.length > 0) {\n throw new Error('Illegal internal state');\n }\n const settler = this._settlers.shift();\n if (value instanceof Error) {\n settler.reject(value);\n } else {\n settler.resolve({value});\n }\n } else {\n this._values.push(value);\n }\n }\n\n /** Indicate that we not waiting for more values - The async iterator will be done */\n close(): void {\n while (this._settlers.length > 0) {\n const settler = this._settlers.shift();\n settler.resolve({done: true});\n }\n this._closed = true;\n }\n\n // ITERATOR IMPLEMENTATION\n\n /** @returns a Promise for an IteratorResult */\n next(): Promise<IteratorResult<T, any>> {\n // If values in queue, yield the first value\n if (this._values.length > 0) {\n const value = this._values.shift();\n if (value instanceof Error) {\n return Promise.reject(value);\n }\n return Promise.resolve({done: false, value});\n }\n\n // If queue is closed, the iterator is done\n if (this._closed) {\n if (this._settlers.length > 0) {\n throw new Error('Illegal internal state');\n }\n return Promise.resolve({done: true, value: undefined});\n }\n\n // Yield a promise that waits for new values to be enqueued\n return new Promise((resolve, reject) => {\n this._settlers.push({resolve, reject});\n });\n }\n}\n", "// NOTE - there is a copy of this function is both in core and loader-utils\n// core does not need all the utils in loader-utils, just this one.\n\n/**\n * Returns an array of Transferrable objects that can be used with postMessage\n * https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage\n * @param object data to be sent via postMessage\n * @param recursive - not for application use\n * @param transfers - not for application use\n * @returns a transfer list that can be passed to postMessage\n */\nexport function getTransferList(\n object: any,\n recursive: boolean = true,\n transfers?: Set<any>\n): Transferable[] {\n // Make sure that items in the transfer list is unique\n const transfersSet = transfers || new Set();\n\n if (!object) {\n // ignore\n } else if (isTransferable(object)) {\n transfersSet.add(object);\n } else if (isTransferable(object.buffer)) {\n // Typed array\n transfersSet.add(object.buffer);\n } else if (ArrayBuffer.isView(object)) {\n // object is a TypeArray viewing into a SharedArrayBuffer (not transferable)\n // Do not iterate through the content in this case\n } else if (recursive && typeof object === 'object') {\n for (const key in object) {\n // Avoid perf hit - only go one level deep\n getTransferList(object[key], recursive, transfersSet);\n }\n }\n\n // If transfers is defined, is internal recursive call\n // Otherwise it's called by the user\n return transfers === undefined ? Array.from(transfersSet) : [];\n}\n\n// https://developer.mozilla.org/en-US/docs/Web/API/Transferable\nfunction isTransferable(object: unknown) {\n if (!object) {\n return false;\n }\n if (object instanceof ArrayBuffer) {\n return true;\n }\n if (typeof MessagePort !== 'undefined' && object instanceof MessagePort) {\n return true;\n }\n if (typeof ImageBitmap !== 'undefined' && object instanceof ImageBitmap) {\n return true;\n }\n // @ts-ignore\n if (typeof OffscreenCanvas !== 'undefined' && object instanceof OffscreenCanvas) {\n return true;\n }\n return false;\n}\n\n/**\n * Recursively drop non serializable values like functions and regexps.\n * @param object\n */\nexport function getTransferListForWriter(object: object | null): object {\n if (object === null) {\n return {};\n }\n const clone = Object.assign({}, object);\n\n Object.keys(clone).forEach((key) => {\n // Typed Arrays and Arrays are passed with no change\n if (\n typeof object[key] === 'object' &&\n !ArrayBuffer.isView(object[key]) &&\n !(object[key] instanceof Array)\n ) {\n clone[key] = getTransferListForWriter(object[key]);\n } else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {\n clone[key] = {};\n } else {\n clone[key] = object[key];\n }\n });\n\n return clone;\n}\n", "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 */\nasync function 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 } catch {\n try {\n // prettier-ignore\n eval('globalThis.workerThreadsPromise = import(\\'worker_threads\\')'); // eslint-disable-line no-eval\n const workerThreads = await globalThis.workerThreadsPromise;\n parentPort = workerThreads.parentPort;\n } catch (error) {\n console.error((error as Error).message); // eslint-disable-line no-console\n }\n }\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 async inWorkerThread(): Promise<boolean> {\n return typeof self !== 'undefined' || Boolean(await getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n async function handleMessage(message) {\n const parentPort = await getParentPort();\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n getParentPort().then((parentPort) => {\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\n static async addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = async (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n const parentPort = await getParentPort();\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = await getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static async removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = await 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 async postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): Promise<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 = await 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", "import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport async function createWorker(\n process: Process,\n processInBatches?: ProcessInBatches\n): Promise<void> {\n if (!(await WorkerBody.inWorkerThread())) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n", "import {createWorker} from '../lib/worker-api/create-worker';\n\ncreateWorker(async (data) => {\n // @ts-ignore\n return data;\n});\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
6
|
"names": ["parentPort", "options", "payload"]
|
|
7
7
|
}
|
package/dist/null-worker.js
CHANGED
|
@@ -106,61 +106,69 @@
|
|
|
106
106
|
}
|
|
107
107
|
|
|
108
108
|
// src/lib/worker-farm/worker-body.ts
|
|
109
|
-
function getParentPort() {
|
|
109
|
+
async function getParentPort() {
|
|
110
110
|
let parentPort;
|
|
111
111
|
try {
|
|
112
112
|
eval("globalThis.parentPort = require('worker_threads').parentPort");
|
|
113
113
|
parentPort = globalThis.parentPort;
|
|
114
114
|
} catch {
|
|
115
|
+
try {
|
|
116
|
+
eval("globalThis.workerThreadsPromise = import('worker_threads')");
|
|
117
|
+
const workerThreads = await globalThis.workerThreadsPromise;
|
|
118
|
+
parentPort = workerThreads.parentPort;
|
|
119
|
+
} catch (error) {
|
|
120
|
+
console.error(error.message);
|
|
121
|
+
}
|
|
115
122
|
}
|
|
116
123
|
return parentPort;
|
|
117
124
|
}
|
|
118
125
|
var onMessageWrapperMap = /* @__PURE__ */ new Map();
|
|
119
126
|
var WorkerBody = class {
|
|
120
127
|
/** Check that we are actually in a worker thread */
|
|
121
|
-
static inWorkerThread() {
|
|
122
|
-
return typeof self !== "undefined" || Boolean(getParentPort());
|
|
128
|
+
static async inWorkerThread() {
|
|
129
|
+
return typeof self !== "undefined" || Boolean(await getParentPort());
|
|
123
130
|
}
|
|
124
131
|
/*
|
|
125
132
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
126
133
|
*/
|
|
127
134
|
static set onmessage(onMessage) {
|
|
128
|
-
function handleMessage(message) {
|
|
129
|
-
const
|
|
130
|
-
const { type, payload } =
|
|
135
|
+
async function handleMessage(message) {
|
|
136
|
+
const parentPort2 = await getParentPort();
|
|
137
|
+
const { type, payload } = parentPort2 ? message : message.data;
|
|
131
138
|
onMessage(type, payload);
|
|
132
139
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
+
getParentPort().then((parentPort2) => {
|
|
141
|
+
if (parentPort2) {
|
|
142
|
+
parentPort2.on("message", handleMessage);
|
|
143
|
+
parentPort2.on("exit", () => console.debug("Node worker closing"));
|
|
144
|
+
} else {
|
|
145
|
+
globalThis.onmessage = handleMessage;
|
|
146
|
+
}
|
|
147
|
+
});
|
|
140
148
|
}
|
|
141
|
-
static addEventListener(onMessage) {
|
|
149
|
+
static async addEventListener(onMessage) {
|
|
142
150
|
let onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
143
151
|
if (!onMessageWrapper) {
|
|
144
|
-
onMessageWrapper = (message) => {
|
|
152
|
+
onMessageWrapper = async (message) => {
|
|
145
153
|
if (!isKnownMessage(message)) {
|
|
146
154
|
return;
|
|
147
155
|
}
|
|
148
|
-
const parentPort3 = getParentPort();
|
|
156
|
+
const parentPort3 = await getParentPort();
|
|
149
157
|
const { type, payload } = parentPort3 ? message : message.data;
|
|
150
158
|
onMessage(type, payload);
|
|
151
159
|
};
|
|
152
160
|
}
|
|
153
|
-
const parentPort2 = getParentPort();
|
|
161
|
+
const parentPort2 = await getParentPort();
|
|
154
162
|
if (parentPort2) {
|
|
155
163
|
console.error("not implemented");
|
|
156
164
|
} else {
|
|
157
165
|
globalThis.addEventListener("message", onMessageWrapper);
|
|
158
166
|
}
|
|
159
167
|
}
|
|
160
|
-
static removeEventListener(onMessage) {
|
|
168
|
+
static async removeEventListener(onMessage) {
|
|
161
169
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
162
170
|
onMessageWrapperMap.delete(onMessage);
|
|
163
|
-
const parentPort2 = getParentPort();
|
|
171
|
+
const parentPort2 = await getParentPort();
|
|
164
172
|
if (parentPort2) {
|
|
165
173
|
console.error("not implemented");
|
|
166
174
|
} else {
|
|
@@ -172,10 +180,10 @@
|
|
|
172
180
|
* @param type
|
|
173
181
|
* @param payload
|
|
174
182
|
*/
|
|
175
|
-
static postMessage(type, payload) {
|
|
183
|
+
static async postMessage(type, payload) {
|
|
176
184
|
const data = { source: "loaders.gl", type, payload };
|
|
177
185
|
const transferList = getTransferList(payload);
|
|
178
|
-
const parentPort2 = getParentPort();
|
|
186
|
+
const parentPort2 = await getParentPort();
|
|
179
187
|
if (parentPort2) {
|
|
180
188
|
parentPort2.postMessage(data, transferList);
|
|
181
189
|
} else {
|
|
@@ -192,8 +200,8 @@
|
|
|
192
200
|
var requestId = 0;
|
|
193
201
|
var inputBatches;
|
|
194
202
|
var options;
|
|
195
|
-
function createWorker(process, processInBatches) {
|
|
196
|
-
if (!WorkerBody.inWorkerThread()) {
|
|
203
|
+
async function createWorker(process, processInBatches) {
|
|
204
|
+
if (!await WorkerBody.inWorkerThread()) {
|
|
197
205
|
return;
|
|
198
206
|
}
|
|
199
207
|
const context = {
|
package/dist/null-worker.js.map
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../src/lib/async-queue/async-queue.ts", "../src/lib/worker-utils/get-transfer-list.ts", "../src/lib/worker-farm/worker-body.ts", "../src/lib/worker-api/create-worker.ts", "../src/workers/null-worker.ts"],
|
|
4
|
-
"sourcesContent": ["// From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license\n// http://2ality.com/2016/10/asynchronous-iteration.html\n\n/**\n * Async Queue\n * - AsyncIterable: An async iterator can be\n * - Values can be pushed onto the queue\n * @example\n * const asyncQueue = new AsyncQueue();\n * setTimeout(() => asyncQueue.enqueue('tick'), 1000);\n * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);\n * for await (const value of asyncQueue) {\n * console.log(value); // tick\n * }\n */\nexport default class AsyncQueue<T> {\n private _values: any[];\n private _settlers: any[];\n private _closed: boolean;\n\n constructor() {\n this._values = []; // enqueues > dequeues\n this._settlers = []; // dequeues > enqueues\n this._closed = false;\n }\n\n /** Return an async iterator for this queue */\n [Symbol.asyncIterator](): AsyncIterator<T> {\n return this;\n }\n\n /** Push a new value - the async iterator will yield a promise resolved to this value */\n push(value: T): void {\n return this.enqueue(value);\n }\n\n /**\n * Push a new value - the async iterator will yield a promise resolved to this value\n * Add an error - the async iterator will yield a promise rejected with this value\n */\n enqueue(value: T | Error): void {\n if (this._closed) {\n throw new Error('Closed');\n }\n\n if (this._settlers.length > 0) {\n if (this._values.length > 0) {\n throw new Error('Illegal internal state');\n }\n const settler = this._settlers.shift();\n if (value instanceof Error) {\n settler.reject(value);\n } else {\n settler.resolve({value});\n }\n } else {\n this._values.push(value);\n }\n }\n\n /** Indicate that we not waiting for more values - The async iterator will be done */\n close(): void {\n while (this._settlers.length > 0) {\n const settler = this._settlers.shift();\n settler.resolve({done: true});\n }\n this._closed = true;\n }\n\n // ITERATOR IMPLEMENTATION\n\n /** @returns a Promise for an IteratorResult */\n next(): Promise<IteratorResult<T, any>> {\n // If values in queue, yield the first value\n if (this._values.length > 0) {\n const value = this._values.shift();\n if (value instanceof Error) {\n return Promise.reject(value);\n }\n return Promise.resolve({done: false, value});\n }\n\n // If queue is closed, the iterator is done\n if (this._closed) {\n if (this._settlers.length > 0) {\n throw new Error('Illegal internal state');\n }\n return Promise.resolve({done: true, value: undefined});\n }\n\n // Yield a promise that waits for new values to be enqueued\n return new Promise((resolve, reject) => {\n this._settlers.push({resolve, reject});\n });\n }\n}\n", "// NOTE - there is a copy of this function is both in core and loader-utils\n// core does not need all the utils in loader-utils, just this one.\n\n/**\n * Returns an array of Transferrable objects that can be used with postMessage\n * https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage\n * @param object data to be sent via postMessage\n * @param recursive - not for application use\n * @param transfers - not for application use\n * @returns a transfer list that can be passed to postMessage\n */\nexport function getTransferList(\n object: any,\n recursive: boolean = true,\n transfers?: Set<any>\n): Transferable[] {\n // Make sure that items in the transfer list is unique\n const transfersSet = transfers || new Set();\n\n if (!object) {\n // ignore\n } else if (isTransferable(object)) {\n transfersSet.add(object);\n } else if (isTransferable(object.buffer)) {\n // Typed array\n transfersSet.add(object.buffer);\n } else if (ArrayBuffer.isView(object)) {\n // object is a TypeArray viewing into a SharedArrayBuffer (not transferable)\n // Do not iterate through the content in this case\n } else if (recursive && typeof object === 'object') {\n for (const key in object) {\n // Avoid perf hit - only go one level deep\n getTransferList(object[key], recursive, transfersSet);\n }\n }\n\n // If transfers is defined, is internal recursive call\n // Otherwise it's called by the user\n return transfers === undefined ? Array.from(transfersSet) : [];\n}\n\n// https://developer.mozilla.org/en-US/docs/Web/API/Transferable\nfunction isTransferable(object: unknown) {\n if (!object) {\n return false;\n }\n if (object instanceof ArrayBuffer) {\n return true;\n }\n if (typeof MessagePort !== 'undefined' && object instanceof MessagePort) {\n return true;\n }\n if (typeof ImageBitmap !== 'undefined' && object instanceof ImageBitmap) {\n return true;\n }\n // @ts-ignore\n if (typeof OffscreenCanvas !== 'undefined' && object instanceof OffscreenCanvas) {\n return true;\n }\n return false;\n}\n\n/**\n * Recursively drop non serializable values like functions and regexps.\n * @param object\n */\nexport function getTransferListForWriter(object: object | null): object {\n if (object === null) {\n return {};\n }\n const clone = Object.assign({}, object);\n\n Object.keys(clone).forEach((key) => {\n // Typed Arrays and Arrays are passed with no change\n if (\n typeof object[key] === 'object' &&\n !ArrayBuffer.isView(object[key]) &&\n !(object[key] instanceof Array)\n ) {\n clone[key] = getTransferListForWriter(object[key]);\n } else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {\n clone[key] = {};\n } else {\n clone[key] = object[key];\n }\n });\n\n return clone;\n}\n", "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", "import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n", "import {createWorker} from '../lib/worker-api/create-worker';\n\ncreateWorker(async (data) => {\n // @ts-ignore\n return data;\n});\n"],
|
|
5
|
-
"mappings": "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
|
|
4
|
+
"sourcesContent": ["// From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license\n// http://2ality.com/2016/10/asynchronous-iteration.html\n\n/**\n * Async Queue\n * - AsyncIterable: An async iterator can be\n * - Values can be pushed onto the queue\n * @example\n * const asyncQueue = new AsyncQueue();\n * setTimeout(() => asyncQueue.enqueue('tick'), 1000);\n * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);\n * for await (const value of asyncQueue) {\n * console.log(value); // tick\n * }\n */\nexport default class AsyncQueue<T> {\n private _values: any[];\n private _settlers: any[];\n private _closed: boolean;\n\n constructor() {\n this._values = []; // enqueues > dequeues\n this._settlers = []; // dequeues > enqueues\n this._closed = false;\n }\n\n /** Return an async iterator for this queue */\n [Symbol.asyncIterator](): AsyncIterator<T> {\n return this;\n }\n\n /** Push a new value - the async iterator will yield a promise resolved to this value */\n push(value: T): void {\n return this.enqueue(value);\n }\n\n /**\n * Push a new value - the async iterator will yield a promise resolved to this value\n * Add an error - the async iterator will yield a promise rejected with this value\n */\n enqueue(value: T | Error): void {\n if (this._closed) {\n throw new Error('Closed');\n }\n\n if (this._settlers.length > 0) {\n if (this._values.length > 0) {\n throw new Error('Illegal internal state');\n }\n const settler = this._settlers.shift();\n if (value instanceof Error) {\n settler.reject(value);\n } else {\n settler.resolve({value});\n }\n } else {\n this._values.push(value);\n }\n }\n\n /** Indicate that we not waiting for more values - The async iterator will be done */\n close(): void {\n while (this._settlers.length > 0) {\n const settler = this._settlers.shift();\n settler.resolve({done: true});\n }\n this._closed = true;\n }\n\n // ITERATOR IMPLEMENTATION\n\n /** @returns a Promise for an IteratorResult */\n next(): Promise<IteratorResult<T, any>> {\n // If values in queue, yield the first value\n if (this._values.length > 0) {\n const value = this._values.shift();\n if (value instanceof Error) {\n return Promise.reject(value);\n }\n return Promise.resolve({done: false, value});\n }\n\n // If queue is closed, the iterator is done\n if (this._closed) {\n if (this._settlers.length > 0) {\n throw new Error('Illegal internal state');\n }\n return Promise.resolve({done: true, value: undefined});\n }\n\n // Yield a promise that waits for new values to be enqueued\n return new Promise((resolve, reject) => {\n this._settlers.push({resolve, reject});\n });\n }\n}\n", "// NOTE - there is a copy of this function is both in core and loader-utils\n// core does not need all the utils in loader-utils, just this one.\n\n/**\n * Returns an array of Transferrable objects that can be used with postMessage\n * https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage\n * @param object data to be sent via postMessage\n * @param recursive - not for application use\n * @param transfers - not for application use\n * @returns a transfer list that can be passed to postMessage\n */\nexport function getTransferList(\n object: any,\n recursive: boolean = true,\n transfers?: Set<any>\n): Transferable[] {\n // Make sure that items in the transfer list is unique\n const transfersSet = transfers || new Set();\n\n if (!object) {\n // ignore\n } else if (isTransferable(object)) {\n transfersSet.add(object);\n } else if (isTransferable(object.buffer)) {\n // Typed array\n transfersSet.add(object.buffer);\n } else if (ArrayBuffer.isView(object)) {\n // object is a TypeArray viewing into a SharedArrayBuffer (not transferable)\n // Do not iterate through the content in this case\n } else if (recursive && typeof object === 'object') {\n for (const key in object) {\n // Avoid perf hit - only go one level deep\n getTransferList(object[key], recursive, transfersSet);\n }\n }\n\n // If transfers is defined, is internal recursive call\n // Otherwise it's called by the user\n return transfers === undefined ? Array.from(transfersSet) : [];\n}\n\n// https://developer.mozilla.org/en-US/docs/Web/API/Transferable\nfunction isTransferable(object: unknown) {\n if (!object) {\n return false;\n }\n if (object instanceof ArrayBuffer) {\n return true;\n }\n if (typeof MessagePort !== 'undefined' && object instanceof MessagePort) {\n return true;\n }\n if (typeof ImageBitmap !== 'undefined' && object instanceof ImageBitmap) {\n return true;\n }\n // @ts-ignore\n if (typeof OffscreenCanvas !== 'undefined' && object instanceof OffscreenCanvas) {\n return true;\n }\n return false;\n}\n\n/**\n * Recursively drop non serializable values like functions and regexps.\n * @param object\n */\nexport function getTransferListForWriter(object: object | null): object {\n if (object === null) {\n return {};\n }\n const clone = Object.assign({}, object);\n\n Object.keys(clone).forEach((key) => {\n // Typed Arrays and Arrays are passed with no change\n if (\n typeof object[key] === 'object' &&\n !ArrayBuffer.isView(object[key]) &&\n !(object[key] instanceof Array)\n ) {\n clone[key] = getTransferListForWriter(object[key]);\n } else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {\n clone[key] = {};\n } else {\n clone[key] = object[key];\n }\n });\n\n return clone;\n}\n", "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 */\nasync function 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 } catch {\n try {\n // prettier-ignore\n eval('globalThis.workerThreadsPromise = import(\\'worker_threads\\')'); // eslint-disable-line no-eval\n const workerThreads = await globalThis.workerThreadsPromise;\n parentPort = workerThreads.parentPort;\n } catch (error) {\n console.error((error as Error).message); // eslint-disable-line no-console\n }\n }\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 async inWorkerThread(): Promise<boolean> {\n return typeof self !== 'undefined' || Boolean(await getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n async function handleMessage(message) {\n const parentPort = await getParentPort();\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n getParentPort().then((parentPort) => {\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\n static async addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = async (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n const parentPort = await getParentPort();\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = await getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static async removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = await 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 async postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): Promise<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 = await 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", "import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport async function createWorker(\n process: Process,\n processInBatches?: ProcessInBatches\n): Promise<void> {\n if (!(await WorkerBody.inWorkerThread())) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n", "import {createWorker} from '../lib/worker-api/create-worker';\n\ncreateWorker(async (data) => {\n // @ts-ignore\n return data;\n});\n"],
|
|
5
|
+
"mappings": ";;;AAeA,MAAqB,aAArB,MAAmC;AAAA,IACzB;AAAA,IACA;AAAA,IACA;AAAA,IAER,cAAc;AACZ,WAAK,UAAU,CAAC;AAChB,WAAK,YAAY,CAAC;AAClB,WAAK,UAAU;AAAA,IACjB;AAAA;AAAA,IAGA,CAAC,OAAO,aAAa,IAAsB;AACzC,aAAO;AAAA,IACT;AAAA;AAAA,IAGA,KAAK,OAAgB;AACnB,aAAO,KAAK,QAAQ,KAAK;AAAA,IAC3B;AAAA;AAAA;AAAA;AAAA;AAAA,IAMA,QAAQ,OAAwB;AAC9B,UAAI,KAAK,SAAS;AAChB,cAAM,IAAI,MAAM,QAAQ;AAAA,MAC1B;AAEA,UAAI,KAAK,UAAU,SAAS,GAAG;AAC7B,YAAI,KAAK,QAAQ,SAAS,GAAG;AAC3B,gBAAM,IAAI,MAAM,wBAAwB;AAAA,QAC1C;AACA,cAAM,UAAU,KAAK,UAAU,MAAM;AACrC,YAAI,iBAAiB,OAAO;AAC1B,kBAAQ,OAAO,KAAK;AAAA,QACtB,OAAO;AACL,kBAAQ,QAAQ,EAAC,MAAK,CAAC;AAAA,QACzB;AAAA,MACF,OAAO;AACL,aAAK,QAAQ,KAAK,KAAK;AAAA,MACzB;AAAA,IACF;AAAA;AAAA,IAGA,QAAc;AACZ,aAAO,KAAK,UAAU,SAAS,GAAG;AAChC,cAAM,UAAU,KAAK,UAAU,MAAM;AACrC,gBAAQ,QAAQ,EAAC,MAAM,KAAI,CAAC;AAAA,MAC9B;AACA,WAAK,UAAU;AAAA,IACjB;AAAA;AAAA;AAAA,IAKA,OAAwC;AAEtC,UAAI,KAAK,QAAQ,SAAS,GAAG;AAC3B,cAAM,QAAQ,KAAK,QAAQ,MAAM;AACjC,YAAI,iBAAiB,OAAO;AAC1B,iBAAO,QAAQ,OAAO,KAAK;AAAA,QAC7B;AACA,eAAO,QAAQ,QAAQ,EAAC,MAAM,OAAO,MAAK,CAAC;AAAA,MAC7C;AAGA,UAAI,KAAK,SAAS;AAChB,YAAI,KAAK,UAAU,SAAS,GAAG;AAC7B,gBAAM,IAAI,MAAM,wBAAwB;AAAA,QAC1C;AACA,eAAO,QAAQ,QAAQ,EAAC,MAAM,MAAM,OAAO,OAAS,CAAC;AAAA,MACvD;AAGA,aAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,aAAK,UAAU,KAAK,EAAC,SAAS,OAAM,CAAC;AAAA,MACvC,CAAC;AAAA,IACH;AAAA,EACF;;;ACpFO,WAAS,gBACd,QACA,YAAqB,MACrB,WACgB;AAEhB,UAAM,eAAe,aAAa,oBAAI,IAAI;AAE1C,QAAI,CAAC,QAAQ;AAAA,IAEb,WAAW,eAAe,MAAM,GAAG;AACjC,mBAAa,IAAI,MAAM;AAAA,IACzB,WAAW,eAAe,OAAO,MAAM,GAAG;AAExC,mBAAa,IAAI,OAAO,MAAM;AAAA,IAChC,WAAW,YAAY,OAAO,MAAM,GAAG;AAAA,IAGvC,WAAW,aAAa,OAAO,WAAW,UAAU;AAClD,iBAAW,OAAO,QAAQ;AAExB,wBAAgB,OAAO,GAAG,GAAG,WAAW,YAAY;AAAA,MACtD;AAAA,IACF;AAIA,WAAO,cAAc,SAAY,MAAM,KAAK,YAAY,IAAI,CAAC;AAAA,EAC/D;AAGA,WAAS,eAAe,QAAiB;AACvC,QAAI,CAAC,QAAQ;AACX,aAAO;AAAA,IACT;AACA,QAAI,kBAAkB,aAAa;AACjC,aAAO;AAAA,IACT;AACA,QAAI,OAAO,gBAAgB,eAAe,kBAAkB,aAAa;AACvE,aAAO;AAAA,IACT;AACA,QAAI,OAAO,gBAAgB,eAAe,kBAAkB,aAAa;AACvE,aAAO;AAAA,IACT;AAEA,QAAI,OAAO,oBAAoB,eAAe,kBAAkB,iBAAiB;AAC/E,aAAO;AAAA,IACT;AACA,WAAO;AAAA,EACT;;;ACxDA,iBAAe,gBAAgB;AAE7B,QAAI;AACJ,QAAI;AAEF,WAAK,8DAAgE;AACrE,mBAAa,WAAW;AAAA,IAC1B,QAAE;AACA,UAAI;AAEF,aAAK,4DAA8D;AACnE,cAAM,gBAAgB,MAAM,WAAW;AACvC,qBAAa,cAAc;AAAA,MAC7B,SAAS,OAAP;AACA,gBAAQ,MAAO,MAAgB,OAAO;AAAA,MACxC;AAAA,IACF;AACA,WAAO;AAAA,EACT;AAEA,MAAM,sBAAsB,oBAAI,IAAI;AAKpC,MAAqB,aAArB,MAAgC;AAAA;AAAA,IAE9B,aAAa,iBAAmC;AAC9C,aAAO,OAAO,SAAS,eAAe,QAAQ,MAAM,cAAc,CAAC;AAAA,IACrE;AAAA;AAAA;AAAA;AAAA,IAKA,WAAW,UAAU,WAA4E;AAC/F,qBAAe,cAAc,SAAS;AACpC,cAAMA,cAAa,MAAM,cAAc;AAEvC,cAAM,EAAC,MAAM,QAAO,IAAIA,cAAa,UAAU,QAAQ;AAIvD,kBAAU,MAAM,OAAO;AAAA,MACzB;AAEA,oBAAc,EAAE,KAAK,CAACA,gBAAe;AACnC,YAAIA,aAAY;AACd,UAAAA,YAAW,GAAG,WAAW,aAAa;AAGtC,UAAAA,YAAW,GAAG,QAAQ,MAAM,QAAQ,MAAM,qBAAqB,CAAC;AAAA,QAClE,OAAO;AAEL,qBAAW,YAAY;AAAA,QACzB;AAAA,MACF,CAAC;AAAA,IACH;AAAA,IAEA,aAAa,iBACX,WACA;AACA,UAAI,mBAAmB,oBAAoB,IAAI,SAAS;AAExD,UAAI,CAAC,kBAAkB;AACrB,2BAAmB,OAAO,YAA+B;AACvD,cAAI,CAAC,eAAe,OAAO,GAAG;AAC5B;AAAA,UACF;AAEA,gBAAMA,cAAa,MAAM,cAAc;AAEvC,gBAAM,EAAC,MAAM,QAAO,IAAIA,cAAa,UAAU,QAAQ;AACvD,oBAAU,MAAM,OAAO;AAAA,QACzB;AAAA,MACF;AAEA,YAAMA,cAAa,MAAM,cAAc;AACvC,UAAIA,aAAY;AACd,gBAAQ,MAAM,iBAAiB;AAAA,MACjC,OAAO;AACL,mBAAW,iBAAiB,WAAW,gBAAgB;AAAA,MACzD;AAAA,IACF;AAAA,IAEA,aAAa,oBACX,WACA;AACA,YAAM,mBAAmB,oBAAoB,IAAI,SAAS;AAC1D,0BAAoB,OAAO,SAAS;AACpC,YAAMA,cAAa,MAAM,cAAc;AACvC,UAAIA,aAAY;AACd,gBAAQ,MAAM,iBAAiB;AAAA,MACjC,OAAO;AACL,mBAAW,oBAAoB,WAAW,gBAAgB;AAAA,MAC5D;AAAA,IACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,IAOA,aAAa,YAAY,MAAyB,SAA8C;AAC9F,YAAM,OAA0B,EAAC,QAAQ,cAAc,MAAM,QAAO;AAEpE,YAAM,eAAe,gBAAgB,OAAO;AAE5C,YAAMA,cAAa,MAAM,cAAc;AACvC,UAAIA,aAAY;AACd,QAAAA,YAAW,YAAY,MAAM,YAAY;AAAA,MAE3C,OAAO;AAEL,mBAAW,YAAY,MAAM,YAAY;AAAA,MAC3C;AAAA,IACF;AAAA,EACF;AAGA,WAAS,eAAe,SAA4B;AAClD,UAAM,EAAC,MAAM,KAAI,IAAI;AACrB,WACE,SAAS,aACT,QACA,OAAO,KAAK,WAAW,YACvB,KAAK,OAAO,WAAW,YAAY;AAAA,EAEvC;;;ACvHA,MAAI,YAAY;AAChB,MAAI;AACJ,MAAI;AAWJ,iBAAsB,aACpB,SACA,kBACe;AACf,QAAI,CAAE,MAAM,WAAW,eAAe,GAAI;AACxC;AAAA,IACF;AAEA,UAAM,UAAyB;AAAA,MAC7B,SAAS;AAAA,IACX;AAGA,eAAW,YAAY,OAAO,MAAyB,YAAkC;AACvF,UAAI;AACF,gBAAQ,MAAM;AAAA,UACZ,KAAK;AACH,gBAAI,CAAC,SAAS;AACZ,oBAAM,IAAI,MAAM,2CAA2C;AAAA,YAC7D;AACA,kBAAM,SAAS,MAAM,QAAQ,QAAQ,OAAO,QAAQ,WAAW,CAAC,GAAG,OAAO;AAC1E,uBAAW,YAAY,QAAQ,EAAC,OAAM,CAAC;AACvC;AAAA,UAEF,KAAK;AACH,gBAAI,CAAC,kBAAkB;AACrB,oBAAM,IAAI,MAAM,4CAA4C;AAAA,YAC9D;AACA,2BAAe,IAAI,WAAgB;AACnC,sBAAU,QAAQ,WAAW,CAAC;AAC9B,kBAAM,iBAAiB,iBAAiB,cAAc,SAAS,OAAO;AACtE,6BAAiB,SAAS,gBAAgB;AACxC,yBAAW,YAAY,gBAAgB,EAAC,QAAQ,MAAK,CAAC;AAAA,YACxD;AACA,uBAAW,YAAY,QAAQ,CAAC,CAAC;AACjC;AAAA,UAEF,KAAK;AACH,yBAAa,KAAK,QAAQ,KAAK;AAC/B;AAAA,UAEF,KAAK;AACH,yBAAa,MAAM;AACnB;AAAA,UAEF;AAAA,QACF;AAAA,MACF,SAAS,OAAP;AACA,cAAM,UAAU,iBAAiB,QAAQ,MAAM,UAAU;AACzD,mBAAW,YAAY,SAAS,EAAC,OAAO,QAAO,CAAC;AAAA,MAClD;AAAA,IACF;AAAA,EACF;AAEA,WAAS,oBAAoB,aAA0BC,WAAU,CAAC,GAAG;AACnE,WAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,YAAM,KAAK;AAIX,YAAM,YAAY,CAAC,MAAcC,aAAkC;AACjE,YAAIA,SAAQ,OAAO,IAAI;AAErB;AAAA,QACF;AAEA,gBAAQ,MAAM;AAAA,UACZ,KAAK;AACH,uBAAW,oBAAoB,SAAS;AACxC,oBAAQA,SAAQ,MAAM;AACtB;AAAA,UAEF,KAAK;AACH,uBAAW,oBAAoB,SAAS;AACxC,mBAAOA,SAAQ,KAAK;AACpB;AAAA,UAEF;AAAA,QAEF;AAAA,MACF;AAEA,iBAAW,iBAAiB,SAAS;AAGrC,YAAM,UAAU,EAAC,IAAI,OAAO,aAAa,SAAAD,SAAO;AAChD,iBAAW,YAAY,WAAW,OAAO;AAAA,IAC3C,CAAC;AAAA,EACH;;;AC/GA,eAAa,OAAO,SAAS;AAE3B,WAAO;AAAA,EACT,CAAC;",
|
|
6
6
|
"names": ["parentPort", "options", "payload"]
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/worker-utils",
|
|
3
|
-
"version": "4.0.
|
|
3
|
+
"version": "4.0.2",
|
|
4
4
|
"description": "Utilities for running tasks on worker threads",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@babel/runtime": "^7.3.1"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "471058d109d5652f28c32c1f296fd632f9a5c806"
|
|
56
56
|
}
|
|
@@ -23,8 +23,11 @@ export type ProcessOnMainThread = (
|
|
|
23
23
|
/**
|
|
24
24
|
* Set up a WebWorkerGlobalScope to talk with the main thread
|
|
25
25
|
*/
|
|
26
|
-
export function createWorker(
|
|
27
|
-
|
|
26
|
+
export async function createWorker(
|
|
27
|
+
process: Process,
|
|
28
|
+
processInBatches?: ProcessInBatches
|
|
29
|
+
): Promise<void> {
|
|
30
|
+
if (!(await WorkerBody.inWorkerThread())) {
|
|
28
31
|
return;
|
|
29
32
|
}
|
|
30
33
|
|
|
@@ -41,7 +41,12 @@ export function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}):
|
|
|
41
41
|
// If URL is test, generate local loaders.gl url
|
|
42
42
|
// @ts-ignore _workerType
|
|
43
43
|
if (options._workerType === 'test') {
|
|
44
|
-
|
|
44
|
+
if (isBrowser) {
|
|
45
|
+
url = `modules/${worker.module}/dist/${workerFile}`;
|
|
46
|
+
} else {
|
|
47
|
+
// In the test environment the ts-node loader requires TypeScript code
|
|
48
|
+
url = `modules/${worker.module}/src/workers/${worker.id}-worker-node.ts`;
|
|
49
|
+
}
|
|
45
50
|
}
|
|
46
51
|
|
|
47
52
|
// If url override is not provided, generate a URL to published version on npm CDN unpkg.com
|
|
@@ -2,15 +2,23 @@ import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '.
|
|
|
2
2
|
import {getTransferList} from '../worker-utils/get-transfer-list';
|
|
3
3
|
|
|
4
4
|
/** Vile hack to defeat over-zealous bundlers from stripping out the require */
|
|
5
|
-
function getParentPort() {
|
|
5
|
+
async function getParentPort() {
|
|
6
6
|
// const isNode = globalThis.process;
|
|
7
7
|
let parentPort;
|
|
8
8
|
try {
|
|
9
9
|
// prettier-ignore
|
|
10
10
|
eval('globalThis.parentPort = require(\'worker_threads\').parentPort'); // eslint-disable-line no-eval
|
|
11
11
|
parentPort = globalThis.parentPort;
|
|
12
|
-
|
|
13
|
-
|
|
12
|
+
} catch {
|
|
13
|
+
try {
|
|
14
|
+
// prettier-ignore
|
|
15
|
+
eval('globalThis.workerThreadsPromise = import(\'worker_threads\')'); // eslint-disable-line no-eval
|
|
16
|
+
const workerThreads = await globalThis.workerThreadsPromise;
|
|
17
|
+
parentPort = workerThreads.parentPort;
|
|
18
|
+
} catch (error) {
|
|
19
|
+
console.error((error as Error).message); // eslint-disable-line no-console
|
|
20
|
+
}
|
|
21
|
+
}
|
|
14
22
|
return parentPort;
|
|
15
23
|
}
|
|
16
24
|
|
|
@@ -21,17 +29,17 @@ const onMessageWrapperMap = new Map();
|
|
|
21
29
|
*/
|
|
22
30
|
export default class WorkerBody {
|
|
23
31
|
/** Check that we are actually in a worker thread */
|
|
24
|
-
static inWorkerThread(): boolean {
|
|
25
|
-
return typeof self !== 'undefined' || Boolean(getParentPort());
|
|
32
|
+
static async inWorkerThread(): Promise<boolean> {
|
|
33
|
+
return typeof self !== 'undefined' || Boolean(await getParentPort());
|
|
26
34
|
}
|
|
27
35
|
|
|
28
36
|
/*
|
|
29
37
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
30
38
|
*/
|
|
31
39
|
static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {
|
|
32
|
-
function handleMessage(message) {
|
|
40
|
+
async function handleMessage(message) {
|
|
41
|
+
const parentPort = await getParentPort();
|
|
33
42
|
// Confusingly the message itself also has a 'type' field which is always set to 'message'
|
|
34
|
-
const parentPort = getParentPort();
|
|
35
43
|
const {type, payload} = parentPort ? message : message.data;
|
|
36
44
|
// if (!isKnownMessage(message)) {
|
|
37
45
|
// return;
|
|
@@ -39,37 +47,38 @@ export default class WorkerBody {
|
|
|
39
47
|
onMessage(type, payload);
|
|
40
48
|
}
|
|
41
49
|
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
50
|
+
getParentPort().then((parentPort) => {
|
|
51
|
+
if (parentPort) {
|
|
52
|
+
parentPort.on('message', handleMessage);
|
|
53
|
+
// if (message == 'exit') { parentPort.unref(); }
|
|
54
|
+
// eslint-disable-next-line
|
|
55
|
+
parentPort.on('exit', () => console.debug('Node worker closing'));
|
|
56
|
+
} else {
|
|
57
|
+
// eslint-disable-next-line no-restricted-globals
|
|
58
|
+
globalThis.onmessage = handleMessage;
|
|
59
|
+
}
|
|
60
|
+
});
|
|
52
61
|
}
|
|
53
62
|
|
|
54
|
-
static addEventListener(
|
|
63
|
+
static async addEventListener(
|
|
55
64
|
onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
56
65
|
) {
|
|
57
66
|
let onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
58
67
|
|
|
59
68
|
if (!onMessageWrapper) {
|
|
60
|
-
onMessageWrapper = (message: MessageEvent<any>) => {
|
|
69
|
+
onMessageWrapper = async (message: MessageEvent<any>) => {
|
|
61
70
|
if (!isKnownMessage(message)) {
|
|
62
71
|
return;
|
|
63
72
|
}
|
|
64
73
|
|
|
74
|
+
const parentPort = await getParentPort();
|
|
65
75
|
// Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'
|
|
66
|
-
const parentPort = getParentPort();
|
|
67
76
|
const {type, payload} = parentPort ? message : message.data;
|
|
68
77
|
onMessage(type, payload);
|
|
69
78
|
};
|
|
70
79
|
}
|
|
71
80
|
|
|
72
|
-
const parentPort = getParentPort();
|
|
81
|
+
const parentPort = await getParentPort();
|
|
73
82
|
if (parentPort) {
|
|
74
83
|
console.error('not implemented'); // eslint-disable-line
|
|
75
84
|
} else {
|
|
@@ -77,12 +86,12 @@ export default class WorkerBody {
|
|
|
77
86
|
}
|
|
78
87
|
}
|
|
79
88
|
|
|
80
|
-
static removeEventListener(
|
|
89
|
+
static async removeEventListener(
|
|
81
90
|
onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
82
91
|
) {
|
|
83
92
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
84
93
|
onMessageWrapperMap.delete(onMessage);
|
|
85
|
-
const parentPort = getParentPort();
|
|
94
|
+
const parentPort = await getParentPort();
|
|
86
95
|
if (parentPort) {
|
|
87
96
|
console.error('not implemented'); // eslint-disable-line
|
|
88
97
|
} else {
|
|
@@ -95,12 +104,12 @@ export default class WorkerBody {
|
|
|
95
104
|
* @param type
|
|
96
105
|
* @param payload
|
|
97
106
|
*/
|
|
98
|
-
static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {
|
|
107
|
+
static async postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): Promise<void> {
|
|
99
108
|
const data: WorkerMessageData = {source: 'loaders.gl', type, payload};
|
|
100
109
|
// console.log('posting message', data);
|
|
101
110
|
const transferList = getTransferList(payload);
|
|
102
111
|
|
|
103
|
-
const parentPort = getParentPort();
|
|
112
|
+
const parentPort = await getParentPort();
|
|
104
113
|
if (parentPort) {
|
|
105
114
|
parentPort.postMessage(data, transferList);
|
|
106
115
|
// console.log('posted message', data);
|