@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,3 +1,5 @@
1
+ /// <reference types="node" />
2
+ import { Worker as NodeWorker } from 'worker_threads';
1
3
  export declare type WorkerThreadProps = {
2
4
  name: string;
3
5
  source?: string;
@@ -11,10 +13,11 @@ export default class WorkerThread {
11
13
  readonly source: string | undefined;
12
14
  readonly url: string | undefined;
13
15
  terminated: boolean;
14
- worker: Worker;
16
+ worker: Worker | NodeWorker;
15
17
  onMessage: (message: any) => void;
16
18
  onError: (error: Error) => void;
17
19
  private _loadableURL;
20
+ /** Checks if workers are supported on this platform */
18
21
  static isSupported(): boolean;
19
22
  constructor(props: WorkerThreadProps);
20
23
  /**
@@ -31,12 +34,17 @@ export default class WorkerThread {
31
34
  postMessage(data: any, transferList?: any[]): void;
32
35
  /**
33
36
  * Generate a standard Error from an ErrorEvent
34
- * @param {ErrorEvent} event
37
+ * @param event
35
38
  */
36
39
  _getErrorFromErrorEvent(event: ErrorEvent): Error;
37
40
  /**
38
41
  * Creates a worker thread on the browser
39
42
  */
40
43
  _createBrowserWorker(): Worker;
44
+ /**
45
+ * Creates a worker thread in node.js
46
+ * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
47
+ */
48
+ _createNodeWorker(): NodeWorker;
41
49
  }
42
50
  //# sourceMappingURL=worker-thread.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":"AAMA,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,MAAM,CAAC,WAAW,IAAI,OAAO;gBAIjB,KAAK,EAAE,iBAAiB;IAYpC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAQf,IAAI,SAAS,YAEZ;IAED;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAQlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK;IAiBjD;;OAEG;IACH,oBAAoB;CAqBrB"}
1
+ {"version":3,"file":"worker-thread.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,MAAM,IAAI,UAAU,EAAC,MAAM,gBAAgB,CAAC;AAQpD,oBAAY,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,GAAG,CAAC,EAAE,MAAM,CAAC;CACd,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,YAAY;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,SAAS,CAAC;IACjC,UAAU,EAAE,OAAO,CAAS;IAC5B,MAAM,EAAE,MAAM,GAAG,UAAU,CAAC;IAC5B,SAAS,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,IAAI,CAAC;IAClC,OAAO,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,IAAI,CAAC;IAEhC,OAAO,CAAC,YAAY,CAAc;IAElC,uDAAuD;IACvD,MAAM,CAAC,WAAW,IAAI,OAAO;gBAIjB,KAAK,EAAE,iBAAiB;IAYpC;;;OAGG;IACH,OAAO,IAAI,IAAI;IAOf,IAAI,SAAS,YAEZ;IAED;;;;OAIG;IACH,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,GAAG,EAAE,GAAG,IAAI;IAQlD;;;OAGG;IACH,uBAAuB,CAAC,KAAK,EAAE,UAAU,GAAG,KAAK;IAiBjD;;OAEG;IACH,oBAAoB,IAAI,MAAM;IAsB9B;;;OAGG;IACH,iBAAiB,IAAI,UAAU;CA0BhC"}
@@ -1,5 +1,7 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
+ const worker_threads_1 = require("worker_threads");
4
+ const globals_1 = require("../env-utils/globals");
3
5
  const assert_1 = require("../env-utils/assert");
4
6
  const get_loadable_worker_url_1 = require("../worker-utils/get-loadable-worker-url");
5
7
  const get_transfer_list_1 = require("../worker-utils/get-transfer-list");
@@ -18,10 +20,11 @@ class WorkerThread {
18
20
  this.url = url;
19
21
  this.onMessage = NOOP;
20
22
  this.onError = (error) => console.log(error); // eslint-disable-line
21
- this.worker = this._createBrowserWorker();
23
+ this.worker = globals_1.isBrowser ? this._createBrowserWorker() : this._createNodeWorker();
22
24
  }
25
+ /** Checks if workers are supported on this platform */
23
26
  static isSupported() {
24
- return typeof Worker !== 'undefined';
27
+ return (typeof Worker !== 'undefined' && globals_1.isBrowser) || typeof worker_threads_1.Worker !== undefined;
25
28
  }
26
29
  /**
27
30
  * Terminate this worker thread
@@ -30,8 +33,7 @@ class WorkerThread {
30
33
  destroy() {
31
34
  this.onMessage = NOOP;
32
35
  this.onError = NOOP;
33
- // @ts-ignore
34
- this.worker.terminate();
36
+ this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises
35
37
  this.terminated = true;
36
38
  }
37
39
  get isRunning() {
@@ -50,7 +52,7 @@ class WorkerThread {
50
52
  // PRIVATE
51
53
  /**
52
54
  * Generate a standard Error from an ErrorEvent
53
- * @param {ErrorEvent} event
55
+ * @param event
54
56
  */
55
57
  _getErrorFromErrorEvent(event) {
56
58
  // Note Error object does not have the expected fields if loading failed completely
@@ -91,5 +93,37 @@ class WorkerThread {
91
93
  worker.onmessageerror = (event) => console.error(event); // eslint-disable-line
92
94
  return worker;
93
95
  }
96
+ /**
97
+ * Creates a worker thread in node.js
98
+ * @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
99
+ */
100
+ _createNodeWorker() {
101
+ let worker;
102
+ if (this.url) {
103
+ // Make sure relative URLs start with './'
104
+ const absolute = this.url.includes(':/') || this.url.startsWith('/');
105
+ const url = absolute ? this.url : `./${this.url}`;
106
+ // console.log('Starting work from', url);
107
+ worker = new worker_threads_1.Worker(url, { eval: false });
108
+ }
109
+ else if (this.source) {
110
+ worker = new worker_threads_1.Worker(this.source, { eval: true });
111
+ }
112
+ else {
113
+ throw new Error('no worker');
114
+ }
115
+ worker.on('message', (data) => {
116
+ // console.error('message', data);
117
+ this.onMessage(data);
118
+ });
119
+ worker.on('error', (error) => {
120
+ // console.error('error', error);
121
+ this.onError(error);
122
+ });
123
+ worker.on('exit', (code) => {
124
+ // console.error('exit', code);
125
+ });
126
+ return worker;
127
+ }
94
128
  }
95
129
  exports.default = WorkerThread;
@@ -50,8 +50,6 @@ function getLoadableWorkerURLFromURL(url) {
50
50
  * @returns loadable url
51
51
  */
52
52
  function getLoadableWorkerURLFromSource(workerSource) {
53
- // NOTE: webworkify was previously used
54
- // const blob = webworkify(workerSource, {bare: true});
55
53
  const blob = new Blob([workerSource], { type: 'application/javascript' });
56
54
  return URL.createObjectURL(blob);
57
55
  }
@@ -93,16 +93,33 @@
93
93
  }
94
94
 
95
95
  // src/lib/worker-farm/worker-body.ts
96
+ function getParentPort() {
97
+ let parentPort;
98
+ try {
99
+ eval("globalThis.parentPort = require('worker_threads').parentPort");
100
+ parentPort = globalThis.parentPort;
101
+ } catch {
102
+ }
103
+ return parentPort;
104
+ }
96
105
  var onMessageWrapperMap = new Map();
97
106
  var WorkerBody = class {
107
+ static inWorkerThread() {
108
+ return typeof self !== "undefined" || Boolean(getParentPort());
109
+ }
98
110
  static set onmessage(onMessage) {
99
- self.onmessage = (message) => {
100
- if (!isKnownMessage(message)) {
101
- return;
102
- }
103
- const { type, payload } = message.data;
111
+ function handleMessage(message) {
112
+ const parentPort3 = getParentPort();
113
+ const { type, payload } = parentPort3 ? message : message.data;
104
114
  onMessage(type, payload);
105
- };
115
+ }
116
+ const parentPort2 = getParentPort();
117
+ if (parentPort2) {
118
+ parentPort2.on("message", handleMessage);
119
+ parentPort2.on("exit", () => console.debug("Node worker closing"));
120
+ } else {
121
+ globalThis.onmessage = handleMessage;
122
+ }
106
123
  }
107
124
  static addEventListener(onMessage) {
108
125
  let onMessageWrapper = onMessageWrapperMap.get(onMessage);
@@ -111,22 +128,36 @@
111
128
  if (!isKnownMessage(message)) {
112
129
  return;
113
130
  }
114
- const { type, payload } = message.data;
131
+ const parentPort3 = getParentPort();
132
+ const { type, payload } = parentPort3 ? message : message.data;
115
133
  onMessage(type, payload);
116
134
  };
117
135
  }
118
- self.addEventListener("message", onMessageWrapper);
136
+ const parentPort2 = getParentPort();
137
+ if (parentPort2) {
138
+ console.error("not implemented");
139
+ } else {
140
+ globalThis.addEventListener("message", onMessageWrapper);
141
+ }
119
142
  }
120
143
  static removeEventListener(onMessage) {
121
144
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
122
145
  onMessageWrapperMap.delete(onMessage);
123
- self.removeEventListener("message", onMessageWrapper);
146
+ const parentPort2 = getParentPort();
147
+ if (parentPort2) {
148
+ console.error("not implemented");
149
+ } else {
150
+ globalThis.removeEventListener("message", onMessageWrapper);
151
+ }
124
152
  }
125
153
  static postMessage(type, payload) {
126
- if (self) {
127
- const data = { source: "loaders.gl", type, payload };
128
- const transferList = getTransferList(payload);
129
- self.postMessage(data, transferList);
154
+ const data = { source: "loaders.gl", type, payload };
155
+ const transferList = getTransferList(payload);
156
+ const parentPort2 = getParentPort();
157
+ if (parentPort2) {
158
+ parentPort2.postMessage(data, transferList);
159
+ } else {
160
+ globalThis.postMessage(data, transferList);
130
161
  }
131
162
  }
132
163
  };
@@ -140,7 +171,7 @@
140
171
  var inputBatches;
141
172
  var options;
142
173
  function createWorker(process, processInBatches) {
143
- if (typeof self === "undefined") {
174
+ if (!WorkerBody.inWorkerThread()) {
144
175
  return;
145
176
  }
146
177
  const context = {
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "version": 3,
3
3
  "sources": ["../src/lib/async-queue/async-queue.ts", "../src/lib/worker-utils/get-transfer-list.ts", "../src/lib/worker-farm/worker-body.ts", "../src/lib/worker-api/create-worker.ts", "../src/workers/null-worker.ts"],
4
- "sourcesContent": ["// From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license\n// http://2ality.com/2016/10/asynchronous-iteration.html\n\n/**\n * Async Queue\n * - AsyncIterable: An async iterator can be\n * - Values can be pushed onto the queue\n * @example\n * const asyncQueue = new AsyncQueue();\n * setTimeout(() => asyncQueue.enqueue('tick'), 1000);\n * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);\n * for await (const value of asyncQueue) {\n * console.log(value); // tick\n * }\n */\nexport default class AsyncQueue<T> {\n private _values: any[];\n private _settlers: any[];\n private _closed: boolean;\n\n constructor() {\n this._values = []; // enqueues > dequeues\n this._settlers = []; // dequeues > enqueues\n this._closed = false;\n }\n\n /** Return an async iterator for this queue */\n [Symbol.asyncIterator](): AsyncIterator<T> {\n return this;\n }\n\n /** Push a new value - the async iterator will yield a promise resolved to this value */\n push(value: T): void {\n return this.enqueue(value);\n }\n\n /**\n * Push a new value - the async iterator will yield a promise resolved to this value\n * Add an error - the async iterator will yield a promise rejected with this value\n */\n enqueue(value: T | Error): void {\n if (this._closed) {\n throw new Error('Closed');\n }\n\n if (this._settlers.length > 0) {\n if (this._values.length > 0) {\n throw new Error('Illegal internal state');\n }\n const settler = this._settlers.shift();\n if (value instanceof Error) {\n settler.reject(value);\n } else {\n settler.resolve({value});\n }\n } else {\n this._values.push(value);\n }\n }\n\n /** Indicate that we not waiting for more values - The async iterator will be done */\n close(): void {\n while (this._settlers.length > 0) {\n const settler = this._settlers.shift();\n settler.resolve({done: true});\n }\n this._closed = true;\n }\n\n // ITERATOR IMPLEMENTATION\n\n /** @returns a Promise for an IteratorResult */\n next(): Promise<IteratorResult<T, any>> {\n // If values in queue, yield the first value\n if (this._values.length > 0) {\n const value = this._values.shift();\n if (value instanceof Error) {\n return Promise.reject(value);\n }\n return Promise.resolve({done: false, value});\n }\n\n // If queue is closed, the iterator is done\n if (this._closed) {\n if (this._settlers.length > 0) {\n throw new Error('Illegal internal state');\n }\n return Promise.resolve({done: true, value: undefined});\n }\n\n // Yield a promise that waits for new values to be enqueued\n return new Promise((resolve, reject) => {\n this._settlers.push({resolve, reject});\n });\n }\n}\n", "// NOTE - there is a copy of this function is both in core and loader-utils\n// core does not need all the utils in loader-utils, just this one.\n\n/**\n * Returns an array of Transferrable objects that can be used with postMessage\n * https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage\n * @param object data to be sent via postMessage\n * @param recursive - not for application use\n * @param transfers - not for application use\n * @returns a transfer list that can be passed to postMessage\n */\nexport function getTransferList(\n object: any,\n recursive: boolean = true,\n transfers?: Set<any>\n): Transferable[] {\n // Make sure that items in the transfer list is unique\n const transfersSet = transfers || new Set();\n\n if (!object) {\n // ignore\n } else if (isTransferable(object)) {\n transfersSet.add(object);\n } else if (isTransferable(object.buffer)) {\n // Typed array\n transfersSet.add(object.buffer);\n } else if (ArrayBuffer.isView(object)) {\n // object is a TypeArray viewing into a SharedArrayBuffer (not transferable)\n // Do not iterate through the content in this case\n } else if (recursive && typeof object === 'object') {\n for (const key in object) {\n // Avoid perf hit - only go one level deep\n getTransferList(object[key], recursive, transfersSet);\n }\n }\n\n // If transfers is defined, is internal recursive call\n // Otherwise it's called by the user\n return transfers === undefined ? Array.from(transfersSet) : [];\n}\n\n// https://developer.mozilla.org/en-US/docs/Web/API/Transferable\nfunction isTransferable(object: unknown) {\n if (!object) {\n return false;\n }\n if (object instanceof ArrayBuffer) {\n return true;\n }\n if (typeof MessagePort !== 'undefined' && object instanceof MessagePort) {\n return true;\n }\n if (typeof ImageBitmap !== 'undefined' && object instanceof ImageBitmap) {\n return true;\n }\n // @ts-ignore\n if (typeof OffscreenCanvas !== 'undefined' && object instanceof OffscreenCanvas) {\n return true;\n }\n return false;\n}\n", "import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n // eslint-disable-next-line no-restricted-globals\n self.onmessage = (message) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n // eslint-disable-next-line no-restricted-globals\n self.addEventListener('message', onMessageWrapper);\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n // eslint-disable-next-line no-restricted-globals\n self.removeEventListener('message', onMessageWrapper);\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n if (self) {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n const transferList = getTransferList(payload);\n // eslint-disable-next-line no-restricted-globals\n // @ts-ignore\n self.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n", "import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n // Check that we are actually in a worker thread\n if (typeof self === 'undefined') {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n", "import {createWorker} from '../lib/worker-api/create-worker';\n\ncreateWorker(async (data) => {\n // @ts-ignore\n return data;\n});\n"],
5
- "mappings": "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",
4
+ "sourcesContent": ["// From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license\n// http://2ality.com/2016/10/asynchronous-iteration.html\n\n/**\n * Async Queue\n * - AsyncIterable: An async iterator can be\n * - Values can be pushed onto the queue\n * @example\n * const asyncQueue = new AsyncQueue();\n * setTimeout(() => asyncQueue.enqueue('tick'), 1000);\n * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);\n * for await (const value of asyncQueue) {\n * console.log(value); // tick\n * }\n */\nexport default class AsyncQueue<T> {\n private _values: any[];\n private _settlers: any[];\n private _closed: boolean;\n\n constructor() {\n this._values = []; // enqueues > dequeues\n this._settlers = []; // dequeues > enqueues\n this._closed = false;\n }\n\n /** Return an async iterator for this queue */\n [Symbol.asyncIterator](): AsyncIterator<T> {\n return this;\n }\n\n /** Push a new value - the async iterator will yield a promise resolved to this value */\n push(value: T): void {\n return this.enqueue(value);\n }\n\n /**\n * Push a new value - the async iterator will yield a promise resolved to this value\n * Add an error - the async iterator will yield a promise rejected with this value\n */\n enqueue(value: T | Error): void {\n if (this._closed) {\n throw new Error('Closed');\n }\n\n if (this._settlers.length > 0) {\n if (this._values.length > 0) {\n throw new Error('Illegal internal state');\n }\n const settler = this._settlers.shift();\n if (value instanceof Error) {\n settler.reject(value);\n } else {\n settler.resolve({value});\n }\n } else {\n this._values.push(value);\n }\n }\n\n /** Indicate that we not waiting for more values - The async iterator will be done */\n close(): void {\n while (this._settlers.length > 0) {\n const settler = this._settlers.shift();\n settler.resolve({done: true});\n }\n this._closed = true;\n }\n\n // ITERATOR IMPLEMENTATION\n\n /** @returns a Promise for an IteratorResult */\n next(): Promise<IteratorResult<T, any>> {\n // If values in queue, yield the first value\n if (this._values.length > 0) {\n const value = this._values.shift();\n if (value instanceof Error) {\n return Promise.reject(value);\n }\n return Promise.resolve({done: false, value});\n }\n\n // If queue is closed, the iterator is done\n if (this._closed) {\n if (this._settlers.length > 0) {\n throw new Error('Illegal internal state');\n }\n return Promise.resolve({done: true, value: undefined});\n }\n\n // Yield a promise that waits for new values to be enqueued\n return new Promise((resolve, reject) => {\n this._settlers.push({resolve, reject});\n });\n }\n}\n", "// NOTE - there is a copy of this function is both in core and loader-utils\n// core does not need all the utils in loader-utils, just this one.\n\n/**\n * Returns an array of Transferrable objects that can be used with postMessage\n * https://developer.mozilla.org/en-US/docs/Web/API/Worker/postMessage\n * @param object data to be sent via postMessage\n * @param recursive - not for application use\n * @param transfers - not for application use\n * @returns a transfer list that can be passed to postMessage\n */\nexport function getTransferList(\n object: any,\n recursive: boolean = true,\n transfers?: Set<any>\n): Transferable[] {\n // Make sure that items in the transfer list is unique\n const transfersSet = transfers || new Set();\n\n if (!object) {\n // ignore\n } else if (isTransferable(object)) {\n transfersSet.add(object);\n } else if (isTransferable(object.buffer)) {\n // Typed array\n transfersSet.add(object.buffer);\n } else if (ArrayBuffer.isView(object)) {\n // object is a TypeArray viewing into a SharedArrayBuffer (not transferable)\n // Do not iterate through the content in this case\n } else if (recursive && typeof object === 'object') {\n for (const key in object) {\n // Avoid perf hit - only go one level deep\n getTransferList(object[key], recursive, transfersSet);\n }\n }\n\n // If transfers is defined, is internal recursive call\n // Otherwise it's called by the user\n return transfers === undefined ? Array.from(transfersSet) : [];\n}\n\n// https://developer.mozilla.org/en-US/docs/Web/API/Transferable\nfunction isTransferable(object: unknown) {\n if (!object) {\n return false;\n }\n if (object instanceof ArrayBuffer) {\n return true;\n }\n if (typeof MessagePort !== 'undefined' && object instanceof MessagePort) {\n return true;\n }\n if (typeof ImageBitmap !== 'undefined' && object instanceof ImageBitmap) {\n return true;\n }\n // @ts-ignore\n if (typeof OffscreenCanvas !== 'undefined' && object instanceof OffscreenCanvas) {\n return true;\n }\n return false;\n}\n", "import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\n/** Vile hack to defeat over-zealous bundlers from stripping out the require */\nfunction getParentPort() {\n // const isNode = globalThis.process;\n let parentPort;\n try {\n // prettier-ignore\n eval('globalThis.parentPort = require(\\'worker_threads\\').parentPort'); // eslint-disable-line no-eval\n parentPort = globalThis.parentPort;\n // eslint-disable-next-line no-empty\n } catch {}\n return parentPort;\n}\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /** Check that we are actually in a worker thread */\n static inWorkerThread(): boolean {\n return typeof self !== 'undefined' || Boolean(getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n function handleMessage(message) {\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.on('message', handleMessage);\n // if (message == 'exit') { parentPort.unref(); }\n // eslint-disable-next-line\n parentPort.on('exit', () => console.debug('Node worker closing'));\n } else {\n // eslint-disable-next-line no-restricted-globals\n globalThis.onmessage = handleMessage;\n }\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.removeEventListener('message', onMessageWrapper);\n }\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n // console.log('posting message', data);\n const transferList = getTransferList(payload);\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.postMessage(data, transferList);\n // console.log('posted message', data);\n } else {\n // @ts-ignore\n globalThis.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n", "import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n", "import {createWorker} from '../lib/worker-api/create-worker';\n\ncreateWorker(async (data) => {\n // @ts-ignore\n return data;\n});\n"],
5
+ "mappings": "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",
6
6
  "names": []
7
7
  }
package/dist/types.d.ts CHANGED
@@ -30,7 +30,9 @@ export declare type WorkerObject = {
30
30
  module: string;
31
31
  version: string;
32
32
  worker?: string | boolean;
33
- options: object;
33
+ options: {
34
+ [key: string]: any;
35
+ };
34
36
  deprecatedOptions?: object;
35
37
  process?: Process;
36
38
  processInBatches?: ProcessInBatches;
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,aAAa,GAAG;IAE1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,oBAAY,OAAO,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,KAAK,GAAG,CAAC;AAElG,oBAAY,gBAAgB,GAAG,CAC7B,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,EAC5C,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAC9B,OAAO,CAAC,EAAE,aAAa,KACpB,aAAa,CAAC,GAAG,CAAC,CAAC;AAExB;;GAEG;AACH,oBAAY,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAmBF,oBAAY,iBAAiB,GACzB,SAAS,GACT,MAAM,GACN,OAAO,GACP,oBAAoB,GACpB,aAAa,GACb,YAAY,GACZ,cAAc,CAAC;AAEnB,oBAAY,oBAAoB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,aAAa,GAAG;IAE1B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAEF,oBAAY,OAAO,GAAG,CAAC,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAAE,OAAO,CAAC,EAAE,aAAa,KAAK,GAAG,CAAC;AAElG,oBAAY,gBAAgB,GAAG,CAC7B,QAAQ,EAAE,aAAa,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,EAC5C,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAC9B,OAAO,CAAC,EAAE,aAAa,KACpB,aAAa,CAAC,GAAG,CAAC,CAAC;AAExB;;GAEG;AACH,oBAAY,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;IAC1B,OAAO,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;CACrC,CAAC;AAmBF,oBAAY,iBAAiB,GACzB,SAAS,GACT,MAAM,GACN,OAAO,GACP,oBAAoB,GACpB,aAAa,GACb,YAAY,GACZ,cAAc,CAAC;AAEnB,oBAAY,oBAAoB,GAAG;IACjC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE;QAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAC,CAAC;IAC/B,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,MAAM,CAAC,EAAE,GAAG,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,oBAAY,iBAAiB,GAAG;IAC9B,MAAM,EAAE,YAAY,CAAC;IACrB,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;CAC/B,CAAC;AAEF,oBAAY,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,iBAAiB,CAAC;CACzB,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/worker-utils",
3
- "version": "3.1.7",
3
+ "version": "3.2.0-alpha.2",
4
4
  "description": "Utilities for running tasks on worker threads",
5
5
  "license": "MIT",
6
6
  "publishConfig": {
@@ -27,6 +27,7 @@
27
27
  "browser": {
28
28
  "child_process": false,
29
29
  "fs": false,
30
+ "worker_threads": "./src/lib/node/worker_threads-browser.js",
30
31
  "./src/lib/node/require-utils.node.ts": false,
31
32
  "./dist/lib/node/require-utils.node.js": false,
32
33
  "./dist/es5/lib/node/require-utils.node.js": false,
@@ -45,5 +46,5 @@
45
46
  "dependencies": {
46
47
  "@babel/runtime": "^7.3.1"
47
48
  },
48
- "gitHead": "e48d29e426e9f23879875763e73efc5c58345be1"
49
+ "gitHead": "52a602739cbfce60fc314f474efc984d199dff78"
49
50
  }
@@ -2,7 +2,7 @@
2
2
  // __VERSION__ is injected by babel-plugin-version-inline
3
3
 
4
4
  // Change to `latest` on production branches
5
- const DEFAULT_VERSION = 'latest';
5
+ const DEFAULT_VERSION = 'beta';
6
6
  declare let __VERSION__: string;
7
7
  export const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;
8
8
  if (typeof __VERSION__ === 'undefined') {
@@ -5,7 +5,7 @@ import {assert} from '../env-utils/assert';
5
5
  import {VERSION as __VERSION__} from '../env-utils/version';
6
6
 
7
7
  // TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
8
- const LATEST = 'latest';
8
+ const LATEST = 'beta';
9
9
  const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;
10
10
 
11
11
  const loadLibraryPromises: Record<string, Promise<any>> = {}; // promises
@@ -0,0 +1,11 @@
1
+ // Browser fills for Node.js built-in `worker_threads` module.
2
+ // These fills are non-functional, and just intended to ensure that
3
+ // `import 'worker_threads` doesn't break browser builds.
4
+ // The replacement is done in package.json browser field
5
+ export class Worker {
6
+ on(message, cb) {}
7
+ postMessage(...args) {}
8
+ terminate() {}
9
+ }
10
+
11
+ export const parentPort = null;
@@ -24,8 +24,7 @@ export type ProcessOnMainThread = (
24
24
  * Set up a WebWorkerGlobalScope to talk with the main thread
25
25
  */
26
26
  export function createWorker(process: Process, processInBatches?: ProcessInBatches): void {
27
- // Check that we are actually in a worker thread
28
- if (typeof self === 'undefined') {
27
+ if (!WorkerBody.inWorkerThread()) {
29
28
  return;
30
29
  }
31
30
 
@@ -2,7 +2,7 @@ import type {WorkerObject, WorkerOptions} from '../../types';
2
2
  import {assert} from '../env-utils/assert';
3
3
  import {VERSION as __VERSION__} from '../env-utils/version';
4
4
 
5
- const NPM_TAG = 'latest'; // Change to 'latest' on release-branch
5
+ const NPM_TAG = 'beta'; // Change to 'latest' on release-branch
6
6
  const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;
7
7
 
8
8
  /**
@@ -41,10 +41,14 @@ export async function processOnWorker(
41
41
  context: WorkerContext = {}
42
42
  ): Promise<any> {
43
43
  const name = getWorkerName(worker);
44
- const url = getWorkerURL(worker, options);
45
44
 
46
45
  const workerFarm = WorkerFarm.getWorkerFarm(options);
47
- const workerPool = workerFarm.getWorkerPool({name, url});
46
+ const {source} = options;
47
+ const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};
48
+ if (!source) {
49
+ workerPoolProps.url = getWorkerURL(worker, options);
50
+ }
51
+ const workerPool = workerFarm.getWorkerPool(workerPoolProps);
48
52
 
49
53
  const jobName = options.jobName || worker.name;
50
54
  const job = await workerPool.startJob(
@@ -1,26 +1,54 @@
1
1
  import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';
2
2
  import {getTransferList} from '../worker-utils/get-transfer-list';
3
3
 
4
+ /** Vile hack to defeat over-zealous bundlers from stripping out the require */
5
+ function getParentPort() {
6
+ // const isNode = globalThis.process;
7
+ let parentPort;
8
+ try {
9
+ // prettier-ignore
10
+ eval('globalThis.parentPort = require(\'worker_threads\').parentPort'); // eslint-disable-line no-eval
11
+ parentPort = globalThis.parentPort;
12
+ // eslint-disable-next-line no-empty
13
+ } catch {}
14
+ return parentPort;
15
+ }
16
+
4
17
  const onMessageWrapperMap = new Map();
5
18
 
6
19
  /**
7
20
  * Type safe wrapper for worker code
8
21
  */
9
22
  export default class WorkerBody {
23
+ /** Check that we are actually in a worker thread */
24
+ static inWorkerThread(): boolean {
25
+ return typeof self !== 'undefined' || Boolean(getParentPort());
26
+ }
27
+
10
28
  /*
11
29
  * (type: WorkerMessageType, payload: WorkerMessagePayload) => any
12
30
  */
13
31
  static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {
14
- // eslint-disable-next-line no-restricted-globals
15
- self.onmessage = (message) => {
16
- if (!isKnownMessage(message)) {
17
- return;
18
- }
19
-
32
+ function handleMessage(message) {
20
33
  // Confusingly the message itself also has a 'type' field which is always set to 'message'
21
- const {type, payload} = message.data;
34
+ const parentPort = getParentPort();
35
+ const {type, payload} = parentPort ? message : message.data;
36
+ // if (!isKnownMessage(message)) {
37
+ // return;
38
+ // }
22
39
  onMessage(type, payload);
23
- };
40
+ }
41
+
42
+ const parentPort = getParentPort();
43
+ if (parentPort) {
44
+ parentPort.on('message', handleMessage);
45
+ // if (message == 'exit') { parentPort.unref(); }
46
+ // eslint-disable-next-line
47
+ parentPort.on('exit', () => console.debug('Node worker closing'));
48
+ } else {
49
+ // eslint-disable-next-line no-restricted-globals
50
+ globalThis.onmessage = handleMessage;
51
+ }
24
52
  }
25
53
 
26
54
  static addEventListener(
@@ -34,14 +62,19 @@ export default class WorkerBody {
34
62
  return;
35
63
  }
36
64
 
37
- // Confusingly the message itself also has a 'type' field which is always set to 'message'
38
- const {type, payload} = message.data;
65
+ // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'
66
+ const parentPort = getParentPort();
67
+ const {type, payload} = parentPort ? message : message.data;
39
68
  onMessage(type, payload);
40
69
  };
41
70
  }
42
71
 
43
- // eslint-disable-next-line no-restricted-globals
44
- self.addEventListener('message', onMessageWrapper);
72
+ const parentPort = getParentPort();
73
+ if (parentPort) {
74
+ console.error('not implemented'); // eslint-disable-line
75
+ } else {
76
+ globalThis.addEventListener('message', onMessageWrapper);
77
+ }
45
78
  }
46
79
 
47
80
  static removeEventListener(
@@ -49,8 +82,12 @@ export default class WorkerBody {
49
82
  ) {
50
83
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
51
84
  onMessageWrapperMap.delete(onMessage);
52
- // eslint-disable-next-line no-restricted-globals
53
- self.removeEventListener('message', onMessageWrapper);
85
+ const parentPort = getParentPort();
86
+ if (parentPort) {
87
+ console.error('not implemented'); // eslint-disable-line
88
+ } else {
89
+ globalThis.removeEventListener('message', onMessageWrapper);
90
+ }
54
91
  }
55
92
 
56
93
  /**
@@ -59,12 +96,17 @@ export default class WorkerBody {
59
96
  * @param payload
60
97
  */
61
98
  static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {
62
- if (self) {
63
- const data: WorkerMessageData = {source: 'loaders.gl', type, payload};
64
- const transferList = getTransferList(payload);
65
- // eslint-disable-next-line no-restricted-globals
99
+ const data: WorkerMessageData = {source: 'loaders.gl', type, payload};
100
+ // console.log('posting message', data);
101
+ const transferList = getTransferList(payload);
102
+
103
+ const parentPort = getParentPort();
104
+ if (parentPort) {
105
+ parentPort.postMessage(data, transferList);
106
+ // console.log('posted message', data);
107
+ } else {
66
108
  // @ts-ignore
67
- self.postMessage(data, transferList);
109
+ globalThis.postMessage(data, transferList);
68
110
  }
69
111
  }
70
112
  }
@@ -2,7 +2,11 @@ import WorkerPool from './worker-pool';
2
2
  import WorkerThread from './worker-thread';
3
3
 
4
4
  /**
5
- * @param maxConcurrency {number} - max count of workers
5
+ * @param maxConcurrency - max count of workers
6
+ * @param maxMobileConcurrency - max count of workers on mobile
7
+ * @param maxConcurrency - max count of workers
8
+ * @param reuseWorkers - if false, destroys workers when task is completed
9
+ * @param onDebug - callback intended to allow application to log worker pool activity
6
10
  */
7
11
  export type WorkerFarmProps = {
8
12
  maxConcurrency?: number;
@@ -11,11 +15,11 @@ export type WorkerFarmProps = {
11
15
  onDebug?: () => void;
12
16
  };
13
17
 
14
- const DEFAULT_PROPS: WorkerFarmProps = {
18
+ const DEFAULT_PROPS: Required<WorkerFarmProps> = {
15
19
  maxConcurrency: 3,
16
20
  maxMobileConcurrency: 1,
17
- onDebug: () => {},
18
- reuseWorkers: true
21
+ reuseWorkers: true,
22
+ onDebug: () => {}
19
23
  };
20
24
 
21
25
  /**
@@ -27,7 +31,7 @@ export default class WorkerFarm {
27
31
  // singleton
28
32
  private static _workerFarm?: WorkerFarm;
29
33
 
30
- /** Check if Workers are supported */
34
+ /** Checks if workers are supported on this platform */
31
35
  static isSupported(): boolean {
32
36
  return WorkerThread.isSupported();
33
37
  }
@@ -55,6 +59,7 @@ export default class WorkerFarm {
55
59
  for (const workerPool of this.workerPools.values()) {
56
60
  workerPool.destroy();
57
61
  }
62
+ this.workerPools = new Map<string, WorkerPool>();
58
63
  }
59
64
 
60
65
  /**
@@ -8,19 +8,16 @@ import {assert} from '../env-utils/assert';
8
8
  export default class WorkerJob {
9
9
  readonly name: string;
10
10
  readonly workerThread: WorkerThread;
11
- isRunning: boolean;
11
+ isRunning: boolean = true;
12
12
  /** Promise that resolves when Job is done */
13
13
  readonly result: Promise<any>;
14
14
 
15
- private _resolve: (value: any) => void;
16
- private _reject: (reason?: any) => void;
15
+ private _resolve: (value: any) => void = () => {};
16
+ private _reject: (reason?: any) => void = () => {};
17
17
 
18
18
  constructor(jobName: string, workerThread: WorkerThread) {
19
19
  this.name = jobName;
20
20
  this.workerThread = workerThread;
21
- this.isRunning = true;
22
- this._resolve = () => {};
23
- this._reject = () => {};
24
21
  this.result = new Promise((resolve, reject) => {
25
22
  this._resolve = resolve;
26
23
  this._reject = reject;
@@ -53,6 +53,11 @@ export default class WorkerPool {
53
53
  private count = 0;
54
54
  private isDestroyed = false;
55
55
 
56
+ /** Checks if workers are supported on this platform */
57
+ static isSupported(): boolean {
58
+ return WorkerThread.isSupported();
59
+ }
60
+
56
61
  /**
57
62
  * @param processor - worker function
58
63
  * @param maxConcurrency - max count of workers