@loaders.gl/worker-utils 3.3.0-alpha.4 → 3.3.0-alpha.6
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 +35 -52
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/async-queue/async-queue.js +15 -22
- package/dist/es5/lib/async-queue/async-queue.js.map +1 -1
- package/dist/es5/lib/env-utils/assert.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +7 -4
- 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 +6 -45
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/node/require-utils.node.js +0 -22
- package/dist/es5/lib/node/require-utils.node.js.map +1 -1
- package/dist/es5/lib/node/worker_threads-browser.js +3 -6
- package/dist/es5/lib/node/worker_threads-browser.js.map +1 -1
- package/dist/es5/lib/node/worker_threads.js +0 -2
- package/dist/es5/lib/node/worker_threads.js.map +1 -1
- package/dist/es5/lib/process-utils/child-process-proxy.js +6 -49
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/es5/lib/process-utils/process-utils.js +0 -7
- package/dist/es5/lib/process-utils/process-utils.js.map +1 -1
- package/dist/es5/lib/worker-api/create-worker.js +40 -96
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +2 -7
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +13 -39
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/validate-worker-version.js +0 -4
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-body.js +13 -30
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-farm.js +21 -32
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-job.js +9 -13
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +18 -51
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +21 -33
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +1 -5
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +5 -12
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +0 -4
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/es5/types.js.map +1 -1
- package/dist/es5/workers/null-worker.js +0 -6
- package/dist/es5/workers/null-worker.js.map +1 -1
- package/dist/esm/index.js +8 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/lib/async-queue/async-queue.js +1 -14
- package/dist/esm/lib/async-queue/async-queue.js.map +1 -1
- package/dist/esm/lib/env-utils/assert.js +2 -0
- package/dist/esm/lib/env-utils/assert.js.map +1 -1
- package/dist/esm/lib/env-utils/globals.js +9 -1
- package/dist/esm/lib/env-utils/globals.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +4 -3
- package/dist/esm/lib/env-utils/version.js.map +1 -1
- package/dist/esm/lib/library-utils/library-utils.js +10 -12
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/node/require-utils.node.js +7 -9
- package/dist/esm/lib/node/require-utils.node.js.map +1 -1
- package/dist/esm/lib/node/worker_threads-browser.js +1 -0
- package/dist/esm/lib/node/worker_threads-browser.js.map +1 -1
- package/dist/esm/lib/node/worker_threads.js.map +1 -1
- package/dist/esm/lib/process-utils/child-process-proxy.js +13 -25
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/esm/lib/process-utils/process-utils.js +3 -5
- package/dist/esm/lib/process-utils/process-utils.js.map +1 -1
- package/dist/esm/lib/worker-api/create-worker.js +4 -14
- package/dist/esm/lib/worker-api/create-worker.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +6 -5
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +7 -11
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/esm/lib/worker-api/validate-worker-version.js +3 -2
- package/dist/esm/lib/worker-api/validate-worker-version.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-body.js +1 -13
- package/dist/esm/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-farm.js +9 -14
- package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-job.js +2 -9
- package/dist/esm/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +8 -31
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +2 -23
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +2 -3
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-transfer-list.js +10 -11
- package/dist/esm/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +1 -1
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/esm/types.js.map +1 -1
- package/dist/esm/workers/null-worker.js.map +1 -1
- package/dist/lib/library-utils/library-utils.js +5 -1
- package/dist/lib/node/worker_threads.js +5 -1
- package/dist/lib/process-utils/child-process-proxy.js +5 -1
- package/dist/lib/worker-utils/get-transfer-list.d.ts.map +1 -1
- package/dist/lib/worker-utils/get-transfer-list.js +4 -2
- package/dist/null-worker.js.map +1 -1
- package/package.json +2 -2
- package/src/lib/worker-utils/get-transfer-list.ts +6 -2
|
@@ -1,193 +1,143 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.createWorker = createWorker;
|
|
9
|
-
|
|
10
8
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
11
|
-
|
|
12
9
|
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
|
-
|
|
18
11
|
var _workerBody = _interopRequireDefault(require("../worker-farm/worker-body"));
|
|
12
|
+
function _asyncIterator(iterable) { var method, async, sync, retry = 2; for ("undefined" != typeof Symbol && (async = Symbol.asyncIterator, sync = Symbol.iterator); retry--;) { if (async && null != (method = iterable[async])) return method.call(iterable); if (sync && null != (method = iterable[sync])) return new AsyncFromSyncIterator(method.call(iterable)); async = "@@asyncIterator", sync = "@@iterator"; } throw new TypeError("Object is not async iterable"); }
|
|
13
|
+
function AsyncFromSyncIterator(s) { function AsyncFromSyncIteratorContinuation(r) { if (Object(r) !== r) return Promise.reject(new TypeError(r + " is not an object.")); var done = r.done; return Promise.resolve(r.value).then(function (value) { return { value: value, done: done }; }); } return AsyncFromSyncIterator = function AsyncFromSyncIterator(s) { this.s = s, this.n = s.next; }, AsyncFromSyncIterator.prototype = { s: null, n: null, next: function next() { return AsyncFromSyncIteratorContinuation(this.n.apply(this.s, arguments)); }, return: function _return(value) { var ret = this.s.return; return void 0 === ret ? Promise.resolve({ value: value, done: !0 }) : AsyncFromSyncIteratorContinuation(ret.apply(this.s, arguments)); }, throw: function _throw(value) { var thr = this.s.return; return void 0 === thr ? Promise.reject(value) : AsyncFromSyncIteratorContinuation(thr.apply(this.s, arguments)); } }, new AsyncFromSyncIterator(s); }
|
|
19
14
|
|
|
20
15
|
var requestId = 0;
|
|
21
16
|
var inputBatches;
|
|
22
17
|
var options;
|
|
23
|
-
|
|
24
18
|
function createWorker(process, processInBatches) {
|
|
25
19
|
if (!_workerBody.default.inWorkerThread()) {
|
|
26
20
|
return;
|
|
27
21
|
}
|
|
28
|
-
|
|
29
22
|
var context = {
|
|
30
23
|
process: processOnMainThread
|
|
31
24
|
};
|
|
32
25
|
|
|
33
26
|
_workerBody.default.onmessage = function () {
|
|
34
27
|
var _ref = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(type, payload) {
|
|
35
|
-
var result, resultIterator,
|
|
36
|
-
|
|
28
|
+
var result, resultIterator, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, batch, message;
|
|
37
29
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
38
30
|
while (1) {
|
|
39
31
|
switch (_context.prev = _context.next) {
|
|
40
32
|
case 0:
|
|
41
33
|
_context.prev = 0;
|
|
42
34
|
_context.t0 = type;
|
|
43
|
-
_context.next = _context.t0 === 'process' ? 4 : _context.t0 === 'process-in-batches' ? 11 : _context.t0 === 'input-batch' ?
|
|
35
|
+
_context.next = _context.t0 === 'process' ? 4 : _context.t0 === 'process-in-batches' ? 11 : _context.t0 === 'input-batch' ? 46 : _context.t0 === 'input-done' ? 48 : 50;
|
|
44
36
|
break;
|
|
45
|
-
|
|
46
37
|
case 4:
|
|
47
38
|
if (process) {
|
|
48
39
|
_context.next = 6;
|
|
49
40
|
break;
|
|
50
41
|
}
|
|
51
|
-
|
|
52
42
|
throw new Error('Worker does not support atomic processing');
|
|
53
|
-
|
|
54
43
|
case 6:
|
|
55
44
|
_context.next = 8;
|
|
56
45
|
return process(payload.input, payload.options || {}, context);
|
|
57
|
-
|
|
58
46
|
case 8:
|
|
59
47
|
result = _context.sent;
|
|
60
|
-
|
|
61
48
|
_workerBody.default.postMessage('done', {
|
|
62
49
|
result: result
|
|
63
50
|
});
|
|
64
|
-
|
|
65
|
-
return _context.abrupt("break", 55);
|
|
66
|
-
|
|
51
|
+
return _context.abrupt("break", 50);
|
|
67
52
|
case 11:
|
|
68
53
|
if (processInBatches) {
|
|
69
54
|
_context.next = 13;
|
|
70
55
|
break;
|
|
71
56
|
}
|
|
72
|
-
|
|
73
57
|
throw new Error('Worker does not support batched processing');
|
|
74
|
-
|
|
75
58
|
case 13:
|
|
76
59
|
inputBatches = new _asyncQueue.default();
|
|
77
60
|
options = payload.options || {};
|
|
78
61
|
resultIterator = processInBatches(inputBatches, options, context);
|
|
79
|
-
|
|
62
|
+
_iteratorAbruptCompletion = false;
|
|
80
63
|
_didIteratorError = false;
|
|
81
64
|
_context.prev = 18;
|
|
82
|
-
_iterator = (
|
|
83
|
-
|
|
65
|
+
_iterator = _asyncIterator(resultIterator);
|
|
84
66
|
case 20:
|
|
85
67
|
_context.next = 22;
|
|
86
68
|
return _iterator.next();
|
|
87
|
-
|
|
88
69
|
case 22:
|
|
89
|
-
_step = _context.sent
|
|
90
|
-
|
|
91
|
-
_context.next = 26;
|
|
92
|
-
return _step.value;
|
|
93
|
-
|
|
94
|
-
case 26:
|
|
95
|
-
_value = _context.sent;
|
|
96
|
-
|
|
97
|
-
if (_iteratorNormalCompletion) {
|
|
98
|
-
_context.next = 33;
|
|
70
|
+
if (!(_iteratorAbruptCompletion = !(_step = _context.sent).done)) {
|
|
71
|
+
_context.next = 28;
|
|
99
72
|
break;
|
|
100
73
|
}
|
|
101
|
-
|
|
102
|
-
batch = _value;
|
|
103
|
-
|
|
74
|
+
batch = _step.value;
|
|
104
75
|
_workerBody.default.postMessage('output-batch', {
|
|
105
76
|
result: batch
|
|
106
77
|
});
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
_iteratorNormalCompletion = true;
|
|
78
|
+
case 25:
|
|
79
|
+
_iteratorAbruptCompletion = false;
|
|
110
80
|
_context.next = 20;
|
|
111
81
|
break;
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
_context.next = 39;
|
|
82
|
+
case 28:
|
|
83
|
+
_context.next = 34;
|
|
115
84
|
break;
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
_context.prev = 35;
|
|
85
|
+
case 30:
|
|
86
|
+
_context.prev = 30;
|
|
119
87
|
_context.t1 = _context["catch"](18);
|
|
120
88
|
_didIteratorError = true;
|
|
121
89
|
_iteratorError = _context.t1;
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
_context.prev =
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
if (!(!_iteratorNormalCompletion && _iterator.return != null)) {
|
|
128
|
-
_context.next = 44;
|
|
90
|
+
case 34:
|
|
91
|
+
_context.prev = 34;
|
|
92
|
+
_context.prev = 35;
|
|
93
|
+
if (!(_iteratorAbruptCompletion && _iterator.return != null)) {
|
|
94
|
+
_context.next = 39;
|
|
129
95
|
break;
|
|
130
96
|
}
|
|
131
|
-
|
|
132
|
-
_context.next = 44;
|
|
97
|
+
_context.next = 39;
|
|
133
98
|
return _iterator.return();
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
_context.prev = 44;
|
|
137
|
-
|
|
99
|
+
case 39:
|
|
100
|
+
_context.prev = 39;
|
|
138
101
|
if (!_didIteratorError) {
|
|
139
|
-
_context.next =
|
|
102
|
+
_context.next = 42;
|
|
140
103
|
break;
|
|
141
104
|
}
|
|
142
|
-
|
|
143
105
|
throw _iteratorError;
|
|
144
|
-
|
|
145
|
-
case 47:
|
|
146
|
-
return _context.finish(44);
|
|
147
|
-
|
|
148
|
-
case 48:
|
|
106
|
+
case 42:
|
|
149
107
|
return _context.finish(39);
|
|
150
|
-
|
|
151
|
-
|
|
108
|
+
case 43:
|
|
109
|
+
return _context.finish(34);
|
|
110
|
+
case 44:
|
|
152
111
|
_workerBody.default.postMessage('done', {});
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
case 51:
|
|
112
|
+
return _context.abrupt("break", 50);
|
|
113
|
+
case 46:
|
|
157
114
|
inputBatches.push(payload.input);
|
|
158
|
-
return _context.abrupt("break",
|
|
159
|
-
|
|
160
|
-
case 53:
|
|
115
|
+
return _context.abrupt("break", 50);
|
|
116
|
+
case 48:
|
|
161
117
|
inputBatches.close();
|
|
162
|
-
return _context.abrupt("break",
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
_context.next = 61;
|
|
118
|
+
return _context.abrupt("break", 50);
|
|
119
|
+
case 50:
|
|
120
|
+
_context.next = 56;
|
|
166
121
|
break;
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
_context.prev = 57;
|
|
122
|
+
case 52:
|
|
123
|
+
_context.prev = 52;
|
|
170
124
|
_context.t2 = _context["catch"](0);
|
|
171
125
|
message = _context.t2 instanceof Error ? _context.t2.message : '';
|
|
172
|
-
|
|
173
126
|
_workerBody.default.postMessage('error', {
|
|
174
127
|
error: message
|
|
175
128
|
});
|
|
176
|
-
|
|
177
|
-
case 61:
|
|
129
|
+
case 56:
|
|
178
130
|
case "end":
|
|
179
131
|
return _context.stop();
|
|
180
132
|
}
|
|
181
133
|
}
|
|
182
|
-
}, _callee, null, [[0,
|
|
134
|
+
}, _callee, null, [[0, 52], [18, 30, 34, 44], [35,, 39, 43]]);
|
|
183
135
|
}));
|
|
184
|
-
|
|
185
136
|
return function (_x, _x2) {
|
|
186
137
|
return _ref.apply(this, arguments);
|
|
187
138
|
};
|
|
188
139
|
}();
|
|
189
140
|
}
|
|
190
|
-
|
|
191
141
|
function processOnMainThread(arrayBuffer) {
|
|
192
142
|
var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
|
|
193
143
|
return new Promise(function (resolve, reject) {
|
|
@@ -197,20 +147,15 @@ function processOnMainThread(arrayBuffer) {
|
|
|
197
147
|
if (payload.id !== id) {
|
|
198
148
|
return;
|
|
199
149
|
}
|
|
200
|
-
|
|
201
150
|
switch (type) {
|
|
202
151
|
case 'done':
|
|
203
152
|
_workerBody.default.removeEventListener(onMessage);
|
|
204
|
-
|
|
205
153
|
resolve(payload.result);
|
|
206
154
|
break;
|
|
207
|
-
|
|
208
155
|
case 'error':
|
|
209
156
|
_workerBody.default.removeEventListener(onMessage);
|
|
210
|
-
|
|
211
157
|
reject(payload.error);
|
|
212
158
|
break;
|
|
213
|
-
|
|
214
159
|
default:
|
|
215
160
|
}
|
|
216
161
|
};
|
|
@@ -222,7 +167,6 @@ function processOnMainThread(arrayBuffer) {
|
|
|
222
167
|
input: arrayBuffer,
|
|
223
168
|
options: options
|
|
224
169
|
};
|
|
225
|
-
|
|
226
170
|
_workerBody.default.postMessage('process', payload);
|
|
227
171
|
});
|
|
228
172
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"create-worker.js","names":["requestId","inputBatches","options","createWorker","process","processInBatches","WorkerBody","inWorkerThread","context","processOnMainThread","onmessage","type","payload","Error","input","result","postMessage","AsyncQueue","resultIterator","batch","push","close","message","error","arrayBuffer","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"sources":["../../../../src/lib/worker-api/create-worker.ts"],"sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n"],"mappings":"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"}
|
|
@@ -5,13 +5,10 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.getWorkerName = getWorkerName;
|
|
7
7
|
exports.getWorkerURL = getWorkerURL;
|
|
8
|
-
|
|
9
8
|
var _assert = require("../env-utils/assert");
|
|
10
|
-
|
|
11
9
|
var _version = require("../env-utils/version");
|
|
12
|
-
|
|
13
10
|
var NPM_TAG = 'beta';
|
|
14
|
-
var VERSION = typeof "3.3.0-alpha.
|
|
11
|
+
var VERSION = typeof "3.3.0-alpha.6" !== 'undefined' ? "3.3.0-alpha.6" : NPM_TAG;
|
|
15
12
|
|
|
16
13
|
function getWorkerName(worker) {
|
|
17
14
|
var warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
|
|
@@ -34,16 +31,14 @@ function getWorkerURL(worker) {
|
|
|
34
31
|
|
|
35
32
|
if (!url) {
|
|
36
33
|
var version = worker.version;
|
|
37
|
-
|
|
38
34
|
if (version === 'latest') {
|
|
39
35
|
version = NPM_TAG;
|
|
40
36
|
}
|
|
41
|
-
|
|
42
37
|
var versionTag = version ? "@".concat(version) : '';
|
|
43
38
|
url = "https://unpkg.com/@loaders.gl/".concat(worker.module).concat(versionTag, "/dist/").concat(workerFile);
|
|
44
39
|
}
|
|
45
|
-
|
|
46
40
|
(0, _assert.assert)(url);
|
|
41
|
+
|
|
47
42
|
return url;
|
|
48
43
|
}
|
|
49
44
|
//# sourceMappingURL=get-worker-url.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"get-worker-url.js","names":["NPM_TAG","VERSION","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag","assert"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":";;;;;;;AACA;AACA;AAEA,IAAMA,OAAO,GAAG,MAAM;AACtB,IAAMC,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiBD,OAAO;;AAKnE,SAASE,aAAa,CAACC,MAAoB,EAAU;EAC1D,IAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKJ,OAAO,4BAAqBA,OAAO,SAAM,EAAE;EAC9E,iBAAUE,MAAM,CAACG,IAAI,cAAIH,MAAM,CAACE,OAAO,SAAGD,OAAO;AACnD;;AASO,SAASG,YAAY,CAACJ,MAAoB,EAAuC;EAAA,IAArCK,OAAsB,uEAAG,CAAC,CAAC;EAC5E,IAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,IAAMC,UAAU,aAAMR,MAAM,CAACO,EAAE,eAAY;EAE3C,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;;EAQjC,IAAI,CAACD,GAAG,IAAIT,MAAM,CAACO,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGJ,OAAO,CAACK,SAAS;EACzB;;EAIA,IAAIL,OAAO,CAACM,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,qBAAcT,MAAM,CAACY,MAAM,mBAASJ,UAAU,CAAE;EACrD;;EAGA,IAAI,CAACC,GAAG,EAAE;IAER,IAAIP,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGL,OAAO;IACnB;IACA,IAAMgB,UAAU,GAAGX,OAAO,cAAOA,OAAO,IAAK,EAAE;IAC/CO,GAAG,2CAAoCT,MAAM,CAACY,MAAM,SAAGC,UAAU,mBAASL,UAAU,CAAE;EACxF;EAEA,IAAAM,cAAM,EAACL,GAAG,CAAC;;EAGX,OAAOA,GAAG;AACZ"}
|
|
@@ -1,49 +1,40 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
-
|
|
5
4
|
Object.defineProperty(exports, "__esModule", {
|
|
6
5
|
value: true
|
|
7
6
|
});
|
|
8
7
|
exports.canProcessOnWorker = canProcessOnWorker;
|
|
9
8
|
exports.processOnWorker = processOnWorker;
|
|
10
|
-
|
|
11
9
|
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
12
|
-
|
|
13
10
|
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
14
|
-
|
|
15
11
|
var _workerFarm = _interopRequireDefault(require("../worker-farm/worker-farm"));
|
|
16
|
-
|
|
17
12
|
var _getWorkerUrl = require("./get-worker-url");
|
|
18
|
-
|
|
19
13
|
var _getTransferList = require("../worker-utils/get-transfer-list");
|
|
20
|
-
|
|
21
14
|
function canProcessOnWorker(worker, options) {
|
|
22
15
|
if (!_workerFarm.default.isSupported()) {
|
|
23
16
|
return false;
|
|
24
17
|
}
|
|
25
|
-
|
|
26
18
|
return worker.worker && (options === null || options === void 0 ? void 0 : options.worker);
|
|
27
19
|
}
|
|
28
20
|
|
|
29
21
|
function processOnWorker(_x, _x2) {
|
|
30
22
|
return _processOnWorker.apply(this, arguments);
|
|
31
23
|
}
|
|
32
|
-
|
|
33
24
|
function _processOnWorker() {
|
|
34
25
|
_processOnWorker = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(worker, data) {
|
|
35
26
|
var options,
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
27
|
+
context,
|
|
28
|
+
name,
|
|
29
|
+
workerFarm,
|
|
30
|
+
source,
|
|
31
|
+
workerPoolProps,
|
|
32
|
+
workerPool,
|
|
33
|
+
jobName,
|
|
34
|
+
job,
|
|
35
|
+
transferableOptions,
|
|
36
|
+
result,
|
|
37
|
+
_args = arguments;
|
|
47
38
|
return _regenerator.default.wrap(function _callee$(_context) {
|
|
48
39
|
while (1) {
|
|
49
40
|
switch (_context.prev = _context.next) {
|
|
@@ -57,16 +48,14 @@ function _processOnWorker() {
|
|
|
57
48
|
name: name,
|
|
58
49
|
source: source
|
|
59
50
|
};
|
|
60
|
-
|
|
61
51
|
if (!source) {
|
|
62
52
|
workerPoolProps.url = (0, _getWorkerUrl.getWorkerURL)(worker, options);
|
|
63
53
|
}
|
|
64
|
-
|
|
65
54
|
workerPool = workerFarm.getWorkerPool(workerPoolProps);
|
|
66
55
|
jobName = options.jobName || worker.name;
|
|
67
56
|
_context.next = 11;
|
|
68
|
-
return workerPool.startJob(jobName,
|
|
69
|
-
|
|
57
|
+
return workerPool.startJob(jobName,
|
|
58
|
+
onMessage.bind(null, context));
|
|
70
59
|
case 11:
|
|
71
60
|
job = _context.sent;
|
|
72
61
|
transferableOptions = (0, _getTransferList.getTransferListForWriter)(options);
|
|
@@ -76,11 +65,9 @@ function _processOnWorker() {
|
|
|
76
65
|
});
|
|
77
66
|
_context.next = 16;
|
|
78
67
|
return job.result;
|
|
79
|
-
|
|
80
68
|
case 16:
|
|
81
69
|
result = _context.sent;
|
|
82
70
|
return _context.abrupt("return", result.result);
|
|
83
|
-
|
|
84
71
|
case 18:
|
|
85
72
|
case "end":
|
|
86
73
|
return _context.stop();
|
|
@@ -90,11 +77,9 @@ function _processOnWorker() {
|
|
|
90
77
|
}));
|
|
91
78
|
return _processOnWorker.apply(this, arguments);
|
|
92
79
|
}
|
|
93
|
-
|
|
94
80
|
function onMessage(_x3, _x4, _x5, _x6) {
|
|
95
81
|
return _onMessage.apply(this, arguments);
|
|
96
82
|
}
|
|
97
|
-
|
|
98
83
|
function _onMessage() {
|
|
99
84
|
_onMessage = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(context, job, type, payload) {
|
|
100
85
|
var id, input, options, result, message;
|
|
@@ -105,34 +90,27 @@ function _onMessage() {
|
|
|
105
90
|
_context2.t0 = type;
|
|
106
91
|
_context2.next = _context2.t0 === 'done' ? 3 : _context2.t0 === 'error' ? 5 : _context2.t0 === 'process' ? 7 : 23;
|
|
107
92
|
break;
|
|
108
|
-
|
|
109
93
|
case 3:
|
|
110
94
|
job.done(payload);
|
|
111
95
|
return _context2.abrupt("break", 24);
|
|
112
|
-
|
|
113
96
|
case 5:
|
|
114
97
|
job.error(new Error(payload.error));
|
|
115
98
|
return _context2.abrupt("break", 24);
|
|
116
|
-
|
|
117
99
|
case 7:
|
|
118
100
|
id = payload.id, input = payload.input, options = payload.options;
|
|
119
101
|
_context2.prev = 8;
|
|
120
|
-
|
|
121
102
|
if (context.process) {
|
|
122
103
|
_context2.next = 12;
|
|
123
104
|
break;
|
|
124
105
|
}
|
|
125
|
-
|
|
126
106
|
job.postMessage('error', {
|
|
127
107
|
id: id,
|
|
128
108
|
error: 'Worker not set up to process on main thread'
|
|
129
109
|
});
|
|
130
110
|
return _context2.abrupt("return");
|
|
131
|
-
|
|
132
111
|
case 12:
|
|
133
112
|
_context2.next = 14;
|
|
134
113
|
return context.process(input, options);
|
|
135
|
-
|
|
136
114
|
case 14:
|
|
137
115
|
result = _context2.sent;
|
|
138
116
|
job.postMessage('done', {
|
|
@@ -141,7 +119,6 @@ function _onMessage() {
|
|
|
141
119
|
});
|
|
142
120
|
_context2.next = 22;
|
|
143
121
|
break;
|
|
144
|
-
|
|
145
122
|
case 18:
|
|
146
123
|
_context2.prev = 18;
|
|
147
124
|
_context2.t1 = _context2["catch"](8);
|
|
@@ -150,13 +127,10 @@ function _onMessage() {
|
|
|
150
127
|
id: id,
|
|
151
128
|
error: message
|
|
152
129
|
});
|
|
153
|
-
|
|
154
130
|
case 22:
|
|
155
131
|
return _context2.abrupt("break", 24);
|
|
156
|
-
|
|
157
132
|
case 23:
|
|
158
133
|
console.warn("process-on-worker: unknown message ".concat(type));
|
|
159
|
-
|
|
160
134
|
case 24:
|
|
161
135
|
case "end":
|
|
162
136
|
return _context2.stop();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"process-on-worker.js","names":["canProcessOnWorker","worker","options","WorkerFarm","isSupported","processOnWorker","data","context","name","getWorkerName","workerFarm","getWorkerFarm","source","workerPoolProps","url","getWorkerURL","workerPool","getWorkerPool","jobName","startJob","onMessage","bind","job","transferableOptions","getTransferListForWriter","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\nimport {getTransferListForWriter} from '../worker-utils/get-transfer-list';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const {source} = options;\n const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};\n if (!source) {\n workerPoolProps.url = getWorkerURL(worker, options);\n }\n const workerPool = workerFarm.getWorkerPool(workerPoolProps);\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = getTransferListForWriter(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"mappings":"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"}
|
|
@@ -4,16 +4,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
6
|
exports.validateWorkerVersion = validateWorkerVersion;
|
|
7
|
-
|
|
8
7
|
var _assert = require("../env-utils/assert");
|
|
9
|
-
|
|
10
8
|
var _version = require("../env-utils/version");
|
|
11
|
-
|
|
12
9
|
function validateWorkerVersion(worker) {
|
|
13
10
|
var coreVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : _version.VERSION;
|
|
14
11
|
(0, _assert.assert)(worker, 'no worker provided');
|
|
15
12
|
var workerVersion = worker.version;
|
|
16
|
-
|
|
17
13
|
if (!coreVersion || !workerVersion) {
|
|
18
14
|
return false;
|
|
19
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"
|
|
1
|
+
{"version":3,"file":"validate-worker-version.js","names":["validateWorkerVersion","worker","coreVersion","VERSION","assert","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"sources":["../../../../src/lib/worker-api/validate-worker-version.ts"],"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"],"mappings":";;;;;;AACA;AACA;AAQO,SAASA,qBAAqB,CACnCC,MAAoB,EAEX;EAAA,IADTC,WAAmB,uEAAGC,gBAAO;EAE7B,IAAAC,cAAM,EAACH,MAAM,EAAE,oBAAoB,CAAC;EAEpC,IAAMI,aAAa,GAAGJ,MAAM,CAACK,OAAO;EACpC,IAAI,CAACJ,WAAW,IAAI,CAACG,aAAa,EAAE;IAClC,OAAO,KAAK;EACd;;EAYA,OAAO,IAAI;AACb;;AAIA,SAASE,YAAY,CAACD,OAAO,EAAE;EAC7B,IAAME,KAAK,GAAGF,OAAO,CAACG,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EAC5C,OAAO;IAACC,KAAK,EAAEJ,KAAK,CAAC,CAAC,CAAC;IAAEK,KAAK,EAAEL,KAAK,CAAC,CAAC;EAAC,CAAC;AAC3C"}
|