@loaders.gl/worker-utils 4.0.0-alpha.5 → 4.0.0-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es5/index.js +148 -0
- package/dist/es5/index.js.map +1 -0
- package/dist/es5/lib/async-queue/async-queue.js +100 -0
- package/dist/es5/lib/async-queue/async-queue.js.map +1 -0
- package/dist/es5/lib/env-utils/assert.js +12 -0
- package/dist/es5/lib/env-utils/assert.js.map +1 -0
- package/dist/es5/lib/env-utils/globals.js +32 -0
- package/dist/es5/lib/env-utils/globals.js.map +1 -0
- package/dist/es5/lib/env-utils/version.js +13 -0
- package/dist/es5/lib/env-utils/version.js.map +1 -0
- package/dist/es5/lib/library-utils/library-utils.js +154 -0
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -0
- package/dist/es5/lib/node/require-utils.node.js +71 -0
- package/dist/es5/lib/node/require-utils.node.js.map +1 -0
- package/dist/es5/lib/node/worker_threads-browser.js +23 -0
- package/dist/es5/lib/node/worker_threads-browser.js.map +1 -0
- package/dist/es5/lib/node/worker_threads.js +27 -0
- package/dist/es5/lib/node/worker_threads.js.map +1 -0
- package/dist/es5/lib/process-utils/child-process-proxy.js +193 -0
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -0
- package/dist/es5/lib/process-utils/process-utils.js +33 -0
- package/dist/es5/lib/process-utils/process-utils.js.map +1 -0
- package/dist/es5/lib/worker-api/create-worker.js +166 -0
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -0
- package/dist/es5/lib/worker-api/get-worker-url.js +38 -0
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -0
- package/dist/es5/lib/worker-api/process-on-worker.js +137 -0
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -0
- package/dist/es5/lib/worker-api/validate-worker-version.js +25 -0
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-body.js +109 -0
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-farm.js +113 -0
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-job.js +56 -0
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-pool.js +211 -0
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-thread.js +136 -0
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -0
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +41 -0
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -0
- package/dist/es5/lib/worker-utils/get-transfer-list.js +59 -0
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -0
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +25 -0
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -0
- package/dist/es5/types.js +2 -0
- package/dist/es5/types.js.map +1 -0
- package/dist/es5/workers/null-worker.js +23 -0
- package/dist/es5/workers/null-worker.js.map +1 -0
- package/dist/esm/index.js +26 -0
- package/dist/esm/index.js.map +1 -0
- package/dist/esm/lib/async-queue/async-queue.js +76 -0
- package/dist/esm/lib/async-queue/async-queue.js.map +1 -0
- package/dist/esm/lib/env-utils/assert.js +6 -0
- package/dist/esm/lib/env-utils/assert.js.map +1 -0
- package/dist/esm/lib/env-utils/globals.js +17 -0
- package/dist/esm/lib/env-utils/globals.js.map +1 -0
- package/dist/esm/lib/env-utils/version.js +6 -0
- package/dist/esm/lib/env-utils/version.js.map +1 -0
- package/dist/esm/lib/library-utils/library-utils.js +74 -0
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -0
- package/dist/esm/lib/node/require-utils.node.js +36 -0
- package/dist/esm/lib/node/require-utils.node.js.map +1 -0
- package/dist/esm/lib/node/worker_threads-browser.js +7 -0
- package/dist/esm/lib/node/worker_threads-browser.js.map +1 -0
- package/dist/esm/lib/node/worker_threads.js +4 -0
- package/dist/esm/lib/node/worker_threads.js.map +1 -0
- package/dist/esm/lib/process-utils/child-process-proxy.js +104 -0
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -0
- package/dist/esm/lib/process-utils/process-utils.js +26 -0
- package/dist/esm/lib/process-utils/process-utils.js.map +1 -0
- package/dist/esm/lib/worker-api/create-worker.js +84 -0
- package/dist/esm/lib/worker-api/create-worker.js.map +1 -0
- package/dist/esm/lib/worker-api/get-worker-url.js +31 -0
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -0
- package/dist/esm/lib/worker-api/process-on-worker.js +75 -0
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -0
- package/dist/esm/lib/worker-api/validate-worker-version.js +19 -0
- package/dist/esm/lib/worker-api/validate-worker-version.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-body.js +86 -0
- package/dist/esm/lib/worker-farm/worker-body.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-farm.js +72 -0
- package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-job.js +36 -0
- package/dist/esm/lib/worker-farm/worker-job.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-pool.js +124 -0
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-thread.js +105 -0
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -0
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +35 -0
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -0
- package/dist/esm/lib/worker-utils/get-transfer-list.js +50 -0
- package/dist/esm/lib/worker-utils/get-transfer-list.js.map +1 -0
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +17 -0
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +1 -0
- package/dist/esm/types.js +2 -0
- package/dist/esm/types.js.map +1 -0
- package/dist/esm/workers/null-worker.js +5 -0
- package/dist/esm/workers/null-worker.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +58 -25
- package/dist/lib/async-queue/async-queue.js +81 -91
- package/dist/lib/env-utils/assert.js +12 -5
- package/dist/lib/env-utils/globals.js +25 -10
- package/dist/lib/env-utils/version.js +10 -5
- package/dist/lib/library-utils/library-utils.d.ts.map +1 -1
- package/dist/lib/library-utils/library-utils.js +161 -79
- package/dist/lib/node/require-utils.node.js +58 -41
- package/dist/lib/node/worker_threads-browser.d.ts +7 -0
- package/dist/lib/node/worker_threads-browser.d.ts.map +1 -0
- package/dist/lib/node/worker_threads-browser.js +15 -0
- package/dist/lib/node/worker_threads.d.ts +6 -0
- package/dist/lib/node/worker_threads.d.ts.map +1 -0
- package/dist/lib/node/worker_threads.js +33 -0
- package/dist/lib/process-utils/child-process-proxy.d.ts +1 -1
- package/dist/lib/process-utils/child-process-proxy.d.ts.map +1 -1
- package/dist/lib/process-utils/child-process-proxy.js +126 -113
- package/dist/lib/process-utils/process-utils.js +33 -27
- 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 +84 -92
- package/dist/lib/worker-api/get-worker-url.d.ts.map +1 -1
- package/dist/lib/worker-api/get-worker-url.js +55 -33
- package/dist/lib/worker-api/process-on-worker.d.ts +1 -1
- package/dist/lib/worker-api/process-on-worker.d.ts.map +1 -1
- package/dist/lib/worker-api/process-on-worker.js +79 -71
- package/dist/lib/worker-api/validate-worker-version.js +32 -18
- package/dist/lib/worker-farm/worker-body.d.ts +2 -0
- package/dist/lib/worker-farm/worker-body.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-body.js +104 -58
- package/dist/lib/worker-farm/worker-farm.d.ts +7 -3
- package/dist/lib/worker-farm/worker-farm.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-farm.js +83 -77
- package/dist/lib/worker-farm/worker-job.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-job.js +46 -53
- package/dist/lib/worker-farm/worker-pool.d.ts +6 -4
- package/dist/lib/worker-farm/worker-pool.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-pool.js +145 -147
- package/dist/lib/worker-farm/worker-thread.d.ts +10 -3
- package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-thread.js +128 -102
- package/dist/lib/worker-utils/get-loadable-worker-url.js +63 -33
- package/dist/lib/worker-utils/get-transfer-list.d.ts +5 -0
- package/dist/lib/worker-utils/get-transfer-list.d.ts.map +1 -1
- package/dist/lib/worker-utils/get-transfer-list.js +83 -36
- package/dist/lib/worker-utils/remove-nontransferable-options.d.ts +3 -3
- package/dist/lib/worker-utils/remove-nontransferable-options.d.ts.map +1 -1
- package/dist/lib/worker-utils/remove-nontransferable-options.js +25 -21
- package/dist/null-worker.js +45 -14
- package/dist/null-worker.js.map +2 -2
- package/dist/types.d.ts +16 -11
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +2 -2
- package/dist/workers/null-worker.js +6 -4
- package/package.json +8 -4
- package/src/index.ts +1 -1
- package/src/lib/library-utils/library-utils.ts +4 -1
- package/src/lib/node/worker_threads-browser.ts +13 -0
- package/src/lib/node/worker_threads.ts +6 -0
- package/src/lib/worker-api/create-worker.ts +1 -2
- package/src/lib/worker-api/get-worker-url.ts +3 -1
- package/src/lib/worker-api/process-on-worker.ts +8 -4
- package/src/lib/worker-farm/worker-body.ts +61 -19
- package/src/lib/worker-farm/worker-farm.ts +10 -5
- package/src/lib/worker-farm/worker-job.ts +3 -6
- package/src/lib/worker-farm/worker-pool.ts +5 -0
- package/src/lib/worker-farm/worker-thread.ts +45 -7
- package/src/lib/worker-utils/get-loadable-worker-url.ts +0 -2
- package/src/lib/worker-utils/get-transfer-list.ts +28 -0
- package/src/lib/worker-utils/remove-nontransferable-options.ts +17 -25
- package/src/types.ts +3 -2
- package/dist/index.js.map +0 -1
- package/dist/lib/async-queue/async-queue.js.map +0 -1
- package/dist/lib/env-utils/assert.js.map +0 -1
- package/dist/lib/env-utils/globals.js.map +0 -1
- package/dist/lib/env-utils/version.js.map +0 -1
- package/dist/lib/library-utils/library-utils.js.map +0 -1
- package/dist/lib/node/require-utils.node.js.map +0 -1
- package/dist/lib/process-utils/child-process-proxy.js.map +0 -1
- package/dist/lib/process-utils/process-utils.js.map +0 -1
- package/dist/lib/worker-api/create-worker.js.map +0 -1
- package/dist/lib/worker-api/get-worker-url.js.map +0 -1
- package/dist/lib/worker-api/process-on-worker.js.map +0 -1
- package/dist/lib/worker-api/validate-worker-version.js.map +0 -1
- package/dist/lib/worker-farm/worker-body.js.map +0 -1
- package/dist/lib/worker-farm/worker-farm.js.map +0 -1
- package/dist/lib/worker-farm/worker-job.js.map +0 -1
- package/dist/lib/worker-farm/worker-pool.js.map +0 -1
- package/dist/lib/worker-farm/worker-thread.js.map +0 -1
- package/dist/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
- package/dist/lib/worker-utils/get-transfer-list.js.map +0 -1
- package/dist/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
- package/dist/types.js.map +0 -1
- package/dist/workers/null-worker.js.map +0 -1
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", "import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n // eslint-disable-next-line no-restricted-globals\n self.onmessage = (message) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\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 the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n // eslint-disable-next-line no-restricted-globals\n self.addEventListener('message', onMessageWrapper);\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n // eslint-disable-next-line no-restricted-globals\n self.removeEventListener('message', onMessageWrapper);\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 if (self) {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n const transferList = getTransferList(payload);\n // eslint-disable-next-line no-restricted-globals\n // @ts-ignore\n self.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 // Check that we are actually in a worker thread\n if (typeof self === 'undefined') {\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,yBAAmC;AAAA,IAKjC,cAAc;AACZ,WAAK,UAAU;AACf,WAAK,YAAY;AACjB,WAAK,UAAU;AAAA;AAAA,KAIhB,OAAO,iBAAmC;AACzC,aAAO;AAAA;AAAA,IAIT,KAAK,OAAgB;AACnB,aAAO,KAAK,QAAQ;AAAA;AAAA,IAOtB,QAAQ,OAAwB;AAC9B,UAAI,KAAK,SAAS;AAChB,cAAM,IAAI,MAAM;AAAA;AAGlB,UAAI,KAAK,UAAU,SAAS,GAAG;AAC7B,YAAI,KAAK,QAAQ,SAAS,GAAG;AAC3B,gBAAM,IAAI,MAAM;AAAA;AAElB,cAAM,UAAU,KAAK,UAAU;AAC/B,YAAI,iBAAiB,OAAO;AAC1B,kBAAQ,OAAO;AAAA,eACV;AACL,kBAAQ,QAAQ,EAAC;AAAA;AAAA,aAEd;AACL,aAAK,QAAQ,KAAK;AAAA;AAAA;AAAA,IAKtB,QAAc;AACZ,aAAO,KAAK,UAAU,SAAS,GAAG;AAChC,cAAM,UAAU,KAAK,UAAU;AAC/B,gBAAQ,QAAQ,EAAC,MAAM;AAAA;AAEzB,WAAK,UAAU;AAAA;AAAA,IAMjB,OAAwC;AAEtC,UAAI,KAAK,QAAQ,SAAS,GAAG;AAC3B,cAAM,QAAQ,KAAK,QAAQ;AAC3B,YAAI,iBAAiB,OAAO;AAC1B,iBAAO,QAAQ,OAAO;AAAA;AAExB,eAAO,QAAQ,QAAQ,EAAC,MAAM,OAAO;AAAA;AAIvC,UAAI,KAAK,SAAS;AAChB,YAAI,KAAK,UAAU,SAAS,GAAG;AAC7B,gBAAM,IAAI,MAAM;AAAA;AAElB,eAAO,QAAQ,QAAQ,EAAC,MAAM,MAAM,OAAO;AAAA;AAI7C,aAAO,IAAI,QAAQ,CAAC,SAAS,WAAW;AACtC,aAAK,UAAU,KAAK,EAAC,SAAS;AAAA;AAAA;AAAA;;;ACjF7B,2BACL,QACA,YAAqB,MACrB,WACgB;AAEhB,UAAM,eAAe,aAAa,IAAI;AAEtC,QAAI,CAAC,QAAQ;AAAA,eAEF,eAAe,SAAS;AACjC,mBAAa,IAAI;AAAA,eACR,eAAe,OAAO,SAAS;AAExC,mBAAa,IAAI,OAAO;AAAA,eACf,YAAY,OAAO,SAAS;AAAA,eAG5B,aAAa,OAAO,WAAW,UAAU;AAClD,iBAAW,OAAO,QAAQ;AAExB,wBAAgB,OAAO,MAAM,WAAW;AAAA;AAAA;AAM5C,WAAO,cAAc,SAAY,MAAM,KAAK,gBAAgB;AAAA;AAI9D,0BAAwB,QAAiB;AACvC,QAAI,CAAC,QAAQ;AACX,aAAO;AAAA;AAET,QAAI,kBAAkB,aAAa;AACjC,aAAO;AAAA;AAET,QAAI,OAAO,gBAAgB,eAAe,kBAAkB,aAAa;AACvE,aAAO;AAAA;AAET,QAAI,OAAO,gBAAgB,eAAe,kBAAkB,aAAa;AACvE,aAAO;AAAA;AAGT,QAAI,OAAO,oBAAoB,eAAe,kBAAkB,iBAAiB;AAC/E,aAAO;AAAA;AAET,WAAO;AAAA;;;
|
|
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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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/dist/types.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* Worker Options
|
|
3
3
|
*/
|
|
4
|
-
export
|
|
5
|
-
CDN?: string;
|
|
4
|
+
export type WorkerOptions = {
|
|
5
|
+
CDN?: string | null;
|
|
6
6
|
worker?: boolean;
|
|
7
7
|
maxConcurrency?: number;
|
|
8
8
|
maxMobileConcurrency?: number;
|
|
@@ -11,46 +11,51 @@ export declare type WorkerOptions = {
|
|
|
11
11
|
workerUrl?: string;
|
|
12
12
|
[key: string]: any;
|
|
13
13
|
};
|
|
14
|
-
export
|
|
14
|
+
export type WorkerContext = {
|
|
15
15
|
process?: Process;
|
|
16
16
|
processInBatches?: ProcessInBatches;
|
|
17
17
|
};
|
|
18
|
-
export
|
|
18
|
+
export type Process = (data: any, options?: {
|
|
19
19
|
[key: string]: any;
|
|
20
20
|
}, context?: WorkerContext) => any;
|
|
21
|
-
export
|
|
21
|
+
export type ProcessInBatches = (iterator: AsyncIterable<any> | Iterable<any>, options?: {
|
|
22
22
|
[key: string]: any;
|
|
23
23
|
}, context?: WorkerContext) => AsyncIterable<any>;
|
|
24
24
|
/**
|
|
25
25
|
* A worker description object
|
|
26
26
|
*/
|
|
27
|
-
export
|
|
27
|
+
export type WorkerObject = {
|
|
28
28
|
id: string;
|
|
29
29
|
name: string;
|
|
30
30
|
module: string;
|
|
31
31
|
version: string;
|
|
32
32
|
worker?: string | boolean;
|
|
33
|
-
options:
|
|
33
|
+
options: {
|
|
34
|
+
[key: string]: any;
|
|
35
|
+
};
|
|
34
36
|
deprecatedOptions?: object;
|
|
35
37
|
process?: Process;
|
|
36
38
|
processInBatches?: ProcessInBatches;
|
|
37
39
|
};
|
|
38
|
-
export
|
|
39
|
-
export
|
|
40
|
+
export type WorkerMessageType = 'process' | 'done' | 'error' | 'process-in-batches' | 'input-batch' | 'input-done' | 'output-batch';
|
|
41
|
+
export type WorkerMessagePayload = {
|
|
40
42
|
id?: number;
|
|
41
43
|
options?: {
|
|
42
44
|
[key: string]: any;
|
|
43
45
|
};
|
|
46
|
+
context?: {
|
|
47
|
+
[key: string]: any;
|
|
48
|
+
};
|
|
44
49
|
input?: any;
|
|
45
50
|
result?: any;
|
|
46
51
|
error?: string;
|
|
47
52
|
};
|
|
48
|
-
export
|
|
53
|
+
export type WorkerMessageData = {
|
|
49
54
|
source: 'loaders.gl';
|
|
50
55
|
type: WorkerMessageType;
|
|
51
56
|
payload: WorkerMessagePayload;
|
|
52
57
|
};
|
|
53
|
-
export
|
|
58
|
+
export type WorkerMessage = {
|
|
54
59
|
type: string;
|
|
55
60
|
data: WorkerMessageData;
|
|
56
61
|
};
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,MAAM,aAAa,GAAG;IAE1B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,KAAK,GAAG,CAAC;AAElG,MAAM,MAAM,gBAAgB,GAAG,CAC7B,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,EAC5C,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAC9B,OAAO,CAAC,EAAE,aAAa,KACpB,aAAa,CAAC,GAAG,CAAC,CAAC;AAExB;;GAEG;AACH,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAmBF,MAAM,MAAM,iBAAiB,GACzB,SAAS,GACT,MAAM,GACN,OAAO,GACP,oBAAoB,GACpB,aAAa,GACb,YAAY,GACZ,cAAc,CAAC;AAEnB,MAAM,MAAM,oBAAoB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC/B,OAAO,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC"}
|
package/dist/types.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const create_worker_1 = require("../lib/worker-api/create-worker");
|
|
4
|
+
(0, create_worker_1.createWorker)(async (data) => {
|
|
5
|
+
// @ts-ignore
|
|
6
|
+
return data;
|
|
4
7
|
});
|
|
5
|
-
//# sourceMappingURL=null-worker.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/worker-utils",
|
|
3
|
-
"version": "4.0.0-alpha.
|
|
3
|
+
"version": "4.0.0-alpha.6",
|
|
4
4
|
"description": "Utilities for running tasks on worker threads",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
"thread"
|
|
17
17
|
],
|
|
18
18
|
"types": "dist/index.d.ts",
|
|
19
|
-
"main": "dist/index.js",
|
|
20
|
-
"module": "dist/index.js",
|
|
19
|
+
"main": "dist/es5/index.js",
|
|
20
|
+
"module": "dist/esm/index.js",
|
|
21
21
|
"sideEffects": false,
|
|
22
22
|
"files": [
|
|
23
23
|
"src",
|
|
@@ -27,6 +27,10 @@
|
|
|
27
27
|
"browser": {
|
|
28
28
|
"child_process": false,
|
|
29
29
|
"fs": false,
|
|
30
|
+
"./src/lib/node/worker_threads.ts": "./src/lib/node/worker_threads-browser.ts",
|
|
31
|
+
"./dist/lib/node/worker_threads.js": "./dist/lib/node/worker_threads-browser.js",
|
|
32
|
+
"./dist/es5/lib/node/worker_threads.js": "./dist/es5/lib/node/worker_threads-browser.js",
|
|
33
|
+
"./dist/esm/lib/node/worker_threads.js": "./dist/esm/lib/node/worker_threads-browser.js",
|
|
30
34
|
"./src/lib/node/require-utils.node.ts": false,
|
|
31
35
|
"./dist/lib/node/require-utils.node.js": false,
|
|
32
36
|
"./dist/es5/lib/node/require-utils.node.js": false,
|
|
@@ -45,5 +49,5 @@
|
|
|
45
49
|
"dependencies": {
|
|
46
50
|
"@babel/runtime": "^7.3.1"
|
|
47
51
|
},
|
|
48
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "acc1985050dfaa0f1f0c066f8da5bce7454a046c"
|
|
49
53
|
}
|
package/src/index.ts
CHANGED
|
@@ -31,7 +31,7 @@ export {createWorker} from './lib/worker-api/create-worker';
|
|
|
31
31
|
// WORKER UTILS - EXPORTS
|
|
32
32
|
export {getWorkerURL} from './lib/worker-api/get-worker-url';
|
|
33
33
|
export {validateWorkerVersion} from './lib/worker-api/validate-worker-version';
|
|
34
|
-
export {getTransferList} from './lib/worker-utils/get-transfer-list';
|
|
34
|
+
export {getTransferList, getTransferListForWriter} from './lib/worker-utils/get-transfer-list';
|
|
35
35
|
|
|
36
36
|
// LIBRARY UTILS
|
|
37
37
|
export {getLibraryUrl, loadLibrary} from './lib/library-utils/library-utils';
|
|
@@ -4,7 +4,10 @@ import * as node from '../node/require-utils.node';
|
|
|
4
4
|
import {assert} from '../env-utils/assert';
|
|
5
5
|
import {VERSION as __VERSION__} from '../env-utils/version';
|
|
6
6
|
|
|
7
|
-
|
|
7
|
+
/**
|
|
8
|
+
* TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
|
|
9
|
+
* 'beta' on beta branch, 'latest' on prod branch
|
|
10
|
+
*/
|
|
8
11
|
const LATEST = 'beta';
|
|
9
12
|
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;
|
|
10
13
|
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
// Browser fills for Node.js built-in `worker_threads` module.
|
|
2
|
+
// These fills are non-functional, and just intended to ensure that
|
|
3
|
+
// `import 'worker_threads` doesn't break browser builds.
|
|
4
|
+
// The replacement is done in package.json browser field
|
|
5
|
+
export class Worker {
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
7
|
+
terminate() {}
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export {Worker as NodeWorker};
|
|
11
|
+
export {Worker as NodeWorkerType};
|
|
12
|
+
|
|
13
|
+
export const parentPort = null;
|
|
@@ -24,8 +24,7 @@ export type ProcessOnMainThread = (
|
|
|
24
24
|
* Set up a WebWorkerGlobalScope to talk with the main thread
|
|
25
25
|
*/
|
|
26
26
|
export function createWorker(process: Process, processInBatches?: ProcessInBatches): void {
|
|
27
|
-
|
|
28
|
-
if (typeof self === 'undefined') {
|
|
27
|
+
if (!WorkerBody.inWorkerThread()) {
|
|
29
28
|
return;
|
|
30
29
|
}
|
|
31
30
|
|
|
@@ -1,8 +1,10 @@
|
|
|
1
|
+
// loaders.gl, MIT license
|
|
2
|
+
|
|
1
3
|
import type {WorkerObject, WorkerOptions} from '../../types';
|
|
2
4
|
import {assert} from '../env-utils/assert';
|
|
3
5
|
import {VERSION as __VERSION__} from '../env-utils/version';
|
|
4
6
|
|
|
5
|
-
const NPM_TAG = 'beta'; //
|
|
7
|
+
const NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch
|
|
6
8
|
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;
|
|
7
9
|
|
|
8
10
|
/**
|
|
@@ -7,8 +7,8 @@ import type {
|
|
|
7
7
|
} from '../../types';
|
|
8
8
|
import type WorkerJob from '../worker-farm/worker-job';
|
|
9
9
|
import WorkerFarm from '../worker-farm/worker-farm';
|
|
10
|
-
import {removeNontransferableOptions} from '../worker-utils/remove-nontransferable-options';
|
|
11
10
|
import {getWorkerURL, getWorkerName} from './get-worker-url';
|
|
11
|
+
import {getTransferListForWriter} from '../worker-utils/get-transfer-list';
|
|
12
12
|
|
|
13
13
|
type ProcessOnWorkerOptions = WorkerOptions & {
|
|
14
14
|
jobName?: string;
|
|
@@ -41,10 +41,14 @@ export async function processOnWorker(
|
|
|
41
41
|
context: WorkerContext = {}
|
|
42
42
|
): Promise<any> {
|
|
43
43
|
const name = getWorkerName(worker);
|
|
44
|
-
const url = getWorkerURL(worker, options);
|
|
45
44
|
|
|
46
45
|
const workerFarm = WorkerFarm.getWorkerFarm(options);
|
|
47
|
-
const
|
|
46
|
+
const {source} = options;
|
|
47
|
+
const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};
|
|
48
|
+
if (!source) {
|
|
49
|
+
workerPoolProps.url = getWorkerURL(worker, options);
|
|
50
|
+
}
|
|
51
|
+
const workerPool = workerFarm.getWorkerPool(workerPoolProps);
|
|
48
52
|
|
|
49
53
|
const jobName = options.jobName || worker.name;
|
|
50
54
|
const job = await workerPool.startJob(
|
|
@@ -54,7 +58,7 @@ export async function processOnWorker(
|
|
|
54
58
|
);
|
|
55
59
|
|
|
56
60
|
// Kick off the processing in the worker
|
|
57
|
-
const transferableOptions =
|
|
61
|
+
const transferableOptions = getTransferListForWriter(options);
|
|
58
62
|
job.postMessage('process', {input: data, options: transferableOptions});
|
|
59
63
|
|
|
60
64
|
const result = await job.result;
|
|
@@ -1,26 +1,54 @@
|
|
|
1
1
|
import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';
|
|
2
2
|
import {getTransferList} from '../worker-utils/get-transfer-list';
|
|
3
3
|
|
|
4
|
+
/** Vile hack to defeat over-zealous bundlers from stripping out the require */
|
|
5
|
+
function getParentPort() {
|
|
6
|
+
// const isNode = globalThis.process;
|
|
7
|
+
let parentPort;
|
|
8
|
+
try {
|
|
9
|
+
// prettier-ignore
|
|
10
|
+
eval('globalThis.parentPort = require(\'worker_threads\').parentPort'); // eslint-disable-line no-eval
|
|
11
|
+
parentPort = globalThis.parentPort;
|
|
12
|
+
// eslint-disable-next-line no-empty
|
|
13
|
+
} catch {}
|
|
14
|
+
return parentPort;
|
|
15
|
+
}
|
|
16
|
+
|
|
4
17
|
const onMessageWrapperMap = new Map();
|
|
5
18
|
|
|
6
19
|
/**
|
|
7
20
|
* Type safe wrapper for worker code
|
|
8
21
|
*/
|
|
9
22
|
export default class WorkerBody {
|
|
23
|
+
/** Check that we are actually in a worker thread */
|
|
24
|
+
static inWorkerThread(): boolean {
|
|
25
|
+
return typeof self !== 'undefined' || Boolean(getParentPort());
|
|
26
|
+
}
|
|
27
|
+
|
|
10
28
|
/*
|
|
11
29
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
12
30
|
*/
|
|
13
31
|
static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {
|
|
14
|
-
|
|
15
|
-
self.onmessage = (message) => {
|
|
16
|
-
if (!isKnownMessage(message)) {
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
|
|
32
|
+
function handleMessage(message) {
|
|
20
33
|
// Confusingly the message itself also has a 'type' field which is always set to 'message'
|
|
21
|
-
const
|
|
34
|
+
const parentPort = getParentPort();
|
|
35
|
+
const {type, payload} = parentPort ? message : message.data;
|
|
36
|
+
// if (!isKnownMessage(message)) {
|
|
37
|
+
// return;
|
|
38
|
+
// }
|
|
22
39
|
onMessage(type, payload);
|
|
23
|
-
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const parentPort = getParentPort();
|
|
43
|
+
if (parentPort) {
|
|
44
|
+
parentPort.on('message', handleMessage);
|
|
45
|
+
// if (message == 'exit') { parentPort.unref(); }
|
|
46
|
+
// eslint-disable-next-line
|
|
47
|
+
parentPort.on('exit', () => console.debug('Node worker closing'));
|
|
48
|
+
} else {
|
|
49
|
+
// eslint-disable-next-line no-restricted-globals
|
|
50
|
+
globalThis.onmessage = handleMessage;
|
|
51
|
+
}
|
|
24
52
|
}
|
|
25
53
|
|
|
26
54
|
static addEventListener(
|
|
@@ -34,14 +62,19 @@ export default class WorkerBody {
|
|
|
34
62
|
return;
|
|
35
63
|
}
|
|
36
64
|
|
|
37
|
-
// Confusingly the message itself also has a 'type' field which is always set to 'message'
|
|
38
|
-
const
|
|
65
|
+
// Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'
|
|
66
|
+
const parentPort = getParentPort();
|
|
67
|
+
const {type, payload} = parentPort ? message : message.data;
|
|
39
68
|
onMessage(type, payload);
|
|
40
69
|
};
|
|
41
70
|
}
|
|
42
71
|
|
|
43
|
-
|
|
44
|
-
|
|
72
|
+
const parentPort = getParentPort();
|
|
73
|
+
if (parentPort) {
|
|
74
|
+
console.error('not implemented'); // eslint-disable-line
|
|
75
|
+
} else {
|
|
76
|
+
globalThis.addEventListener('message', onMessageWrapper);
|
|
77
|
+
}
|
|
45
78
|
}
|
|
46
79
|
|
|
47
80
|
static removeEventListener(
|
|
@@ -49,8 +82,12 @@ export default class WorkerBody {
|
|
|
49
82
|
) {
|
|
50
83
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
51
84
|
onMessageWrapperMap.delete(onMessage);
|
|
52
|
-
|
|
53
|
-
|
|
85
|
+
const parentPort = getParentPort();
|
|
86
|
+
if (parentPort) {
|
|
87
|
+
console.error('not implemented'); // eslint-disable-line
|
|
88
|
+
} else {
|
|
89
|
+
globalThis.removeEventListener('message', onMessageWrapper);
|
|
90
|
+
}
|
|
54
91
|
}
|
|
55
92
|
|
|
56
93
|
/**
|
|
@@ -59,12 +96,17 @@ export default class WorkerBody {
|
|
|
59
96
|
* @param payload
|
|
60
97
|
*/
|
|
61
98
|
static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
99
|
+
const data: WorkerMessageData = {source: 'loaders.gl', type, payload};
|
|
100
|
+
// console.log('posting message', data);
|
|
101
|
+
const transferList = getTransferList(payload);
|
|
102
|
+
|
|
103
|
+
const parentPort = getParentPort();
|
|
104
|
+
if (parentPort) {
|
|
105
|
+
parentPort.postMessage(data, transferList);
|
|
106
|
+
// console.log('posted message', data);
|
|
107
|
+
} else {
|
|
66
108
|
// @ts-ignore
|
|
67
|
-
|
|
109
|
+
globalThis.postMessage(data, transferList);
|
|
68
110
|
}
|
|
69
111
|
}
|
|
70
112
|
}
|
|
@@ -2,7 +2,11 @@ import WorkerPool from './worker-pool';
|
|
|
2
2
|
import WorkerThread from './worker-thread';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
|
-
* @param maxConcurrency
|
|
5
|
+
* @param maxConcurrency - max count of workers
|
|
6
|
+
* @param maxMobileConcurrency - max count of workers on mobile
|
|
7
|
+
* @param maxConcurrency - max count of workers
|
|
8
|
+
* @param reuseWorkers - if false, destroys workers when task is completed
|
|
9
|
+
* @param onDebug - callback intended to allow application to log worker pool activity
|
|
6
10
|
*/
|
|
7
11
|
export type WorkerFarmProps = {
|
|
8
12
|
maxConcurrency?: number;
|
|
@@ -11,11 +15,11 @@ export type WorkerFarmProps = {
|
|
|
11
15
|
onDebug?: () => void;
|
|
12
16
|
};
|
|
13
17
|
|
|
14
|
-
const DEFAULT_PROPS: WorkerFarmProps = {
|
|
18
|
+
const DEFAULT_PROPS: Required<WorkerFarmProps> = {
|
|
15
19
|
maxConcurrency: 3,
|
|
16
20
|
maxMobileConcurrency: 1,
|
|
17
|
-
|
|
18
|
-
|
|
21
|
+
reuseWorkers: true,
|
|
22
|
+
onDebug: () => {}
|
|
19
23
|
};
|
|
20
24
|
|
|
21
25
|
/**
|
|
@@ -27,7 +31,7 @@ export default class WorkerFarm {
|
|
|
27
31
|
// singleton
|
|
28
32
|
private static _workerFarm?: WorkerFarm;
|
|
29
33
|
|
|
30
|
-
/**
|
|
34
|
+
/** Checks if workers are supported on this platform */
|
|
31
35
|
static isSupported(): boolean {
|
|
32
36
|
return WorkerThread.isSupported();
|
|
33
37
|
}
|
|
@@ -55,6 +59,7 @@ export default class WorkerFarm {
|
|
|
55
59
|
for (const workerPool of this.workerPools.values()) {
|
|
56
60
|
workerPool.destroy();
|
|
57
61
|
}
|
|
62
|
+
this.workerPools = new Map<string, WorkerPool>();
|
|
58
63
|
}
|
|
59
64
|
|
|
60
65
|
/**
|
|
@@ -8,19 +8,16 @@ import {assert} from '../env-utils/assert';
|
|
|
8
8
|
export default class WorkerJob {
|
|
9
9
|
readonly name: string;
|
|
10
10
|
readonly workerThread: WorkerThread;
|
|
11
|
-
isRunning: boolean;
|
|
11
|
+
isRunning: boolean = true;
|
|
12
12
|
/** Promise that resolves when Job is done */
|
|
13
13
|
readonly result: Promise<any>;
|
|
14
14
|
|
|
15
|
-
private _resolve: (value: any) => void;
|
|
16
|
-
private _reject: (reason?: any) => void;
|
|
15
|
+
private _resolve: (value: any) => void = () => {};
|
|
16
|
+
private _reject: (reason?: any) => void = () => {};
|
|
17
17
|
|
|
18
18
|
constructor(jobName: string, workerThread: WorkerThread) {
|
|
19
19
|
this.name = jobName;
|
|
20
20
|
this.workerThread = workerThread;
|
|
21
|
-
this.isRunning = true;
|
|
22
|
-
this._resolve = () => {};
|
|
23
|
-
this._reject = () => {};
|
|
24
21
|
this.result = new Promise((resolve, reject) => {
|
|
25
22
|
this._resolve = resolve;
|
|
26
23
|
this._reject = reject;
|
|
@@ -53,6 +53,11 @@ export default class WorkerPool {
|
|
|
53
53
|
private count = 0;
|
|
54
54
|
private isDestroyed = false;
|
|
55
55
|
|
|
56
|
+
/** Checks if workers are supported on this platform */
|
|
57
|
+
static isSupported(): boolean {
|
|
58
|
+
return WorkerThread.isSupported();
|
|
59
|
+
}
|
|
60
|
+
|
|
56
61
|
/**
|
|
57
62
|
* @param processor - worker function
|
|
58
63
|
* @param maxConcurrency - max count of workers
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
// loaders.gl, MIT license
|
|
2
|
+
|
|
3
|
+
import {NodeWorker, NodeWorkerType} from '../node/worker_threads';
|
|
4
|
+
import {isBrowser} from '../env-utils/globals';
|
|
1
5
|
import {assert} from '../env-utils/assert';
|
|
2
6
|
import {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';
|
|
3
7
|
import {getTransferList} from '../worker-utils/get-transfer-list';
|
|
@@ -18,14 +22,18 @@ export default class WorkerThread {
|
|
|
18
22
|
readonly source: string | undefined;
|
|
19
23
|
readonly url: string | undefined;
|
|
20
24
|
terminated: boolean = false;
|
|
21
|
-
worker: Worker;
|
|
25
|
+
worker: Worker | NodeWorkerType;
|
|
22
26
|
onMessage: (message: any) => void;
|
|
23
27
|
onError: (error: Error) => void;
|
|
24
28
|
|
|
25
29
|
private _loadableURL: string = '';
|
|
26
30
|
|
|
31
|
+
/** Checks if workers are supported on this platform */
|
|
27
32
|
static isSupported(): boolean {
|
|
28
|
-
return
|
|
33
|
+
return (
|
|
34
|
+
(typeof Worker !== 'undefined' && isBrowser) ||
|
|
35
|
+
(typeof NodeWorker !== 'undefined' && !isBrowser)
|
|
36
|
+
);
|
|
29
37
|
}
|
|
30
38
|
|
|
31
39
|
constructor(props: WorkerThreadProps) {
|
|
@@ -37,7 +45,7 @@ export default class WorkerThread {
|
|
|
37
45
|
this.onMessage = NOOP;
|
|
38
46
|
this.onError = (error) => console.log(error); // eslint-disable-line
|
|
39
47
|
|
|
40
|
-
this.worker = this._createBrowserWorker();
|
|
48
|
+
this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();
|
|
41
49
|
}
|
|
42
50
|
|
|
43
51
|
/**
|
|
@@ -47,8 +55,7 @@ export default class WorkerThread {
|
|
|
47
55
|
destroy(): void {
|
|
48
56
|
this.onMessage = NOOP;
|
|
49
57
|
this.onError = NOOP;
|
|
50
|
-
// @
|
|
51
|
-
this.worker.terminate();
|
|
58
|
+
this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises
|
|
52
59
|
this.terminated = true;
|
|
53
60
|
}
|
|
54
61
|
|
|
@@ -71,7 +78,7 @@ export default class WorkerThread {
|
|
|
71
78
|
|
|
72
79
|
/**
|
|
73
80
|
* Generate a standard Error from an ErrorEvent
|
|
74
|
-
* @param
|
|
81
|
+
* @param event
|
|
75
82
|
*/
|
|
76
83
|
_getErrorFromErrorEvent(event: ErrorEvent): Error {
|
|
77
84
|
// Note Error object does not have the expected fields if loading failed completely
|
|
@@ -93,7 +100,7 @@ export default class WorkerThread {
|
|
|
93
100
|
/**
|
|
94
101
|
* Creates a worker thread on the browser
|
|
95
102
|
*/
|
|
96
|
-
_createBrowserWorker() {
|
|
103
|
+
_createBrowserWorker(): Worker {
|
|
97
104
|
this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});
|
|
98
105
|
const worker = new Worker(this._loadableURL, {name: this.name});
|
|
99
106
|
|
|
@@ -114,4 +121,35 @@ export default class WorkerThread {
|
|
|
114
121
|
|
|
115
122
|
return worker;
|
|
116
123
|
}
|
|
124
|
+
|
|
125
|
+
/**
|
|
126
|
+
* Creates a worker thread in node.js
|
|
127
|
+
* @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
|
|
128
|
+
*/
|
|
129
|
+
_createNodeWorker(): NodeWorkerType {
|
|
130
|
+
let worker: NodeWorkerType;
|
|
131
|
+
if (this.url) {
|
|
132
|
+
// Make sure relative URLs start with './'
|
|
133
|
+
const absolute = this.url.includes(':/') || this.url.startsWith('/');
|
|
134
|
+
const url = absolute ? this.url : `./${this.url}`;
|
|
135
|
+
// console.log('Starting work from', url);
|
|
136
|
+
worker = new NodeWorker(url, {eval: false});
|
|
137
|
+
} else if (this.source) {
|
|
138
|
+
worker = new NodeWorker(this.source, {eval: true});
|
|
139
|
+
} else {
|
|
140
|
+
throw new Error('no worker');
|
|
141
|
+
}
|
|
142
|
+
worker.on('message', (data) => {
|
|
143
|
+
// console.error('message', data);
|
|
144
|
+
this.onMessage(data);
|
|
145
|
+
});
|
|
146
|
+
worker.on('error', (error) => {
|
|
147
|
+
// console.error('error', error);
|
|
148
|
+
this.onError(error);
|
|
149
|
+
});
|
|
150
|
+
worker.on('exit', (code) => {
|
|
151
|
+
// console.error('exit', code);
|
|
152
|
+
});
|
|
153
|
+
return worker;
|
|
154
|
+
}
|
|
117
155
|
}
|
|
@@ -54,8 +54,6 @@ function getLoadableWorkerURLFromURL(url: string): string {
|
|
|
54
54
|
* @returns loadable url
|
|
55
55
|
*/
|
|
56
56
|
function getLoadableWorkerURLFromSource(workerSource: string): string {
|
|
57
|
-
// NOTE: webworkify was previously used
|
|
58
|
-
// const blob = webworkify(workerSource, {bare: true});
|
|
59
57
|
const blob = new Blob([workerSource], {type: 'application/javascript'});
|
|
60
58
|
return URL.createObjectURL(blob);
|
|
61
59
|
}
|