@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.
Files changed (54) hide show
  1. package/dist/es5/index.js +50 -51
  2. package/dist/es5/index.js.map +1 -1
  3. package/dist/es5/json-loader.js +5 -24
  4. package/dist/es5/json-loader.js.map +1 -1
  5. package/dist/es5/lib/binary-utils/array-buffer-utils.js +18 -37
  6. package/dist/es5/lib/binary-utils/array-buffer-utils.js.map +1 -1
  7. package/dist/es5/lib/binary-utils/dataview-copy-utils.js +14 -14
  8. package/dist/es5/lib/binary-utils/dataview-copy-utils.js.map +1 -1
  9. package/dist/es5/lib/binary-utils/get-first-characters.js +5 -5
  10. package/dist/es5/lib/binary-utils/get-first-characters.js.map +1 -1
  11. package/dist/es5/lib/binary-utils/memory-conversion-utils.js +6 -9
  12. package/dist/es5/lib/binary-utils/memory-conversion-utils.js.map +1 -1
  13. package/dist/es5/lib/binary-utils/memory-copy-utils.js +6 -6
  14. package/dist/es5/lib/binary-utils/memory-copy-utils.js.map +1 -1
  15. package/dist/es5/lib/env-utils/globals.js +9 -11
  16. package/dist/es5/lib/env-utils/globals.js.map +1 -1
  17. package/dist/es5/lib/filesystems/node-filesystem.js +51 -199
  18. package/dist/es5/lib/filesystems/node-filesystem.js.map +1 -1
  19. package/dist/es5/lib/filesystems/readable-file.js +9 -74
  20. package/dist/es5/lib/filesystems/readable-file.js.map +1 -1
  21. package/dist/es5/lib/filesystems/writable-file.js +11 -65
  22. package/dist/es5/lib/filesystems/writable-file.js.map +1 -1
  23. package/dist/es5/lib/iterators/async-iteration.js +27 -177
  24. package/dist/es5/lib/iterators/async-iteration.js.map +1 -1
  25. package/dist/es5/lib/iterators/text-iterators.js +44 -293
  26. package/dist/es5/lib/iterators/text-iterators.js.map +1 -1
  27. package/dist/es5/lib/node/buffer.js +1 -1
  28. package/dist/es5/lib/node/buffer.js.map +1 -1
  29. package/dist/es5/lib/node/fs.browser.js +13 -13
  30. package/dist/es5/lib/node/fs.browser.js.map +1 -1
  31. package/dist/es5/lib/node/fs.js +21 -49
  32. package/dist/es5/lib/node/fs.js.map +1 -1
  33. package/dist/es5/lib/node/promisify.js +3 -21
  34. package/dist/es5/lib/node/promisify.js.map +1 -1
  35. package/dist/es5/lib/node/stream.browser.js +2 -2
  36. package/dist/es5/lib/node/stream.browser.js.map +1 -1
  37. package/dist/es5/lib/node/stream.js +2 -2
  38. package/dist/es5/lib/node/stream.js.map +1 -1
  39. package/dist/es5/lib/option-utils/merge-loader-options.js +5 -12
  40. package/dist/es5/lib/option-utils/merge-loader-options.js.map +1 -1
  41. package/dist/es5/lib/path-utils/file-aliases.js +4 -4
  42. package/dist/es5/lib/path-utils/file-aliases.js.map +1 -1
  43. package/dist/es5/lib/path-utils/get-cwd.js +1 -1
  44. package/dist/es5/lib/path-utils/get-cwd.js.map +1 -1
  45. package/dist/es5/lib/path-utils/path.js +22 -22
  46. package/dist/es5/lib/path-utils/path.js.map +1 -1
  47. package/dist/es5/lib/request-utils/request-scheduler.js +88 -110
  48. package/dist/es5/lib/request-utils/request-scheduler.js.map +1 -1
  49. package/dist/es5/lib/worker-loader-utils/create-loader-worker.js +64 -105
  50. package/dist/es5/lib/worker-loader-utils/create-loader-worker.js.map +1 -1
  51. package/dist/es5/lib/worker-loader-utils/parse-with-worker.js +48 -94
  52. package/dist/es5/lib/worker-loader-utils/parse-with-worker.js.map +1 -1
  53. package/dist/esm/json-loader.js +1 -1
  54. 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
- function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
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 = function () {
20
- var _ref = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(type, payload) {
21
- var input, _payload$options, options, _payload$context, context, result, message;
22
- return _regenerator.default.wrap(function _callee$(_context) {
23
- while (1) switch (_context.prev = _context.next) {
24
- case 0:
25
- _context.t0 = type;
26
- _context.next = _context.t0 === 'process' ? 3 : 16;
27
- break;
28
- case 3:
29
- _context.prev = 3;
30
- input = payload.input, _payload$options = payload.options, options = _payload$options === void 0 ? {} : _payload$options, _payload$context = payload.context, context = _payload$context === void 0 ? {} : _payload$context;
31
- _context.next = 7;
32
- return parseData({
33
- loader: loader,
34
- arrayBuffer: input,
35
- options: options,
36
- context: _objectSpread(_objectSpread({}, context), {}, {
37
- parse: parseOnMainThread
38
- })
39
- });
40
- case 7:
41
- result = _context.sent;
42
- _workerUtils.WorkerBody.postMessage('done', {
43
- result: result
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
- }, _callee, null, [[3, 11]]);
61
- }));
62
- return function (_x, _x2) {
63
- return _ref.apply(this, arguments);
64
- };
65
- }();
40
+ break;
41
+ default:
42
+ }
43
+ };
66
44
  }
67
45
  function parseOnMainThread(arrayBuffer, options) {
68
- return new Promise(function (resolve, reject) {
69
- var id = requestId++;
70
- var onMessage = function onMessage(type, payload) {
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
- var payload = {
88
- id: id,
65
+ const payload = {
66
+ id,
89
67
  input: arrayBuffer,
90
- options: options
68
+ options
91
69
  };
92
70
  _workerUtils.WorkerBody.postMessage('process', payload);
93
71
  });
94
72
  }
95
- function parseData(_x3) {
96
- return _parseData.apply(this, arguments);
97
- }
98
- function _parseData() {
99
- _parseData = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee2(_ref2) {
100
- var loader, arrayBuffer, options, context, data, parser, textDecoder;
101
- return _regenerator.default.wrap(function _callee2$(_context2) {
102
- while (1) switch (_context2.prev = _context2.next) {
103
- case 0:
104
- loader = _ref2.loader, arrayBuffer = _ref2.arrayBuffer, options = _ref2.options, context = _ref2.context;
105
- if (!(loader.parseSync || loader.parse)) {
106
- _context2.next = 6;
107
- break;
108
- }
109
- data = arrayBuffer;
110
- parser = loader.parseSync || loader.parse;
111
- _context2.next = 13;
112
- break;
113
- case 6:
114
- if (!loader.parseTextSync) {
115
- _context2.next = 12;
116
- break;
117
- }
118
- textDecoder = new TextDecoder();
119
- data = textDecoder.decode(arrayBuffer);
120
- parser = loader.parseTextSync;
121
- _context2.next = 13;
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","ownKeys","object","enumerableOnly","keys","Object","getOwnPropertySymbols","symbols","filter","sym","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","target","i","arguments","length","source","forEach","key","_defineProperty2","default","getOwnPropertyDescriptors","defineProperties","defineProperty","requestId","createLoaderWorker","loader","WorkerBody","inWorkerThread","onmessage","_ref","_asyncToGenerator2","_regenerator","mark","_callee","type","payload","input","_payload$options","options","_payload$context","context","result","message","wrap","_callee$","_context","prev","next","t0","parseData","arrayBuffer","parse","parseOnMainThread","sent","postMessage","t1","Error","error","abrupt","stop","_x","_x2","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener","_x3","_parseData","_callee2","_ref2","data","parser","textDecoder","_callee2$","_context2","parseSync","parseTextSync","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
+ {"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(_x, _x2, _x3, _x4, _x5) {
22
- return _parseWithWorker.apply(this, arguments);
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 _parseWithWorker() {
25
- _parseWithWorker = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(loader, data, options, context, parseOnMainThread) {
26
- var name, url, workerFarm, workerPool, job, result;
27
- return _regenerator.default.wrap(function _callee$(_context) {
28
- while (1) switch (_context.prev = _context.next) {
29
- case 0:
30
- name = loader.id;
31
- url = (0, _workerUtils.getWorkerURL)(loader, options);
32
- workerFarm = _workerUtils.WorkerFarm.getWorkerFarm(options);
33
- workerPool = workerFarm.getWorkerPool({
34
- name: name,
35
- url: url
36
- });
37
- options = JSON.parse(JSON.stringify(options));
38
- context = JSON.parse(JSON.stringify(context || {}));
39
- _context.next = 8;
40
- return workerPool.startJob('process-on-worker', onMessage.bind(null, parseOnMainThread));
41
- case 8:
42
- job = _context.sent;
43
- job.postMessage('process', {
44
- input: data,
45
- options: options,
46
- context: context
47
- });
48
- _context.next = 12;
49
- return job.result;
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
- }, _callee);
61
- }));
62
- return _parseWithWorker.apply(this, arguments);
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","_x","_x2","_x3","_x4","_x5","_parseWithWorker","apply","arguments","_asyncToGenerator2","default","_regenerator","mark","_callee","data","context","parseOnMainThread","name","url","workerFarm","workerPool","job","result","wrap","_callee$","_context","prev","next","id","getWorkerURL","getWorkerFarm","getWorkerPool","JSON","parse","stringify","startJob","onMessage","bind","sent","postMessage","input","abrupt","stop","_x6","_x7","_x8","_x9","_onMessage","_callee2","type","payload","_options","message","_callee2$","_context2","t0","done","error","Error","t1","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":"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"}
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"}
@@ -1,4 +1,4 @@
1
- const VERSION = typeof "3.4.13" !== 'undefined' ? "3.4.13" : 'latest';
1
+ const VERSION = typeof "3.4.15" !== 'undefined' ? "3.4.15" : 'latest';
2
2
  export const JSONLoader = {
3
3
  name: 'JSON',
4
4
  id: 'json',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/loader-utils",
3
- "version": "3.4.13",
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.13",
46
- "@probe.gl/stats": "^4.0.1"
45
+ "@loaders.gl/worker-utils": "3.4.15",
46
+ "@probe.gl/stats": "^3.5.0"
47
47
  },
48
- "gitHead": "be8849c02972ce541e01720d29b976f830d6af92"
48
+ "gitHead": "19e941d5805568e449ef9092490d6568a4853298"
49
49
  }