@loaders.gl/worker-utils 4.0.0-alpha.9 → 4.0.0-beta.2

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 (53) hide show
  1. package/dist/es5/lib/env-utils/version.js +17 -6
  2. package/dist/es5/lib/env-utils/version.js.map +1 -1
  3. package/dist/es5/lib/library-utils/library-utils.js +106 -43
  4. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  5. package/dist/es5/lib/node/require-utils.node.js +78 -11
  6. package/dist/es5/lib/node/require-utils.node.js.map +1 -1
  7. package/dist/es5/lib/worker-api/get-worker-url.js +2 -4
  8. package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
  9. package/dist/esm/lib/env-utils/version.js +14 -4
  10. package/dist/esm/lib/env-utils/version.js.map +1 -1
  11. package/dist/esm/lib/library-utils/library-utils.js +30 -16
  12. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  13. package/dist/esm/lib/node/require-utils.node.js +17 -0
  14. package/dist/esm/lib/node/require-utils.node.js.map +1 -1
  15. package/dist/esm/lib/worker-api/get-worker-url.js +1 -3
  16. package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
  17. package/dist/lib/env-utils/version.d.ts +6 -1
  18. package/dist/lib/env-utils/version.d.ts.map +1 -1
  19. package/dist/lib/library-utils/library-utils.d.ts +2 -2
  20. package/dist/lib/library-utils/library-utils.d.ts.map +1 -1
  21. package/dist/lib/node/require-utils.node.d.ts +12 -0
  22. package/dist/lib/node/require-utils.node.d.ts.map +1 -1
  23. package/dist/lib/worker-api/get-worker-url.d.ts.map +1 -1
  24. package/package.json +4 -5
  25. package/src/lib/env-utils/version.ts +25 -9
  26. package/src/lib/library-utils/library-utils.ts +42 -23
  27. package/src/lib/node/require-utils.node.ts +29 -0
  28. package/src/lib/worker-api/get-worker-url.ts +1 -4
  29. package/dist/index.js +0 -59
  30. package/dist/lib/async-queue/async-queue.js +0 -87
  31. package/dist/lib/env-utils/assert.js +0 -13
  32. package/dist/lib/env-utils/globals.js +0 -32
  33. package/dist/lib/env-utils/version.js +0 -12
  34. package/dist/lib/library-utils/library-utils.js +0 -170
  35. package/dist/lib/node/require-utils.node.js +0 -60
  36. package/dist/lib/node/worker_threads-browser.js +0 -15
  37. package/dist/lib/node/worker_threads.js +0 -33
  38. package/dist/lib/process-utils/child-process-proxy.js +0 -136
  39. package/dist/lib/process-utils/process-utils.js +0 -35
  40. package/dist/lib/worker-api/create-worker.js +0 -91
  41. package/dist/lib/worker-api/get-worker-url.js +0 -59
  42. package/dist/lib/worker-api/process-on-worker.js +0 -83
  43. package/dist/lib/worker-api/validate-worker-version.js +0 -35
  44. package/dist/lib/worker-farm/worker-body.js +0 -111
  45. package/dist/lib/worker-farm/worker-farm.js +0 -89
  46. package/dist/lib/worker-farm/worker-job.js +0 -47
  47. package/dist/lib/worker-farm/worker-pool.js +0 -164
  48. package/dist/lib/worker-farm/worker-thread.js +0 -131
  49. package/dist/lib/worker-utils/get-loadable-worker-url.js +0 -72
  50. package/dist/lib/worker-utils/get-transfer-list.js +0 -87
  51. package/dist/lib/worker-utils/remove-nontransferable-options.js +0 -27
  52. package/dist/types.js +0 -2
  53. package/dist/workers/null-worker.js +0 -7
@@ -1,43 +1,44 @@
1
1
  import { global, isBrowser, isWorker } from '../env-utils/globals';
2
2
  import * as node from '../node/require-utils.node';
3
3
  import { assert } from '../env-utils/assert';
4
- import { VERSION as __VERSION__ } from '../env-utils/version';
5
- const LATEST = 'beta';
6
- const VERSION = typeof "4.0.0-alpha.9" !== 'undefined' ? "4.0.0-alpha.9" : LATEST;
4
+ import { VERSION } from '../env-utils/version';
7
5
  const loadLibraryPromises = {};
8
6
  export async function loadLibrary(libraryUrl) {
9
7
  let moduleName = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
10
8
  let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
9
+ let libraryName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
11
10
  if (moduleName) {
12
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
11
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
13
12
  }
14
13
  loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
15
14
  return await loadLibraryPromises[libraryUrl];
16
15
  }
17
- export function getLibraryUrl(library, moduleName, options) {
18
- if (library.startsWith('http')) {
16
+ export function getLibraryUrl(library, moduleName) {
17
+ let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
18
+ let libraryName = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
19
+ if (!options.useLocalLibraries && library.startsWith('http')) {
19
20
  return library;
20
21
  }
22
+ libraryName = libraryName || library;
21
23
  const modules = options.modules || {};
22
- if (modules[library]) {
23
- return modules[library];
24
+ if (modules[libraryName]) {
25
+ return modules[libraryName];
24
26
  }
25
27
  if (!isBrowser) {
26
- return "modules/".concat(moduleName, "/dist/libs/").concat(library);
28
+ return "modules/".concat(moduleName, "/dist/libs/").concat(libraryName);
27
29
  }
28
30
  if (options.CDN) {
29
31
  assert(options.CDN.startsWith('http'));
30
- return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(library);
32
+ return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(libraryName);
31
33
  }
32
34
  if (isWorker) {
33
- return "../src/libs/".concat(library);
35
+ return "../src/libs/".concat(libraryName);
34
36
  }
35
- return "modules/".concat(moduleName, "/src/libs/").concat(library);
37
+ return "modules/".concat(moduleName, "/src/libs/").concat(libraryName);
36
38
  }
37
39
  async function loadLibraryFromFile(libraryUrl) {
38
40
  if (libraryUrl.endsWith('wasm')) {
39
- const response = await fetch(libraryUrl);
40
- return await response.arrayBuffer();
41
+ return await loadAsArrayBuffer(libraryUrl);
41
42
  }
42
43
  if (!isBrowser) {
43
44
  try {
@@ -49,8 +50,7 @@ async function loadLibraryFromFile(libraryUrl) {
49
50
  if (isWorker) {
50
51
  return importScripts(libraryUrl);
51
52
  }
52
- const response = await fetch(libraryUrl);
53
- const scriptSource = await response.text();
53
+ const scriptSource = await loadAsText(libraryUrl);
54
54
  return loadLibraryFromString(scriptSource, libraryUrl);
55
55
  }
56
56
  function loadLibraryFromString(scriptSource, id) {
@@ -71,4 +71,18 @@ function loadLibraryFromString(scriptSource, id) {
71
71
  document.body.appendChild(script);
72
72
  return null;
73
73
  }
74
+ async function loadAsArrayBuffer(url) {
75
+ if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
76
+ const response = await fetch(url);
77
+ return await response.arrayBuffer();
78
+ }
79
+ return await node.readFileAsArrayBuffer(url);
80
+ }
81
+ async function loadAsText(url) {
82
+ if (!node.readFileAsText || url.startsWith('http')) {
83
+ const response = await fetch(url);
84
+ return await response.text();
85
+ }
86
+ return await node.readFileAsText(url);
87
+ }
74
88
  //# sourceMappingURL=library-utils.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"library-utils.js","names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","arguments","length","undefined","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","concat","CDN","endsWith","response","fetch","arrayBuffer","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","body"],"sources":["../../../../src/lib/library-utils/library-utils.ts"],"sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\n/**\n * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\n * 'beta' on beta branch, 'latest' on prod branch\n */\nconst LATEST = 'beta';\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {}\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);\n }\n\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(library: string, moduleName?: string, options?: any): string {\n // Check if already a URL\n if (library.startsWith('http')) {\n return library;\n }\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[library]) {\n return modules[library];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${library}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${library}`;\n }\n\n return `modules/${moduleName}/src/libs/${library}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const response = await fetch(libraryUrl);\n const scriptSource = await response.text();\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(global, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n"],"mappings":"AACA,SAAQA,MAAM,EAAEC,SAAS,EAAEC,QAAQ,QAAO,sBAAsB;AAChE,OAAO,KAAKC,IAAI,MAAM,4BAA4B;AAClD,SAAQC,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,OAAO,IAAIC,WAAW,QAAO,sBAAsB;AAM3D,MAAMC,MAAM,GAAG,MAAM;AACrB,MAAMF,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiBE,MAAM;AAEzE,MAAMC,mBAAiD,GAAG,CAAC,CAAC;AAiB5D,OAAO,eAAeC,WAAWA,CAC/BC,UAAkB,EAGJ;EAAA,IAFdC,UAAyB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,IAAI;EAAA,IAChCG,OAAe,GAAAH,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAEpB,IAAID,UAAU,EAAE;IACdD,UAAU,GAAGM,aAAa,CAACN,UAAU,EAAEC,UAAU,EAAEI,OAAO,CAAC;EAC7D;EAIAP,mBAAmB,CAACE,UAAU,CAAC,GAE7BF,mBAAmB,CAACE,UAAU,CAAC,IAAIO,mBAAmB,CAACP,UAAU,CAAC;EACpE,OAAO,MAAMF,mBAAmB,CAACE,UAAU,CAAC;AAC9C;AAGA,OAAO,SAASM,aAAaA,CAACE,OAAe,EAAEP,UAAmB,EAAEI,OAAa,EAAU;EAEzF,IAAIG,OAAO,CAACC,UAAU,CAAC,MAAM,CAAC,EAAE;IAC9B,OAAOD,OAAO;EAChB;EAGA,MAAME,OAAO,GAAGL,OAAO,CAACK,OAAO,IAAI,CAAC,CAAC;EACrC,IAAIA,OAAO,CAACF,OAAO,CAAC,EAAE;IACpB,OAAOE,OAAO,CAACF,OAAO,CAAC;EACzB;EAIA,IAAI,CAACjB,SAAS,EAAE;IACd,kBAAAoB,MAAA,CAAkBV,UAAU,iBAAAU,MAAA,CAAcH,OAAO;EACnD;EAGA,IAAIH,OAAO,CAACO,GAAG,EAAE;IACflB,MAAM,CAACW,OAAO,CAACO,GAAG,CAACH,UAAU,CAAC,MAAM,CAAC,CAAC;IACtC,UAAAE,MAAA,CAAUN,OAAO,CAACO,GAAG,OAAAD,MAAA,CAAIV,UAAU,OAAAU,MAAA,CAAIhB,OAAO,iBAAAgB,MAAA,CAAcH,OAAO;EACrE;EAGA,IAAIhB,QAAQ,EAAE;IACZ,sBAAAmB,MAAA,CAAsBH,OAAO;EAC/B;EAEA,kBAAAG,MAAA,CAAkBV,UAAU,gBAAAU,MAAA,CAAaH,OAAO;AAClD;AAEA,eAAeD,mBAAmBA,CAACP,UAAkB,EAAgB;EACnE,IAAIA,UAAU,CAACa,QAAQ,CAAC,MAAM,CAAC,EAAE;IAC/B,MAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACf,UAAU,CAAC;IACxC,OAAO,MAAMc,QAAQ,CAACE,WAAW,CAAC,CAAC;EACrC;EAEA,IAAI,CAACzB,SAAS,EAAE;IACd,IAAI;MACF,OAAOE,IAAI,IAAIA,IAAI,CAACwB,eAAe,KAAK,MAAMxB,IAAI,CAACwB,eAAe,CAACjB,UAAU,CAAC,CAAC;IACjF,CAAC,CAAC,MAAM;MACN,OAAO,IAAI;IACb;EACF;EACA,IAAIR,QAAQ,EAAE;IACZ,OAAO0B,aAAa,CAAClB,UAAU,CAAC;EAClC;EAMA,MAAMc,QAAQ,GAAG,MAAMC,KAAK,CAACf,UAAU,CAAC;EACxC,MAAMmB,YAAY,GAAG,MAAML,QAAQ,CAACM,IAAI,CAAC,CAAC;EAC1C,OAAOC,qBAAqB,CAACF,YAAY,EAAEnB,UAAU,CAAC;AACxD;AAoBA,SAASqB,qBAAqBA,CAACF,YAAoB,EAAEG,EAAU,EAAc;EAC3E,IAAI,CAAC/B,SAAS,EAAE;IACd,OAAOE,IAAI,CAAC8B,iBAAiB,IAAI9B,IAAI,CAAC8B,iBAAiB,CAACJ,YAAY,EAAEG,EAAE,CAAC;EAC3E;EAEA,IAAI9B,QAAQ,EAAE;IAEZgC,IAAI,CAACC,IAAI,CAACnC,MAAM,EAAE6B,YAAY,CAAC;IAG/B,OAAO,IAAI;EACb;EAEA,MAAMO,MAAM,GAAGC,QAAQ,CAACC,aAAa,CAAC,QAAQ,CAAC;EAC/CF,MAAM,CAACJ,EAAE,GAAGA,EAAE;EAEd,IAAI;IACFI,MAAM,CAACG,WAAW,CAACF,QAAQ,CAACG,cAAc,CAACX,YAAY,CAAC,CAAC;EAC3D,CAAC,CAAC,OAAOY,CAAC,EAAE;IACVL,MAAM,CAACN,IAAI,GAAGD,YAAY;EAC5B;EACAQ,QAAQ,CAACK,IAAI,CAACH,WAAW,CAACH,MAAM,CAAC;EACjC,OAAO,IAAI;AACb"}
1
+ {"version":3,"file":"library-utils.js","names":["global","isBrowser","isWorker","node","assert","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","arguments","length","undefined","options","libraryName","getLibraryUrl","loadLibraryFromFile","library","useLocalLibraries","startsWith","modules","concat","CDN","endsWith","loadAsArrayBuffer","requireFromFile","importScripts","scriptSource","loadAsText","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","text","body","url","readFileAsArrayBuffer","response","fetch","arrayBuffer","readFileAsText"],"sources":["../../../../src/lib/library-utils/library-utils.ts"],"sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {},\n libraryName: string | null = null\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);\n }\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(\n library: string,\n moduleName?: string,\n options: any = {},\n libraryName: string | null = null\n): string {\n // Check if already a URL\n if (!options.useLocalLibraries && library.startsWith('http')) {\n return library;\n }\n\n libraryName = libraryName || library;\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[libraryName]) {\n return modules[libraryName];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${libraryName}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${libraryName}`;\n }\n\n return `modules/${moduleName}/src/libs/${libraryName}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n return await loadAsArrayBuffer(libraryUrl);\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const scriptSource = await loadAsText(libraryUrl);\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(global, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n\nasync function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {\n if (!node.readFileAsArrayBuffer || url.startsWith('http')) {\n const response = await fetch(url);\n return await response.arrayBuffer();\n }\n return await node.readFileAsArrayBuffer(url);\n}\n\n/**\n * Load a file from local file system\n * @param filename\n * @returns\n */\nasync function loadAsText(url: string): Promise<string> {\n if (!node.readFileAsText || url.startsWith('http')) {\n const response = await fetch(url);\n return await response.text();\n }\n return await node.readFileAsText(url);\n}\n"],"mappings":"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"}
@@ -1,5 +1,22 @@
1
1
  import Module from 'module';
2
2
  import path from 'path';
3
+ import fs from 'fs';
4
+ export async function readFileAsArrayBuffer(filename) {
5
+ if (filename.startsWith('http')) {
6
+ const response = await fetch(filename);
7
+ return await response.arrayBuffer();
8
+ }
9
+ const buffer = fs.readFileSync(filename);
10
+ return buffer.buffer;
11
+ }
12
+ export async function readFileAsText(filename) {
13
+ if (filename.startsWith('http')) {
14
+ const response = await fetch(filename);
15
+ return await response.text();
16
+ }
17
+ const text = fs.readFileSync(filename, 'utf8');
18
+ return text;
19
+ }
3
20
  export async function requireFromFile(filename) {
4
21
  if (filename.startsWith('http')) {
5
22
  const response = await fetch(filename);
@@ -1 +1 @@
1
- {"version":3,"file":"require-utils.node.js","names":["Module","path","requireFromFile","filename","startsWith","response","fetch","code","text","requireFromString","concat","process","cwd","require","_options","_options2","arguments","length","undefined","options","Error","paths","_nodeModulePaths","dirname","parent","module","newModule","prependPaths","appendPaths","_compile","children","splice","indexOf","exports"],"sources":["../../../../src/lib/node/require-utils.node.ts"],"sourcesContent":["// Fork of https://github.com/floatdrop/require-from-string/blob/master/index.js\n// Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)\n// MIT license\n\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\n\nimport Module from 'module';\nimport path from 'path';\n\n// Node.js Dynamically require from file\n// Relative names are resolved relative to cwd\n// This indirect function is provided because webpack will try to bundle `module.require`.\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\nexport async function requireFromFile(filename: string): Promise<any> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n const code = await response.text();\n return requireFromString(code);\n }\n\n if (!filename.startsWith('/')) {\n filename = `${process.cwd()}/${filename}`;\n }\n return require(filename);\n}\n\n// Dynamically require from string\n// - `code` - Required - Type: string - Module code.\n// - `filename` - Type: string - Default: '' - Optional filename.\n// - `options.appendPaths` Type: Array List of paths, that will be appended to module paths.\n// Useful, when you want to be able require modules from these paths.\n// - `options.prependPaths` Type: Array Same as appendPaths, but paths will be prepended.\nexport function requireFromString(\n code: string,\n filename = '',\n options?: {\n prependPaths?: string[];\n appendPaths?: string[];\n }\n): any {\n if (typeof filename === 'object') {\n options = filename;\n filename = '';\n }\n\n if (typeof code !== 'string') {\n throw new Error(`code must be a string, not ${typeof code}`);\n }\n\n // @ts-ignore\n const paths = Module._nodeModulePaths(path.dirname(filename));\n\n const parent = module.parent;\n // @ts-ignore\n const newModule = new Module(filename, parent);\n newModule.filename = filename;\n newModule.paths = ([] as string[])\n .concat(options?.prependPaths || [])\n .concat(paths)\n .concat(options?.appendPaths || []);\n // @ts-ignore\n newModule._compile(code, filename);\n\n if (parent && parent.children) {\n parent.children.splice(parent.children.indexOf(newModule), 1);\n }\n\n return newModule.exports;\n}\n"],"mappings":"AAMA,OAAOA,MAAM,MAAM,QAAQ;AAC3B,OAAOC,IAAI,MAAM,MAAM;AAMvB,OAAO,eAAeC,eAAeA,CAACC,QAAgB,EAAgB;EACpE,IAAIA,QAAQ,CAACC,UAAU,CAAC,MAAM,CAAC,EAAE;IAC/B,MAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACH,QAAQ,CAAC;IACtC,MAAMI,IAAI,GAAG,MAAMF,QAAQ,CAACG,IAAI,CAAC,CAAC;IAClC,OAAOC,iBAAiB,CAACF,IAAI,CAAC;EAChC;EAEA,IAAI,CAACJ,QAAQ,CAACC,UAAU,CAAC,GAAG,CAAC,EAAE;IAC7BD,QAAQ,MAAAO,MAAA,CAAMC,OAAO,CAACC,GAAG,CAAC,CAAC,OAAAF,MAAA,CAAIP,QAAQ,CAAE;EAC3C;EACA,OAAOU,OAAO,CAACV,QAAQ,CAAC;AAC1B;AAQA,OAAO,SAASM,iBAAiBA,CAC/BF,IAAY,EAMP;EAAA,IAAAO,QAAA,EAAAC,SAAA;EAAA,IALLZ,QAAQ,GAAAa,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,EAAE;EAAA,IACbG,OAGC,GAAAH,SAAA,CAAAC,MAAA,OAAAD,SAAA,MAAAE,SAAA;EAED,IAAI,OAAOf,QAAQ,KAAK,QAAQ,EAAE;IAChCgB,OAAO,GAAGhB,QAAQ;IAClBA,QAAQ,GAAG,EAAE;EACf;EAEA,IAAI,OAAOI,IAAI,KAAK,QAAQ,EAAE;IAC5B,MAAM,IAAIa,KAAK,+BAAAV,MAAA,CAA+B,OAAOH,IAAI,CAAE,CAAC;EAC9D;EAGA,MAAMc,KAAK,GAAGrB,MAAM,CAACsB,gBAAgB,CAACrB,IAAI,CAACsB,OAAO,CAACpB,QAAQ,CAAC,CAAC;EAE7D,MAAMqB,MAAM,GAAGC,MAAM,CAACD,MAAM;EAE5B,MAAME,SAAS,GAAG,IAAI1B,MAAM,CAACG,QAAQ,EAAEqB,MAAM,CAAC;EAC9CE,SAAS,CAACvB,QAAQ,GAAGA,QAAQ;EAC7BuB,SAAS,CAACL,KAAK,GAAI,EAAE,CAClBX,MAAM,CAAC,EAAAI,QAAA,GAAAK,OAAO,cAAAL,QAAA,uBAAPA,QAAA,CAASa,YAAY,KAAI,EAAE,CAAC,CACnCjB,MAAM,CAACW,KAAK,CAAC,CACbX,MAAM,CAAC,EAAAK,SAAA,GAAAI,OAAO,cAAAJ,SAAA,uBAAPA,SAAA,CAASa,WAAW,KAAI,EAAE,CAAC;EAErCF,SAAS,CAACG,QAAQ,CAACtB,IAAI,EAAEJ,QAAQ,CAAC;EAElC,IAAIqB,MAAM,IAAIA,MAAM,CAACM,QAAQ,EAAE;IAC7BN,MAAM,CAACM,QAAQ,CAACC,MAAM,CAACP,MAAM,CAACM,QAAQ,CAACE,OAAO,CAACN,SAAS,CAAC,EAAE,CAAC,CAAC;EAC/D;EAEA,OAAOA,SAAS,CAACO,OAAO;AAC1B"}
1
+ {"version":3,"file":"require-utils.node.js","names":["Module","path","fs","readFileAsArrayBuffer","filename","startsWith","response","fetch","arrayBuffer","buffer","readFileSync","readFileAsText","text","requireFromFile","code","requireFromString","concat","process","cwd","require","_options","_options2","arguments","length","undefined","options","Error","paths","_nodeModulePaths","dirname","parent","module","newModule","prependPaths","appendPaths","_compile","children","splice","indexOf","exports"],"sources":["../../../../src/lib/node/require-utils.node.ts"],"sourcesContent":["// Fork of https://github.com/floatdrop/require-from-string/blob/master/index.js\n// Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)\n// MIT license\n\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\n\nimport Module from 'module';\nimport path from 'path';\nimport fs from 'fs';\n\n/**\n * Load a file from local file system\n * @param filename\n * @returns\n */\nexport async function readFileAsArrayBuffer(filename: string): Promise<ArrayBuffer> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n return await response.arrayBuffer();\n }\n const buffer = fs.readFileSync(filename);\n return buffer.buffer;\n}\n\n/**\n * Load a file from local file system\n * @param filename\n * @returns\n */\nexport async function readFileAsText(filename: string): Promise<string> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n return await response.text();\n }\n const text = fs.readFileSync(filename, 'utf8');\n return text;\n}\n\n// Node.js Dynamically require from file\n// Relative names are resolved relative to cwd\n// This indirect function is provided because webpack will try to bundle `module.require`.\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\nexport async function requireFromFile(filename: string): Promise<any> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n const code = await response.text();\n return requireFromString(code);\n }\n\n if (!filename.startsWith('/')) {\n filename = `${process.cwd()}/${filename}`;\n }\n return require(filename);\n}\n\n// Dynamically require from string\n// - `code` - Required - Type: string - Module code.\n// - `filename` - Type: string - Default: '' - Optional filename.\n// - `options.appendPaths` Type: Array List of paths, that will be appended to module paths.\n// Useful, when you want to be able require modules from these paths.\n// - `options.prependPaths` Type: Array Same as appendPaths, but paths will be prepended.\nexport function requireFromString(\n code: string,\n filename = '',\n options?: {\n prependPaths?: string[];\n appendPaths?: string[];\n }\n): any {\n if (typeof filename === 'object') {\n options = filename;\n filename = '';\n }\n\n if (typeof code !== 'string') {\n throw new Error(`code must be a string, not ${typeof code}`);\n }\n\n // @ts-ignore\n const paths = Module._nodeModulePaths(path.dirname(filename));\n\n const parent = module.parent;\n // @ts-ignore\n const newModule = new Module(filename, parent);\n newModule.filename = filename;\n newModule.paths = ([] as string[])\n .concat(options?.prependPaths || [])\n .concat(paths)\n .concat(options?.appendPaths || []);\n // @ts-ignore\n newModule._compile(code, filename);\n\n if (parent && parent.children) {\n parent.children.splice(parent.children.indexOf(newModule), 1);\n }\n\n return newModule.exports;\n}\n"],"mappings":"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"}
@@ -1,8 +1,6 @@
1
1
  import { assert } from '../env-utils/assert';
2
2
  import { isBrowser } from '../env-utils/globals';
3
- import { VERSION as __VERSION__ } from '../env-utils/version';
4
- const NPM_TAG = 'beta';
5
- const VERSION = typeof "4.0.0-alpha.9" !== 'undefined' ? "4.0.0-alpha.9" : NPM_TAG;
3
+ import { VERSION, NPM_TAG } from '../env-utils/version';
6
4
  export function getWorkerName(worker) {
7
5
  const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
8
6
  return "".concat(worker.name, "@").concat(worker.version).concat(warning);
@@ -1 +1 @@
1
- {"version":3,"file":"get-worker-url.js","names":["assert","isBrowser","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","concat","name","getWorkerURL","options","arguments","length","undefined","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // 'beta', or '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 = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.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":"AAGA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,SAAS,QAAO,sBAAsB;AAC9C,SAAQC,OAAO,IAAIC,WAAW,QAAO,sBAAsB;AAE3D,MAAMC,OAAO,GAAG,MAAM;AACtB,MAAMF,OAAO,GAAG,sBAAkB,KAAK,WAAW,qBAAiBE,OAAO;AAK1E,OAAO,SAASC,aAAaA,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKN,OAAO,qBAAAO,MAAA,CAAqBP,OAAO,SAAM,EAAE;EAC9E,UAAAO,MAAA,CAAUH,MAAM,CAACI,IAAI,OAAAD,MAAA,CAAIH,MAAM,CAACE,OAAO,EAAAC,MAAA,CAAGF,OAAO;AACnD;AASA,OAAO,SAASI,YAAYA,CAACL,MAAoB,EAAuC;EAAA,IAArCM,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,MAAMG,aAAa,GAAGJ,OAAO,CAACN,MAAM,CAACW,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,GAAGjB,SAAS,MAAAQ,MAAA,CAAMH,MAAM,CAACW,EAAE,qBAAAR,MAAA,CAAkBH,MAAM,CAACW,EAAE,oBAAiB;EAEvF,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIb,MAAM,CAACW,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGP,OAAO,CAACQ,SAAS;EACzB;EAIA,IAAIR,OAAO,CAACS,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,cAAAV,MAAA,CAAcH,MAAM,CAACgB,MAAM,YAAAb,MAAA,CAASS,UAAU,CAAE;EACrD;EAGA,IAAI,CAACC,GAAG,EAAE;IAER,IAAIX,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGJ,OAAO;IACnB;IACA,MAAMmB,UAAU,GAAGf,OAAO,OAAAC,MAAA,CAAOD,OAAO,IAAK,EAAE;IAC/CW,GAAG,oCAAAV,MAAA,CAAoCH,MAAM,CAACgB,MAAM,EAAAb,MAAA,CAAGc,UAAU,YAAAd,MAAA,CAASS,UAAU,CAAE;EACxF;EAEAlB,MAAM,CAACmB,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
1
+ {"version":3,"file":"get-worker-url.js","names":["assert","isBrowser","VERSION","NPM_TAG","getWorkerName","worker","warning","version","concat","name","getWorkerURL","options","arguments","length","undefined","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["// loaders.gl, MIT license\n\nimport type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {isBrowser} from '../env-utils/globals';\nimport {VERSION, NPM_TAG} from '../env-utils/version';\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 = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.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":"AAGA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,SAAS,QAAO,sBAAsB;AAC9C,SAAQC,OAAO,EAAEC,OAAO,QAAO,sBAAsB;AAKrD,OAAO,SAASC,aAAaA,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKL,OAAO,qBAAAM,MAAA,CAAqBN,OAAO,SAAM,EAAE;EAC9E,UAAAM,MAAA,CAAUH,MAAM,CAACI,IAAI,OAAAD,MAAA,CAAIH,MAAM,CAACE,OAAO,EAAAC,MAAA,CAAGF,OAAO;AACnD;AASA,OAAO,SAASI,YAAYA,CAACL,MAAoB,EAAuC;EAAA,IAArCM,OAAsB,GAAAC,SAAA,CAAAC,MAAA,QAAAD,SAAA,QAAAE,SAAA,GAAAF,SAAA,MAAG,CAAC,CAAC;EAC5E,MAAMG,aAAa,GAAGJ,OAAO,CAACN,MAAM,CAACW,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,GAAGhB,SAAS,MAAAO,MAAA,CAAMH,MAAM,CAACW,EAAE,qBAAAR,MAAA,CAAkBH,MAAM,CAACW,EAAE,oBAAiB;EAEvF,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;EAQjC,IAAI,CAACD,GAAG,IAAIb,MAAM,CAACW,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGP,OAAO,CAACQ,SAAS;EACzB;EAIA,IAAIR,OAAO,CAACS,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,cAAAV,MAAA,CAAcH,MAAM,CAACgB,MAAM,YAAAb,MAAA,CAASS,UAAU,CAAE;EACrD;EAGA,IAAI,CAACC,GAAG,EAAE;IAER,IAAIX,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGJ,OAAO;IACnB;IACA,MAAMmB,UAAU,GAAGf,OAAO,OAAAC,MAAA,CAAOD,OAAO,IAAK,EAAE;IAC/CW,GAAG,oCAAAV,MAAA,CAAoCH,MAAM,CAACgB,MAAM,EAAAb,MAAA,CAAGc,UAAU,YAAAd,MAAA,CAASS,UAAU,CAAE;EACxF;EAEAjB,MAAM,CAACkB,GAAG,CAAC;EAGX,OAAOA,GAAG;AACZ"}
@@ -1,2 +1,7 @@
1
- export declare const VERSION: string;
1
+ /**
2
+ * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
3
+ * 'beta' on beta branch, 'latest' on prod branch
4
+ */
5
+ export declare const NPM_TAG = "beta";
6
+ export declare const VERSION: any;
2
7
  //# sourceMappingURL=version.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/lib/env-utils/version.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,OAAO,QAAqE,CAAC"}
1
+ {"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../../src/lib/env-utils/version.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,eAAO,MAAM,OAAO,SAAS,CAAC;AAsB9B,eAAO,MAAM,OAAO,KAAe,CAAC"}
@@ -13,6 +13,6 @@
13
13
  * @param moduleName
14
14
  * @param options
15
15
  */
16
- export declare function loadLibrary(libraryUrl: string, moduleName?: string | null, options?: object): Promise<any>;
17
- export declare function getLibraryUrl(library: string, moduleName?: string, options?: any): string;
16
+ export declare function loadLibrary(libraryUrl: string, moduleName?: string | null, options?: object, libraryName?: string | null): Promise<any>;
17
+ export declare function getLibraryUrl(library: string, moduleName?: string, options?: any, libraryName?: string | null): string;
18
18
  //# sourceMappingURL=library-utils.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"library-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/library-utils/library-utils.ts"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAM,GAAG,IAAW,EAChC,OAAO,GAAE,MAAW,GACnB,OAAO,CAAC,GAAG,CAAC,CAWd;AAGD,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,GAAG,MAAM,CA8BzF"}
1
+ {"version":3,"file":"library-utils.d.ts","sourceRoot":"","sources":["../../../src/lib/library-utils/library-utils.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,UAAU,GAAE,MAAM,GAAG,IAAW,EAChC,OAAO,GAAE,MAAW,EACpB,WAAW,GAAE,MAAM,GAAG,IAAW,GAChC,OAAO,CAAC,GAAG,CAAC,CAUd;AAGD,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,UAAU,CAAC,EAAE,MAAM,EACnB,OAAO,GAAE,GAAQ,EACjB,WAAW,GAAE,MAAM,GAAG,IAAW,GAChC,MAAM,CAgCR"}
@@ -1,3 +1,15 @@
1
+ /**
2
+ * Load a file from local file system
3
+ * @param filename
4
+ * @returns
5
+ */
6
+ export declare function readFileAsArrayBuffer(filename: string): Promise<ArrayBuffer>;
7
+ /**
8
+ * Load a file from local file system
9
+ * @param filename
10
+ * @returns
11
+ */
12
+ export declare function readFileAsText(filename: string): Promise<string>;
1
13
  export declare function requireFromFile(filename: string): Promise<any>;
2
14
  export declare function requireFromString(code: string, filename?: string, options?: {
3
15
  prependPaths?: string[];
@@ -1 +1 @@
1
- {"version":3,"file":"require-utils.node.d.ts","sourceRoot":"","sources":["../../../src/lib/node/require-utils.node.ts"],"names":[],"mappings":"AAaA,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAWpE;AAQD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,SAAK,EACb,OAAO,CAAC,EAAE;IACR,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,GAAG,CA6BL"}
1
+ {"version":3,"file":"require-utils.node.d.ts","sourceRoot":"","sources":["../../../src/lib/node/require-utils.node.ts"],"names":[],"mappings":"AAUA;;;;GAIG;AACH,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC,CAOlF;AAED;;;;GAIG;AACH,wBAAsB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAOtE;AAMD,wBAAsB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAWpE;AAQD,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,MAAM,EACZ,QAAQ,SAAK,EACb,OAAO,CAAC,EAAE;IACR,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;CACxB,GACA,GAAG,CA6BL"}
@@ -1 +1 @@
1
- {"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAQ7D;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAG1D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAwCtF"}
1
+ {"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAK7D;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAG1D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAwCtF"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@loaders.gl/worker-utils",
3
- "version": "4.0.0-alpha.9",
3
+ "version": "4.0.0-beta.2",
4
4
  "description": "Utilities for running tasks on worker threads",
5
5
  "license": "MIT",
6
6
  "publishConfig": {
@@ -26,17 +26,16 @@
26
26
  ],
27
27
  "browser": {
28
28
  "child_process": false,
29
+ "module": false,
30
+ "path": false,
29
31
  "fs": false,
30
32
  "./src/lib/node/worker_threads.ts": "./src/lib/node/worker_threads-browser.ts",
31
- "./dist/lib/node/worker_threads.js": "./dist/lib/node/worker_threads-browser.js",
32
33
  "./dist/es5/lib/node/worker_threads.js": "./dist/es5/lib/node/worker_threads-browser.js",
33
34
  "./dist/esm/lib/node/worker_threads.js": "./dist/esm/lib/node/worker_threads-browser.js",
34
35
  "./src/lib/node/require-utils.node.ts": false,
35
- "./dist/lib/node/require-utils.node.js": false,
36
36
  "./dist/es5/lib/node/require-utils.node.js": false,
37
37
  "./dist/esm/lib/node/require-utils.node.js": false,
38
38
  "./src/lib/process-utils/child-process-proxy.ts": false,
39
- "./dist/lib/process-utils/child-process-proxy.js": false,
40
39
  "./dist/es5/lib/process-utils/child-process-proxy.js": false,
41
40
  "./dist/esm/lib/process-utils/child-process-proxy.js": false
42
41
  },
@@ -50,5 +49,5 @@
50
49
  "dependencies": {
51
50
  "@babel/runtime": "^7.3.1"
52
51
  },
53
- "gitHead": "03ff81ab468f20f3bddeec787aa88d477a7e1c72"
52
+ "gitHead": "79c2033f755e88e11bc30a04428e3666b177b8fc"
54
53
  }
@@ -1,13 +1,29 @@
1
1
  // Version constant cannot be imported, it needs to correspond to the build version of **this** module.
2
- // __VERSION__ is injected by babel-plugin-version-inline
3
2
 
4
- // Change to `latest` on production branches
5
- const DEFAULT_VERSION = 'beta';
3
+ /**
4
+ * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
5
+ * 'beta' on beta branch, 'latest' on prod branch
6
+ */
7
+ export const NPM_TAG = 'beta'; // Change to `latest` on production branches
8
+
6
9
  declare let __VERSION__: string;
7
- export const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;
8
- if (typeof __VERSION__ === 'undefined') {
9
- // eslint-disable-next-line
10
- console.error(
11
- 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'
12
- );
10
+
11
+ function getVersion() {
12
+ if (!globalThis._loadersgl_?.version) {
13
+ globalThis._loadersgl_ = globalThis._loadersgl_ || {};
14
+ // __VERSION__ is injected by babel-plugin-version-inline
15
+ if (typeof __VERSION__ === 'undefined') {
16
+ // eslint-disable-next-line
17
+ console.error(
18
+ 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'
19
+ );
20
+ globalThis._loadersgl_.version = NPM_TAG;
21
+ } else {
22
+ globalThis._loadersgl_.version = __VERSION__;
23
+ }
24
+ }
25
+
26
+ return globalThis._loadersgl_.version;
13
27
  }
28
+
29
+ export const VERSION = getVersion();
@@ -2,14 +2,7 @@
2
2
  import {global, isBrowser, isWorker} from '../env-utils/globals';
3
3
  import * as node from '../node/require-utils.node';
4
4
  import {assert} from '../env-utils/assert';
5
- import {VERSION as __VERSION__} from '../env-utils/version';
6
-
7
- /**
8
- * TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
9
- * 'beta' on beta branch, 'latest' on prod branch
10
- */
11
- const LATEST = 'beta';
12
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;
5
+ import {VERSION} from '../env-utils/version';
13
6
 
14
7
  const loadLibraryPromises: Record<string, Promise<any>> = {}; // promises
15
8
 
@@ -31,12 +24,12 @@ const loadLibraryPromises: Record<string, Promise<any>> = {}; // promises
31
24
  export async function loadLibrary(
32
25
  libraryUrl: string,
33
26
  moduleName: string | null = null,
34
- options: object = {}
27
+ options: object = {},
28
+ libraryName: string | null = null
35
29
  ): Promise<any> {
36
30
  if (moduleName) {
37
- libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
31
+ libraryUrl = getLibraryUrl(libraryUrl, moduleName, options, libraryName);
38
32
  }
39
-
40
33
  // Ensure libraries are only loaded once
41
34
 
42
35
  loadLibraryPromises[libraryUrl] =
@@ -46,42 +39,48 @@ export async function loadLibrary(
46
39
  }
47
40
 
48
41
  // TODO - sort out how to resolve paths for main/worker and dev/prod
49
- export function getLibraryUrl(library: string, moduleName?: string, options?: any): string {
42
+ export function getLibraryUrl(
43
+ library: string,
44
+ moduleName?: string,
45
+ options: any = {},
46
+ libraryName: string | null = null
47
+ ): string {
50
48
  // Check if already a URL
51
- if (library.startsWith('http')) {
49
+ if (!options.useLocalLibraries && library.startsWith('http')) {
52
50
  return library;
53
51
  }
54
52
 
53
+ libraryName = libraryName || library;
54
+
55
55
  // Allow application to import and supply libraries through `options.modules`
56
56
  const modules = options.modules || {};
57
- if (modules[library]) {
58
- return modules[library];
57
+ if (modules[libraryName]) {
58
+ return modules[libraryName];
59
59
  }
60
60
 
61
61
  // Load from local files, not from CDN scripts in Node.js
62
62
  // TODO - needs to locate the modules directory when installed!
63
63
  if (!isBrowser) {
64
- return `modules/${moduleName}/dist/libs/${library}`;
64
+ return `modules/${moduleName}/dist/libs/${libraryName}`;
65
65
  }
66
66
 
67
67
  // In browser, load from external scripts
68
68
  if (options.CDN) {
69
69
  assert(options.CDN.startsWith('http'));
70
- return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;
70
+ return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${libraryName}`;
71
71
  }
72
72
 
73
73
  // TODO - loading inside workers requires paths relative to worker script location...
74
74
  if (isWorker) {
75
- return `../src/libs/${library}`;
75
+ return `../src/libs/${libraryName}`;
76
76
  }
77
77
 
78
- return `modules/${moduleName}/src/libs/${library}`;
78
+ return `modules/${moduleName}/src/libs/${libraryName}`;
79
79
  }
80
80
 
81
81
  async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
82
82
  if (libraryUrl.endsWith('wasm')) {
83
- const response = await fetch(libraryUrl);
84
- return await response.arrayBuffer();
83
+ return await loadAsArrayBuffer(libraryUrl);
85
84
  }
86
85
 
87
86
  if (!isBrowser) {
@@ -99,8 +98,7 @@ async function loadLibraryFromFile(libraryUrl: string): Promise<any> {
99
98
  // return await loadScriptFromFile(libraryUrl);
100
99
  // }
101
100
 
102
- const response = await fetch(libraryUrl);
103
- const scriptSource = await response.text();
101
+ const scriptSource = await loadAsText(libraryUrl);
104
102
  return loadLibraryFromString(scriptSource, libraryUrl);
105
103
  }
106
104
 
@@ -161,3 +159,24 @@ function combineWorkerWithLibrary(worker, jsContent) {
161
159
  this.workerSourceURL = URL.createObjectURL(new Blob([body]));
162
160
  }
163
161
  */
162
+
163
+ async function loadAsArrayBuffer(url: string): Promise<ArrayBuffer> {
164
+ if (!node.readFileAsArrayBuffer || url.startsWith('http')) {
165
+ const response = await fetch(url);
166
+ return await response.arrayBuffer();
167
+ }
168
+ return await node.readFileAsArrayBuffer(url);
169
+ }
170
+
171
+ /**
172
+ * Load a file from local file system
173
+ * @param filename
174
+ * @returns
175
+ */
176
+ async function loadAsText(url: string): Promise<string> {
177
+ if (!node.readFileAsText || url.startsWith('http')) {
178
+ const response = await fetch(url);
179
+ return await response.text();
180
+ }
181
+ return await node.readFileAsText(url);
182
+ }
@@ -6,6 +6,35 @@
6
6
 
7
7
  import Module from 'module';
8
8
  import path from 'path';
9
+ import fs from 'fs';
10
+
11
+ /**
12
+ * Load a file from local file system
13
+ * @param filename
14
+ * @returns
15
+ */
16
+ export async function readFileAsArrayBuffer(filename: string): Promise<ArrayBuffer> {
17
+ if (filename.startsWith('http')) {
18
+ const response = await fetch(filename);
19
+ return await response.arrayBuffer();
20
+ }
21
+ const buffer = fs.readFileSync(filename);
22
+ return buffer.buffer;
23
+ }
24
+
25
+ /**
26
+ * Load a file from local file system
27
+ * @param filename
28
+ * @returns
29
+ */
30
+ export async function readFileAsText(filename: string): Promise<string> {
31
+ if (filename.startsWith('http')) {
32
+ const response = await fetch(filename);
33
+ return await response.text();
34
+ }
35
+ const text = fs.readFileSync(filename, 'utf8');
36
+ return text;
37
+ }
9
38
 
10
39
  // Node.js Dynamically require from file
11
40
  // Relative names are resolved relative to cwd
@@ -3,10 +3,7 @@
3
3
  import type {WorkerObject, WorkerOptions} from '../../types';
4
4
  import {assert} from '../env-utils/assert';
5
5
  import {isBrowser} from '../env-utils/globals';
6
- import {VERSION as __VERSION__} from '../env-utils/version';
7
-
8
- const NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch
9
- const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;
6
+ import {VERSION, NPM_TAG} from '../env-utils/version';
10
7
 
11
8
  /**
12
9
  * Gets worker object's name (for debugging in Chrome thread inspector window)
package/dist/index.js DELETED
@@ -1,59 +0,0 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.NullWorker = exports.ChildProcessProxy = exports.AsyncQueue = exports.loadLibrary = exports.getLibraryUrl = exports.getTransferListForWriter = exports.getTransferList = exports.validateWorkerVersion = exports.getWorkerURL = exports.createWorker = exports.canProcessOnWorker = exports.processOnWorker = exports.WorkerBody = exports.WorkerPool = exports.WorkerFarm = exports.WorkerThread = exports.WorkerJob = exports.isWorker = exports.isBrowser = exports.assert = void 0;
7
- const version_1 = require("./lib/env-utils/version");
8
- // GENERAL UTILS
9
- var assert_1 = require("./lib/env-utils/assert");
10
- Object.defineProperty(exports, "assert", { enumerable: true, get: function () { return assert_1.assert; } });
11
- var globals_1 = require("./lib/env-utils/globals");
12
- Object.defineProperty(exports, "isBrowser", { enumerable: true, get: function () { return globals_1.isBrowser; } });
13
- Object.defineProperty(exports, "isWorker", { enumerable: true, get: function () { return globals_1.isWorker; } });
14
- // WORKER UTILS - TYPES
15
- var worker_job_1 = require("./lib/worker-farm/worker-job");
16
- Object.defineProperty(exports, "WorkerJob", { enumerable: true, get: function () { return __importDefault(worker_job_1).default; } });
17
- var worker_thread_1 = require("./lib/worker-farm/worker-thread");
18
- Object.defineProperty(exports, "WorkerThread", { enumerable: true, get: function () { return __importDefault(worker_thread_1).default; } });
19
- // WORKER FARMS
20
- var worker_farm_1 = require("./lib/worker-farm/worker-farm");
21
- Object.defineProperty(exports, "WorkerFarm", { enumerable: true, get: function () { return __importDefault(worker_farm_1).default; } });
22
- var worker_pool_1 = require("./lib/worker-farm/worker-pool");
23
- Object.defineProperty(exports, "WorkerPool", { enumerable: true, get: function () { return __importDefault(worker_pool_1).default; } });
24
- var worker_body_1 = require("./lib/worker-farm/worker-body");
25
- Object.defineProperty(exports, "WorkerBody", { enumerable: true, get: function () { return __importDefault(worker_body_1).default; } });
26
- var process_on_worker_1 = require("./lib/worker-api/process-on-worker");
27
- Object.defineProperty(exports, "processOnWorker", { enumerable: true, get: function () { return process_on_worker_1.processOnWorker; } });
28
- Object.defineProperty(exports, "canProcessOnWorker", { enumerable: true, get: function () { return process_on_worker_1.canProcessOnWorker; } });
29
- var create_worker_1 = require("./lib/worker-api/create-worker");
30
- Object.defineProperty(exports, "createWorker", { enumerable: true, get: function () { return create_worker_1.createWorker; } });
31
- // WORKER UTILS - EXPORTS
32
- var get_worker_url_1 = require("./lib/worker-api/get-worker-url");
33
- Object.defineProperty(exports, "getWorkerURL", { enumerable: true, get: function () { return get_worker_url_1.getWorkerURL; } });
34
- var validate_worker_version_1 = require("./lib/worker-api/validate-worker-version");
35
- Object.defineProperty(exports, "validateWorkerVersion", { enumerable: true, get: function () { return validate_worker_version_1.validateWorkerVersion; } });
36
- var get_transfer_list_1 = require("./lib/worker-utils/get-transfer-list");
37
- Object.defineProperty(exports, "getTransferList", { enumerable: true, get: function () { return get_transfer_list_1.getTransferList; } });
38
- Object.defineProperty(exports, "getTransferListForWriter", { enumerable: true, get: function () { return get_transfer_list_1.getTransferListForWriter; } });
39
- // LIBRARY UTILS
40
- var library_utils_1 = require("./lib/library-utils/library-utils");
41
- Object.defineProperty(exports, "getLibraryUrl", { enumerable: true, get: function () { return library_utils_1.getLibraryUrl; } });
42
- Object.defineProperty(exports, "loadLibrary", { enumerable: true, get: function () { return library_utils_1.loadLibrary; } });
43
- // PARSER UTILS
44
- var async_queue_1 = require("./lib/async-queue/async-queue");
45
- Object.defineProperty(exports, "AsyncQueue", { enumerable: true, get: function () { return __importDefault(async_queue_1).default; } });
46
- // PROCESS UTILS
47
- var child_process_proxy_1 = require("./lib/process-utils/child-process-proxy");
48
- Object.defineProperty(exports, "ChildProcessProxy", { enumerable: true, get: function () { return __importDefault(child_process_proxy_1).default; } });
49
- // WORKER OBJECTS
50
- /** A null worker to test that worker processing is functional */
51
- exports.NullWorker = {
52
- id: 'null',
53
- name: 'null',
54
- module: 'worker-utils',
55
- version: version_1.VERSION,
56
- options: {
57
- null: {}
58
- }
59
- };