@loaders.gl/worker-utils 3.1.7 → 3.2.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/dist/es5/lib/env-utils/version.js +3 -3
  2. package/dist/es5/lib/env-utils/version.js.map +1 -1
  3. package/dist/es5/lib/library-utils/library-utils.js +2 -2
  4. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  5. package/dist/es5/lib/node/worker_threads-browser.js +35 -0
  6. package/dist/es5/lib/node/worker_threads-browser.js.map +1 -0
  7. package/dist/es5/lib/worker-api/create-worker.js +1 -1
  8. package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
  9. package/dist/es5/lib/worker-api/get-worker-url.js +2 -2
  10. package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
  11. package/dist/es5/lib/worker-api/process-on-worker.js +17 -10
  12. package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
  13. package/dist/es5/lib/worker-farm/worker-body.js +67 -22
  14. package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
  15. package/dist/es5/lib/worker-farm/worker-farm.js +4 -2
  16. package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
  17. package/dist/es5/lib/worker-farm/worker-job.js +3 -9
  18. package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
  19. package/dist/es5/lib/worker-farm/worker-pool.js +5 -0
  20. package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
  21. package/dist/es5/lib/worker-farm/worker-thread.js +38 -2
  22. package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
  23. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
  24. package/dist/esm/lib/env-utils/version.js +3 -3
  25. package/dist/esm/lib/env-utils/version.js.map +1 -1
  26. package/dist/esm/lib/library-utils/library-utils.js +2 -2
  27. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  28. package/dist/esm/lib/node/worker_threads-browser.js +10 -0
  29. package/dist/esm/lib/node/worker_threads-browser.js.map +1 -0
  30. package/dist/esm/lib/worker-api/create-worker.js +1 -1
  31. package/dist/esm/lib/worker-api/create-worker.js.map +1 -1
  32. package/dist/esm/lib/worker-api/get-worker-url.js +2 -2
  33. package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
  34. package/dist/esm/lib/worker-api/process-on-worker.js +12 -4
  35. package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
  36. package/dist/esm/lib/worker-farm/worker-body.js +57 -18
  37. package/dist/esm/lib/worker-farm/worker-body.js.map +1 -1
  38. package/dist/esm/lib/worker-farm/worker-farm.js +4 -2
  39. package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -1
  40. package/dist/esm/lib/worker-farm/worker-job.js +3 -9
  41. package/dist/esm/lib/worker-farm/worker-job.js.map +1 -1
  42. package/dist/esm/lib/worker-farm/worker-pool.js +4 -0
  43. package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
  44. package/dist/esm/lib/worker-farm/worker-thread.js +31 -2
  45. package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
  46. package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
  47. package/dist/lib/env-utils/version.js +1 -1
  48. package/dist/lib/library-utils/library-utils.js +1 -1
  49. package/dist/lib/node/worker_threads-browser.d.ts +7 -0
  50. package/dist/lib/node/worker_threads-browser.d.ts.map +1 -0
  51. package/dist/lib/node/worker_threads-browser.js +14 -0
  52. package/dist/lib/worker-api/create-worker.d.ts.map +1 -1
  53. package/dist/lib/worker-api/create-worker.js +1 -2
  54. package/dist/lib/worker-api/get-worker-url.js +1 -1
  55. package/dist/lib/worker-api/process-on-worker.d.ts.map +1 -1
  56. package/dist/lib/worker-api/process-on-worker.js +6 -2
  57. package/dist/lib/worker-farm/worker-body.d.ts +2 -0
  58. package/dist/lib/worker-farm/worker-body.d.ts.map +1 -1
  59. package/dist/lib/worker-farm/worker-body.js +62 -18
  60. package/dist/lib/worker-farm/worker-farm.d.ts +6 -2
  61. package/dist/lib/worker-farm/worker-farm.d.ts.map +1 -1
  62. package/dist/lib/worker-farm/worker-farm.js +4 -3
  63. package/dist/lib/worker-farm/worker-job.d.ts.map +1 -1
  64. package/dist/lib/worker-farm/worker-job.js +2 -2
  65. package/dist/lib/worker-farm/worker-pool.d.ts +2 -0
  66. package/dist/lib/worker-farm/worker-pool.d.ts.map +1 -1
  67. package/dist/lib/worker-farm/worker-pool.js +4 -0
  68. package/dist/lib/worker-farm/worker-thread.d.ts +10 -2
  69. package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
  70. package/dist/lib/worker-farm/worker-thread.js +39 -5
  71. package/dist/lib/worker-utils/get-loadable-worker-url.js +0 -2
  72. package/dist/null-worker.js +45 -14
  73. package/dist/null-worker.js.map +2 -2
  74. package/dist/types.d.ts +3 -1
  75. package/dist/types.d.ts.map +1 -1
  76. package/package.json +3 -2
  77. package/src/lib/env-utils/version.ts +1 -1
  78. package/src/lib/library-utils/library-utils.ts +1 -1
  79. package/src/lib/node/worker_threads-browser.js +11 -0
  80. package/src/lib/worker-api/create-worker.ts +1 -2
  81. package/src/lib/worker-api/get-worker-url.ts +1 -1
  82. package/src/lib/worker-api/process-on-worker.ts +6 -2
  83. package/src/lib/worker-farm/worker-body.ts +61 -19
  84. package/src/lib/worker-farm/worker-farm.ts +10 -5
  85. package/src/lib/worker-farm/worker-job.ts +3 -6
  86. package/src/lib/worker-farm/worker-pool.ts +5 -0
  87. package/src/lib/worker-farm/worker-thread.ts +40 -7
  88. package/src/lib/worker-utils/get-loadable-worker-url.ts +0 -2
  89. package/src/types.ts +1 -1
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-pool.ts"],"names":["WorkerPool","props","source","url","setProps","idleQueue","forEach","worker","destroy","isDestroyed","name","undefined","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","onMessage","job","type","data","done","onError","error","startPromise","Promise","onStart","jobQueue","push","_startQueuedJob","length","workerThread","_getAvailableWorker","queuedJob","shift","message","backlog","WorkerJob","payload","result","returnWorkerToQueue","shouldDestroyWorker","count","_getMaxConcurrency","toLowerCase","WorkerThread","isMobile"],"mappings":"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","sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {isMobile} from '../env-utils/globals';\nimport WorkerThread from './worker-thread';\nimport WorkerJob from './worker-job';\n\n/** WorkerPool onDebug Callback Parameters */\ntype OnDebugParameters = {\n message: string;\n worker: string;\n name: string;\n job: string;\n backlog: number;\n workerThread: WorkerThread;\n};\n\n/** WorkerPool Properties */\nexport type WorkerPoolProps = {\n name?: string;\n source?: string; // | Function;\n url?: string;\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n onDebug?: (options: OnDebugParameters) => any;\n reuseWorkers?: boolean;\n};\n\n/** Private helper types */\ntype OnMessage = (job: WorkerJob, type: WorkerMessageType, payload: WorkerMessagePayload) => void;\ntype OnError = (job: WorkerJob, error: Error) => void;\n\ntype QueuedJob = {\n name: string;\n onMessage: OnMessage;\n onError: OnError;\n onStart: (value: any) => void; // Resolve job start promise\n};\n\n/**\n * Process multiple data messages with small pool of identical workers\n */\nexport default class WorkerPool {\n name: string = 'unnamed';\n source?: string; // | Function;\n url?: string;\n maxConcurrency: number = 1;\n maxMobileConcurrency: number = 1;\n onDebug: (options: OnDebugParameters) => any = () => {};\n reuseWorkers: boolean = true;\n\n private props: WorkerPoolProps = {};\n private jobQueue: QueuedJob[] = [];\n private idleQueue: WorkerThread[] = [];\n private count = 0;\n private isDestroyed = false;\n\n /**\n * @param processor - worker function\n * @param maxConcurrency - max count of workers\n */\n constructor(props: WorkerPoolProps) {\n this.source = props.source;\n this.url = props.url;\n this.setProps(props);\n }\n\n /**\n * Terminates all workers in the pool\n * @note Can free up significant memory\n */\n destroy(): void {\n // Destroy idle workers, active Workers will be destroyed on completion\n this.idleQueue.forEach((worker) => worker.destroy());\n this.isDestroyed = true;\n }\n\n setProps(props: WorkerPoolProps) {\n this.props = {...this.props, ...props};\n\n if (props.name !== undefined) {\n this.name = props.name;\n }\n if (props.maxConcurrency !== undefined) {\n this.maxConcurrency = props.maxConcurrency;\n }\n if (props.maxMobileConcurrency !== undefined) {\n this.maxMobileConcurrency = props.maxMobileConcurrency;\n }\n if (props.reuseWorkers !== undefined) {\n this.reuseWorkers = props.reuseWorkers;\n }\n if (props.onDebug !== undefined) {\n this.onDebug = props.onDebug;\n }\n }\n\n async startJob(\n name: string,\n onMessage: OnMessage = (job, type, data) => job.done(data),\n onError: OnError = (job, error) => job.error(error)\n ): Promise<WorkerJob> {\n // Promise resolves when thread starts working on this job\n const startPromise = new Promise<WorkerJob>((onStart) => {\n // Promise resolves when thread completes or fails working on this job\n this.jobQueue.push({name, onMessage, onError, onStart});\n return this;\n });\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n return await startPromise;\n }\n\n // PRIVATE\n\n /**\n * Starts first queued job if worker is available or can be created\n * Called when job is started and whenever a worker returns to the idleQueue\n */\n async _startQueuedJob(): Promise<void> {\n if (!this.jobQueue.length) {\n return;\n }\n\n const workerThread = this._getAvailableWorker();\n if (!workerThread) {\n return;\n }\n\n // We have a worker, dequeue and start the job\n const queuedJob = this.jobQueue.shift();\n if (queuedJob) {\n // Emit a debug event\n // @ts-ignore\n this.onDebug({\n message: 'Starting job',\n name: queuedJob.name,\n workerThread,\n backlog: this.jobQueue.length\n });\n\n // Create a worker job to let the app access thread and manage job completion\n const job = new WorkerJob(queuedJob.name, workerThread);\n\n // Set the worker thread's message handlers\n workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);\n workerThread.onError = (error) => queuedJob.onError(job, error);\n\n // Resolve the start promise so that the app can start sending messages to worker\n queuedJob.onStart(job);\n\n // Wait for the app to signal that the job is complete, then return worker to queue\n try {\n await job.result;\n } finally {\n this.returnWorkerToQueue(workerThread);\n }\n }\n }\n\n /**\n * Returns a worker to the idle queue\n * Destroys the worker if\n * - pool is destroyed\n * - if this pool doesn't reuse workers\n * - if maxConcurrency has been lowered\n * @param worker\n */\n returnWorkerToQueue(worker: WorkerThread) {\n const shouldDestroyWorker =\n this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();\n\n if (shouldDestroyWorker) {\n worker.destroy();\n this.count--;\n } else {\n this.idleQueue.push(worker);\n }\n\n if (!this.isDestroyed) {\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n /**\n * Returns idle worker or creates new worker if maxConcurrency has not been reached\n */\n _getAvailableWorker(): WorkerThread | null {\n // If a worker has completed and returned to the queue, it can be used\n if (this.idleQueue.length > 0) {\n return this.idleQueue.shift() || null;\n }\n\n // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source\n if (this.count < this._getMaxConcurrency()) {\n this.count++;\n const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;\n return new WorkerThread({name, source: this.source, url: this.url});\n }\n\n // No worker available, have to wait\n return null;\n }\n\n _getMaxConcurrency() {\n return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;\n }\n}\n"],"file":"worker-pool.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-farm/worker-pool.ts"],"names":["WorkerPool","props","source","url","setProps","idleQueue","forEach","worker","destroy","isDestroyed","name","undefined","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","onMessage","job","type","data","done","onError","error","startPromise","Promise","onStart","jobQueue","push","_startQueuedJob","length","workerThread","_getAvailableWorker","queuedJob","shift","message","backlog","WorkerJob","payload","result","returnWorkerToQueue","shouldDestroyWorker","count","_getMaxConcurrency","toLowerCase","WorkerThread","isMobile","isSupported"],"mappings":"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","sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {isMobile} from '../env-utils/globals';\nimport WorkerThread from './worker-thread';\nimport WorkerJob from './worker-job';\n\n/** WorkerPool onDebug Callback Parameters */\ntype OnDebugParameters = {\n message: string;\n worker: string;\n name: string;\n job: string;\n backlog: number;\n workerThread: WorkerThread;\n};\n\n/** WorkerPool Properties */\nexport type WorkerPoolProps = {\n name?: string;\n source?: string; // | Function;\n url?: string;\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n onDebug?: (options: OnDebugParameters) => any;\n reuseWorkers?: boolean;\n};\n\n/** Private helper types */\ntype OnMessage = (job: WorkerJob, type: WorkerMessageType, payload: WorkerMessagePayload) => void;\ntype OnError = (job: WorkerJob, error: Error) => void;\n\ntype QueuedJob = {\n name: string;\n onMessage: OnMessage;\n onError: OnError;\n onStart: (value: any) => void; // Resolve job start promise\n};\n\n/**\n * Process multiple data messages with small pool of identical workers\n */\nexport default class WorkerPool {\n name: string = 'unnamed';\n source?: string; // | Function;\n url?: string;\n maxConcurrency: number = 1;\n maxMobileConcurrency: number = 1;\n onDebug: (options: OnDebugParameters) => any = () => {};\n reuseWorkers: boolean = true;\n\n private props: WorkerPoolProps = {};\n private jobQueue: QueuedJob[] = [];\n private idleQueue: WorkerThread[] = [];\n private count = 0;\n private isDestroyed = false;\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /**\n * @param processor - worker function\n * @param maxConcurrency - max count of workers\n */\n constructor(props: WorkerPoolProps) {\n this.source = props.source;\n this.url = props.url;\n this.setProps(props);\n }\n\n /**\n * Terminates all workers in the pool\n * @note Can free up significant memory\n */\n destroy(): void {\n // Destroy idle workers, active Workers will be destroyed on completion\n this.idleQueue.forEach((worker) => worker.destroy());\n this.isDestroyed = true;\n }\n\n setProps(props: WorkerPoolProps) {\n this.props = {...this.props, ...props};\n\n if (props.name !== undefined) {\n this.name = props.name;\n }\n if (props.maxConcurrency !== undefined) {\n this.maxConcurrency = props.maxConcurrency;\n }\n if (props.maxMobileConcurrency !== undefined) {\n this.maxMobileConcurrency = props.maxMobileConcurrency;\n }\n if (props.reuseWorkers !== undefined) {\n this.reuseWorkers = props.reuseWorkers;\n }\n if (props.onDebug !== undefined) {\n this.onDebug = props.onDebug;\n }\n }\n\n async startJob(\n name: string,\n onMessage: OnMessage = (job, type, data) => job.done(data),\n onError: OnError = (job, error) => job.error(error)\n ): Promise<WorkerJob> {\n // Promise resolves when thread starts working on this job\n const startPromise = new Promise<WorkerJob>((onStart) => {\n // Promise resolves when thread completes or fails working on this job\n this.jobQueue.push({name, onMessage, onError, onStart});\n return this;\n });\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n return await startPromise;\n }\n\n // PRIVATE\n\n /**\n * Starts first queued job if worker is available or can be created\n * Called when job is started and whenever a worker returns to the idleQueue\n */\n async _startQueuedJob(): Promise<void> {\n if (!this.jobQueue.length) {\n return;\n }\n\n const workerThread = this._getAvailableWorker();\n if (!workerThread) {\n return;\n }\n\n // We have a worker, dequeue and start the job\n const queuedJob = this.jobQueue.shift();\n if (queuedJob) {\n // Emit a debug event\n // @ts-ignore\n this.onDebug({\n message: 'Starting job',\n name: queuedJob.name,\n workerThread,\n backlog: this.jobQueue.length\n });\n\n // Create a worker job to let the app access thread and manage job completion\n const job = new WorkerJob(queuedJob.name, workerThread);\n\n // Set the worker thread's message handlers\n workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);\n workerThread.onError = (error) => queuedJob.onError(job, error);\n\n // Resolve the start promise so that the app can start sending messages to worker\n queuedJob.onStart(job);\n\n // Wait for the app to signal that the job is complete, then return worker to queue\n try {\n await job.result;\n } finally {\n this.returnWorkerToQueue(workerThread);\n }\n }\n }\n\n /**\n * Returns a worker to the idle queue\n * Destroys the worker if\n * - pool is destroyed\n * - if this pool doesn't reuse workers\n * - if maxConcurrency has been lowered\n * @param worker\n */\n returnWorkerToQueue(worker: WorkerThread) {\n const shouldDestroyWorker =\n this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();\n\n if (shouldDestroyWorker) {\n worker.destroy();\n this.count--;\n } else {\n this.idleQueue.push(worker);\n }\n\n if (!this.isDestroyed) {\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n /**\n * Returns idle worker or creates new worker if maxConcurrency has not been reached\n */\n _getAvailableWorker(): WorkerThread | null {\n // If a worker has completed and returned to the queue, it can be used\n if (this.idleQueue.length > 0) {\n return this.idleQueue.shift() || null;\n }\n\n // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source\n if (this.count < this._getMaxConcurrency()) {\n this.count++;\n const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;\n return new WorkerThread({name, source: this.source, url: this.url});\n }\n\n // No worker available, have to wait\n return null;\n }\n\n _getMaxConcurrency() {\n return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;\n }\n}\n"],"file":"worker-pool.js"}
@@ -7,12 +7,18 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.default = void 0;
9
9
 
10
+ var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
11
+
10
12
  var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
13
 
12
14
  var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
13
15
 
14
16
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
17
 
18
+ var _worker_threads = require("worker_threads");
19
+
20
+ var _globals = require("../env-utils/globals");
21
+
16
22
  var _assert = require("../env-utils/assert");
17
23
 
18
24
  var _getLoadableWorkerUrl = require("../worker-utils/get-loadable-worker-url");
@@ -45,7 +51,7 @@ var WorkerThread = function () {
45
51
  return console.log(error);
46
52
  };
47
53
 
48
- this.worker = this._createBrowserWorker();
54
+ this.worker = _globals.isBrowser ? this._createBrowserWorker() : this._createNodeWorker();
49
55
  }
50
56
 
51
57
  (0, _createClass2.default)(WorkerThread, [{
@@ -114,12 +120,42 @@ var WorkerThread = function () {
114
120
  return console.error(event);
115
121
  };
116
122
 
123
+ return worker;
124
+ }
125
+ }, {
126
+ key: "_createNodeWorker",
127
+ value: function _createNodeWorker() {
128
+ var _this2 = this;
129
+
130
+ var worker;
131
+
132
+ if (this.url) {
133
+ var absolute = this.url.includes(':/') || this.url.startsWith('/');
134
+ var url = absolute ? this.url : "./".concat(this.url);
135
+ worker = new _worker_threads.Worker(url, {
136
+ eval: false
137
+ });
138
+ } else if (this.source) {
139
+ worker = new _worker_threads.Worker(this.source, {
140
+ eval: true
141
+ });
142
+ } else {
143
+ throw new Error('no worker');
144
+ }
145
+
146
+ worker.on('message', function (data) {
147
+ _this2.onMessage(data);
148
+ });
149
+ worker.on('error', function (error) {
150
+ _this2.onError(error);
151
+ });
152
+ worker.on('exit', function (code) {});
117
153
  return worker;
118
154
  }
119
155
  }], [{
120
156
  key: "isSupported",
121
157
  value: function isSupported() {
122
- return typeof Worker !== 'undefined';
158
+ return typeof Worker !== 'undefined' && _globals.isBrowser || (0, _typeof2.default)(_worker_threads.Worker) !== undefined;
123
159
  }
124
160
  }]);
125
161
  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","_createBrowserWorker","terminate","terminated","Boolean","data","transferList","postMessage","event","message","lineno","colno","Error","_loadableURL","Worker","onmessage","onerror","_getErrorFromErrorEvent","onmessageerror"],"mappings":"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","sourcesContent":["import {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;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n static isSupported(): boolean {\n return typeof Worker !== 'undefined';\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = this._createBrowserWorker();\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 // @ts-ignore\n this.worker.terminate();\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 {ErrorEvent} 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() {\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"],"file":"worker-thread.js"}
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","undefined"],"mappings":"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","sourcesContent":["import {Worker as NodeWorker} from 'worker_threads';\nimport {isBrowser} from '../env-utils/globals';\nimport {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker | NodeWorker;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return (typeof Worker !== 'undefined' && isBrowser) || typeof NodeWorker !== undefined;\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker(): Worker {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n\n /**\n * Creates a worker thread in node.js\n * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool\n */\n _createNodeWorker(): NodeWorker {\n let worker: NodeWorker;\n if (this.url) {\n // Make sure relative URLs start with './'\n const absolute = this.url.includes(':/') || this.url.startsWith('/');\n const url = absolute ? this.url : `./${this.url}`;\n // console.log('Starting work from', url);\n worker = new NodeWorker(url, {eval: false});\n } else if (this.source) {\n worker = new NodeWorker(this.source, {eval: true});\n } else {\n throw new Error('no worker');\n }\n worker.on('message', (data) => {\n // console.error('message', data);\n this.onMessage(data);\n });\n worker.on('error', (error) => {\n // console.error('error', error);\n this.onError(error);\n });\n worker.on('exit', (code) => {\n // console.error('exit', code);\n });\n return worker;\n }\n}\n"],"file":"worker-thread.js"}
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-utils/get-loadable-worker-url.ts"],"names":["workerURLCache","Map","getLoadableWorkerURL","props","source","url","workerURL","get","getLoadableWorkerURLFromURL","set","getLoadableWorkerURLFromSource","startsWith","workerSource","buildScriptSource","blob","Blob","type","URL","createObjectURL","workerUrl"],"mappings":";;;;;;;AAAA;;AAEA,IAAMA,cAAc,GAAG,IAAIC,GAAJ,EAAvB;;AAWO,SAASC,oBAAT,CAA8BC,KAA9B,EAAsE;AAC3E,sBAAQA,KAAK,CAACC,MAAN,IAAgB,CAACD,KAAK,CAACE,GAAxB,IAAiC,CAACF,KAAK,CAACC,MAAP,IAAiBD,KAAK,CAACE,GAA/D;AAEA,MAAIC,SAAS,GAAGN,cAAc,CAACO,GAAf,CAAmBJ,KAAK,CAACC,MAAN,IAAgBD,KAAK,CAACE,GAAzC,CAAhB;;AACA,MAAI,CAACC,SAAL,EAAgB;AAEd,QAAIH,KAAK,CAACE,GAAV,EAAe;AACbC,MAAAA,SAAS,GAAGE,2BAA2B,CAACL,KAAK,CAACE,GAAP,CAAvC;AACAL,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACE,GAAzB,EAA8BC,SAA9B;AACD;;AAED,QAAIH,KAAK,CAACC,MAAV,EAAkB;AAChBE,MAAAA,SAAS,GAAGI,8BAA8B,CAACP,KAAK,CAACC,MAAP,CAA1C;AACAJ,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACC,MAAzB,EAAiCE,SAAjC;AACD;AACF;;AAED,sBAAOA,SAAP;AACA,SAAOA,SAAP;AACD;;AAOD,SAASE,2BAAT,CAAqCH,GAArC,EAA0D;AAExD,MAAI,CAACA,GAAG,CAACM,UAAJ,CAAe,MAAf,CAAL,EAA6B;AAC3B,WAAON,GAAP;AACD;;AAGD,MAAMO,YAAY,GAAGC,iBAAiB,CAACR,GAAD,CAAtC;AACA,SAAOK,8BAA8B,CAACE,YAAD,CAArC;AACD;;AAOD,SAASF,8BAAT,CAAwCE,YAAxC,EAAsE;AAGpE,MAAME,IAAI,GAAG,IAAIC,IAAJ,CAAS,CAACH,YAAD,CAAT,EAAyB;AAACI,IAAAA,IAAI,EAAE;AAAP,GAAzB,CAAb;AACA,SAAOC,GAAG,CAACC,eAAJ,CAAoBJ,IAApB,CAAP;AACD;;AAUD,SAASD,iBAAT,CAA2BM,SAA3B,EAAsD;AACpD,2CAEiBA,SAFjB;AAOD","sourcesContent":["import {assert} from '../env-utils/assert';\n\nconst workerURLCache = new Map();\n\n/**\n * Creates a loadable URL from worker source or URL\n * that can be used to create `Worker` instances.\n * Due to CORS issues it may be necessary to wrap a URL in a small importScripts\n * @param props\n * @param props.source Worker source\n * @param props.url Worker URL\n * @returns loadable url\n */\nexport function getLoadableWorkerURL(props: {source?: string; url?: string}) {\n assert((props.source && !props.url) || (!props.source && props.url)); // Either source or url must be defined\n\n let workerURL = workerURLCache.get(props.source || props.url);\n if (!workerURL) {\n // Differentiate worker urls from worker source code\n if (props.url) {\n workerURL = getLoadableWorkerURLFromURL(props.url);\n workerURLCache.set(props.url, workerURL);\n }\n\n if (props.source) {\n workerURL = getLoadableWorkerURLFromSource(props.source);\n workerURLCache.set(props.source, workerURL);\n }\n }\n\n assert(workerURL);\n return workerURL;\n}\n\n/**\n * Build a loadable worker URL from worker URL\n * @param url\n * @returns loadable URL\n */\nfunction getLoadableWorkerURLFromURL(url: string): string {\n // A local script url, we can use it to initialize a Worker directly\n if (!url.startsWith('http')) {\n return url;\n }\n\n // A remote script, we need to use `importScripts` to load from different origin\n const workerSource = buildScriptSource(url);\n return getLoadableWorkerURLFromSource(workerSource);\n}\n\n/**\n * Build a loadable worker URL from worker source\n * @param workerSource\n * @returns loadable url\n */\nfunction getLoadableWorkerURLFromSource(workerSource: string): string {\n // NOTE: webworkify was previously used\n // const blob = webworkify(workerSource, {bare: true});\n const blob = new Blob([workerSource], {type: 'application/javascript'});\n return URL.createObjectURL(blob);\n}\n\n/**\n * Per spec, worker cannot be initialized with a script from a different origin\n * However a local worker script can still import scripts from other origins,\n * so we simply build a wrapper script.\n *\n * @param workerUrl\n * @returns source\n */\nfunction buildScriptSource(workerUrl: string): string {\n return `\\\ntry {\n importScripts('${workerUrl}');\n} catch (error) {\n console.error(error);\n throw error;\n}`;\n}\n"],"file":"get-loadable-worker-url.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-utils/get-loadable-worker-url.ts"],"names":["workerURLCache","Map","getLoadableWorkerURL","props","source","url","workerURL","get","getLoadableWorkerURLFromURL","set","getLoadableWorkerURLFromSource","startsWith","workerSource","buildScriptSource","blob","Blob","type","URL","createObjectURL","workerUrl"],"mappings":";;;;;;;AAAA;;AAEA,IAAMA,cAAc,GAAG,IAAIC,GAAJ,EAAvB;;AAWO,SAASC,oBAAT,CAA8BC,KAA9B,EAAsE;AAC3E,sBAAQA,KAAK,CAACC,MAAN,IAAgB,CAACD,KAAK,CAACE,GAAxB,IAAiC,CAACF,KAAK,CAACC,MAAP,IAAiBD,KAAK,CAACE,GAA/D;AAEA,MAAIC,SAAS,GAAGN,cAAc,CAACO,GAAf,CAAmBJ,KAAK,CAACC,MAAN,IAAgBD,KAAK,CAACE,GAAzC,CAAhB;;AACA,MAAI,CAACC,SAAL,EAAgB;AAEd,QAAIH,KAAK,CAACE,GAAV,EAAe;AACbC,MAAAA,SAAS,GAAGE,2BAA2B,CAACL,KAAK,CAACE,GAAP,CAAvC;AACAL,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACE,GAAzB,EAA8BC,SAA9B;AACD;;AAED,QAAIH,KAAK,CAACC,MAAV,EAAkB;AAChBE,MAAAA,SAAS,GAAGI,8BAA8B,CAACP,KAAK,CAACC,MAAP,CAA1C;AACAJ,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACC,MAAzB,EAAiCE,SAAjC;AACD;AACF;;AAED,sBAAOA,SAAP;AACA,SAAOA,SAAP;AACD;;AAOD,SAASE,2BAAT,CAAqCH,GAArC,EAA0D;AAExD,MAAI,CAACA,GAAG,CAACM,UAAJ,CAAe,MAAf,CAAL,EAA6B;AAC3B,WAAON,GAAP;AACD;;AAGD,MAAMO,YAAY,GAAGC,iBAAiB,CAACR,GAAD,CAAtC;AACA,SAAOK,8BAA8B,CAACE,YAAD,CAArC;AACD;;AAOD,SAASF,8BAAT,CAAwCE,YAAxC,EAAsE;AACpE,MAAME,IAAI,GAAG,IAAIC,IAAJ,CAAS,CAACH,YAAD,CAAT,EAAyB;AAACI,IAAAA,IAAI,EAAE;AAAP,GAAzB,CAAb;AACA,SAAOC,GAAG,CAACC,eAAJ,CAAoBJ,IAApB,CAAP;AACD;;AAUD,SAASD,iBAAT,CAA2BM,SAA3B,EAAsD;AACpD,2CAEiBA,SAFjB;AAOD","sourcesContent":["import {assert} from '../env-utils/assert';\n\nconst workerURLCache = new Map();\n\n/**\n * Creates a loadable URL from worker source or URL\n * that can be used to create `Worker` instances.\n * Due to CORS issues it may be necessary to wrap a URL in a small importScripts\n * @param props\n * @param props.source Worker source\n * @param props.url Worker URL\n * @returns loadable url\n */\nexport function getLoadableWorkerURL(props: {source?: string; url?: string}) {\n assert((props.source && !props.url) || (!props.source && props.url)); // Either source or url must be defined\n\n let workerURL = workerURLCache.get(props.source || props.url);\n if (!workerURL) {\n // Differentiate worker urls from worker source code\n if (props.url) {\n workerURL = getLoadableWorkerURLFromURL(props.url);\n workerURLCache.set(props.url, workerURL);\n }\n\n if (props.source) {\n workerURL = getLoadableWorkerURLFromSource(props.source);\n workerURLCache.set(props.source, workerURL);\n }\n }\n\n assert(workerURL);\n return workerURL;\n}\n\n/**\n * Build a loadable worker URL from worker URL\n * @param url\n * @returns loadable URL\n */\nfunction getLoadableWorkerURLFromURL(url: string): string {\n // A local script url, we can use it to initialize a Worker directly\n if (!url.startsWith('http')) {\n return url;\n }\n\n // A remote script, we need to use `importScripts` to load from different origin\n const workerSource = buildScriptSource(url);\n return getLoadableWorkerURLFromSource(workerSource);\n}\n\n/**\n * Build a loadable worker URL from worker source\n * @param workerSource\n * @returns loadable url\n */\nfunction getLoadableWorkerURLFromSource(workerSource: string): string {\n const blob = new Blob([workerSource], {type: 'application/javascript'});\n return URL.createObjectURL(blob);\n}\n\n/**\n * Per spec, worker cannot be initialized with a script from a different origin\n * However a local worker script can still import scripts from other origins,\n * so we simply build a wrapper script.\n *\n * @param workerUrl\n * @returns source\n */\nfunction buildScriptSource(workerUrl: string): string {\n return `\\\ntry {\n importScripts('${workerUrl}');\n} catch (error) {\n console.error(error);\n throw error;\n}`;\n}\n"],"file":"get-loadable-worker-url.js"}
@@ -1,7 +1,7 @@
1
- const DEFAULT_VERSION = 'latest';
2
- export const VERSION = typeof "3.1.7" !== 'undefined' ? "3.1.7" : DEFAULT_VERSION;
1
+ const DEFAULT_VERSION = 'beta';
2
+ export const VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : DEFAULT_VERSION;
3
3
 
4
- if (typeof "3.1.7" === 'undefined') {
4
+ if (typeof "3.2.0-alpha.2" === '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
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":"AAIA,MAAMA,eAAe,GAAG,QAAxB;AAEA,OAAO,MAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,eAAnE;;AACP,IAAI,mBAAuB,WAA3B,EAAwC;AAEtCE,EAAAA,OAAO,CAACC,KAAR,CACE,iIADF;AAGD","sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'latest';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"file":"version.js"}
1
+ {"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":"AAIA,MAAMA,eAAe,GAAG,MAAxB;AAEA,OAAO,MAAMC,OAAO,GAAG,2BAAuB,WAAvB,qBAAmDD,eAAnE;;AACP,IAAI,2BAAuB,WAA3B,EAAwC;AAEtCE,EAAAA,OAAO,CAACC,KAAR,CACE,iIADF;AAGD","sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'beta';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"file":"version.js"}
@@ -2,8 +2,8 @@ import { global, isBrowser, isWorker } from '../env-utils/globals';
2
2
  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
- const LATEST = 'latest';
6
- const VERSION = typeof "3.1.7" !== 'undefined' ? "3.1.7" : LATEST;
5
+ const LATEST = 'beta';
6
+ const VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : LATEST;
7
7
  const loadLibraryPromises = {};
8
8
  export async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
9
9
  if (moduleName) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","CDN","endsWith","response","fetch","arrayBuffer","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":"AACA,SAAQA,MAAR,EAAgBC,SAAhB,EAA2BC,QAA3B,QAA0C,sBAA1C;AACA,OAAO,KAAKC,IAAZ,MAAsB,4BAAtB;AACA,SAAQC,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAGA,MAAMC,MAAM,GAAG,QAAf;AACA,MAAMF,OAAO,GAAG,mBAAuB,WAAvB,aAAmDE,MAAnE;AAEA,MAAMC,mBAAiD,GAAG,EAA1D;AAiBA,OAAO,eAAeC,WAAf,CACLC,UADK,EAELC,UAAyB,GAAG,IAFvB,EAGLC,OAAe,GAAG,EAHb,EAIS;AACd,MAAID,UAAJ,EAAgB;AACdD,IAAAA,UAAU,GAAGG,aAAa,CAACH,UAAD,EAAaC,UAAb,EAAyBC,OAAzB,CAA1B;AACD;;AAIDJ,EAAAA,mBAAmB,CAACE,UAAD,CAAnB,GAEEF,mBAAmB,CAACE,UAAD,CAAnB,IAAmCI,mBAAmB,CAACJ,UAAD,CAFxD;AAGA,SAAO,MAAMF,mBAAmB,CAACE,UAAD,CAAhC;AACD;AAGD,OAAO,SAASG,aAAT,CAAuBE,OAAvB,EAAwCJ,UAAxC,EAA6DC,OAA7D,EAAoF;AAEzF,MAAIG,OAAO,CAACC,UAAR,CAAmB,MAAnB,CAAJ,EAAgC;AAC9B,WAAOD,OAAP;AACD;;AAGD,QAAME,OAAO,GAAGL,OAAO,CAACK,OAAR,IAAmB,EAAnC;;AACA,MAAIA,OAAO,CAACF,OAAD,CAAX,EAAsB;AACpB,WAAOE,OAAO,CAACF,OAAD,CAAd;AACD;;AAID,MAAI,CAACd,SAAL,EAAgB;AACd,6BAAkBU,UAAlB,wBAA0CI,OAA1C;AACD;;AAGD,MAAIH,OAAO,CAACM,GAAZ,EAAiB;AACfd,IAAAA,MAAM,CAACQ,OAAO,CAACM,GAAR,CAAYF,UAAZ,CAAuB,MAAvB,CAAD,CAAN;AACA,qBAAUJ,OAAO,CAACM,GAAlB,cAAyBP,UAAzB,cAAuCN,OAAvC,wBAA4DU,OAA5D;AACD;;AAGD,MAAIb,QAAJ,EAAc;AACZ,iCAAsBa,OAAtB;AACD;;AAED,2BAAkBJ,UAAlB,uBAAyCI,OAAzC;AACD;;AAED,eAAeD,mBAAf,CAAmCJ,UAAnC,EAAqE;AACnE,MAAIA,UAAU,CAACS,QAAX,CAAoB,MAApB,CAAJ,EAAiC;AAC/B,UAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACX,UAAD,CAA5B;AACA,WAAO,MAAMU,QAAQ,CAACE,WAAT,EAAb;AACD;;AAED,MAAI,CAACrB,SAAL,EAAgB;AACd,QAAI;AACF,aAAOE,IAAI,IAAIA,IAAI,CAACoB,eAAb,KAAiC,MAAMpB,IAAI,CAACoB,eAAL,CAAqBb,UAArB,CAAvC,CAAP;AACD,KAFD,CAEE,MAAM;AACN,aAAO,IAAP;AACD;AACF;;AACD,MAAIR,QAAJ,EAAc;AACZ,WAAOsB,aAAa,CAACd,UAAD,CAApB;AACD;;AAMD,QAAMU,QAAQ,GAAG,MAAMC,KAAK,CAACX,UAAD,CAA5B;AACA,QAAMe,YAAY,GAAG,MAAML,QAAQ,CAACM,IAAT,EAA3B;AACA,SAAOC,qBAAqB,CAACF,YAAD,EAAef,UAAf,CAA5B;AACD;;AAoBD,SAASiB,qBAAT,CAA+BF,YAA/B,EAAqDG,EAArD,EAA6E;AAC3E,MAAI,CAAC3B,SAAL,EAAgB;AACd,WAAOE,IAAI,CAAC0B,iBAAL,IAA0B1B,IAAI,CAAC0B,iBAAL,CAAuBJ,YAAvB,EAAqCG,EAArC,CAAjC;AACD;;AAED,MAAI1B,QAAJ,EAAc;AAEZ4B,IAAAA,IAAI,CAACC,IAAL,CAAU/B,MAAV,EAAkByB,YAAlB;AAGA,WAAO,IAAP;AACD;;AAED,QAAMO,MAAM,GAAGC,QAAQ,CAACC,aAAT,CAAuB,QAAvB,CAAf;AACAF,EAAAA,MAAM,CAACJ,EAAP,GAAYA,EAAZ;;AAEA,MAAI;AACFI,IAAAA,MAAM,CAACG,WAAP,CAAmBF,QAAQ,CAACG,cAAT,CAAwBX,YAAxB,CAAnB;AACD,GAFD,CAEE,OAAOY,CAAP,EAAU;AACVL,IAAAA,MAAM,CAACN,IAAP,GAAcD,YAAd;AACD;;AACDQ,EAAAA,QAAQ,CAACK,IAAT,CAAcH,WAAd,CAA0BH,MAA1B;AACA,SAAO,IAAP;AACD","sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\n// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\nconst LATEST = 'latest';\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {}\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);\n }\n\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(library: string, moduleName?: string, options?: any): string {\n // Check if already a URL\n if (library.startsWith('http')) {\n return library;\n }\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[library]) {\n return modules[library];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${library}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${library}`;\n }\n\n return `modules/${moduleName}/src/libs/${library}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const response = await fetch(libraryUrl);\n const scriptSource = await response.text();\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(global, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n"],"file":"library-utils.js"}
1
+ {"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","CDN","endsWith","response","fetch","arrayBuffer","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":"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","sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\n// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\nconst LATEST = 'beta';\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {}\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);\n }\n\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(library: string, moduleName?: string, options?: any): string {\n // Check if already a URL\n if (library.startsWith('http')) {\n return library;\n }\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[library]) {\n return modules[library];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${library}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${library}`;\n }\n\n return `modules/${moduleName}/src/libs/${library}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const response = await fetch(libraryUrl);\n const scriptSource = await response.text();\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(global, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n"],"file":"library-utils.js"}
@@ -0,0 +1,10 @@
1
+ export class Worker {
2
+ on(message, cb) {}
3
+
4
+ postMessage(...args) {}
5
+
6
+ terminate() {}
7
+
8
+ }
9
+ export const parentPort = null;
10
+ //# sourceMappingURL=worker_threads-browser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../../src/lib/node/worker_threads-browser.js"],"names":["Worker","on","message","cb","postMessage","args","terminate","parentPort"],"mappings":"AAIA,OAAO,MAAMA,MAAN,CAAa;AAClBC,EAAAA,EAAE,CAACC,OAAD,EAAUC,EAAV,EAAc,CAAE;;AAClBC,EAAAA,WAAW,CAAC,GAAGC,IAAJ,EAAU,CAAE;;AACvBC,EAAAA,SAAS,GAAG,CAAE;;AAHI;AAMpB,OAAO,MAAMC,UAAU,GAAG,IAAnB","sourcesContent":["// Browser fills for Node.js built-in `worker_threads` module.\n// These fills are non-functional, and just intended to ensure that\n// `import 'worker_threads` doesn't break browser builds.\n// The replacement is done in package.json browser field\nexport class Worker {\n on(message, cb) {}\n postMessage(...args) {}\n terminate() {}\n}\n\nexport const parentPort = null;\n"],"file":"worker_threads-browser.js"}
@@ -4,7 +4,7 @@ let requestId = 0;
4
4
  let inputBatches;
5
5
  let options;
6
6
  export function createWorker(process, processInBatches) {
7
- if (typeof self === 'undefined') {
7
+ if (!WorkerBody.inWorkerThread()) {
8
8
  return;
9
9
  }
10
10
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/create-worker.ts"],"names":["AsyncQueue","WorkerBody","requestId","inputBatches","options","createWorker","process","processInBatches","self","context","processOnMainThread","onmessage","type","payload","Error","result","input","postMessage","resultIterator","batch","push","close","error","message","arrayBuffer","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"mappings":"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","sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n // Check that we are actually in a worker thread\n if (typeof self === 'undefined') {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n"],"file":"create-worker.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-api/create-worker.ts"],"names":["AsyncQueue","WorkerBody","requestId","inputBatches","options","createWorker","process","processInBatches","inWorkerThread","context","processOnMainThread","onmessage","type","payload","Error","result","input","postMessage","resultIterator","batch","push","close","error","message","arrayBuffer","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"mappings":"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","sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, 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"],"file":"create-worker.js"}
@@ -1,7 +1,7 @@
1
1
  import { assert } from '../env-utils/assert';
2
2
  import { VERSION as __VERSION__ } from '../env-utils/version';
3
- const NPM_TAG = 'latest';
4
- const VERSION = typeof "3.1.7" !== 'undefined' ? "3.1.7" : NPM_TAG;
3
+ const NPM_TAG = 'beta';
4
+ const VERSION = typeof "3.2.0-alpha.2" !== 'undefined' ? "3.2.0-alpha.2" : 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 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAEA,MAAMC,OAAO,GAAG,QAAhB;AACA,MAAMF,OAAO,GAAG,mBAAuB,WAAvB,aAAmDE,OAAnE;AAKA,OAAO,SAASC,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,QAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBN,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUI,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;AASD,OAAO,SAASG,YAAT,CAAsBJ,MAAtB,EAA4CK,OAAsB,GAAG,EAArE,EAAiF;AACtF,QAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,QAAMC,UAAU,aAAMR,MAAM,CAACO,EAAb,eAAhB;AAEA,MAAIE,GAAG,GAAGH,aAAa,CAACI,SAAxB;;AAQA,MAAI,CAACD,GAAD,IAAQT,MAAM,CAACO,EAAP,KAAc,aAA1B,EAAyC;AACvCE,IAAAA,GAAG,GAAGJ,OAAO,CAACK,SAAd;AACD;;AAID,MAAIL,OAAO,CAACM,WAAR,KAAwB,MAA5B,EAAoC;AAClCF,IAAAA,GAAG,qBAAcT,MAAM,CAACY,MAArB,mBAAoCJ,UAApC,CAAH;AACD;;AAGD,MAAI,CAACC,GAAL,EAAU;AAER,QAAIP,OAAO,GAAGF,MAAM,CAACE,OAArB;;AAEA,QAAIA,OAAO,KAAK,QAAhB,EAA0B;AAExBA,MAAAA,OAAO,GAAGJ,OAAV;AACD;;AACD,UAAMe,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAEDb,EAAAA,MAAM,CAACc,GAAD,CAAN;AAGA,SAAOA,GAAP;AACD","sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'latest'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"file":"get-worker-url.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAEA,MAAMC,OAAO,GAAG,MAAhB;AACA,MAAMF,OAAO,GAAG,2BAAuB,WAAvB,qBAAmDE,OAAnE;AAKA,OAAO,SAASC,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,QAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBN,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUI,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;AASD,OAAO,SAASG,YAAT,CAAsBJ,MAAtB,EAA4CK,OAAsB,GAAG,EAArE,EAAiF;AACtF,QAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,QAAMC,UAAU,aAAMR,MAAM,CAACO,EAAb,eAAhB;AAEA,MAAIE,GAAG,GAAGH,aAAa,CAACI,SAAxB;;AAQA,MAAI,CAACD,GAAD,IAAQT,MAAM,CAACO,EAAP,KAAc,aAA1B,EAAyC;AACvCE,IAAAA,GAAG,GAAGJ,OAAO,CAACK,SAAd;AACD;;AAID,MAAIL,OAAO,CAACM,WAAR,KAAwB,MAA5B,EAAoC;AAClCF,IAAAA,GAAG,qBAAcT,MAAM,CAACY,MAArB,mBAAoCJ,UAApC,CAAH;AACD;;AAGD,MAAI,CAACC,GAAL,EAAU;AAER,QAAIP,OAAO,GAAGF,MAAM,CAACE,OAArB;;AAEA,QAAIA,OAAO,KAAK,QAAhB,EAA0B;AAExBA,MAAAA,OAAO,GAAGJ,OAAV;AACD;;AACD,UAAMe,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAEDb,EAAAA,MAAM,CAACc,GAAD,CAAN;AAGA,SAAOA,GAAP;AACD","sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"file":"get-worker-url.js"}
@@ -10,12 +10,20 @@ export function canProcessOnWorker(worker, options) {
10
10
  }
11
11
  export async function processOnWorker(worker, data, options = {}, context = {}) {
12
12
  const name = getWorkerName(worker);
13
- const url = getWorkerURL(worker, options);
14
13
  const workerFarm = WorkerFarm.getWorkerFarm(options);
15
- const workerPool = workerFarm.getWorkerPool({
14
+ const {
15
+ source
16
+ } = options;
17
+ const workerPoolProps = {
16
18
  name,
17
- url
18
- });
19
+ source
20
+ };
21
+
22
+ if (!source) {
23
+ workerPoolProps.url = getWorkerURL(worker, options);
24
+ }
25
+
26
+ const workerPool = workerFarm.getWorkerPool(workerPoolProps);
19
27
  const jobName = options.jobName || worker.name;
20
28
  const job = await workerPool.startJob(jobName, onMessage.bind(null, context));
21
29
  const transferableOptions = removeNontransferableOptions(options);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["WorkerFarm","removeNontransferableOptions","getWorkerURL","getWorkerName","canProcessOnWorker","worker","options","isSupported","processOnWorker","data","context","name","url","workerFarm","getWorkerFarm","workerPool","getWorkerPool","jobName","job","startJob","onMessage","bind","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"mappings":"AAQA,OAAOA,UAAP,MAAuB,4BAAvB;AACA,SAAQC,4BAAR,QAA2C,gDAA3C;AACA,SAAQC,YAAR,EAAsBC,aAAtB,QAA0C,kBAA1C;AAaA,OAAO,SAASC,kBAAT,CAA4BC,MAA5B,EAAkDC,OAAlD,EAA2E;AAChF,MAAI,CAACN,UAAU,CAACO,WAAX,EAAL,EAA+B;AAC7B,WAAO,KAAP;AACD;;AAED,SAAOF,MAAM,CAACA,MAAP,KAAiBC,OAAjB,aAAiBA,OAAjB,uBAAiBA,OAAO,CAAED,MAA1B,CAAP;AACD;AAOD,OAAO,eAAeG,eAAf,CACLH,MADK,EAELI,IAFK,EAGLH,OAA+B,GAAG,EAH7B,EAILI,OAAsB,GAAG,EAJpB,EAKS;AACd,QAAMC,IAAI,GAAGR,aAAa,CAACE,MAAD,CAA1B;AACA,QAAMO,GAAG,GAAGV,YAAY,CAACG,MAAD,EAASC,OAAT,CAAxB;AAEA,QAAMO,UAAU,GAAGb,UAAU,CAACc,aAAX,CAAyBR,OAAzB,CAAnB;AACA,QAAMS,UAAU,GAAGF,UAAU,CAACG,aAAX,CAAyB;AAACL,IAAAA,IAAD;AAAOC,IAAAA;AAAP,GAAzB,CAAnB;AAEA,QAAMK,OAAO,GAAGX,OAAO,CAACW,OAAR,IAAmBZ,MAAM,CAACM,IAA1C;AACA,QAAMO,GAAG,GAAG,MAAMH,UAAU,CAACI,QAAX,CAChBF,OADgB,EAGhBG,SAAS,CAACC,IAAV,CAAe,IAAf,EAAqBX,OAArB,CAHgB,CAAlB;AAOA,QAAMY,mBAAmB,GAAGrB,4BAA4B,CAACK,OAAD,CAAxD;AACAY,EAAAA,GAAG,CAACK,WAAJ,CAAgB,SAAhB,EAA2B;AAACC,IAAAA,KAAK,EAAEf,IAAR;AAAcH,IAAAA,OAAO,EAAEgB;AAAvB,GAA3B;AAEA,QAAMG,MAAM,GAAG,MAAMP,GAAG,CAACO,MAAzB;AACA,SAAOA,MAAM,CAACA,MAAd;AACD;;AAOD,eAAeL,SAAf,CACEV,OADF,EAEEQ,GAFF,EAGEQ,IAHF,EAIEC,OAJF,EAKE;AACA,UAAQD,IAAR;AACE,SAAK,MAAL;AAEER,MAAAA,GAAG,CAACU,IAAJ,CAASD,OAAT;AACA;;AAEF,SAAK,OAAL;AAEET,MAAAA,GAAG,CAACW,KAAJ,CAAU,IAAIC,KAAJ,CAAUH,OAAO,CAACE,KAAlB,CAAV;AACA;;AAEF,SAAK,SAAL;AAEE,YAAM;AAACE,QAAAA,EAAD;AAAKP,QAAAA,KAAL;AAAYlB,QAAAA;AAAZ,UAAuBqB,OAA7B;;AACA,UAAI;AACF,YAAI,CAACjB,OAAO,CAACsB,OAAb,EAAsB;AACpBd,UAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACQ,YAAAA,EAAD;AAAKF,YAAAA,KAAK,EAAE;AAAZ,WAAzB;AACA;AACD;;AACD,cAAMJ,MAAM,GAAG,MAAMf,OAAO,CAACsB,OAAR,CAAgBR,KAAhB,EAAuBlB,OAAvB,CAArB;AACAY,QAAAA,GAAG,CAACK,WAAJ,CAAgB,MAAhB,EAAwB;AAACQ,UAAAA,EAAD;AAAKN,UAAAA;AAAL,SAAxB;AACD,OAPD,CAOE,OAAOI,KAAP,EAAc;AACd,cAAMI,OAAO,GAAGJ,KAAK,YAAYC,KAAjB,GAAyBD,KAAK,CAACI,OAA/B,GAAyC,eAAzD;AACAf,QAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACQ,UAAAA,EAAD;AAAKF,UAAAA,KAAK,EAAEI;AAAZ,SAAzB;AACD;;AACD;;AAEF;AAEEC,MAAAA,OAAO,CAACC,IAAR,8CAAmDT,IAAnD;AA7BJ;AA+BD","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 {removeNontransferableOptions} from '../worker-utils/remove-nontransferable-options';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\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 const url = getWorkerURL(worker, options);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const workerPool = workerFarm.getWorkerPool({name, url});\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 = removeNontransferableOptions(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"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["WorkerFarm","removeNontransferableOptions","getWorkerURL","getWorkerName","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 {removeNontransferableOptions} from '../worker-utils/remove-nontransferable-options';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\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 = removeNontransferableOptions(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"}
@@ -1,18 +1,40 @@
1
1
  import { getTransferList } from '../worker-utils/get-transfer-list';
2
+
3
+ function getParentPort() {
4
+ let parentPort;
5
+
6
+ try {
7
+ eval('globalThis.parentPort = require(\'worker_threads\').parentPort');
8
+ parentPort = globalThis.parentPort;
9
+ } catch {}
10
+
11
+ return parentPort;
12
+ }
13
+
2
14
  const onMessageWrapperMap = new Map();
3
15
  export default class WorkerBody {
4
- static set onmessage(onMessage) {
5
- self.onmessage = message => {
6
- if (!isKnownMessage(message)) {
7
- return;
8
- }
16
+ static inWorkerThread() {
17
+ return typeof self !== 'undefined' || Boolean(getParentPort());
18
+ }
9
19
 
20
+ static set onmessage(onMessage) {
21
+ function handleMessage(message) {
22
+ const parentPort = getParentPort();
10
23
  const {
11
24
  type,
12
25
  payload
13
- } = message.data;
26
+ } = parentPort ? message : message.data;
14
27
  onMessage(type, payload);
15
- };
28
+ }
29
+
30
+ const parentPort = getParentPort();
31
+
32
+ if (parentPort) {
33
+ parentPort.on('message', handleMessage);
34
+ parentPort.on('exit', () => console.debug('Node worker closing'));
35
+ } else {
36
+ globalThis.onmessage = handleMessage;
37
+ }
16
38
  }
17
39
 
18
40
  static addEventListener(onMessage) {
@@ -24,32 +46,49 @@ export default class WorkerBody {
24
46
  return;
25
47
  }
26
48
 
49
+ const parentPort = getParentPort();
27
50
  const {
28
51
  type,
29
52
  payload
30
- } = message.data;
53
+ } = parentPort ? message : message.data;
31
54
  onMessage(type, payload);
32
55
  };
33
56
  }
34
57
 
35
- self.addEventListener('message', onMessageWrapper);
58
+ const parentPort = getParentPort();
59
+
60
+ if (parentPort) {
61
+ console.error('not implemented');
62
+ } else {
63
+ globalThis.addEventListener('message', onMessageWrapper);
64
+ }
36
65
  }
37
66
 
38
67
  static removeEventListener(onMessage) {
39
68
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
40
69
  onMessageWrapperMap.delete(onMessage);
41
- self.removeEventListener('message', onMessageWrapper);
70
+ const parentPort = getParentPort();
71
+
72
+ if (parentPort) {
73
+ console.error('not implemented');
74
+ } else {
75
+ globalThis.removeEventListener('message', onMessageWrapper);
76
+ }
42
77
  }
43
78
 
44
79
  static postMessage(type, payload) {
45
- if (self) {
46
- const data = {
47
- source: 'loaders.gl',
48
- type,
49
- payload
50
- };
51
- const transferList = getTransferList(payload);
52
- self.postMessage(data, transferList);
80
+ const data = {
81
+ source: 'loaders.gl',
82
+ type,
83
+ payload
84
+ };
85
+ const transferList = getTransferList(payload);
86
+ const parentPort = getParentPort();
87
+
88
+ if (parentPort) {
89
+ parentPort.postMessage(data, transferList);
90
+ } else {
91
+ globalThis.postMessage(data, transferList);
53
92
  }
54
93
  }
55
94
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"names":["getTransferList","onMessageWrapperMap","Map","WorkerBody","onmessage","onMessage","self","message","isKnownMessage","type","payload","data","addEventListener","onMessageWrapper","get","removeEventListener","delete","postMessage","source","transferList","startsWith"],"mappings":"AACA,SAAQA,eAAR,QAA8B,mCAA9B;AAEA,MAAMC,mBAAmB,GAAG,IAAIC,GAAJ,EAA5B;AAKA,eAAe,MAAMC,UAAN,CAAiB;AAIV,aAATC,SAAS,CAACC,SAAD,EAA6E;AAE/FC,IAAAA,IAAI,CAACF,SAAL,GAAkBG,OAAD,IAAa;AAC5B,UAAI,CAACC,cAAc,CAACD,OAAD,CAAnB,EAA8B;AAC5B;AACD;;AAGD,YAAM;AAACE,QAAAA,IAAD;AAAOC,QAAAA;AAAP,UAAkBH,OAAO,CAACI,IAAhC;AACAN,MAAAA,SAAS,CAACI,IAAD,EAAOC,OAAP,CAAT;AACD,KARD;AASD;;AAEsB,SAAhBE,gBAAgB,CACrBP,SADqB,EAErB;AACA,QAAIQ,gBAAgB,GAAGZ,mBAAmB,CAACa,GAApB,CAAwBT,SAAxB,CAAvB;;AAEA,QAAI,CAACQ,gBAAL,EAAuB;AACrBA,MAAAA,gBAAgB,GAAIN,OAAD,IAAgC;AACjD,YAAI,CAACC,cAAc,CAACD,OAAD,CAAnB,EAA8B;AAC5B;AACD;;AAGD,cAAM;AAACE,UAAAA,IAAD;AAAOC,UAAAA;AAAP,YAAkBH,OAAO,CAACI,IAAhC;AACAN,QAAAA,SAAS,CAACI,IAAD,EAAOC,OAAP,CAAT;AACD,OARD;AASD;;AAGDJ,IAAAA,IAAI,CAACM,gBAAL,CAAsB,SAAtB,EAAiCC,gBAAjC;AACD;;AAEyB,SAAnBE,mBAAmB,CACxBV,SADwB,EAExB;AACA,UAAMQ,gBAAgB,GAAGZ,mBAAmB,CAACa,GAApB,CAAwBT,SAAxB,CAAzB;AACAJ,IAAAA,mBAAmB,CAACe,MAApB,CAA2BX,SAA3B;AAEAC,IAAAA,IAAI,CAACS,mBAAL,CAAyB,SAAzB,EAAoCF,gBAApC;AACD;;AAOiB,SAAXI,WAAW,CAACR,IAAD,EAA0BC,OAA1B,EAA+D;AAC/E,QAAIJ,IAAJ,EAAU;AACR,YAAMK,IAAuB,GAAG;AAACO,QAAAA,MAAM,EAAE,YAAT;AAAuBT,QAAAA,IAAvB;AAA6BC,QAAAA;AAA7B,OAAhC;AACA,YAAMS,YAAY,GAAGnB,eAAe,CAACU,OAAD,CAApC;AAGAJ,MAAAA,IAAI,CAACW,WAAL,CAAiBN,IAAjB,EAAuBQ,YAAvB;AACD;AACF;;AA5D6B;;AAgEhC,SAASX,cAAT,CAAwBD,OAAxB,EAAoD;AAClD,QAAM;AAACE,IAAAA,IAAD;AAAOE,IAAAA;AAAP,MAAeJ,OAArB;AACA,SACEE,IAAI,KAAK,SAAT,IACAE,IADA,IAEA,OAAOA,IAAI,CAACO,MAAZ,KAAuB,QAFvB,IAGAP,IAAI,CAACO,MAAL,CAAYE,UAAZ,CAAuB,YAAvB,CAJF;AAMD","sourcesContent":["import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n // eslint-disable-next-line no-restricted-globals\n self.onmessage = (message) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n // eslint-disable-next-line no-restricted-globals\n self.addEventListener('message', onMessageWrapper);\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n // eslint-disable-next-line no-restricted-globals\n self.removeEventListener('message', onMessageWrapper);\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n if (self) {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n const transferList = getTransferList(payload);\n // eslint-disable-next-line no-restricted-globals\n // @ts-ignore\n self.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n"],"file":"worker-body.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"names":["getTransferList","getParentPort","parentPort","eval","globalThis","onMessageWrapperMap","Map","WorkerBody","inWorkerThread","self","Boolean","onmessage","onMessage","handleMessage","message","type","payload","data","on","console","debug","addEventListener","onMessageWrapper","get","isKnownMessage","error","removeEventListener","delete","postMessage","source","transferList","startsWith"],"mappings":"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","sourcesContent":["import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\n/** Vile hack to defeat over-zealous bundlers from stripping out the require */\nfunction getParentPort() {\n // const isNode = globalThis.process;\n let parentPort;\n try {\n // prettier-ignore\n eval('globalThis.parentPort = require(\\'worker_threads\\').parentPort'); // eslint-disable-line no-eval\n parentPort = globalThis.parentPort;\n // eslint-disable-next-line no-empty\n } catch {}\n return parentPort;\n}\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /** Check that we are actually in a worker thread */\n static inWorkerThread(): boolean {\n return typeof self !== 'undefined' || Boolean(getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n function handleMessage(message) {\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.on('message', handleMessage);\n // if (message == 'exit') { parentPort.unref(); }\n // eslint-disable-next-line\n parentPort.on('exit', () => console.debug('Node worker closing'));\n } else {\n // eslint-disable-next-line no-restricted-globals\n globalThis.onmessage = handleMessage;\n }\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.removeEventListener('message', onMessageWrapper);\n }\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n // console.log('posting message', data);\n const transferList = getTransferList(payload);\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.postMessage(data, transferList);\n // console.log('posted message', data);\n } else {\n // @ts-ignore\n globalThis.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n"],"file":"worker-body.js"}
@@ -4,8 +4,8 @@ import WorkerThread from './worker-thread';
4
4
  const DEFAULT_PROPS = {
5
5
  maxConcurrency: 3,
6
6
  maxMobileConcurrency: 1,
7
- onDebug: () => {},
8
- reuseWorkers: true
7
+ reuseWorkers: true,
8
+ onDebug: () => {}
9
9
  };
10
10
  export default class WorkerFarm {
11
11
  static isSupported() {
@@ -35,6 +35,8 @@ export default class WorkerFarm {
35
35
  for (const workerPool of this.workerPools.values()) {
36
36
  workerPool.destroy();
37
37
  }
38
+
39
+ this.workerPools = new Map();
38
40
  }
39
41
 
40
42
  setProps(props) {