@loaders.gl/worker-utils 3.1.0-alpha.4 → 3.1.0-alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es5/index.js +19 -19
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/async-queue/async-queue.js +62 -76
- package/dist/es5/lib/async-queue/async-queue.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +10 -15
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- package/dist/es5/lib/env-utils/version.js +3 -3
- package/dist/es5/lib/env-utils/version.js.map +1 -1
- package/dist/es5/lib/library-utils/library-utils.js +29 -127
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/node/require-utils.node.js +20 -65
- package/dist/es5/lib/node/require-utils.node.js.map +1 -1
- package/dist/es5/lib/process-utils/child-process-proxy.js +90 -199
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/es5/lib/process-utils/process-utils.js +8 -9
- package/dist/es5/lib/process-utils/process-utils.js.map +1 -1
- package/dist/es5/lib/worker-api/create-worker.js +52 -162
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +9 -10
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +59 -130
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/validate-worker-version.js +3 -4
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-body.js +46 -58
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-farm.js +60 -99
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-job.js +28 -40
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +108 -204
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +67 -85
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +4 -4
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +4 -10
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +3 -7
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/es5/workers/null-worker.js +3 -26
- package/dist/es5/workers/null-worker.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +2 -2
- package/dist/esm/lib/library-utils/library-utils.js +5 -5
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/node/require-utils.node.js +2 -2
- package/dist/esm/lib/node/require-utils.node.js.map +1 -1
- package/dist/esm/lib/process-utils/child-process-proxy.js +5 -5
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +7 -7
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +3 -3
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +1 -7
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/index.d.ts +19 -0
- package/dist/lib/async-queue/async-queue.d.ts +31 -0
- package/dist/lib/env-utils/assert.d.ts +2 -0
- package/dist/lib/env-utils/globals.d.ts +21 -0
- package/dist/lib/env-utils/version.d.ts +1 -0
- package/dist/lib/library-utils/library-utils.d.ts +17 -0
- package/dist/lib/node/require-utils.node.d.ts +2 -0
- package/dist/lib/process-utils/child-process-proxy.d.ts +42 -0
- package/dist/lib/process-utils/process-utils.d.ts +1 -0
- package/dist/lib/worker-api/create-worker.d.ts +8 -0
- package/dist/lib/worker-api/get-worker-url.d.ts +13 -0
- package/dist/lib/worker-api/process-on-worker.d.ts +19 -0
- package/dist/lib/worker-api/validate-worker-version.d.ts +8 -0
- package/dist/lib/worker-farm/worker-body.d.ts +15 -0
- package/dist/lib/worker-farm/worker-farm.d.ts +54 -0
- package/dist/lib/worker-farm/worker-job.d.ts +28 -0
- package/dist/lib/worker-farm/worker-pool.d.ts +74 -0
- package/dist/lib/worker-farm/worker-thread.d.ts +41 -0
- package/dist/lib/worker-utils/get-loadable-worker-url.d.ts +13 -0
- package/dist/lib/worker-utils/get-transfer-list.d.ts +9 -0
- package/dist/lib/worker-utils/remove-nontransferable-options.d.ts +5 -0
- package/dist/null-worker.js +3 -3
- package/dist/null-worker.js.map +1 -1
- package/dist/types.d.ts +55 -0
- package/dist/workers/null-worker.d.ts +1 -0
- package/package.json +4 -3
|
@@ -7,193 +7,83 @@ 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
|
-
|
|
16
10
|
var _asyncQueue = _interopRequireDefault(require("../async-queue/async-queue"));
|
|
17
11
|
|
|
18
12
|
var _workerBody = _interopRequireDefault(require("../worker-farm/worker-body"));
|
|
19
13
|
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
14
|
+
let requestId = 0;
|
|
15
|
+
let inputBatches;
|
|
16
|
+
let options;
|
|
23
17
|
|
|
24
18
|
function createWorker(process, processInBatches) {
|
|
25
19
|
if (typeof self === 'undefined') {
|
|
26
20
|
return;
|
|
27
21
|
}
|
|
28
22
|
|
|
29
|
-
|
|
23
|
+
const context = {
|
|
30
24
|
process: processOnMainThread
|
|
31
25
|
};
|
|
32
26
|
|
|
33
|
-
_workerBody.default.onmessage =
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
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');
|
|
53
|
-
|
|
54
|
-
case 6:
|
|
55
|
-
_context.next = 8;
|
|
56
|
-
return process(payload.input, payload.options || {}, context);
|
|
57
|
-
|
|
58
|
-
case 8:
|
|
59
|
-
result = _context.sent;
|
|
60
|
-
|
|
61
|
-
_workerBody.default.postMessage('done', {
|
|
62
|
-
result: result
|
|
63
|
-
});
|
|
64
|
-
|
|
65
|
-
return _context.abrupt("break", 55);
|
|
66
|
-
|
|
67
|
-
case 11:
|
|
68
|
-
if (processInBatches) {
|
|
69
|
-
_context.next = 13;
|
|
70
|
-
break;
|
|
71
|
-
}
|
|
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
|
+
}
|
|
72
34
|
|
|
73
|
-
|
|
35
|
+
const result = await process(payload.input, payload.options || {}, context);
|
|
74
36
|
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
resultIterator = processInBatches(inputBatches, options, context === null || context === void 0 ? void 0 : context.processInBatches);
|
|
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
|
-
}
|
|
37
|
+
_workerBody.default.postMessage('done', {
|
|
38
|
+
result
|
|
39
|
+
});
|
|
142
40
|
|
|
143
|
-
|
|
41
|
+
break;
|
|
144
42
|
|
|
145
|
-
|
|
146
|
-
|
|
43
|
+
case 'process-in-batches':
|
|
44
|
+
if (!processInBatches) {
|
|
45
|
+
throw new Error('Worker does not support batched processing');
|
|
46
|
+
}
|
|
147
47
|
|
|
148
|
-
|
|
149
|
-
|
|
48
|
+
inputBatches = new _asyncQueue.default();
|
|
49
|
+
options = payload.options || {};
|
|
50
|
+
const resultIterator = processInBatches(inputBatches, options, context === null || context === void 0 ? void 0 : context.processInBatches);
|
|
150
51
|
|
|
151
|
-
|
|
152
|
-
|
|
52
|
+
for await (const batch of resultIterator) {
|
|
53
|
+
_workerBody.default.postMessage('output-batch', {
|
|
54
|
+
result: batch
|
|
55
|
+
});
|
|
56
|
+
}
|
|
153
57
|
|
|
154
|
-
|
|
58
|
+
_workerBody.default.postMessage('done', {});
|
|
155
59
|
|
|
156
|
-
|
|
157
|
-
inputBatches.push(payload.input);
|
|
158
|
-
return _context.abrupt("break", 55);
|
|
60
|
+
break;
|
|
159
61
|
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
62
|
+
case 'input-batch':
|
|
63
|
+
inputBatches.push(payload.input);
|
|
64
|
+
break;
|
|
163
65
|
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
case 57:
|
|
169
|
-
_context.prev = 57;
|
|
170
|
-
_context.t2 = _context["catch"](0);
|
|
171
|
-
message = _context.t2 instanceof Error ? _context.t2.message : '';
|
|
66
|
+
case 'input-done':
|
|
67
|
+
inputBatches.close();
|
|
68
|
+
break;
|
|
172
69
|
|
|
173
|
-
|
|
174
|
-
|
|
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
|
-
}));
|
|
70
|
+
default:
|
|
71
|
+
}
|
|
72
|
+
} catch (error) {
|
|
73
|
+
const message = error instanceof Error ? error.message : '';
|
|
184
74
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
75
|
+
_workerBody.default.postMessage('error', {
|
|
76
|
+
error: message
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
};
|
|
189
80
|
}
|
|
190
81
|
|
|
191
|
-
function processOnMainThread(arrayBuffer) {
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
var id = requestId++;
|
|
82
|
+
function processOnMainThread(arrayBuffer, options = {}) {
|
|
83
|
+
return new Promise((resolve, reject) => {
|
|
84
|
+
const id = requestId++;
|
|
195
85
|
|
|
196
|
-
|
|
86
|
+
const onMessage = (type, payload) => {
|
|
197
87
|
if (payload.id !== id) {
|
|
198
88
|
return;
|
|
199
89
|
}
|
|
@@ -217,10 +107,10 @@ function processOnMainThread(arrayBuffer) {
|
|
|
217
107
|
|
|
218
108
|
_workerBody.default.addEventListener(onMessage);
|
|
219
109
|
|
|
220
|
-
|
|
221
|
-
id
|
|
110
|
+
const payload = {
|
|
111
|
+
id,
|
|
222
112
|
input: arrayBuffer,
|
|
223
|
-
options
|
|
113
|
+
options
|
|
224
114
|
};
|
|
225
115
|
|
|
226
116
|
_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","
|
|
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;\nlet options;\n\nexport type ProcessOnMainThread = (data: any, options?: {[key: string]: any}, context?) => 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();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context?.processInBatches);\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, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type, payload) => {\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,32 +10,31 @@ var _assert = require("../env-utils/assert");
|
|
|
10
10
|
|
|
11
11
|
var _version = require("../env-utils/version");
|
|
12
12
|
|
|
13
|
-
|
|
14
|
-
|
|
13
|
+
const NPM_TAG = 'beta';
|
|
14
|
+
const VERSION = typeof "3.1.0-alpha.5" !== 'undefined' ? "3.1.0-alpha.5" : NPM_TAG;
|
|
15
15
|
|
|
16
16
|
function getWorkerName(worker) {
|
|
17
|
-
|
|
17
|
+
const 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) {
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
var url = workerOptions.workerUrl;
|
|
21
|
+
function getWorkerURL(worker, options = {}) {
|
|
22
|
+
const workerOptions = options[worker.id] || {};
|
|
23
|
+
const workerFile = "".concat(worker.id, "-worker.js");
|
|
24
|
+
let url = workerOptions.workerUrl;
|
|
26
25
|
|
|
27
26
|
if (options._workerType === 'test') {
|
|
28
27
|
url = "modules/".concat(worker.module, "/dist/").concat(workerFile);
|
|
29
28
|
}
|
|
30
29
|
|
|
31
30
|
if (!url) {
|
|
32
|
-
|
|
31
|
+
let version = worker.version;
|
|
33
32
|
|
|
34
33
|
if (version === 'latest') {
|
|
35
34
|
version = NPM_TAG;
|
|
36
35
|
}
|
|
37
36
|
|
|
38
|
-
|
|
37
|
+
const versionTag = version ? "@".concat(version) : '';
|
|
39
38
|
url = "https://unpkg.com/@loaders.gl/".concat(worker.module).concat(versionTag, "/dist/").concat(workerFile);
|
|
40
39
|
}
|
|
41
40
|
|
|
@@ -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,
|
|
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,2BAAuB,WAAvB,qBAAmDD,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"}
|
|
@@ -8,10 +8,6 @@ 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
|
-
|
|
15
11
|
var _workerFarm = _interopRequireDefault(require("../worker-farm/worker-farm"));
|
|
16
12
|
|
|
17
13
|
var _removeNontransferableOptions = require("../worker-utils/remove-nontransferable-options");
|
|
@@ -26,137 +22,70 @@ function canProcessOnWorker(worker, options) {
|
|
|
26
22
|
return worker.worker && (options === null || options === void 0 ? void 0 : options.worker);
|
|
27
23
|
}
|
|
28
24
|
|
|
29
|
-
function processOnWorker(
|
|
30
|
-
|
|
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;
|
|
31
44
|
}
|
|
32
45
|
|
|
33
|
-
function
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
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();
|
|
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(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;
|
|
80
70
|
}
|
|
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
|
+
});
|
|
81
83
|
}
|
|
82
|
-
}, _callee);
|
|
83
|
-
}));
|
|
84
|
-
return _processOnWorker.apply(this, arguments);
|
|
85
|
-
}
|
|
86
84
|
|
|
87
|
-
|
|
88
|
-
return _onMessage.apply(this, arguments);
|
|
89
|
-
}
|
|
85
|
+
break;
|
|
90
86
|
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
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(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);
|
|
87
|
+
default:
|
|
88
|
+
console.warn("process-on-worker: unknown message ".concat(type));
|
|
89
|
+
}
|
|
161
90
|
}
|
|
162
91
|
//# 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","startJob","onMessage","bind","
|
|
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","id","process","message","Error","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,CAAUF,OAAO,CAACE,KAAlB;AACA;;AAEF,SAAK,SAAL;AAEE,YAAM;AAACC,QAAAA,EAAD;AAAKN,QAAAA,KAAL;AAAYnB,QAAAA;AAAZ,UAAuBsB,OAA7B;;AACA,UAAI;AACF,YAAI,CAACjB,OAAO,CAACqB,OAAb,EAAsB;AACpBb,UAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACO,YAAAA,EAAD;AAAKD,YAAAA,KAAK,EAAE;AAAZ,WAAzB;AACA;AACD;;AACD,cAAMJ,MAAM,GAAG,MAAMf,OAAO,CAACqB,OAAR,CAAgBP,KAAhB,EAAuBnB,OAAvB,CAArB;AACAa,QAAAA,GAAG,CAACK,WAAJ,CAAgB,MAAhB,EAAwB;AAACO,UAAAA,EAAD;AAAKL,UAAAA;AAAL,SAAxB;AACD,OAPD,CAOE,OAAOI,KAAP,EAAc;AACd,cAAMG,OAAO,GAAGH,KAAK,YAAYI,KAAjB,GAAyBJ,KAAK,CAACG,OAA/B,GAAyC,eAAzD;AACAd,QAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACO,UAAAA,EAAD;AAAKD,UAAAA,KAAK,EAAEG;AAAZ,SAAzB;AACD;;AACD;;AAEF;AAEEE,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(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,10 +9,9 @@ var _assert = require("../env-utils/assert");
|
|
|
9
9
|
|
|
10
10
|
var _version = require("../env-utils/version");
|
|
11
11
|
|
|
12
|
-
function validateWorkerVersion(worker) {
|
|
13
|
-
var coreVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _version.VERSION;
|
|
12
|
+
function validateWorkerVersion(worker, coreVersion = _version.VERSION) {
|
|
14
13
|
(0, _assert.assert)(worker, 'no worker provided');
|
|
15
|
-
|
|
14
|
+
const workerVersion = worker.version;
|
|
16
15
|
|
|
17
16
|
if (!coreVersion || !workerVersion) {
|
|
18
17
|
return false;
|
|
@@ -22,7 +21,7 @@ function validateWorkerVersion(worker) {
|
|
|
22
21
|
}
|
|
23
22
|
|
|
24
23
|
function parseVersion(version) {
|
|
25
|
-
|
|
24
|
+
const parts = version.split('.').map(Number);
|
|
26
25
|
return {
|
|
27
26
|
major: parts[0],
|
|
28
27
|
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,
|
|
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"}
|