@loaders.gl/worker-utils 3.2.5 → 3.2.8
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 +6 -0
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/env-utils/version.js +2 -2
- package/dist/es5/lib/library-utils/library-utils.js +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +1 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +3 -3
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +1 -3
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +19 -0
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +12 -17
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/esm/index.js +1 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +2 -2
- package/dist/esm/lib/library-utils/library-utils.js +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +2 -2
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-transfer-list.js +18 -0
- package/dist/esm/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +12 -17
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -1
- package/dist/lib/worker-api/process-on-worker.js +2 -2
- package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-thread.js +2 -1
- 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 +25 -1
- 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 +18 -26
- package/dist/null-worker.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +1 -1
- package/src/lib/worker-api/process-on-worker.ts +2 -2
- package/src/lib/worker-farm/worker-thread.ts +4 -1
- package/src/lib/worker-utils/get-transfer-list.ts +24 -0
- package/src/lib/worker-utils/remove-nontransferable-options.ts +17 -25
package/dist/es5/index.js
CHANGED
|
@@ -89,6 +89,12 @@ Object.defineProperty(exports, "getTransferList", {
|
|
|
89
89
|
return _getTransferList.getTransferList;
|
|
90
90
|
}
|
|
91
91
|
});
|
|
92
|
+
Object.defineProperty(exports, "getTransferListForWriter", {
|
|
93
|
+
enumerable: true,
|
|
94
|
+
get: function get() {
|
|
95
|
+
return _getTransferList.getTransferListForWriter;
|
|
96
|
+
}
|
|
97
|
+
});
|
|
92
98
|
Object.defineProperty(exports, "getLibraryUrl", {
|
|
93
99
|
enumerable: true,
|
|
94
100
|
get: function get() {
|
package/dist/es5/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts"],"names":["NullWorker","id","name","module","version","VERSION","options","null"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts"],"names":["NullWorker","id","name","module","version","VERSION","options","null"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA;;AAcA;;AACA;;AAGA;;AACA;;AAGA;;AACA;;AACA;;AAEA;;AACA;;AAGA;;AACA;;AACA;;AAGA;;AAGA;;AAGA;;AAKO,IAAMA,UAAwB,GAAG;AACtCC,EAAAA,EAAE,EAAE,MADkC;AAEtCC,EAAAA,IAAI,EAAE,MAFgC;AAGtCC,EAAAA,MAAM,EAAE,cAH8B;AAItCC,EAAAA,OAAO,EAAEC,gBAJ6B;AAKtCC,EAAAA,OAAO,EAAE;AACPC,IAAAA,IAAI,EAAE;AADC;AAL6B,CAAjC","sourcesContent":["import type {WorkerObject} from './types';\nimport {VERSION} from './lib/env-utils/version';\n\n// TYPES\nexport type {\n WorkerObject,\n WorkerOptions,\n // Protocol\n WorkerMessage,\n WorkerMessageType,\n WorkerMessageData,\n WorkerMessagePayload\n} from './types';\n\n// GENERAL UTILS\nexport {assert} from './lib/env-utils/assert';\nexport {isBrowser, isWorker} from './lib/env-utils/globals';\n\n// WORKER UTILS - TYPES\nexport {default as WorkerJob} from './lib/worker-farm/worker-job';\nexport {default as WorkerThread} from './lib/worker-farm/worker-thread';\n\n// WORKER FARMS\nexport {default as WorkerFarm} from './lib/worker-farm/worker-farm';\nexport {default as WorkerPool} from './lib/worker-farm/worker-pool';\nexport {default as WorkerBody} from './lib/worker-farm/worker-body';\n\nexport {processOnWorker, canProcessOnWorker} from './lib/worker-api/process-on-worker';\nexport {createWorker} from './lib/worker-api/create-worker';\n\n// WORKER UTILS - EXPORTS\nexport {getWorkerURL} from './lib/worker-api/get-worker-url';\nexport {validateWorkerVersion} from './lib/worker-api/validate-worker-version';\nexport {getTransferList, getTransferListForWriter} from './lib/worker-utils/get-transfer-list';\n\n// LIBRARY UTILS\nexport {getLibraryUrl, loadLibrary} from './lib/library-utils/library-utils';\n\n// PARSER UTILS\nexport {default as AsyncQueue} from './lib/async-queue/async-queue';\n\n// PROCESS UTILS\nexport {default as ChildProcessProxy} from './lib/process-utils/child-process-proxy';\n\n// WORKER OBJECTS\n\n/** A null worker to test that worker processing is functional */\nexport const NullWorker: WorkerObject = {\n id: 'null',\n name: 'null',\n module: 'worker-utils',\n version: VERSION,\n options: {\n null: {}\n }\n};\n"],"file":"index.js"}
|
|
@@ -5,10 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.VERSION = void 0;
|
|
7
7
|
var DEFAULT_VERSION = 'latest';
|
|
8
|
-
var VERSION = typeof "3.2.
|
|
8
|
+
var VERSION = typeof "3.2.8" !== 'undefined' ? "3.2.8" : DEFAULT_VERSION;
|
|
9
9
|
exports.VERSION = VERSION;
|
|
10
10
|
|
|
11
|
-
if (typeof "3.2.
|
|
11
|
+
if (typeof "3.2.8" === 'undefined') {
|
|
12
12
|
console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
|
|
13
13
|
}
|
|
14
14
|
//# sourceMappingURL=version.js.map
|
|
@@ -27,7 +27,7 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
|
|
|
27
27
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
28
28
|
|
|
29
29
|
var LATEST = 'latest';
|
|
30
|
-
var VERSION = typeof "3.2.
|
|
30
|
+
var VERSION = typeof "3.2.8" !== 'undefined' ? "3.2.8" : LATEST;
|
|
31
31
|
var loadLibraryPromises = {};
|
|
32
32
|
|
|
33
33
|
function loadLibrary(_x) {
|
|
@@ -11,7 +11,7 @@ var _assert = require("../env-utils/assert");
|
|
|
11
11
|
var _version = require("../env-utils/version");
|
|
12
12
|
|
|
13
13
|
var NPM_TAG = 'latest';
|
|
14
|
-
var VERSION = typeof "3.2.
|
|
14
|
+
var VERSION = typeof "3.2.8" !== 'undefined' ? "3.2.8" : NPM_TAG;
|
|
15
15
|
|
|
16
16
|
function getWorkerName(worker) {
|
|
17
17
|
var warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
|
|
@@ -14,10 +14,10 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
|
|
|
14
14
|
|
|
15
15
|
var _workerFarm = _interopRequireDefault(require("../worker-farm/worker-farm"));
|
|
16
16
|
|
|
17
|
-
var _removeNontransferableOptions = require("../worker-utils/remove-nontransferable-options");
|
|
18
|
-
|
|
19
17
|
var _getWorkerUrl = require("./get-worker-url");
|
|
20
18
|
|
|
19
|
+
var _getTransferList = require("../worker-utils/get-transfer-list");
|
|
20
|
+
|
|
21
21
|
function canProcessOnWorker(worker, options) {
|
|
22
22
|
if (!_workerFarm.default.isSupported()) {
|
|
23
23
|
return false;
|
|
@@ -69,7 +69,7 @@ function _processOnWorker() {
|
|
|
69
69
|
|
|
70
70
|
case 11:
|
|
71
71
|
job = _context.sent;
|
|
72
|
-
transferableOptions = (0,
|
|
72
|
+
transferableOptions = (0, _getTransferList.getTransferListForWriter)(options);
|
|
73
73
|
job.postMessage('process', {
|
|
74
74
|
input: data,
|
|
75
75
|
options: transferableOptions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["canProcessOnWorker","worker","options","WorkerFarm","isSupported","processOnWorker","data","context","name","workerFarm","getWorkerFarm","source","workerPoolProps","url","workerPool","getWorkerPool","jobName","startJob","onMessage","bind","job","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"mappings":";;;;;;;;;;;;;;AAQA;;AACA;;AACA;;AAaO,SAASA,kBAAT,CAA4BC,MAA5B,EAAkDC,OAAlD,EAA2E;AAChF,MAAI,CAACC,oBAAWC,WAAX,EAAL,EAA+B;AAC7B,WAAO,KAAP;AACD;;AAED,SAAOH,MAAM,CAACA,MAAP,KAAiBC,OAAjB,aAAiBA,OAAjB,uBAAiBA,OAAO,CAAED,MAA1B,CAAP;AACD;;SAOqBI,e;;;;;+EAAf,iBACLJ,MADK,EAELK,IAFK;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAGLJ,YAAAA,OAHK,2DAG6B,EAH7B;AAILK,YAAAA,OAJK,2DAIoB,EAJpB;AAMCC,YAAAA,IAND,GAMQ,iCAAcP,MAAd,CANR;AAQCQ,YAAAA,UARD,GAQcN,oBAAWO,aAAX,CAAyBR,OAAzB,CARd;AASES,YAAAA,MATF,GASYT,OATZ,CASES,MATF;AAUCC,YAAAA,eAVD,GAUkE;AAACJ,cAAAA,IAAI,EAAJA,IAAD;AAAOG,cAAAA,MAAM,EAANA;AAAP,aAVlE;;AAWL,gBAAI,CAACA,MAAL,EAAa;AACXC,cAAAA,eAAe,CAACC,GAAhB,GAAsB,gCAAaZ,MAAb,EAAqBC,OAArB,CAAtB;AACD;;AACKY,YAAAA,UAdD,GAccL,UAAU,CAACM,aAAX,CAAyBH,eAAzB,CAdd;AAgBCI,YAAAA,OAhBD,GAgBWd,OAAO,CAACc,OAAR,IAAmBf,MAAM,CAACO,IAhBrC;AAAA;AAAA,mBAiBaM,UAAU,CAACG,QAAX,CAChBD,OADgB,EAGhBE,SAAS,CAACC,IAAV,CAAe,IAAf,EAAqBZ,OAArB,CAHgB,CAjBb;;AAAA;AAiBCa,YAAAA,GAjBD;AAwBCC,YAAAA,mBAxBD,GAwBuB,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["canProcessOnWorker","worker","options","WorkerFarm","isSupported","processOnWorker","data","context","name","workerFarm","getWorkerFarm","source","workerPoolProps","url","workerPool","getWorkerPool","jobName","startJob","onMessage","bind","job","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"mappings":"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","sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\nimport {getTransferListForWriter} from '../worker-utils/get-transfer-list';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const {source} = options;\n const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};\n if (!source) {\n workerPoolProps.url = getWorkerURL(worker, options);\n }\n const workerPool = workerFarm.getWorkerPool(workerPoolProps);\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = getTransferListForWriter(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"file":"process-on-worker.js"}
|
|
@@ -7,8 +7,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
7
7
|
});
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
|
|
10
|
-
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
11
|
-
|
|
12
10
|
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
13
11
|
|
|
14
12
|
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
@@ -155,7 +153,7 @@ var WorkerThread = function () {
|
|
|
155
153
|
}], [{
|
|
156
154
|
key: "isSupported",
|
|
157
155
|
value: function isSupported() {
|
|
158
|
-
return typeof Worker !== 'undefined' && _globals.isBrowser ||
|
|
156
|
+
return typeof Worker !== 'undefined' && _globals.isBrowser || typeof _worker_threads.Worker !== 'undefined' && !_globals.isBrowser;
|
|
159
157
|
}
|
|
160
158
|
}]);
|
|
161
159
|
return WorkerThread;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"names":["NOOP","WorkerThread","props","name","source","url","onMessage","onError","error","console","log","worker","isBrowser","_createBrowserWorker","_createNodeWorker","terminate","terminated","Boolean","data","transferList","postMessage","event","message","lineno","colno","Error","_loadableURL","Worker","onmessage","onerror","_getErrorFromErrorEvent","onmessageerror","absolute","includes","startsWith","NodeWorker","eval","on","code"
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"names":["NOOP","WorkerThread","props","name","source","url","onMessage","onError","error","console","log","worker","isBrowser","_createBrowserWorker","_createNodeWorker","terminate","terminated","Boolean","data","transferList","postMessage","event","message","lineno","colno","Error","_loadableURL","Worker","onmessage","onerror","_getErrorFromErrorEvent","onmessageerror","absolute","includes","startsWith","NodeWorker","eval","on","code"],"mappings":"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","sourcesContent":["import {Worker as NodeWorker} from '../node/worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorker;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorker {\n let worker: NodeWorker;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"file":"worker-thread.js"}
|
|
@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
6
6
|
value: true
|
|
7
7
|
});
|
|
8
8
|
exports.getTransferList = getTransferList;
|
|
9
|
+
exports.getTransferListForWriter = getTransferListForWriter;
|
|
9
10
|
|
|
10
11
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
11
12
|
|
|
@@ -50,4 +51,22 @@ function isTransferable(object) {
|
|
|
50
51
|
|
|
51
52
|
return false;
|
|
52
53
|
}
|
|
54
|
+
|
|
55
|
+
function getTransferListForWriter(object) {
|
|
56
|
+
if (object === null) {
|
|
57
|
+
return {};
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
var clone = Object.assign({}, object);
|
|
61
|
+
Object.keys(clone).forEach(function (key) {
|
|
62
|
+
if ((0, _typeof2.default)(object[key]) === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
63
|
+
clone[key] = getTransferListForWriter(object[key]);
|
|
64
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
65
|
+
clone[key] = {};
|
|
66
|
+
} else {
|
|
67
|
+
clone[key] = object[key];
|
|
68
|
+
}
|
|
69
|
+
});
|
|
70
|
+
return clone;
|
|
71
|
+
}
|
|
53
72
|
//# sourceMappingURL=get-transfer-list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-utils/get-transfer-list.ts"],"names":["getTransferList","object","recursive","transfers","transfersSet","Set","isTransferable","add","buffer","ArrayBuffer","isView","key","undefined","Array","from","MessagePort","ImageBitmap","OffscreenCanvas"],"mappings":"
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-utils/get-transfer-list.ts"],"names":["getTransferList","object","recursive","transfers","transfersSet","Set","isTransferable","add","buffer","ArrayBuffer","isView","key","undefined","Array","from","MessagePort","ImageBitmap","OffscreenCanvas","getTransferListForWriter","clone","Object","assign","keys","forEach","RegExp"],"mappings":";;;;;;;;;;;;AAWO,SAASA,eAAT,CACLC,MADK,EAIW;AAAA,MAFhBC,SAEgB,uEAFK,IAEL;AAAA,MADhBC,SACgB;AAEhB,MAAMC,YAAY,GAAGD,SAAS,IAAI,IAAIE,GAAJ,EAAlC;;AAEA,MAAI,CAACJ,MAAL,EAAa,CAEZ,CAFD,MAEO,IAAIK,cAAc,CAACL,MAAD,CAAlB,EAA4B;AACjCG,IAAAA,YAAY,CAACG,GAAb,CAAiBN,MAAjB;AACD,GAFM,MAEA,IAAIK,cAAc,CAACL,MAAM,CAACO,MAAR,CAAlB,EAAmC;AAExCJ,IAAAA,YAAY,CAACG,GAAb,CAAiBN,MAAM,CAACO,MAAxB;AACD,GAHM,MAGA,IAAIC,WAAW,CAACC,MAAZ,CAAmBT,MAAnB,CAAJ,EAAgC,CAGtC,CAHM,MAGA,IAAIC,SAAS,IAAI,sBAAOD,MAAP,MAAkB,QAAnC,EAA6C;AAClD,SAAK,IAAMU,GAAX,IAAkBV,MAAlB,EAA0B;AAExBD,MAAAA,eAAe,CAACC,MAAM,CAACU,GAAD,CAAP,EAAcT,SAAd,EAAyBE,YAAzB,CAAf;AACD;AACF;;AAID,SAAOD,SAAS,KAAKS,SAAd,GAA0BC,KAAK,CAACC,IAAN,CAAWV,YAAX,CAA1B,GAAqD,EAA5D;AACD;;AAGD,SAASE,cAAT,CAAwBL,MAAxB,EAAyC;AACvC,MAAI,CAACA,MAAL,EAAa;AACX,WAAO,KAAP;AACD;;AACD,MAAIA,MAAM,YAAYQ,WAAtB,EAAmC;AACjC,WAAO,IAAP;AACD;;AACD,MAAI,OAAOM,WAAP,KAAuB,WAAvB,IAAsCd,MAAM,YAAYc,WAA5D,EAAyE;AACvE,WAAO,IAAP;AACD;;AACD,MAAI,OAAOC,WAAP,KAAuB,WAAvB,IAAsCf,MAAM,YAAYe,WAA5D,EAAyE;AACvE,WAAO,IAAP;AACD;;AAED,MAAI,OAAOC,eAAP,KAA2B,WAA3B,IAA0ChB,MAAM,YAAYgB,eAAhE,EAAiF;AAC/E,WAAO,IAAP;AACD;;AACD,SAAO,KAAP;AACD;;AAMM,SAASC,wBAAT,CAAkCjB,MAAlC,EAAiE;AACtE,MAAIA,MAAM,KAAK,IAAf,EAAqB;AACnB,WAAO,EAAP;AACD;;AACD,MAAMkB,KAAK,GAAGC,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBpB,MAAlB,CAAd;AAEAmB,EAAAA,MAAM,CAACE,IAAP,CAAYH,KAAZ,EAAmBI,OAAnB,CAA2B,UAACZ,GAAD,EAAS;AAElC,QAAI,sBAAOV,MAAM,CAACU,GAAD,CAAb,MAAuB,QAAvB,IAAmC,CAACF,WAAW,CAACC,MAAZ,CAAmBT,MAAM,CAACU,GAAD,CAAzB,CAAxC,EAAyE;AACvEQ,MAAAA,KAAK,CAACR,GAAD,CAAL,GAAaO,wBAAwB,CAACjB,MAAM,CAACU,GAAD,CAAP,CAArC;AACD,KAFD,MAEO,IAAI,OAAOQ,KAAK,CAACR,GAAD,CAAZ,KAAsB,UAAtB,IAAoCQ,KAAK,CAACR,GAAD,CAAL,YAAsBa,MAA9D,EAAsE;AAC3EL,MAAAA,KAAK,CAACR,GAAD,CAAL,GAAa,EAAb;AACD,KAFM,MAEA;AACLQ,MAAAA,KAAK,CAACR,GAAD,CAAL,GAAaV,MAAM,CAACU,GAAD,CAAnB;AACD;AACF,GATD;AAWA,SAAOQ,KAAP;AACD","sourcesContent":["// 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 // Checking if it is an object and not a typed array.\n if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {\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"],"file":"get-transfer-list.js"}
|
|
@@ -10,25 +10,20 @@ exports.removeNontransferableOptions = removeNontransferableOptions;
|
|
|
10
10
|
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
11
11
|
|
|
12
12
|
function removeNontransferableOptions(object) {
|
|
13
|
-
|
|
14
|
-
}
|
|
15
|
-
|
|
16
|
-
function stringifyJSON(v) {
|
|
17
|
-
var cache = new Set();
|
|
18
|
-
return JSON.stringify(v, function (key, value) {
|
|
19
|
-
if ((0, _typeof2.default)(value) === 'object' && value !== null) {
|
|
20
|
-
if (cache.has(value)) {
|
|
21
|
-
try {
|
|
22
|
-
return JSON.parse(JSON.stringify(value));
|
|
23
|
-
} catch (err) {
|
|
24
|
-
return undefined;
|
|
25
|
-
}
|
|
26
|
-
}
|
|
13
|
+
if (object === null) {
|
|
14
|
+
return {};
|
|
15
|
+
}
|
|
27
16
|
|
|
28
|
-
|
|
17
|
+
var clone = Object.assign({}, object);
|
|
18
|
+
Object.keys(clone).forEach(function (key) {
|
|
19
|
+
if ((0, _typeof2.default)(object[key]) === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
20
|
+
clone[key] = removeNontransferableOptions(object[key]);
|
|
21
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
22
|
+
clone[key] = {};
|
|
23
|
+
} else {
|
|
24
|
+
clone[key] = object[key];
|
|
29
25
|
}
|
|
30
|
-
|
|
31
|
-
return value;
|
|
32
26
|
});
|
|
27
|
+
return clone;
|
|
33
28
|
}
|
|
34
29
|
//# sourceMappingURL=remove-nontransferable-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-utils/remove-nontransferable-options.ts"],"names":["removeNontransferableOptions","object","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-utils/remove-nontransferable-options.ts"],"names":["removeNontransferableOptions","object","clone","Object","assign","keys","forEach","key","ArrayBuffer","isView","RegExp"],"mappings":";;;;;;;;;;;AAIO,SAASA,4BAAT,CAAsCC,MAAtC,EAAqE;AAC1E,MAAIA,MAAM,KAAK,IAAf,EAAqB;AACnB,WAAO,EAAP;AACD;;AACD,MAAMC,KAAK,GAAGC,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBH,MAAlB,CAAd;AAEAE,EAAAA,MAAM,CAACE,IAAP,CAAYH,KAAZ,EAAmBI,OAAnB,CAA2B,UAACC,GAAD,EAAS;AAElC,QAAI,sBAAON,MAAM,CAACM,GAAD,CAAb,MAAuB,QAAvB,IAAmC,CAACC,WAAW,CAACC,MAAZ,CAAmBR,MAAM,CAACM,GAAD,CAAzB,CAAxC,EAAyE;AACvEL,MAAAA,KAAK,CAACK,GAAD,CAAL,GAAaP,4BAA4B,CAACC,MAAM,CAACM,GAAD,CAAP,CAAzC;AACD,KAFD,MAEO,IAAI,OAAOL,KAAK,CAACK,GAAD,CAAZ,KAAsB,UAAtB,IAAoCL,KAAK,CAACK,GAAD,CAAL,YAAsBG,MAA9D,EAAsE;AAC3ER,MAAAA,KAAK,CAACK,GAAD,CAAL,GAAa,EAAb;AACD,KAFM,MAEA;AACLL,MAAAA,KAAK,CAACK,GAAD,CAAL,GAAaN,MAAM,CAACM,GAAD,CAAnB;AACD;AACF,GATD;AAWA,SAAOL,KAAP;AACD","sourcesContent":["/**\n * Recursively drop non serializable values like functions and regexps.\n * @param object\n */\nexport function removeNontransferableOptions(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 // Checking if it is an object and not a typed array.\n if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {\n clone[key] = removeNontransferableOptions(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"],"file":"remove-nontransferable-options.js"}
|
package/dist/esm/index.js
CHANGED
|
@@ -10,7 +10,7 @@ export { processOnWorker, canProcessOnWorker } from './lib/worker-api/process-on
|
|
|
10
10
|
export { createWorker } from './lib/worker-api/create-worker';
|
|
11
11
|
export { getWorkerURL } from './lib/worker-api/get-worker-url';
|
|
12
12
|
export { validateWorkerVersion } from './lib/worker-api/validate-worker-version';
|
|
13
|
-
export { getTransferList } from './lib/worker-utils/get-transfer-list';
|
|
13
|
+
export { getTransferList, getTransferListForWriter } from './lib/worker-utils/get-transfer-list';
|
|
14
14
|
export { getLibraryUrl, loadLibrary } from './lib/library-utils/library-utils';
|
|
15
15
|
export { default as AsyncQueue } from './lib/async-queue/async-queue';
|
|
16
16
|
export { default as ChildProcessProxy } from './lib/process-utils/child-process-proxy';
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../src/index.ts"],"names":["VERSION","assert","isBrowser","isWorker","default","WorkerJob","WorkerThread","WorkerFarm","WorkerPool","WorkerBody","processOnWorker","canProcessOnWorker","createWorker","getWorkerURL","validateWorkerVersion","getTransferList","getLibraryUrl","loadLibrary","AsyncQueue","ChildProcessProxy","NullWorker","id","name","module","version","options","null"],"mappings":"AACA,SAAQA,OAAR,QAAsB,yBAAtB;AAcA,SAAQC,MAAR,QAAqB,wBAArB;AACA,SAAQC,SAAR,EAAmBC,QAAnB,QAAkC,yBAAlC;AAGA,SAAQC,OAAO,IAAIC,SAAnB,QAAmC,8BAAnC;AACA,SAAQD,OAAO,IAAIE,YAAnB,QAAsC,iCAAtC;AAGA,SAAQF,OAAO,IAAIG,UAAnB,QAAoC,+BAApC;AACA,SAAQH,OAAO,IAAII,UAAnB,QAAoC,+BAApC;AACA,SAAQJ,OAAO,IAAIK,UAAnB,QAAoC,+BAApC;AAEA,SAAQC,eAAR,EAAyBC,kBAAzB,QAAkD,oCAAlD;AACA,SAAQC,YAAR,QAA2B,gCAA3B;AAGA,SAAQC,YAAR,QAA2B,iCAA3B;AACA,SAAQC,qBAAR,QAAoC,0CAApC;AACA,SAAQC,eAAR,
|
|
1
|
+
{"version":3,"sources":["../../src/index.ts"],"names":["VERSION","assert","isBrowser","isWorker","default","WorkerJob","WorkerThread","WorkerFarm","WorkerPool","WorkerBody","processOnWorker","canProcessOnWorker","createWorker","getWorkerURL","validateWorkerVersion","getTransferList","getTransferListForWriter","getLibraryUrl","loadLibrary","AsyncQueue","ChildProcessProxy","NullWorker","id","name","module","version","options","null"],"mappings":"AACA,SAAQA,OAAR,QAAsB,yBAAtB;AAcA,SAAQC,MAAR,QAAqB,wBAArB;AACA,SAAQC,SAAR,EAAmBC,QAAnB,QAAkC,yBAAlC;AAGA,SAAQC,OAAO,IAAIC,SAAnB,QAAmC,8BAAnC;AACA,SAAQD,OAAO,IAAIE,YAAnB,QAAsC,iCAAtC;AAGA,SAAQF,OAAO,IAAIG,UAAnB,QAAoC,+BAApC;AACA,SAAQH,OAAO,IAAII,UAAnB,QAAoC,+BAApC;AACA,SAAQJ,OAAO,IAAIK,UAAnB,QAAoC,+BAApC;AAEA,SAAQC,eAAR,EAAyBC,kBAAzB,QAAkD,oCAAlD;AACA,SAAQC,YAAR,QAA2B,gCAA3B;AAGA,SAAQC,YAAR,QAA2B,iCAA3B;AACA,SAAQC,qBAAR,QAAoC,0CAApC;AACA,SAAQC,eAAR,EAAyBC,wBAAzB,QAAwD,sCAAxD;AAGA,SAAQC,aAAR,EAAuBC,WAAvB,QAAyC,mCAAzC;AAGA,SAAQd,OAAO,IAAIe,UAAnB,QAAoC,+BAApC;AAGA,SAAQf,OAAO,IAAIgB,iBAAnB,QAA2C,yCAA3C;AAKA,OAAO,MAAMC,UAAwB,GAAG;AACtCC,EAAAA,EAAE,EAAE,MADkC;AAEtCC,EAAAA,IAAI,EAAE,MAFgC;AAGtCC,EAAAA,MAAM,EAAE,cAH8B;AAItCC,EAAAA,OAAO,EAAEzB,OAJ6B;AAKtC0B,EAAAA,OAAO,EAAE;AACPC,IAAAA,IAAI,EAAE;AADC;AAL6B,CAAjC","sourcesContent":["import type {WorkerObject} from './types';\nimport {VERSION} from './lib/env-utils/version';\n\n// TYPES\nexport type {\n WorkerObject,\n WorkerOptions,\n // Protocol\n WorkerMessage,\n WorkerMessageType,\n WorkerMessageData,\n WorkerMessagePayload\n} from './types';\n\n// GENERAL UTILS\nexport {assert} from './lib/env-utils/assert';\nexport {isBrowser, isWorker} from './lib/env-utils/globals';\n\n// WORKER UTILS - TYPES\nexport {default as WorkerJob} from './lib/worker-farm/worker-job';\nexport {default as WorkerThread} from './lib/worker-farm/worker-thread';\n\n// WORKER FARMS\nexport {default as WorkerFarm} from './lib/worker-farm/worker-farm';\nexport {default as WorkerPool} from './lib/worker-farm/worker-pool';\nexport {default as WorkerBody} from './lib/worker-farm/worker-body';\n\nexport {processOnWorker, canProcessOnWorker} from './lib/worker-api/process-on-worker';\nexport {createWorker} from './lib/worker-api/create-worker';\n\n// WORKER UTILS - EXPORTS\nexport {getWorkerURL} from './lib/worker-api/get-worker-url';\nexport {validateWorkerVersion} from './lib/worker-api/validate-worker-version';\nexport {getTransferList, getTransferListForWriter} from './lib/worker-utils/get-transfer-list';\n\n// LIBRARY UTILS\nexport {getLibraryUrl, loadLibrary} from './lib/library-utils/library-utils';\n\n// PARSER UTILS\nexport {default as AsyncQueue} from './lib/async-queue/async-queue';\n\n// PROCESS UTILS\nexport {default as ChildProcessProxy} from './lib/process-utils/child-process-proxy';\n\n// WORKER OBJECTS\n\n/** A null worker to test that worker processing is functional */\nexport const NullWorker: WorkerObject = {\n id: 'null',\n name: 'null',\n module: 'worker-utils',\n version: VERSION,\n options: {\n null: {}\n }\n};\n"],"file":"index.js"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const DEFAULT_VERSION = 'latest';
|
|
2
|
-
export const VERSION = typeof "3.2.
|
|
2
|
+
export const VERSION = typeof "3.2.8" !== 'undefined' ? "3.2.8" : DEFAULT_VERSION;
|
|
3
3
|
|
|
4
|
-
if (typeof "3.2.
|
|
4
|
+
if (typeof "3.2.8" === 'undefined') {
|
|
5
5
|
console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
|
|
6
6
|
}
|
|
7
7
|
//# sourceMappingURL=version.js.map
|
|
@@ -3,7 +3,7 @@ import * as node from '../node/require-utils.node';
|
|
|
3
3
|
import { assert } from '../env-utils/assert';
|
|
4
4
|
import { VERSION as __VERSION__ } from '../env-utils/version';
|
|
5
5
|
const LATEST = 'latest';
|
|
6
|
-
const VERSION = typeof "3.2.
|
|
6
|
+
const VERSION = typeof "3.2.8" !== 'undefined' ? "3.2.8" : LATEST;
|
|
7
7
|
const loadLibraryPromises = {};
|
|
8
8
|
export async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
|
|
9
9
|
if (moduleName) {
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { assert } from '../env-utils/assert';
|
|
2
2
|
import { VERSION as __VERSION__ } from '../env-utils/version';
|
|
3
3
|
const NPM_TAG = 'latest';
|
|
4
|
-
const VERSION = typeof "3.2.
|
|
4
|
+
const VERSION = typeof "3.2.8" !== 'undefined' ? "3.2.8" : NPM_TAG;
|
|
5
5
|
export function getWorkerName(worker) {
|
|
6
6
|
const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
|
|
7
7
|
return "".concat(worker.name, "@").concat(worker.version).concat(warning);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import WorkerFarm from '../worker-farm/worker-farm';
|
|
2
|
-
import { removeNontransferableOptions } from '../worker-utils/remove-nontransferable-options';
|
|
3
2
|
import { getWorkerURL, getWorkerName } from './get-worker-url';
|
|
3
|
+
import { getTransferListForWriter } from '../worker-utils/get-transfer-list';
|
|
4
4
|
export function canProcessOnWorker(worker, options) {
|
|
5
5
|
if (!WorkerFarm.isSupported()) {
|
|
6
6
|
return false;
|
|
@@ -26,7 +26,7 @@ export async function processOnWorker(worker, data, options = {}, context = {})
|
|
|
26
26
|
const workerPool = workerFarm.getWorkerPool(workerPoolProps);
|
|
27
27
|
const jobName = options.jobName || worker.name;
|
|
28
28
|
const job = await workerPool.startJob(jobName, onMessage.bind(null, context));
|
|
29
|
-
const transferableOptions =
|
|
29
|
+
const transferableOptions = getTransferListForWriter(options);
|
|
30
30
|
job.postMessage('process', {
|
|
31
31
|
input: data,
|
|
32
32
|
options: transferableOptions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["WorkerFarm","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["WorkerFarm","getWorkerURL","getWorkerName","getTransferListForWriter","canProcessOnWorker","worker","options","isSupported","processOnWorker","data","context","name","workerFarm","getWorkerFarm","source","workerPoolProps","url","workerPool","getWorkerPool","jobName","job","startJob","onMessage","bind","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"mappings":"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","sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\nimport {getTransferListForWriter} from '../worker-utils/get-transfer-list';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const {source} = options;\n const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};\n if (!source) {\n workerPoolProps.url = getWorkerURL(worker, options);\n }\n const workerPool = workerFarm.getWorkerPool(workerPoolProps);\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = getTransferListForWriter(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"file":"process-on-worker.js"}
|
|
@@ -9,7 +9,7 @@ const NOOP = () => {};
|
|
|
9
9
|
|
|
10
10
|
export default class WorkerThread {
|
|
11
11
|
static isSupported() {
|
|
12
|
-
return typeof Worker !== 'undefined' && isBrowser || typeof NodeWorker !== undefined;
|
|
12
|
+
return typeof Worker !== 'undefined' && isBrowser || typeof NodeWorker !== 'undefined' && !isBrowser;
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
constructor(props) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"names":["Worker","NodeWorker","isBrowser","assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-farm/worker-thread.ts"],"names":["Worker","NodeWorker","isBrowser","assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","constructor","props","name","source","url","onMessage","onError","error","console","log","worker","_createBrowserWorker","_createNodeWorker","destroy","terminate","terminated","isRunning","Boolean","postMessage","data","transferList","_getErrorFromErrorEvent","event","message","lineno","colno","Error","_loadableURL","onmessage","onerror","onmessageerror","absolute","includes","startsWith","eval","on","code"],"mappings":"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","sourcesContent":["import {Worker as NodeWorker} from '../node/worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorker;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return (\n (typeof Worker !== 'undefined' && isBrowser) ||\n (typeof NodeWorker !== 'undefined' && !isBrowser)\n );\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorker {\n let worker: NodeWorker;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"file":"worker-thread.js"}
|
|
@@ -37,4 +37,22 @@ function isTransferable(object) {
|
|
|
37
37
|
|
|
38
38
|
return false;
|
|
39
39
|
}
|
|
40
|
+
|
|
41
|
+
export function getTransferListForWriter(object) {
|
|
42
|
+
if (object === null) {
|
|
43
|
+
return {};
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
const clone = Object.assign({}, object);
|
|
47
|
+
Object.keys(clone).forEach(key => {
|
|
48
|
+
if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
49
|
+
clone[key] = getTransferListForWriter(object[key]);
|
|
50
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
51
|
+
clone[key] = {};
|
|
52
|
+
} else {
|
|
53
|
+
clone[key] = object[key];
|
|
54
|
+
}
|
|
55
|
+
});
|
|
56
|
+
return clone;
|
|
57
|
+
}
|
|
40
58
|
//# sourceMappingURL=get-transfer-list.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-utils/get-transfer-list.ts"],"names":["getTransferList","object","recursive","transfers","transfersSet","Set","isTransferable","add","buffer","ArrayBuffer","isView","key","undefined","Array","from","MessagePort","ImageBitmap","OffscreenCanvas"],"mappings":"AAWA,OAAO,SAASA,eAAT,CACLC,MADK,EAELC,SAAkB,GAAG,IAFhB,EAGLC,SAHK,EAIW;AAEhB,QAAMC,YAAY,GAAGD,SAAS,IAAI,IAAIE,GAAJ,EAAlC;;AAEA,MAAI,CAACJ,MAAL,EAAa,CAEZ,CAFD,MAEO,IAAIK,cAAc,CAACL,MAAD,CAAlB,EAA4B;AACjCG,IAAAA,YAAY,CAACG,GAAb,CAAiBN,MAAjB;AACD,GAFM,MAEA,IAAIK,cAAc,CAACL,MAAM,CAACO,MAAR,CAAlB,EAAmC;AAExCJ,IAAAA,YAAY,CAACG,GAAb,CAAiBN,MAAM,CAACO,MAAxB;AACD,GAHM,MAGA,IAAIC,WAAW,CAACC,MAAZ,CAAmBT,MAAnB,CAAJ,EAAgC,CAGtC,CAHM,MAGA,IAAIC,SAAS,IAAI,OAAOD,MAAP,KAAkB,QAAnC,EAA6C;AAClD,SAAK,MAAMU,GAAX,IAAkBV,MAAlB,EAA0B;AAExBD,MAAAA,eAAe,CAACC,MAAM,CAACU,GAAD,CAAP,EAAcT,SAAd,EAAyBE,YAAzB,CAAf;AACD;AACF;;AAID,SAAOD,SAAS,KAAKS,SAAd,GAA0BC,KAAK,CAACC,IAAN,CAAWV,YAAX,CAA1B,GAAqD,EAA5D;AACD;;AAGD,SAASE,cAAT,CAAwBL,MAAxB,EAAyC;AACvC,MAAI,CAACA,MAAL,EAAa;AACX,WAAO,KAAP;AACD;;AACD,MAAIA,MAAM,YAAYQ,WAAtB,EAAmC;AACjC,WAAO,IAAP;AACD;;AACD,MAAI,OAAOM,WAAP,KAAuB,WAAvB,IAAsCd,MAAM,YAAYc,WAA5D,EAAyE;AACvE,WAAO,IAAP;AACD;;AACD,MAAI,OAAOC,WAAP,KAAuB,WAAvB,IAAsCf,MAAM,YAAYe,WAA5D,EAAyE;AACvE,WAAO,IAAP;AACD;;AAED,MAAI,OAAOC,eAAP,KAA2B,WAA3B,IAA0ChB,MAAM,YAAYgB,eAAhE,EAAiF;AAC/E,WAAO,IAAP;AACD;;AACD,SAAO,KAAP;AACD","sourcesContent":["// 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"],"file":"get-transfer-list.js"}
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-utils/get-transfer-list.ts"],"names":["getTransferList","object","recursive","transfers","transfersSet","Set","isTransferable","add","buffer","ArrayBuffer","isView","key","undefined","Array","from","MessagePort","ImageBitmap","OffscreenCanvas","getTransferListForWriter","clone","Object","assign","keys","forEach","RegExp"],"mappings":"AAWA,OAAO,SAASA,eAAT,CACLC,MADK,EAELC,SAAkB,GAAG,IAFhB,EAGLC,SAHK,EAIW;AAEhB,QAAMC,YAAY,GAAGD,SAAS,IAAI,IAAIE,GAAJ,EAAlC;;AAEA,MAAI,CAACJ,MAAL,EAAa,CAEZ,CAFD,MAEO,IAAIK,cAAc,CAACL,MAAD,CAAlB,EAA4B;AACjCG,IAAAA,YAAY,CAACG,GAAb,CAAiBN,MAAjB;AACD,GAFM,MAEA,IAAIK,cAAc,CAACL,MAAM,CAACO,MAAR,CAAlB,EAAmC;AAExCJ,IAAAA,YAAY,CAACG,GAAb,CAAiBN,MAAM,CAACO,MAAxB;AACD,GAHM,MAGA,IAAIC,WAAW,CAACC,MAAZ,CAAmBT,MAAnB,CAAJ,EAAgC,CAGtC,CAHM,MAGA,IAAIC,SAAS,IAAI,OAAOD,MAAP,KAAkB,QAAnC,EAA6C;AAClD,SAAK,MAAMU,GAAX,IAAkBV,MAAlB,EAA0B;AAExBD,MAAAA,eAAe,CAACC,MAAM,CAACU,GAAD,CAAP,EAAcT,SAAd,EAAyBE,YAAzB,CAAf;AACD;AACF;;AAID,SAAOD,SAAS,KAAKS,SAAd,GAA0BC,KAAK,CAACC,IAAN,CAAWV,YAAX,CAA1B,GAAqD,EAA5D;AACD;;AAGD,SAASE,cAAT,CAAwBL,MAAxB,EAAyC;AACvC,MAAI,CAACA,MAAL,EAAa;AACX,WAAO,KAAP;AACD;;AACD,MAAIA,MAAM,YAAYQ,WAAtB,EAAmC;AACjC,WAAO,IAAP;AACD;;AACD,MAAI,OAAOM,WAAP,KAAuB,WAAvB,IAAsCd,MAAM,YAAYc,WAA5D,EAAyE;AACvE,WAAO,IAAP;AACD;;AACD,MAAI,OAAOC,WAAP,KAAuB,WAAvB,IAAsCf,MAAM,YAAYe,WAA5D,EAAyE;AACvE,WAAO,IAAP;AACD;;AAED,MAAI,OAAOC,eAAP,KAA2B,WAA3B,IAA0ChB,MAAM,YAAYgB,eAAhE,EAAiF;AAC/E,WAAO,IAAP;AACD;;AACD,SAAO,KAAP;AACD;;AAMD,OAAO,SAASC,wBAAT,CAAkCjB,MAAlC,EAAiE;AACtE,MAAIA,MAAM,KAAK,IAAf,EAAqB;AACnB,WAAO,EAAP;AACD;;AACD,QAAMkB,KAAK,GAAGC,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBpB,MAAlB,CAAd;AAEAmB,EAAAA,MAAM,CAACE,IAAP,CAAYH,KAAZ,EAAmBI,OAAnB,CAA4BZ,GAAD,IAAS;AAElC,QAAI,OAAOV,MAAM,CAACU,GAAD,CAAb,KAAuB,QAAvB,IAAmC,CAACF,WAAW,CAACC,MAAZ,CAAmBT,MAAM,CAACU,GAAD,CAAzB,CAAxC,EAAyE;AACvEQ,MAAAA,KAAK,CAACR,GAAD,CAAL,GAAaO,wBAAwB,CAACjB,MAAM,CAACU,GAAD,CAAP,CAArC;AACD,KAFD,MAEO,IAAI,OAAOQ,KAAK,CAACR,GAAD,CAAZ,KAAsB,UAAtB,IAAoCQ,KAAK,CAACR,GAAD,CAAL,YAAsBa,MAA9D,EAAsE;AAC3EL,MAAAA,KAAK,CAACR,GAAD,CAAL,GAAa,EAAb;AACD,KAFM,MAEA;AACLQ,MAAAA,KAAK,CAACR,GAAD,CAAL,GAAaV,MAAM,CAACU,GAAD,CAAnB;AACD;AACF,GATD;AAWA,SAAOQ,KAAP;AACD","sourcesContent":["// 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 // Checking if it is an object and not a typed array.\n if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {\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"],"file":"get-transfer-list.js"}
|
|
@@ -1,23 +1,18 @@
|
|
|
1
1
|
export function removeNontransferableOptions(object) {
|
|
2
|
-
|
|
3
|
-
}
|
|
4
|
-
|
|
5
|
-
function stringifyJSON(v) {
|
|
6
|
-
const cache = new Set();
|
|
7
|
-
return JSON.stringify(v, (key, value) => {
|
|
8
|
-
if (typeof value === 'object' && value !== null) {
|
|
9
|
-
if (cache.has(value)) {
|
|
10
|
-
try {
|
|
11
|
-
return JSON.parse(JSON.stringify(value));
|
|
12
|
-
} catch (err) {
|
|
13
|
-
return undefined;
|
|
14
|
-
}
|
|
15
|
-
}
|
|
2
|
+
if (object === null) {
|
|
3
|
+
return {};
|
|
4
|
+
}
|
|
16
5
|
|
|
17
|
-
|
|
6
|
+
const clone = Object.assign({}, object);
|
|
7
|
+
Object.keys(clone).forEach(key => {
|
|
8
|
+
if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
9
|
+
clone[key] = removeNontransferableOptions(object[key]);
|
|
10
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
11
|
+
clone[key] = {};
|
|
12
|
+
} else {
|
|
13
|
+
clone[key] = object[key];
|
|
18
14
|
}
|
|
19
|
-
|
|
20
|
-
return value;
|
|
21
15
|
});
|
|
16
|
+
return clone;
|
|
22
17
|
}
|
|
23
18
|
//# sourceMappingURL=remove-nontransferable-options.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/worker-utils/remove-nontransferable-options.ts"],"names":["removeNontransferableOptions","object","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/worker-utils/remove-nontransferable-options.ts"],"names":["removeNontransferableOptions","object","clone","Object","assign","keys","forEach","key","ArrayBuffer","isView","RegExp"],"mappings":"AAIA,OAAO,SAASA,4BAAT,CAAsCC,MAAtC,EAAqE;AAC1E,MAAIA,MAAM,KAAK,IAAf,EAAqB;AACnB,WAAO,EAAP;AACD;;AACD,QAAMC,KAAK,GAAGC,MAAM,CAACC,MAAP,CAAc,EAAd,EAAkBH,MAAlB,CAAd;AAEAE,EAAAA,MAAM,CAACE,IAAP,CAAYH,KAAZ,EAAmBI,OAAnB,CAA4BC,GAAD,IAAS;AAElC,QAAI,OAAON,MAAM,CAACM,GAAD,CAAb,KAAuB,QAAvB,IAAmC,CAACC,WAAW,CAACC,MAAZ,CAAmBR,MAAM,CAACM,GAAD,CAAzB,CAAxC,EAAyE;AACvEL,MAAAA,KAAK,CAACK,GAAD,CAAL,GAAaP,4BAA4B,CAACC,MAAM,CAACM,GAAD,CAAP,CAAzC;AACD,KAFD,MAEO,IAAI,OAAOL,KAAK,CAACK,GAAD,CAAZ,KAAsB,UAAtB,IAAoCL,KAAK,CAACK,GAAD,CAAL,YAAsBG,MAA9D,EAAsE;AAC3ER,MAAAA,KAAK,CAACK,GAAD,CAAL,GAAa,EAAb;AACD,KAFM,MAEA;AACLL,MAAAA,KAAK,CAACK,GAAD,CAAL,GAAaN,MAAM,CAACM,GAAD,CAAnB;AACD;AACF,GATD;AAWA,SAAOL,KAAP;AACD","sourcesContent":["/**\n * Recursively drop non serializable values like functions and regexps.\n * @param object\n */\nexport function removeNontransferableOptions(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 // Checking if it is an object and not a typed array.\n if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {\n clone[key] = removeNontransferableOptions(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"],"file":"remove-nontransferable-options.js"}
|
package/dist/index.d.ts
CHANGED
|
@@ -11,7 +11,7 @@ export { processOnWorker, canProcessOnWorker } from './lib/worker-api/process-on
|
|
|
11
11
|
export { createWorker } from './lib/worker-api/create-worker';
|
|
12
12
|
export { getWorkerURL } from './lib/worker-api/get-worker-url';
|
|
13
13
|
export { validateWorkerVersion } from './lib/worker-api/validate-worker-version';
|
|
14
|
-
export { getTransferList } from './lib/worker-utils/get-transfer-list';
|
|
14
|
+
export { getTransferList, getTransferListForWriter } from './lib/worker-utils/get-transfer-list';
|
|
15
15
|
export { getLibraryUrl, loadLibrary } from './lib/library-utils/library-utils';
|
|
16
16
|
export { default as AsyncQueue } from './lib/async-queue/async-queue';
|
|
17
17
|
export { default as ChildProcessProxy } from './lib/process-utils/child-process-proxy';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAI1C,YAAY,EACV,YAAY,EACZ,aAAa,EAEb,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAGxE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAC,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAG5D,OAAO,EAAC,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAC,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAI1C,YAAY,EACV,YAAY,EACZ,aAAa,EAEb,aAAa,EACb,iBAAiB,EACjB,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,SAAS,CAAC;AAGjB,OAAO,EAAC,MAAM,EAAC,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAC,SAAS,EAAE,QAAQ,EAAC,MAAM,yBAAyB,CAAC;AAG5D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,8BAA8B,CAAC;AAClE,OAAO,EAAC,OAAO,IAAI,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAGxE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,+BAA+B,CAAC;AACpE,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAEpE,OAAO,EAAC,eAAe,EAAE,kBAAkB,EAAC,MAAM,oCAAoC,CAAC;AACvF,OAAO,EAAC,YAAY,EAAC,MAAM,gCAAgC,CAAC;AAG5D,OAAO,EAAC,YAAY,EAAC,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAC,qBAAqB,EAAC,MAAM,0CAA0C,CAAC;AAC/E,OAAO,EAAC,eAAe,EAAE,wBAAwB,EAAC,MAAM,sCAAsC,CAAC;AAG/F,OAAO,EAAC,aAAa,EAAE,WAAW,EAAC,MAAM,mCAAmC,CAAC;AAG7E,OAAO,EAAC,OAAO,IAAI,UAAU,EAAC,MAAM,+BAA+B,CAAC;AAGpE,OAAO,EAAC,OAAO,IAAI,iBAAiB,EAAC,MAAM,yCAAyC,CAAC;AAIrF,iEAAiE;AACjE,eAAO,MAAM,UAAU,EAAE,YAQxB,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.NullWorker = exports.ChildProcessProxy = exports.AsyncQueue = exports.loadLibrary = exports.getLibraryUrl = exports.getTransferList = exports.validateWorkerVersion = exports.getWorkerURL = exports.createWorker = exports.canProcessOnWorker = exports.processOnWorker = exports.WorkerBody = exports.WorkerPool = exports.WorkerFarm = exports.WorkerThread = exports.WorkerJob = exports.isWorker = exports.isBrowser = exports.assert = void 0;
|
|
6
|
+
exports.NullWorker = exports.ChildProcessProxy = exports.AsyncQueue = exports.loadLibrary = exports.getLibraryUrl = exports.getTransferListForWriter = exports.getTransferList = exports.validateWorkerVersion = exports.getWorkerURL = exports.createWorker = exports.canProcessOnWorker = exports.processOnWorker = exports.WorkerBody = exports.WorkerPool = exports.WorkerFarm = exports.WorkerThread = exports.WorkerJob = exports.isWorker = exports.isBrowser = exports.assert = void 0;
|
|
7
7
|
const version_1 = require("./lib/env-utils/version");
|
|
8
8
|
// GENERAL UTILS
|
|
9
9
|
var assert_1 = require("./lib/env-utils/assert");
|
|
@@ -35,6 +35,7 @@ var validate_worker_version_1 = require("./lib/worker-api/validate-worker-versio
|
|
|
35
35
|
Object.defineProperty(exports, "validateWorkerVersion", { enumerable: true, get: function () { return validate_worker_version_1.validateWorkerVersion; } });
|
|
36
36
|
var get_transfer_list_1 = require("./lib/worker-utils/get-transfer-list");
|
|
37
37
|
Object.defineProperty(exports, "getTransferList", { enumerable: true, get: function () { return get_transfer_list_1.getTransferList; } });
|
|
38
|
+
Object.defineProperty(exports, "getTransferListForWriter", { enumerable: true, get: function () { return get_transfer_list_1.getTransferListForWriter; } });
|
|
38
39
|
// LIBRARY UTILS
|
|
39
40
|
var library_utils_1 = require("./lib/library-utils/library-utils");
|
|
40
41
|
Object.defineProperty(exports, "getLibraryUrl", { enumerable: true, get: function () { return library_utils_1.getLibraryUrl; } });
|
|
@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.processOnWorker = exports.canProcessOnWorker = void 0;
|
|
7
7
|
const worker_farm_1 = __importDefault(require("../worker-farm/worker-farm"));
|
|
8
|
-
const remove_nontransferable_options_1 = require("../worker-utils/remove-nontransferable-options");
|
|
9
8
|
const get_worker_url_1 = require("./get-worker-url");
|
|
9
|
+
const get_transfer_list_1 = require("../worker-utils/get-transfer-list");
|
|
10
10
|
/**
|
|
11
11
|
* Determines if we can parse with worker
|
|
12
12
|
* @param loader
|
|
@@ -39,7 +39,7 @@ async function processOnWorker(worker, data, options = {}, context = {}) {
|
|
|
39
39
|
// eslint-disable-next-line
|
|
40
40
|
onMessage.bind(null, context));
|
|
41
41
|
// Kick off the processing in the worker
|
|
42
|
-
const transferableOptions = (0,
|
|
42
|
+
const transferableOptions = (0, get_transfer_list_1.getTransferListForWriter)(options);
|
|
43
43
|
job.postMessage('process', { input: data, options: transferableOptions });
|
|
44
44
|
const result = await job.result;
|
|
45
45
|
return result.result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAQ5D,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;
|
|
1
|
+
{"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,wBAAwB,CAAC;AAQ5D,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;gBAOjB,KAAK,EAAE,iBAAiB;IAYpC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAOf,IAAI,SAAS,YAEZ;IAED;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAQlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK;IAiBjD;;OAEG;IACH,oBAAoB,IAAI,MAAM;IAsB9B;;;OAGG;IACH,iBAAiB,IAAI,UAAU;CA0BhC"}
|
|
@@ -24,7 +24,8 @@ class WorkerThread {
|
|
|
24
24
|
}
|
|
25
25
|
/** Checks if workers are supported on this platform */
|
|
26
26
|
static isSupported() {
|
|
27
|
-
return (typeof Worker !== 'undefined' && globals_1.isBrowser) ||
|
|
27
|
+
return ((typeof Worker !== 'undefined' && globals_1.isBrowser) ||
|
|
28
|
+
(typeof worker_threads_1.Worker !== 'undefined' && !globals_1.isBrowser));
|
|
28
29
|
}
|
|
29
30
|
/**
|
|
30
31
|
* Terminate this worker thread
|
|
@@ -7,4 +7,9 @@
|
|
|
7
7
|
* @returns a transfer list that can be passed to postMessage
|
|
8
8
|
*/
|
|
9
9
|
export declare function getTransferList(object: any, recursive?: boolean, transfers?: Set<any>): Transferable[];
|
|
10
|
+
/**
|
|
11
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
12
|
+
* @param object
|
|
13
|
+
*/
|
|
14
|
+
export declare function getTransferListForWriter(object: object | null): object;
|
|
10
15
|
//# sourceMappingURL=get-transfer-list.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-transfer-list.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-utils/get-transfer-list.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,EACX,SAAS,GAAE,OAAc,EACzB,SAAS,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GACnB,YAAY,EAAE,CAwBhB"}
|
|
1
|
+
{"version":3,"file":"get-transfer-list.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-utils/get-transfer-list.ts"],"names":[],"mappings":"AAGA;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,MAAM,EAAE,GAAG,EACX,SAAS,GAAE,OAAc,EACzB,SAAS,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,GACnB,YAAY,EAAE,CAwBhB;AAuBD;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAkBtE"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
// NOTE - there is a copy of this function is both in core and loader-utils
|
|
3
3
|
// core does not need all the utils in loader-utils, just this one.
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
|
-
exports.getTransferList = void 0;
|
|
5
|
+
exports.getTransferListForWriter = exports.getTransferList = void 0;
|
|
6
6
|
/**
|
|
7
7
|
* Returns an array of Transferrable objects that can be used with postMessage
|
|
8
8
|
* https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage
|
|
@@ -59,3 +59,27 @@ function isTransferable(object) {
|
|
|
59
59
|
}
|
|
60
60
|
return false;
|
|
61
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
64
|
+
* @param object
|
|
65
|
+
*/
|
|
66
|
+
function getTransferListForWriter(object) {
|
|
67
|
+
if (object === null) {
|
|
68
|
+
return {};
|
|
69
|
+
}
|
|
70
|
+
const clone = Object.assign({}, object);
|
|
71
|
+
Object.keys(clone).forEach((key) => {
|
|
72
|
+
// Checking if it is an object and not a typed array.
|
|
73
|
+
if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
74
|
+
clone[key] = getTransferListForWriter(object[key]);
|
|
75
|
+
}
|
|
76
|
+
else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
77
|
+
clone[key] = {};
|
|
78
|
+
}
|
|
79
|
+
else {
|
|
80
|
+
clone[key] = object[key];
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
return clone;
|
|
84
|
+
}
|
|
85
|
+
exports.getTransferListForWriter = getTransferListForWriter;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
* @param
|
|
2
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
3
|
+
* @param object
|
|
4
4
|
*/
|
|
5
|
-
export declare function removeNontransferableOptions(object: object): object;
|
|
5
|
+
export declare function removeNontransferableOptions(object: object | null): object;
|
|
6
6
|
//# sourceMappingURL=remove-nontransferable-options.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-nontransferable-options.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-utils/remove-nontransferable-options.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"remove-nontransferable-options.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-utils/remove-nontransferable-options.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAkB1E"}
|
|
@@ -2,34 +2,26 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.removeNontransferableOptions = void 0;
|
|
4
4
|
/**
|
|
5
|
-
*
|
|
6
|
-
* @param
|
|
5
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
6
|
+
* @param object
|
|
7
7
|
*/
|
|
8
8
|
function removeNontransferableOptions(object) {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
if (typeof
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
return JSON.parse(JSON.stringify(value));
|
|
24
|
-
}
|
|
25
|
-
catch (err) {
|
|
26
|
-
// discard key if value cannot be deduped
|
|
27
|
-
return undefined;
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
// Store value in our set
|
|
31
|
-
cache.add(value);
|
|
9
|
+
if (object === null) {
|
|
10
|
+
return {};
|
|
11
|
+
}
|
|
12
|
+
const clone = Object.assign({}, object);
|
|
13
|
+
Object.keys(clone).forEach((key) => {
|
|
14
|
+
// Checking if it is an object and not a typed array.
|
|
15
|
+
if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
16
|
+
clone[key] = removeNontransferableOptions(object[key]);
|
|
17
|
+
}
|
|
18
|
+
else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
19
|
+
clone[key] = {};
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
clone[key] = object[key];
|
|
32
23
|
}
|
|
33
|
-
return value;
|
|
34
24
|
});
|
|
25
|
+
return clone;
|
|
35
26
|
}
|
|
27
|
+
exports.removeNontransferableOptions = removeNontransferableOptions;
|
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\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"],
|
|
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 // Checking if it is an object and not a typed array.\n if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {\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
5
|
"mappings": "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",
|
|
6
6
|
"names": []
|
|
7
7
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/worker-utils",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.8",
|
|
4
4
|
"description": "Utilities for running tasks on worker threads",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"dependencies": {
|
|
50
50
|
"@babel/runtime": "^7.3.1"
|
|
51
51
|
},
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "93463b94d4b88799ef4152fcb39d68c9fa58b8fc"
|
|
53
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';
|
|
@@ -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;
|
|
@@ -58,7 +58,7 @@ export async function processOnWorker(
|
|
|
58
58
|
);
|
|
59
59
|
|
|
60
60
|
// Kick off the processing in the worker
|
|
61
|
-
const transferableOptions =
|
|
61
|
+
const transferableOptions = getTransferListForWriter(options);
|
|
62
62
|
job.postMessage('process', {input: data, options: transferableOptions});
|
|
63
63
|
|
|
64
64
|
const result = await job.result;
|
|
@@ -28,7 +28,10 @@ export default class WorkerThread {
|
|
|
28
28
|
|
|
29
29
|
/** Checks if workers are supported on this platform */
|
|
30
30
|
static isSupported(): boolean {
|
|
31
|
-
return (
|
|
31
|
+
return (
|
|
32
|
+
(typeof Worker !== 'undefined' && isBrowser) ||
|
|
33
|
+
(typeof NodeWorker !== 'undefined' && !isBrowser)
|
|
34
|
+
);
|
|
32
35
|
}
|
|
33
36
|
|
|
34
37
|
constructor(props: WorkerThreadProps) {
|
|
@@ -59,3 +59,27 @@ function isTransferable(object: unknown) {
|
|
|
59
59
|
}
|
|
60
60
|
return false;
|
|
61
61
|
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
65
|
+
* @param object
|
|
66
|
+
*/
|
|
67
|
+
export function getTransferListForWriter(object: object | null): object {
|
|
68
|
+
if (object === null) {
|
|
69
|
+
return {};
|
|
70
|
+
}
|
|
71
|
+
const clone = Object.assign({}, object);
|
|
72
|
+
|
|
73
|
+
Object.keys(clone).forEach((key) => {
|
|
74
|
+
// Checking if it is an object and not a typed array.
|
|
75
|
+
if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
76
|
+
clone[key] = getTransferListForWriter(object[key]);
|
|
77
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
78
|
+
clone[key] = {};
|
|
79
|
+
} else {
|
|
80
|
+
clone[key] = object[key];
|
|
81
|
+
}
|
|
82
|
+
});
|
|
83
|
+
|
|
84
|
+
return clone;
|
|
85
|
+
}
|
|
@@ -1,31 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
* @param
|
|
2
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
3
|
+
* @param object
|
|
4
4
|
*/
|
|
5
|
-
export function removeNontransferableOptions(object: object): object {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
}
|
|
5
|
+
export function removeNontransferableOptions(object: object | null): object {
|
|
6
|
+
if (object === null) {
|
|
7
|
+
return {};
|
|
8
|
+
}
|
|
9
|
+
const clone = Object.assign({}, object);
|
|
11
10
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
return JSON.parse(JSON.stringify(value));
|
|
21
|
-
} catch (err) {
|
|
22
|
-
// discard key if value cannot be deduped
|
|
23
|
-
return undefined;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
// Store value in our set
|
|
27
|
-
cache.add(value);
|
|
11
|
+
Object.keys(clone).forEach((key) => {
|
|
12
|
+
// Checking if it is an object and not a typed array.
|
|
13
|
+
if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
14
|
+
clone[key] = removeNontransferableOptions(object[key]);
|
|
15
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
16
|
+
clone[key] = {};
|
|
17
|
+
} else {
|
|
18
|
+
clone[key] = object[key];
|
|
28
19
|
}
|
|
29
|
-
return value;
|
|
30
20
|
});
|
|
21
|
+
|
|
22
|
+
return clone;
|
|
31
23
|
}
|