@loaders.gl/worker-utils 3.1.0-beta.5 → 3.1.1

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 (59) hide show
  1. package/dist/es5/index.js +19 -19
  2. package/dist/es5/index.js.map +1 -1
  3. package/dist/es5/lib/async-queue/async-queue.js +76 -62
  4. package/dist/es5/lib/async-queue/async-queue.js.map +1 -1
  5. package/dist/es5/lib/env-utils/globals.js +15 -10
  6. package/dist/es5/lib/env-utils/globals.js.map +1 -1
  7. package/dist/es5/lib/env-utils/version.js +3 -3
  8. package/dist/es5/lib/env-utils/version.js.map +1 -1
  9. package/dist/es5/lib/library-utils/library-utils.js +133 -29
  10. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  11. package/dist/es5/lib/node/require-utils.node.js +56 -16
  12. package/dist/es5/lib/node/require-utils.node.js.map +1 -1
  13. package/dist/es5/lib/process-utils/child-process-proxy.js +199 -90
  14. package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
  15. package/dist/es5/lib/process-utils/process-utils.js +9 -8
  16. package/dist/es5/lib/process-utils/process-utils.js.map +1 -1
  17. package/dist/es5/lib/worker-api/create-worker.js +162 -52
  18. package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
  19. package/dist/es5/lib/worker-api/get-worker-url.js +14 -9
  20. package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
  21. package/dist/es5/lib/worker-api/process-on-worker.js +130 -59
  22. package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
  23. package/dist/es5/lib/worker-api/validate-worker-version.js +4 -3
  24. package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -1
  25. package/dist/es5/lib/worker-farm/worker-body.js +58 -46
  26. package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
  27. package/dist/es5/lib/worker-farm/worker-farm.js +99 -60
  28. package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
  29. package/dist/es5/lib/worker-farm/worker-job.js +40 -28
  30. package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
  31. package/dist/es5/lib/worker-farm/worker-pool.js +204 -108
  32. package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
  33. package/dist/es5/lib/worker-farm/worker-thread.js +85 -67
  34. package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
  35. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +4 -4
  36. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
  37. package/dist/es5/lib/worker-utils/get-transfer-list.js +10 -4
  38. package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
  39. package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +7 -3
  40. package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
  41. package/dist/es5/workers/null-worker.js +26 -3
  42. package/dist/es5/workers/null-worker.js.map +1 -1
  43. package/dist/esm/lib/env-utils/version.js +3 -3
  44. package/dist/esm/lib/env-utils/version.js.map +1 -1
  45. package/dist/esm/lib/library-utils/library-utils.js +7 -3
  46. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  47. package/dist/esm/lib/worker-api/get-worker-url.js +6 -2
  48. package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
  49. package/dist/lib/env-utils/version.js +1 -1
  50. package/dist/lib/library-utils/library-utils.js +7 -2
  51. package/dist/lib/worker-api/get-worker-url.d.ts.map +1 -1
  52. package/dist/lib/worker-api/get-worker-url.js +10 -1
  53. package/dist/types.d.ts +1 -0
  54. package/dist/types.d.ts.map +1 -1
  55. package/package.json +2 -2
  56. package/src/lib/env-utils/version.ts +1 -1
  57. package/src/lib/library-utils/library-utils.ts +6 -2
  58. package/src/lib/worker-api/get-worker-url.ts +11 -1
  59. package/src/types.ts +1 -0
@@ -7,83 +7,193 @@ Object.defineProperty(exports, "__esModule", {
7
7
  });
8
8
  exports.createWorker = createWorker;
9
9
 
10
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
+
12
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
13
+
14
+ var _asyncIterator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncIterator"));
15
+
10
16
  var _asyncQueue = _interopRequireDefault(require("../async-queue/async-queue"));
11
17
 
12
18
  var _workerBody = _interopRequireDefault(require("../worker-farm/worker-body"));
13
19
 
14
- let requestId = 0;
15
- let inputBatches;
16
- let options;
20
+ var requestId = 0;
21
+ var inputBatches;
22
+ var options;
17
23
 
18
24
  function createWorker(process, processInBatches) {
19
25
  if (typeof self === 'undefined') {
20
26
  return;
21
27
  }
22
28
 
23
- const context = {
29
+ var context = {
24
30
  process: processOnMainThread
25
31
  };
26
32
 
27
- _workerBody.default.onmessage = async (type, payload) => {
28
- try {
29
- switch (type) {
30
- case 'process':
31
- if (!process) {
32
- throw new Error('Worker does not support atomic processing');
33
- }
33
+ _workerBody.default.onmessage = function () {
34
+ var _ref = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(type, payload) {
35
+ var result, resultIterator, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, batch, message;
36
+
37
+ return _regenerator.default.wrap(function _callee$(_context) {
38
+ while (1) {
39
+ switch (_context.prev = _context.next) {
40
+ case 0:
41
+ _context.prev = 0;
42
+ _context.t0 = type;
43
+ _context.next = _context.t0 === 'process' ? 4 : _context.t0 === 'process-in-batches' ? 11 : _context.t0 === 'input-batch' ? 51 : _context.t0 === 'input-done' ? 53 : 55;
44
+ break;
45
+
46
+ case 4:
47
+ if (process) {
48
+ _context.next = 6;
49
+ break;
50
+ }
51
+
52
+ throw new Error('Worker does not support atomic processing');
34
53
 
35
- const result = await process(payload.input, payload.options || {}, context);
54
+ case 6:
55
+ _context.next = 8;
56
+ return process(payload.input, payload.options || {}, context);
36
57
 
37
- _workerBody.default.postMessage('done', {
38
- result
39
- });
58
+ case 8:
59
+ result = _context.sent;
40
60
 
41
- break;
61
+ _workerBody.default.postMessage('done', {
62
+ result: result
63
+ });
42
64
 
43
- case 'process-in-batches':
44
- if (!processInBatches) {
45
- throw new Error('Worker does not support batched processing');
46
- }
65
+ return _context.abrupt("break", 55);
47
66
 
48
- inputBatches = new _asyncQueue.default();
49
- options = payload.options || {};
50
- const resultIterator = processInBatches(inputBatches, options, context);
67
+ case 11:
68
+ if (processInBatches) {
69
+ _context.next = 13;
70
+ break;
71
+ }
51
72
 
52
- for await (const batch of resultIterator) {
53
- _workerBody.default.postMessage('output-batch', {
54
- result: batch
55
- });
56
- }
73
+ throw new Error('Worker does not support batched processing');
57
74
 
58
- _workerBody.default.postMessage('done', {});
75
+ case 13:
76
+ inputBatches = new _asyncQueue.default();
77
+ options = payload.options || {};
78
+ resultIterator = processInBatches(inputBatches, options, context);
79
+ _iteratorNormalCompletion = true;
80
+ _didIteratorError = false;
81
+ _context.prev = 18;
82
+ _iterator = (0, _asyncIterator2.default)(resultIterator);
83
+
84
+ case 20:
85
+ _context.next = 22;
86
+ return _iterator.next();
87
+
88
+ case 22:
89
+ _step = _context.sent;
90
+ _iteratorNormalCompletion = _step.done;
91
+ _context.next = 26;
92
+ return _step.value;
93
+
94
+ case 26:
95
+ _value = _context.sent;
96
+
97
+ if (_iteratorNormalCompletion) {
98
+ _context.next = 33;
99
+ break;
100
+ }
101
+
102
+ batch = _value;
103
+
104
+ _workerBody.default.postMessage('output-batch', {
105
+ result: batch
106
+ });
107
+
108
+ case 30:
109
+ _iteratorNormalCompletion = true;
110
+ _context.next = 20;
111
+ break;
112
+
113
+ case 33:
114
+ _context.next = 39;
115
+ break;
116
+
117
+ case 35:
118
+ _context.prev = 35;
119
+ _context.t1 = _context["catch"](18);
120
+ _didIteratorError = true;
121
+ _iteratorError = _context.t1;
122
+
123
+ case 39:
124
+ _context.prev = 39;
125
+ _context.prev = 40;
126
+
127
+ if (!(!_iteratorNormalCompletion && _iterator.return != null)) {
128
+ _context.next = 44;
129
+ break;
130
+ }
131
+
132
+ _context.next = 44;
133
+ return _iterator.return();
134
+
135
+ case 44:
136
+ _context.prev = 44;
137
+
138
+ if (!_didIteratorError) {
139
+ _context.next = 47;
140
+ break;
141
+ }
59
142
 
60
- break;
143
+ throw _iteratorError;
61
144
 
62
- case 'input-batch':
63
- inputBatches.push(payload.input);
64
- break;
145
+ case 47:
146
+ return _context.finish(44);
65
147
 
66
- case 'input-done':
67
- inputBatches.close();
68
- break;
148
+ case 48:
149
+ return _context.finish(39);
69
150
 
70
- default:
71
- }
72
- } catch (error) {
73
- const message = error instanceof Error ? error.message : '';
151
+ case 49:
152
+ _workerBody.default.postMessage('done', {});
74
153
 
75
- _workerBody.default.postMessage('error', {
76
- error: message
77
- });
78
- }
79
- };
154
+ return _context.abrupt("break", 55);
155
+
156
+ case 51:
157
+ inputBatches.push(payload.input);
158
+ return _context.abrupt("break", 55);
159
+
160
+ case 53:
161
+ inputBatches.close();
162
+ return _context.abrupt("break", 55);
163
+
164
+ case 55:
165
+ _context.next = 61;
166
+ break;
167
+
168
+ case 57:
169
+ _context.prev = 57;
170
+ _context.t2 = _context["catch"](0);
171
+ message = _context.t2 instanceof Error ? _context.t2.message : '';
172
+
173
+ _workerBody.default.postMessage('error', {
174
+ error: message
175
+ });
176
+
177
+ case 61:
178
+ case "end":
179
+ return _context.stop();
180
+ }
181
+ }
182
+ }, _callee, null, [[0, 57], [18, 35, 39, 49], [40,, 44, 48]]);
183
+ }));
184
+
185
+ return function (_x, _x2) {
186
+ return _ref.apply(this, arguments);
187
+ };
188
+ }();
80
189
  }
81
190
 
82
- function processOnMainThread(arrayBuffer, options = {}) {
83
- return new Promise((resolve, reject) => {
84
- const id = requestId++;
191
+ function processOnMainThread(arrayBuffer) {
192
+ var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
193
+ return new Promise(function (resolve, reject) {
194
+ var id = requestId++;
85
195
 
86
- const onMessage = (type, payload) => {
196
+ var onMessage = function onMessage(type, payload) {
87
197
  if (payload.id !== id) {
88
198
  return;
89
199
  }
@@ -107,10 +217,10 @@ function processOnMainThread(arrayBuffer, options = {}) {
107
217
 
108
218
  _workerBody.default.addEventListener(onMessage);
109
219
 
110
- const payload = {
111
- id,
220
+ var payload = {
221
+ id: id,
112
222
  input: arrayBuffer,
113
- options
223
+ options: options
114
224
  };
115
225
 
116
226
  _workerBody.default.postMessage('process', payload);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/create-worker.ts"],"names":["requestId","inputBatches","options","createWorker","process","processInBatches","self","context","processOnMainThread","WorkerBody","onmessage","type","payload","Error","result","input","postMessage","AsyncQueue","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":["requestId","inputBatches","options","createWorker","process","processInBatches","self","context","processOnMainThread","WorkerBody","onmessage","type","payload","Error","input","result","postMessage","AsyncQueue","resultIterator","batch","push","close","message","error","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"}
@@ -10,31 +10,36 @@ var _assert = require("../env-utils/assert");
10
10
 
11
11
  var _version = require("../env-utils/version");
12
12
 
13
- const NPM_TAG = 'beta';
14
- const VERSION = typeof "3.1.0-beta.5" !== 'undefined' ? "3.1.0-beta.5" : NPM_TAG;
13
+ var NPM_TAG = 'latest';
14
+ var VERSION = typeof "3.1.1" !== 'undefined' ? "3.1.1" : NPM_TAG;
15
15
 
16
16
  function getWorkerName(worker) {
17
- const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
17
+ var warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
18
18
  return "".concat(worker.name, "@").concat(worker.version).concat(warning);
19
19
  }
20
20
 
21
- function getWorkerURL(worker, options = {}) {
22
- const workerOptions = options[worker.id] || {};
23
- const workerFile = "".concat(worker.id, "-worker.js");
24
- let url = workerOptions.workerUrl;
21
+ function getWorkerURL(worker) {
22
+ var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
23
+ var workerOptions = options[worker.id] || {};
24
+ var workerFile = "".concat(worker.id, "-worker.js");
25
+ var url = workerOptions.workerUrl;
26
+
27
+ if (!url && worker.id === 'compression') {
28
+ url = options.workerUrl;
29
+ }
25
30
 
26
31
  if (options._workerType === 'test') {
27
32
  url = "modules/".concat(worker.module, "/dist/").concat(workerFile);
28
33
  }
29
34
 
30
35
  if (!url) {
31
- let version = worker.version;
36
+ var version = worker.version;
32
37
 
33
38
  if (version === 'latest') {
34
39
  version = NPM_TAG;
35
40
  }
36
41
 
37
- const versionTag = version ? "@".concat(version) : '';
42
+ var versionTag = version ? "@".concat(version) : '';
38
43
  url = "https://unpkg.com/@loaders.gl/".concat(worker.module).concat(versionTag, "/dist/").concat(workerFile);
39
44
  }
40
45
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["NPM_TAG","VERSION","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":";;;;;;;;AACA;;AACA;;AAEA,MAAMA,OAAO,GAAG,MAAhB;AACA,MAAMC,OAAO,GAAG,0BAAuB,WAAvB,oBAAmDD,OAAnE;;AAKO,SAASE,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,QAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBJ,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUE,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;;AASM,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;;AAIA,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,GAAGL,OAAV;AACD;;AACD,UAAMgB,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAED,sBAAOC,GAAP;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 // 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":["NPM_TAG","VERSION","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":";;;;;;;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,QAAhB;AACA,IAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,OAAnE;;AAKO,SAASE,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBJ,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUE,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;;AASM,SAASG,YAAT,CAAsBJ,MAAtB,EAAiF;AAAA,MAArCK,OAAqC,uEAAZ,EAAY;AACtF,MAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,MAAMC,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,GAAGL,OAAV;AACD;;AACD,QAAMgB,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAED,sBAAOC,GAAP;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"}
@@ -8,6 +8,10 @@ Object.defineProperty(exports, "__esModule", {
8
8
  exports.canProcessOnWorker = canProcessOnWorker;
9
9
  exports.processOnWorker = processOnWorker;
10
10
 
11
+ var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
12
+
13
+ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
14
+
11
15
  var _workerFarm = _interopRequireDefault(require("../worker-farm/worker-farm"));
12
16
 
13
17
  var _removeNontransferableOptions = require("../worker-utils/remove-nontransferable-options");
@@ -22,70 +26,137 @@ function canProcessOnWorker(worker, options) {
22
26
  return worker.worker && (options === null || options === void 0 ? void 0 : options.worker);
23
27
  }
24
28
 
25
- async function processOnWorker(worker, data, options = {}, context = {}) {
26
- const name = (0, _getWorkerUrl.getWorkerName)(worker);
27
- const url = (0, _getWorkerUrl.getWorkerURL)(worker, options);
28
-
29
- const workerFarm = _workerFarm.default.getWorkerFarm(options);
30
-
31
- const workerPool = workerFarm.getWorkerPool({
32
- name,
33
- url
34
- });
35
- const jobName = options.jobName || worker.name;
36
- const job = await workerPool.startJob(jobName, onMessage.bind(null, context));
37
- const transferableOptions = (0, _removeNontransferableOptions.removeNontransferableOptions)(options);
38
- job.postMessage('process', {
39
- input: data,
40
- options: transferableOptions
41
- });
42
- const result = await job.result;
43
- return result.result;
29
+ function processOnWorker(_x, _x2) {
30
+ return _processOnWorker.apply(this, arguments);
44
31
  }
45
32
 
46
- async function onMessage(context, job, type, payload) {
47
- switch (type) {
48
- case 'done':
49
- job.done(payload);
50
- break;
51
-
52
- case 'error':
53
- job.error(new Error(payload.error));
54
- break;
55
-
56
- case 'process':
57
- const {
58
- id,
59
- input,
60
- options
61
- } = payload;
62
-
63
- try {
64
- if (!context.process) {
65
- job.postMessage('error', {
66
- id,
67
- error: 'Worker not set up to process on main thread'
68
- });
69
- return;
33
+ function _processOnWorker() {
34
+ _processOnWorker = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(worker, data) {
35
+ var options,
36
+ context,
37
+ name,
38
+ url,
39
+ workerFarm,
40
+ workerPool,
41
+ jobName,
42
+ job,
43
+ transferableOptions,
44
+ result,
45
+ _args = arguments;
46
+ return _regenerator.default.wrap(function _callee$(_context) {
47
+ while (1) {
48
+ switch (_context.prev = _context.next) {
49
+ case 0:
50
+ options = _args.length > 2 && _args[2] !== undefined ? _args[2] : {};
51
+ context = _args.length > 3 && _args[3] !== undefined ? _args[3] : {};
52
+ name = (0, _getWorkerUrl.getWorkerName)(worker);
53
+ url = (0, _getWorkerUrl.getWorkerURL)(worker, options);
54
+ workerFarm = _workerFarm.default.getWorkerFarm(options);
55
+ workerPool = workerFarm.getWorkerPool({
56
+ name: name,
57
+ url: url
58
+ });
59
+ jobName = options.jobName || worker.name;
60
+ _context.next = 9;
61
+ return workerPool.startJob(jobName, onMessage.bind(null, context));
62
+
63
+ case 9:
64
+ job = _context.sent;
65
+ transferableOptions = (0, _removeNontransferableOptions.removeNontransferableOptions)(options);
66
+ job.postMessage('process', {
67
+ input: data,
68
+ options: transferableOptions
69
+ });
70
+ _context.next = 14;
71
+ return job.result;
72
+
73
+ case 14:
74
+ result = _context.sent;
75
+ return _context.abrupt("return", result.result);
76
+
77
+ case 16:
78
+ case "end":
79
+ return _context.stop();
70
80
  }
71
-
72
- const result = await context.process(input, options);
73
- job.postMessage('done', {
74
- id,
75
- result
76
- });
77
- } catch (error) {
78
- const message = error instanceof Error ? error.message : 'unknown error';
79
- job.postMessage('error', {
80
- id,
81
- error: message
82
- });
83
81
  }
82
+ }, _callee);
83
+ }));
84
+ return _processOnWorker.apply(this, arguments);
85
+ }
84
86
 
85
- break;
87
+ function onMessage(_x3, _x4, _x5, _x6) {
88
+ return _onMessage.apply(this, arguments);
89
+ }
86
90
 
87
- default:
88
- console.warn("process-on-worker: unknown message ".concat(type));
89
- }
91
+ function _onMessage() {
92
+ _onMessage = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(context, job, type, payload) {
93
+ var id, input, options, result, message;
94
+ return _regenerator.default.wrap(function _callee2$(_context2) {
95
+ while (1) {
96
+ switch (_context2.prev = _context2.next) {
97
+ case 0:
98
+ _context2.t0 = type;
99
+ _context2.next = _context2.t0 === 'done' ? 3 : _context2.t0 === 'error' ? 5 : _context2.t0 === 'process' ? 7 : 23;
100
+ break;
101
+
102
+ case 3:
103
+ job.done(payload);
104
+ return _context2.abrupt("break", 24);
105
+
106
+ case 5:
107
+ job.error(new Error(payload.error));
108
+ return _context2.abrupt("break", 24);
109
+
110
+ case 7:
111
+ id = payload.id, input = payload.input, options = payload.options;
112
+ _context2.prev = 8;
113
+
114
+ if (context.process) {
115
+ _context2.next = 12;
116
+ break;
117
+ }
118
+
119
+ job.postMessage('error', {
120
+ id: id,
121
+ error: 'Worker not set up to process on main thread'
122
+ });
123
+ return _context2.abrupt("return");
124
+
125
+ case 12:
126
+ _context2.next = 14;
127
+ return context.process(input, options);
128
+
129
+ case 14:
130
+ result = _context2.sent;
131
+ job.postMessage('done', {
132
+ id: id,
133
+ result: result
134
+ });
135
+ _context2.next = 22;
136
+ break;
137
+
138
+ case 18:
139
+ _context2.prev = 18;
140
+ _context2.t1 = _context2["catch"](8);
141
+ message = _context2.t1 instanceof Error ? _context2.t1.message : 'unknown error';
142
+ job.postMessage('error', {
143
+ id: id,
144
+ error: message
145
+ });
146
+
147
+ case 22:
148
+ return _context2.abrupt("break", 24);
149
+
150
+ case 23:
151
+ console.warn("process-on-worker: unknown message ".concat(type));
152
+
153
+ case 24:
154
+ case "end":
155
+ return _context2.stop();
156
+ }
157
+ }
158
+ }, _callee2, null, [[8, 18]]);
159
+ }));
160
+ return _onMessage.apply(this, arguments);
90
161
  }
91
162
  //# sourceMappingURL=process-on-worker.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["canProcessOnWorker","worker","options","WorkerFarm","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;;AACA;;AACA;;AAaO,SAASA,kBAAT,CAA4BC,MAA5B,EAAkDC,OAAlD,EAA2E;AAChF,MAAI,CAACC,oBAAWC,WAAX,EAAL,EAA+B;AAC7B,WAAO,KAAP;AACD;;AAED,SAAOH,MAAM,CAACA,MAAP,KAAiBC,OAAjB,aAAiBA,OAAjB,uBAAiBA,OAAO,CAAED,MAA1B,CAAP;AACD;;AAOM,eAAeI,eAAf,CACLJ,MADK,EAELK,IAFK,EAGLJ,OAA+B,GAAG,EAH7B,EAILK,OAAsB,GAAG,EAJpB,EAKS;AACd,QAAMC,IAAI,GAAG,iCAAcP,MAAd,CAAb;AACA,QAAMQ,GAAG,GAAG,gCAAaR,MAAb,EAAqBC,OAArB,CAAZ;;AAEA,QAAMQ,UAAU,GAAGP,oBAAWQ,aAAX,CAAyBT,OAAzB,CAAnB;;AACA,QAAMU,UAAU,GAAGF,UAAU,CAACG,aAAX,CAAyB;AAACL,IAAAA,IAAD;AAAOC,IAAAA;AAAP,GAAzB,CAAnB;AAEA,QAAMK,OAAO,GAAGZ,OAAO,CAACY,OAAR,IAAmBb,MAAM,CAACO,IAA1C;AACA,QAAMO,GAAG,GAAG,MAAMH,UAAU,CAACI,QAAX,CAChBF,OADgB,EAGhBG,SAAS,CAACC,IAAV,CAAe,IAAf,EAAqBX,OAArB,CAHgB,CAAlB;AAOA,QAAMY,mBAAmB,GAAG,gEAA6BjB,OAA7B,CAA5B;AACAa,EAAAA,GAAG,CAACK,WAAJ,CAAgB,SAAhB,EAA2B;AAACC,IAAAA,KAAK,EAAEf,IAAR;AAAcJ,IAAAA,OAAO,EAAEiB;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;AAAYnB,QAAAA;AAAZ,UAAuBsB,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,EAAuBnB,OAAvB,CAArB;AACAa,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":["canProcessOnWorker","worker","options","WorkerFarm","isSupported","processOnWorker","data","context","name","url","workerFarm","getWorkerFarm","workerPool","getWorkerPool","jobName","startJob","onMessage","bind","job","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"mappings":"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","sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {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"}
@@ -9,9 +9,10 @@ var _assert = require("../env-utils/assert");
9
9
 
10
10
  var _version = require("../env-utils/version");
11
11
 
12
- function validateWorkerVersion(worker, coreVersion = _version.VERSION) {
12
+ function validateWorkerVersion(worker) {
13
+ var coreVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _version.VERSION;
13
14
  (0, _assert.assert)(worker, 'no worker provided');
14
- const workerVersion = worker.version;
15
+ var workerVersion = worker.version;
15
16
 
16
17
  if (!coreVersion || !workerVersion) {
17
18
  return false;
@@ -21,7 +22,7 @@ function validateWorkerVersion(worker, coreVersion = _version.VERSION) {
21
22
  }
22
23
 
23
24
  function parseVersion(version) {
24
- const parts = version.split('.').map(Number);
25
+ var parts = version.split('.').map(Number);
25
26
  return {
26
27
  major: parts[0],
27
28
  minor: parts[1]
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/validate-worker-version.ts"],"names":["validateWorkerVersion","worker","coreVersion","VERSION","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"mappings":";;;;;;;AACA;;AACA;;AAQO,SAASA,qBAAT,CACLC,MADK,EAELC,WAAmB,GAAGC,gBAFjB,EAGI;AACT,sBAAOF,MAAP,EAAe,oBAAf;AAEA,QAAMG,aAAa,GAAGH,MAAM,CAACI,OAA7B;;AACA,MAAI,CAACH,WAAD,IAAgB,CAACE,aAArB,EAAoC;AAClC,WAAO,KAAP;AACD;;AAYD,SAAO,IAAP;AACD;;AAID,SAASE,YAAT,CAAsBD,OAAtB,EAA+B;AAC7B,QAAME,KAAK,GAAGF,OAAO,CAACG,KAAR,CAAc,GAAd,EAAmBC,GAAnB,CAAuBC,MAAvB,CAAd;AACA,SAAO;AAACC,IAAAA,KAAK,EAAEJ,KAAK,CAAC,CAAD,CAAb;AAAkBK,IAAAA,KAAK,EAAEL,KAAK,CAAC,CAAD;AAA9B,GAAP;AACD","sourcesContent":["import type {WorkerObject} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\n/**\n * Check if worker is compatible with this library version\n * @param worker\n * @param libVersion\n * @returns `true` if the two versions are compatible\n */\nexport function validateWorkerVersion(\n worker: WorkerObject,\n coreVersion: string = VERSION\n): boolean {\n assert(worker, 'no worker provided');\n\n const workerVersion = worker.version;\n if (!coreVersion || !workerVersion) {\n return false;\n }\n\n // TODO enable when fix the __version__ injection\n // const coreVersions = parseVersion(coreVersion);\n // const workerVersions = parseVersion(workerVersion);\n // assert(\n // coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,\n // `worker: ${worker.name} is not compatible. ${coreVersion.major}.${\n // coreVersion.minor\n // }+ is required.`\n // );\n\n return true;\n}\n\n// @ts-ignore\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction parseVersion(version) {\n const parts = version.split('.').map(Number);\n return {major: parts[0], minor: parts[1]};\n}\n"],"file":"validate-worker-version.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-api/validate-worker-version.ts"],"names":["validateWorkerVersion","worker","coreVersion","VERSION","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"mappings":";;;;;;;AACA;;AACA;;AAQO,SAASA,qBAAT,CACLC,MADK,EAGI;AAAA,MADTC,WACS,uEADaC,gBACb;AACT,sBAAOF,MAAP,EAAe,oBAAf;AAEA,MAAMG,aAAa,GAAGH,MAAM,CAACI,OAA7B;;AACA,MAAI,CAACH,WAAD,IAAgB,CAACE,aAArB,EAAoC;AAClC,WAAO,KAAP;AACD;;AAYD,SAAO,IAAP;AACD;;AAID,SAASE,YAAT,CAAsBD,OAAtB,EAA+B;AAC7B,MAAME,KAAK,GAAGF,OAAO,CAACG,KAAR,CAAc,GAAd,EAAmBC,GAAnB,CAAuBC,MAAvB,CAAd;AACA,SAAO;AAACC,IAAAA,KAAK,EAAEJ,KAAK,CAAC,CAAD,CAAb;AAAkBK,IAAAA,KAAK,EAAEL,KAAK,CAAC,CAAD;AAA9B,GAAP;AACD","sourcesContent":["import type {WorkerObject} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\n/**\n * Check if worker is compatible with this library version\n * @param worker\n * @param libVersion\n * @returns `true` if the two versions are compatible\n */\nexport function validateWorkerVersion(\n worker: WorkerObject,\n coreVersion: string = VERSION\n): boolean {\n assert(worker, 'no worker provided');\n\n const workerVersion = worker.version;\n if (!coreVersion || !workerVersion) {\n return false;\n }\n\n // TODO enable when fix the __version__ injection\n // const coreVersions = parseVersion(coreVersion);\n // const workerVersions = parseVersion(workerVersion);\n // assert(\n // coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,\n // `worker: ${worker.name} is not compatible. ${coreVersion.major}.${\n // coreVersion.minor\n // }+ is required.`\n // );\n\n return true;\n}\n\n// @ts-ignore\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction parseVersion(version) {\n const parts = version.split('.').map(Number);\n return {major: parts[0], minor: parts[1]};\n}\n"],"file":"validate-worker-version.js"}