@loaders.gl/loader-utils 3.4.13 → 3.4.15
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 +50 -51
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/json-loader.js +5 -24
- package/dist/es5/json-loader.js.map +1 -1
- package/dist/es5/lib/binary-utils/array-buffer-utils.js +18 -37
- package/dist/es5/lib/binary-utils/array-buffer-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/dataview-copy-utils.js +14 -14
- package/dist/es5/lib/binary-utils/dataview-copy-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/get-first-characters.js +5 -5
- package/dist/es5/lib/binary-utils/get-first-characters.js.map +1 -1
- package/dist/es5/lib/binary-utils/memory-conversion-utils.js +6 -9
- package/dist/es5/lib/binary-utils/memory-conversion-utils.js.map +1 -1
- package/dist/es5/lib/binary-utils/memory-copy-utils.js +6 -6
- package/dist/es5/lib/binary-utils/memory-copy-utils.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +9 -11
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- package/dist/es5/lib/filesystems/node-filesystem.js +51 -199
- package/dist/es5/lib/filesystems/node-filesystem.js.map +1 -1
- package/dist/es5/lib/filesystems/readable-file.js +9 -74
- package/dist/es5/lib/filesystems/readable-file.js.map +1 -1
- package/dist/es5/lib/filesystems/writable-file.js +11 -65
- package/dist/es5/lib/filesystems/writable-file.js.map +1 -1
- package/dist/es5/lib/iterators/async-iteration.js +27 -177
- package/dist/es5/lib/iterators/async-iteration.js.map +1 -1
- package/dist/es5/lib/iterators/text-iterators.js +44 -293
- package/dist/es5/lib/iterators/text-iterators.js.map +1 -1
- package/dist/es5/lib/node/buffer.js +1 -1
- package/dist/es5/lib/node/buffer.js.map +1 -1
- package/dist/es5/lib/node/fs.browser.js +13 -13
- package/dist/es5/lib/node/fs.browser.js.map +1 -1
- package/dist/es5/lib/node/fs.js +21 -49
- package/dist/es5/lib/node/fs.js.map +1 -1
- package/dist/es5/lib/node/promisify.js +3 -21
- package/dist/es5/lib/node/promisify.js.map +1 -1
- package/dist/es5/lib/node/stream.browser.js +2 -2
- package/dist/es5/lib/node/stream.browser.js.map +1 -1
- package/dist/es5/lib/node/stream.js +2 -2
- package/dist/es5/lib/node/stream.js.map +1 -1
- package/dist/es5/lib/option-utils/merge-loader-options.js +5 -12
- package/dist/es5/lib/option-utils/merge-loader-options.js.map +1 -1
- package/dist/es5/lib/path-utils/file-aliases.js +4 -4
- package/dist/es5/lib/path-utils/file-aliases.js.map +1 -1
- package/dist/es5/lib/path-utils/get-cwd.js +1 -1
- package/dist/es5/lib/path-utils/get-cwd.js.map +1 -1
- package/dist/es5/lib/path-utils/path.js +22 -22
- package/dist/es5/lib/path-utils/path.js.map +1 -1
- package/dist/es5/lib/request-utils/request-scheduler.js +88 -110
- package/dist/es5/lib/request-utils/request-scheduler.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js +64 -105
- package/dist/es5/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js +48 -94
- package/dist/es5/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
- package/dist/esm/json-loader.js +1 -1
- package/package.json +4 -4
|
@@ -1,73 +1,51 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.createLoaderWorker = createLoaderWorker;
|
|
8
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
9
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
10
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
7
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
12
|
-
|
|
13
|
-
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
14
|
-
var requestId = 0;
|
|
8
|
+
let requestId = 0;
|
|
15
9
|
function createLoaderWorker(loader) {
|
|
16
10
|
if (!_workerUtils.WorkerBody.inWorkerThread()) {
|
|
17
11
|
return;
|
|
18
12
|
}
|
|
19
|
-
_workerUtils.WorkerBody.onmessage =
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
_context.next = 15;
|
|
46
|
-
break;
|
|
47
|
-
case 11:
|
|
48
|
-
_context.prev = 11;
|
|
49
|
-
_context.t1 = _context["catch"](3);
|
|
50
|
-
message = _context.t1 instanceof Error ? _context.t1.message : '';
|
|
51
|
-
_workerUtils.WorkerBody.postMessage('error', {
|
|
52
|
-
error: message
|
|
53
|
-
});
|
|
54
|
-
case 15:
|
|
55
|
-
return _context.abrupt("break", 16);
|
|
56
|
-
case 16:
|
|
57
|
-
case "end":
|
|
58
|
-
return _context.stop();
|
|
13
|
+
_workerUtils.WorkerBody.onmessage = async (type, payload) => {
|
|
14
|
+
switch (type) {
|
|
15
|
+
case 'process':
|
|
16
|
+
try {
|
|
17
|
+
const {
|
|
18
|
+
input,
|
|
19
|
+
options = {},
|
|
20
|
+
context = {}
|
|
21
|
+
} = payload;
|
|
22
|
+
const result = await parseData({
|
|
23
|
+
loader,
|
|
24
|
+
arrayBuffer: input,
|
|
25
|
+
options,
|
|
26
|
+
context: {
|
|
27
|
+
...context,
|
|
28
|
+
parse: parseOnMainThread
|
|
29
|
+
}
|
|
30
|
+
});
|
|
31
|
+
_workerUtils.WorkerBody.postMessage('done', {
|
|
32
|
+
result
|
|
33
|
+
});
|
|
34
|
+
} catch (error) {
|
|
35
|
+
const message = error instanceof Error ? error.message : '';
|
|
36
|
+
_workerUtils.WorkerBody.postMessage('error', {
|
|
37
|
+
error: message
|
|
38
|
+
});
|
|
59
39
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
};
|
|
65
|
-
}();
|
|
40
|
+
break;
|
|
41
|
+
default:
|
|
42
|
+
}
|
|
43
|
+
};
|
|
66
44
|
}
|
|
67
45
|
function parseOnMainThread(arrayBuffer, options) {
|
|
68
|
-
return new Promise(
|
|
69
|
-
|
|
70
|
-
|
|
46
|
+
return new Promise((resolve, reject) => {
|
|
47
|
+
const id = requestId++;
|
|
48
|
+
const onMessage = (type, payload) => {
|
|
71
49
|
if (payload.id !== id) {
|
|
72
50
|
return;
|
|
73
51
|
}
|
|
@@ -84,59 +62,40 @@ function parseOnMainThread(arrayBuffer, options) {
|
|
|
84
62
|
}
|
|
85
63
|
};
|
|
86
64
|
_workerUtils.WorkerBody.addEventListener(onMessage);
|
|
87
|
-
|
|
88
|
-
id
|
|
65
|
+
const payload = {
|
|
66
|
+
id,
|
|
89
67
|
input: arrayBuffer,
|
|
90
|
-
options
|
|
68
|
+
options
|
|
91
69
|
};
|
|
92
70
|
_workerUtils.WorkerBody.postMessage('process', payload);
|
|
93
71
|
});
|
|
94
72
|
}
|
|
95
|
-
function parseData(
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
break;
|
|
123
|
-
case 12:
|
|
124
|
-
throw new Error("Could not load data with ".concat(loader.name, " loader"));
|
|
125
|
-
case 13:
|
|
126
|
-
options = _objectSpread(_objectSpread({}, options), {}, {
|
|
127
|
-
modules: loader && loader.options && loader.options.modules || {},
|
|
128
|
-
worker: false
|
|
129
|
-
});
|
|
130
|
-
_context2.next = 16;
|
|
131
|
-
return parser(data, _objectSpread({}, options), context, loader);
|
|
132
|
-
case 16:
|
|
133
|
-
return _context2.abrupt("return", _context2.sent);
|
|
134
|
-
case 17:
|
|
135
|
-
case "end":
|
|
136
|
-
return _context2.stop();
|
|
137
|
-
}
|
|
138
|
-
}, _callee2);
|
|
139
|
-
}));
|
|
140
|
-
return _parseData.apply(this, arguments);
|
|
73
|
+
async function parseData(_ref) {
|
|
74
|
+
let {
|
|
75
|
+
loader,
|
|
76
|
+
arrayBuffer,
|
|
77
|
+
options,
|
|
78
|
+
context
|
|
79
|
+
} = _ref;
|
|
80
|
+
let data;
|
|
81
|
+
let parser;
|
|
82
|
+
if (loader.parseSync || loader.parse) {
|
|
83
|
+
data = arrayBuffer;
|
|
84
|
+
parser = loader.parseSync || loader.parse;
|
|
85
|
+
} else if (loader.parseTextSync) {
|
|
86
|
+
const textDecoder = new TextDecoder();
|
|
87
|
+
data = textDecoder.decode(arrayBuffer);
|
|
88
|
+
parser = loader.parseTextSync;
|
|
89
|
+
} else {
|
|
90
|
+
throw new Error("Could not load data with ".concat(loader.name, " loader"));
|
|
91
|
+
}
|
|
92
|
+
options = {
|
|
93
|
+
...options,
|
|
94
|
+
modules: loader && loader.options && loader.options.modules || {},
|
|
95
|
+
worker: false
|
|
96
|
+
};
|
|
97
|
+
return await parser(data, {
|
|
98
|
+
...options
|
|
99
|
+
}, context, loader);
|
|
141
100
|
}
|
|
142
101
|
//# sourceMappingURL=create-loader-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-loader-worker.js","names":["_workerUtils","require","
|
|
1
|
+
{"version":3,"file":"create-loader-worker.js","names":["_workerUtils","require","requestId","createLoaderWorker","loader","WorkerBody","inWorkerThread","onmessage","type","payload","input","options","context","result","parseData","arrayBuffer","parse","parseOnMainThread","postMessage","error","message","Error","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener","_ref","data","parser","parseSync","parseTextSync","textDecoder","TextDecoder","decode","concat","name","modules","worker"],"sources":["../../../../src/lib/worker-loader-utils/create-loader-worker.ts"],"sourcesContent":["/* eslint-disable no-restricted-globals */\nimport type {LoaderWithParser} from '../../types';\nimport {WorkerBody} from '@loaders.gl/worker-utils';\n// import {validateLoaderVersion} from './validate-loader-version';\n\nlet requestId = 0;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n * @param loader\n */\nexport function createLoaderWorker(loader: LoaderWithParser) {\n // Check that we are actually in a worker thread\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n WorkerBody.onmessage = async (type, payload) => {\n switch (type) {\n case 'process':\n try {\n // validateLoaderVersion(loader, data.source.split('@')[1]);\n\n const {input, options = {}, context = {}} = payload;\n\n const result = await parseData({\n loader,\n arrayBuffer: input,\n options,\n context: {\n ...context,\n parse: parseOnMainThread\n }\n });\n WorkerBody.postMessage('done', {result});\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n break;\n default:\n }\n };\n}\n\nfunction parseOnMainThread(arrayBuffer: ArrayBuffer, options: {[key: string]: any}): Promise<void> {\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\n// TODO - Support byteOffset and byteLength (enabling parsing of embedded binaries without copies)\n// TODO - Why not support async loader.parse* funcs here?\n// TODO - Why not reuse a common function instead of reimplementing loader.parse* selection logic? Keeping loader small?\n// TODO - Lack of appropriate parser functions can be detected when we create worker, no need to wait until parse\nasync function parseData({loader, arrayBuffer, options, context}) {\n let data;\n let parser;\n if (loader.parseSync || loader.parse) {\n data = arrayBuffer;\n parser = loader.parseSync || loader.parse;\n } else if (loader.parseTextSync) {\n const textDecoder = new TextDecoder();\n data = textDecoder.decode(arrayBuffer);\n parser = loader.parseTextSync;\n } else {\n throw new Error(`Could not load data with ${loader.name} loader`);\n }\n\n // TODO - proper merge in of loader options...\n options = {\n ...options,\n modules: (loader && loader.options && loader.options.modules) || {},\n worker: false\n };\n\n return await parser(data, {...options}, context, loader);\n}\n"],"mappings":"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"}
|
|
@@ -1,13 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
3
|
Object.defineProperty(exports, "__esModule", {
|
|
5
4
|
value: true
|
|
6
5
|
});
|
|
7
6
|
exports.canParseWithWorker = canParseWithWorker;
|
|
8
7
|
exports.parseWithWorker = parseWithWorker;
|
|
9
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
10
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
11
8
|
var _workerUtils = require("@loaders.gl/worker-utils");
|
|
12
9
|
function canParseWithWorker(loader, options) {
|
|
13
10
|
if (!_workerUtils.WorkerFarm.isSupported()) {
|
|
@@ -18,98 +15,55 @@ function canParseWithWorker(loader, options) {
|
|
|
18
15
|
}
|
|
19
16
|
return loader.worker && (options === null || options === void 0 ? void 0 : options.worker);
|
|
20
17
|
}
|
|
21
|
-
function parseWithWorker(
|
|
22
|
-
|
|
18
|
+
async function parseWithWorker(loader, data, options, context, parseOnMainThread) {
|
|
19
|
+
const name = loader.id;
|
|
20
|
+
const url = (0, _workerUtils.getWorkerURL)(loader, options);
|
|
21
|
+
const workerFarm = _workerUtils.WorkerFarm.getWorkerFarm(options);
|
|
22
|
+
const workerPool = workerFarm.getWorkerPool({
|
|
23
|
+
name,
|
|
24
|
+
url
|
|
25
|
+
});
|
|
26
|
+
options = JSON.parse(JSON.stringify(options));
|
|
27
|
+
context = JSON.parse(JSON.stringify(context || {}));
|
|
28
|
+
const job = await workerPool.startJob('process-on-worker', onMessage.bind(null, parseOnMainThread));
|
|
29
|
+
job.postMessage('process', {
|
|
30
|
+
input: data,
|
|
31
|
+
options,
|
|
32
|
+
context
|
|
33
|
+
});
|
|
34
|
+
const result = await job.result;
|
|
35
|
+
return await result.result;
|
|
23
36
|
}
|
|
24
|
-
function
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
case 12:
|
|
51
|
-
result = _context.sent;
|
|
52
|
-
_context.next = 15;
|
|
53
|
-
return result.result;
|
|
54
|
-
case 15:
|
|
55
|
-
return _context.abrupt("return", _context.sent);
|
|
56
|
-
case 16:
|
|
57
|
-
case "end":
|
|
58
|
-
return _context.stop();
|
|
37
|
+
async function onMessage(parseOnMainThread, job, type, payload) {
|
|
38
|
+
switch (type) {
|
|
39
|
+
case 'done':
|
|
40
|
+
job.done(payload);
|
|
41
|
+
break;
|
|
42
|
+
case 'error':
|
|
43
|
+
job.error(new Error(payload.error));
|
|
44
|
+
break;
|
|
45
|
+
case 'process':
|
|
46
|
+
const {
|
|
47
|
+
id,
|
|
48
|
+
input,
|
|
49
|
+
options
|
|
50
|
+
} = payload;
|
|
51
|
+
try {
|
|
52
|
+
const result = await parseOnMainThread(input, options);
|
|
53
|
+
job.postMessage('done', {
|
|
54
|
+
id,
|
|
55
|
+
result
|
|
56
|
+
});
|
|
57
|
+
} catch (error) {
|
|
58
|
+
const message = error instanceof Error ? error.message : 'unknown error';
|
|
59
|
+
job.postMessage('error', {
|
|
60
|
+
id,
|
|
61
|
+
error: message
|
|
62
|
+
});
|
|
59
63
|
}
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
}
|
|
64
|
-
function onMessage(_x6, _x7, _x8, _x9) {
|
|
65
|
-
return _onMessage.apply(this, arguments);
|
|
66
|
-
}
|
|
67
|
-
function _onMessage() {
|
|
68
|
-
_onMessage = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(parseOnMainThread, job, type, payload) {
|
|
69
|
-
var id, input, _options, result, message;
|
|
70
|
-
return _regenerator.default.wrap(function _callee2$(_context2) {
|
|
71
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
72
|
-
case 0:
|
|
73
|
-
_context2.t0 = type;
|
|
74
|
-
_context2.next = _context2.t0 === 'done' ? 3 : _context2.t0 === 'error' ? 5 : _context2.t0 === 'process' ? 7 : 20;
|
|
75
|
-
break;
|
|
76
|
-
case 3:
|
|
77
|
-
job.done(payload);
|
|
78
|
-
return _context2.abrupt("break", 21);
|
|
79
|
-
case 5:
|
|
80
|
-
job.error(new Error(payload.error));
|
|
81
|
-
return _context2.abrupt("break", 21);
|
|
82
|
-
case 7:
|
|
83
|
-
id = payload.id, input = payload.input, _options = payload.options;
|
|
84
|
-
_context2.prev = 8;
|
|
85
|
-
_context2.next = 11;
|
|
86
|
-
return parseOnMainThread(input, _options);
|
|
87
|
-
case 11:
|
|
88
|
-
result = _context2.sent;
|
|
89
|
-
job.postMessage('done', {
|
|
90
|
-
id: id,
|
|
91
|
-
result: result
|
|
92
|
-
});
|
|
93
|
-
_context2.next = 19;
|
|
94
|
-
break;
|
|
95
|
-
case 15:
|
|
96
|
-
_context2.prev = 15;
|
|
97
|
-
_context2.t1 = _context2["catch"](8);
|
|
98
|
-
message = _context2.t1 instanceof Error ? _context2.t1.message : 'unknown error';
|
|
99
|
-
job.postMessage('error', {
|
|
100
|
-
id: id,
|
|
101
|
-
error: message
|
|
102
|
-
});
|
|
103
|
-
case 19:
|
|
104
|
-
return _context2.abrupt("break", 21);
|
|
105
|
-
case 20:
|
|
106
|
-
console.warn("parse-with-worker unknown message ".concat(type));
|
|
107
|
-
case 21:
|
|
108
|
-
case "end":
|
|
109
|
-
return _context2.stop();
|
|
110
|
-
}
|
|
111
|
-
}, _callee2, null, [[8, 15]]);
|
|
112
|
-
}));
|
|
113
|
-
return _onMessage.apply(this, arguments);
|
|
64
|
+
break;
|
|
65
|
+
default:
|
|
66
|
+
console.warn("parse-with-worker unknown message ".concat(type));
|
|
67
|
+
}
|
|
114
68
|
}
|
|
115
69
|
//# sourceMappingURL=parse-with-worker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-with-worker.js","names":["_workerUtils","require","canParseWithWorker","loader","options","WorkerFarm","isSupported","isBrowser","_nodeWorkers","worker","parseWithWorker","
|
|
1
|
+
{"version":3,"file":"parse-with-worker.js","names":["_workerUtils","require","canParseWithWorker","loader","options","WorkerFarm","isSupported","isBrowser","_nodeWorkers","worker","parseWithWorker","data","context","parseOnMainThread","name","id","url","getWorkerURL","workerFarm","getWorkerFarm","workerPool","getWorkerPool","JSON","parse","stringify","job","startJob","onMessage","bind","postMessage","input","result","type","payload","done","error","Error","message","console","warn","concat"],"sources":["../../../../src/lib/worker-loader-utils/parse-with-worker.ts"],"sourcesContent":["import {\n WorkerJob,\n WorkerMessageType,\n WorkerMessagePayload,\n isBrowser\n} from '@loaders.gl/worker-utils';\nimport type {Loader, LoaderOptions, LoaderContext} from '../../types';\nimport {WorkerFarm, getWorkerURL} from '@loaders.gl/worker-utils';\n\n/**\n * Determines if a loader can parse with worker\n * @param loader\n * @param options\n */\nexport function canParseWithWorker(loader: Loader, options?: LoaderOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n // Node workers are still experimental\n if (!isBrowser && !options?._nodeWorkers) {\n return false;\n }\n\n return loader.worker && options?.worker;\n}\n\n/**\n * this function expects that the worker function sends certain messages,\n * this can be automated if the worker is wrapper by a call to createLoaderWorker in @loaders.gl/loader-utils.\n */\nexport async function parseWithWorker(\n loader: Loader,\n data: any,\n options?: LoaderOptions,\n context?: LoaderContext,\n parseOnMainThread?: (arrayBuffer: ArrayBuffer, options: {[key: string]: any}) => Promise<void>\n) {\n const name = loader.id; // TODO\n const url = getWorkerURL(loader, options);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const workerPool = workerFarm.getWorkerPool({name, url});\n\n // options.log object contains functions which cannot be transferred\n // context.fetch & context.parse functions cannot be transferred\n // TODO - decide how to handle logging on workers\n options = JSON.parse(JSON.stringify(options));\n context = JSON.parse(JSON.stringify(context || {}));\n\n const job = await workerPool.startJob(\n 'process-on-worker',\n // @ts-expect-error\n onMessage.bind(null, parseOnMainThread) // eslint-disable-line @typescript-eslint/no-misused-promises\n );\n\n job.postMessage('process', {\n // @ts-ignore\n input: data,\n options,\n context\n });\n\n const result = await job.result;\n // TODO - what is going on here?\n return await result.result;\n}\n\n/**\n * Handle worker's responses to the main thread\n * @param job\n * @param type\n * @param payload\n */\nasync function onMessage(\n parseOnMainThread: (arrayBuffer: ArrayBuffer, options?: {[key: string]: any}) => Promise<void>,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n job.done(payload);\n break;\n\n case 'error':\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for main thread to parseO\n const {id, input, options} = payload;\n try {\n const result = await parseOnMainThread(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(`parse-with-worker unknown message ${type}`);\n }\n}\n"],"mappings":";;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAcO,SAASC,kBAAkBA,CAACC,MAAc,EAAEC,OAAuB,EAAE;EAC1E,IAAI,CAACC,uBAAU,CAACC,WAAW,CAAC,CAAC,EAAE;IAC7B,OAAO,KAAK;EACd;EAGA,IAAI,CAACC,sBAAS,IAAI,EAACH,OAAO,aAAPA,OAAO,eAAPA,OAAO,CAAEI,YAAY,GAAE;IACxC,OAAO,KAAK;EACd;EAEA,OAAOL,MAAM,CAACM,MAAM,KAAIL,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAEK,MAAM;AACzC;AAMO,eAAeC,eAAeA,CACnCP,MAAc,EACdQ,IAAS,EACTP,OAAuB,EACvBQ,OAAuB,EACvBC,iBAA8F,EAC9F;EACA,MAAMC,IAAI,GAAGX,MAAM,CAACY,EAAE;EACtB,MAAMC,GAAG,GAAG,IAAAC,yBAAY,EAACd,MAAM,EAAEC,OAAO,CAAC;EAEzC,MAAMc,UAAU,GAAGb,uBAAU,CAACc,aAAa,CAACf,OAAO,CAAC;EACpD,MAAMgB,UAAU,GAAGF,UAAU,CAACG,aAAa,CAAC;IAACP,IAAI;IAAEE;EAAG,CAAC,CAAC;EAKxDZ,OAAO,GAAGkB,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACpB,OAAO,CAAC,CAAC;EAC7CQ,OAAO,GAAGU,IAAI,CAACC,KAAK,CAACD,IAAI,CAACE,SAAS,CAACZ,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;EAEnD,MAAMa,GAAG,GAAG,MAAML,UAAU,CAACM,QAAQ,CACnC,mBAAmB,EAEnBC,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEf,iBAAiB,CACxC,CAAC;EAEDY,GAAG,CAACI,WAAW,CAAC,SAAS,EAAE;IAEzBC,KAAK,EAAEnB,IAAI;IACXP,OAAO;IACPQ;EACF,CAAC,CAAC;EAEF,MAAMmB,MAAM,GAAG,MAAMN,GAAG,CAACM,MAAM;EAE/B,OAAO,MAAMA,MAAM,CAACA,MAAM;AAC5B;AAQA,eAAeJ,SAASA,CACtBd,iBAA8F,EAC9FY,GAAc,EACdO,IAAuB,EACvBC,OAA6B,EAC7B;EACA,QAAQD,IAAI;IACV,KAAK,MAAM;MACTP,GAAG,CAACS,IAAI,CAACD,OAAO,CAAC;MACjB;IAEF,KAAK,OAAO;MACVR,GAAG,CAACU,KAAK,CAAC,IAAIC,KAAK,CAACH,OAAO,CAACE,KAAK,CAAC,CAAC;MACnC;IAEF,KAAK,SAAS;MAEZ,MAAM;QAACpB,EAAE;QAAEe,KAAK;QAAE1B;MAAO,CAAC,GAAG6B,OAAO;MACpC,IAAI;QACF,MAAMF,MAAM,GAAG,MAAMlB,iBAAiB,CAACiB,KAAK,EAAE1B,OAAO,CAAC;QACtDqB,GAAG,CAACI,WAAW,CAAC,MAAM,EAAE;UAACd,EAAE;UAAEgB;QAAM,CAAC,CAAC;MACvC,CAAC,CAAC,OAAOI,KAAK,EAAE;QACd,MAAME,OAAO,GAAGF,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACE,OAAO,GAAG,eAAe;QACxEZ,GAAG,CAACI,WAAW,CAAC,OAAO,EAAE;UAACd,EAAE;UAAEoB,KAAK,EAAEE;QAAO,CAAC,CAAC;MAChD;MACA;IAEF;MAEEC,OAAO,CAACC,IAAI,sCAAAC,MAAA,CAAsCR,IAAI,CAAE,CAAC;EAC7D;AACF"}
|
package/dist/esm/json-loader.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@loaders.gl/loader-utils",
|
|
3
|
-
"version": "3.4.
|
|
3
|
+
"version": "3.4.15",
|
|
4
4
|
"description": "Framework-independent loaders for 3D graphics formats",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -42,8 +42,8 @@
|
|
|
42
42
|
"scripts": {},
|
|
43
43
|
"dependencies": {
|
|
44
44
|
"@babel/runtime": "^7.3.1",
|
|
45
|
-
"@loaders.gl/worker-utils": "3.4.
|
|
46
|
-
"@probe.gl/stats": "^
|
|
45
|
+
"@loaders.gl/worker-utils": "3.4.15",
|
|
46
|
+
"@probe.gl/stats": "^3.5.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "19e941d5805568e449ef9092490d6568a4853298"
|
|
49
49
|
}
|