@loaders.gl/worker-utils 3.1.8 → 3.2.0-alpha.1

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 (79) hide show
  1. package/dist/es5/lib/env-utils/version.js +3 -3
  2. package/dist/es5/lib/env-utils/version.js.map +1 -1
  3. package/dist/es5/lib/library-utils/library-utils.js +2 -2
  4. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  5. package/dist/es5/lib/node/worker_threads-browser.js +35 -0
  6. package/dist/es5/lib/node/worker_threads-browser.js.map +1 -0
  7. package/dist/es5/lib/worker-api/create-worker.js +1 -1
  8. package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
  9. package/dist/es5/lib/worker-api/get-worker-url.js +2 -2
  10. package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
  11. package/dist/es5/lib/worker-farm/worker-body.js +67 -22
  12. package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
  13. package/dist/es5/lib/worker-farm/worker-farm.js +4 -2
  14. package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
  15. package/dist/es5/lib/worker-farm/worker-job.js +3 -9
  16. package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
  17. package/dist/es5/lib/worker-farm/worker-pool.js +5 -0
  18. package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
  19. package/dist/es5/lib/worker-farm/worker-thread.js +36 -2
  20. package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
  21. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
  22. package/dist/esm/lib/env-utils/version.js +3 -3
  23. package/dist/esm/lib/env-utils/version.js.map +1 -1
  24. package/dist/esm/lib/library-utils/library-utils.js +2 -2
  25. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  26. package/dist/esm/lib/node/worker_threads-browser.js +10 -0
  27. package/dist/esm/lib/node/worker_threads-browser.js.map +1 -0
  28. package/dist/esm/lib/worker-api/create-worker.js +1 -1
  29. package/dist/esm/lib/worker-api/create-worker.js.map +1 -1
  30. package/dist/esm/lib/worker-api/get-worker-url.js +2 -2
  31. package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
  32. package/dist/esm/lib/worker-farm/worker-body.js +57 -18
  33. package/dist/esm/lib/worker-farm/worker-body.js.map +1 -1
  34. package/dist/esm/lib/worker-farm/worker-farm.js +4 -2
  35. package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -1
  36. package/dist/esm/lib/worker-farm/worker-job.js +3 -9
  37. package/dist/esm/lib/worker-farm/worker-job.js.map +1 -1
  38. package/dist/esm/lib/worker-farm/worker-pool.js +4 -0
  39. package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
  40. package/dist/esm/lib/worker-farm/worker-thread.js +31 -2
  41. package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
  42. package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
  43. package/dist/lib/env-utils/version.js +1 -1
  44. package/dist/lib/library-utils/library-utils.js +1 -1
  45. package/dist/lib/node/worker_threads-browser.d.ts +7 -0
  46. package/dist/lib/node/worker_threads-browser.d.ts.map +1 -0
  47. package/dist/lib/node/worker_threads-browser.js +14 -0
  48. package/dist/lib/worker-api/create-worker.d.ts.map +1 -1
  49. package/dist/lib/worker-api/create-worker.js +1 -2
  50. package/dist/lib/worker-api/get-worker-url.js +1 -1
  51. package/dist/lib/worker-farm/worker-body.d.ts +2 -0
  52. package/dist/lib/worker-farm/worker-body.d.ts.map +1 -1
  53. package/dist/lib/worker-farm/worker-body.js +62 -18
  54. package/dist/lib/worker-farm/worker-farm.d.ts +6 -2
  55. package/dist/lib/worker-farm/worker-farm.d.ts.map +1 -1
  56. package/dist/lib/worker-farm/worker-farm.js +4 -3
  57. package/dist/lib/worker-farm/worker-job.d.ts.map +1 -1
  58. package/dist/lib/worker-farm/worker-job.js +2 -2
  59. package/dist/lib/worker-farm/worker-pool.d.ts +2 -0
  60. package/dist/lib/worker-farm/worker-pool.d.ts.map +1 -1
  61. package/dist/lib/worker-farm/worker-pool.js +4 -0
  62. package/dist/lib/worker-farm/worker-thread.d.ts +10 -2
  63. package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
  64. package/dist/lib/worker-farm/worker-thread.js +40 -5
  65. package/dist/lib/worker-utils/get-loadable-worker-url.js +0 -2
  66. package/dist/null-worker.js +45 -14
  67. package/dist/null-worker.js.map +2 -2
  68. package/package.json +3 -2
  69. package/src/lib/env-utils/version.ts +1 -1
  70. package/src/lib/library-utils/library-utils.ts +1 -1
  71. package/src/lib/node/worker_threads-browser.js +11 -0
  72. package/src/lib/worker-api/create-worker.ts +1 -2
  73. package/src/lib/worker-api/get-worker-url.ts +1 -1
  74. package/src/lib/worker-farm/worker-body.ts +61 -19
  75. package/src/lib/worker-farm/worker-farm.ts +10 -5
  76. package/src/lib/worker-farm/worker-job.ts +3 -6
  77. package/src/lib/worker-farm/worker-pool.ts +5 -0
  78. package/src/lib/worker-farm/worker-thread.ts +41 -7
  79. package/src/lib/worker-utils/get-loadable-worker-url.ts +0 -2
@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.VERSION = void 0;
7
- var DEFAULT_VERSION = 'latest';
8
- var VERSION = typeof "3.1.8" !== 'undefined' ? "3.1.8" : DEFAULT_VERSION;
7
+ var DEFAULT_VERSION = 'beta';
8
+ var VERSION = typeof "3.2.0-alpha.1" !== 'undefined' ? "3.2.0-alpha.1" : DEFAULT_VERSION;
9
9
  exports.VERSION = VERSION;
10
10
 
11
- if (typeof "3.1.8" === 'undefined') {
11
+ if (typeof "3.2.0-alpha.1" === 'undefined') {
12
12
  console.error('loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.');
13
13
  }
14
14
  //# sourceMappingURL=version.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":";;;;;;AAIA,IAAMA,eAAe,GAAG,QAAxB;AAEO,IAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,eAAnE;;;AACP,IAAI,mBAAuB,WAA3B,EAAwC;AAEtCE,EAAAA,OAAO,CAACC,KAAR,CACE,iIADF;AAGD","sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'latest';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"file":"version.js"}
1
+ {"version":3,"sources":["../../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":";;;;;;AAIA,IAAMA,eAAe,GAAG,MAAxB;AAEO,IAAMC,OAAO,GAAG,2BAAuB,WAAvB,qBAAmDD,eAAnE;;;AACP,IAAI,2BAAuB,WAA3B,EAAwC;AAEtCE,EAAAA,OAAO,CAACC,KAAR,CACE,iIADF;AAGD","sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'beta';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"file":"version.js"}
@@ -26,8 +26,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
26
26
 
27
27
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
28
28
 
29
- var LATEST = 'latest';
30
- var VERSION = typeof "3.1.8" !== 'undefined' ? "3.1.8" : LATEST;
29
+ var LATEST = 'beta';
30
+ var VERSION = typeof "3.2.0-alpha.1" !== 'undefined' ? "3.2.0-alpha.1" : LATEST;
31
31
  var loadLibraryPromises = {};
32
32
 
33
33
  function loadLibrary(_x) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["LATEST","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","isBrowser","CDN","isWorker","endsWith","fetch","response","arrayBuffer","node","requireFromFile","importScripts","text","scriptSource","loadLibraryFromString","id","requireFromString","eval","call","global","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":";;;;;;;;;;;;;;;;AACA;;AACA;;AACA;;AACA;;;;;;AAGA,IAAMA,MAAM,GAAG,QAAf;AACA,IAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,MAAnE;AAEA,IAAME,mBAAiD,GAAG,EAA1D;;SAiBsBC,W;;;;;2EAAf,iBACLC,UADK;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAELC,YAAAA,UAFK,2DAEuB,IAFvB;AAGLC,YAAAA,OAHK,2DAGa,EAHb;;AAKL,gBAAID,UAAJ,EAAgB;AACdD,cAAAA,UAAU,GAAGG,aAAa,CAACH,UAAD,EAAaC,UAAb,EAAyBC,OAAzB,CAA1B;AACD;;AAIDJ,YAAAA,mBAAmB,CAACE,UAAD,CAAnB,GAEEF,mBAAmB,CAACE,UAAD,CAAnB,IAAmCI,mBAAmB,CAACJ,UAAD,CAFxD;AAXK;AAAA,mBAcQF,mBAAmB,CAACE,UAAD,CAd3B;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;AAkBA,SAASG,aAAT,CAAuBE,OAAvB,EAAwCJ,UAAxC,EAA6DC,OAA7D,EAAoF;AAEzF,MAAIG,OAAO,CAACC,UAAR,CAAmB,MAAnB,CAAJ,EAAgC;AAC9B,WAAOD,OAAP;AACD;;AAGD,MAAME,OAAO,GAAGL,OAAO,CAACK,OAAR,IAAmB,EAAnC;;AACA,MAAIA,OAAO,CAACF,OAAD,CAAX,EAAsB;AACpB,WAAOE,OAAO,CAACF,OAAD,CAAd;AACD;;AAID,MAAI,CAACG,kBAAL,EAAgB;AACd,6BAAkBP,UAAlB,wBAA0CI,OAA1C;AACD;;AAGD,MAAIH,OAAO,CAACO,GAAZ,EAAiB;AACf,wBAAOP,OAAO,CAACO,GAAR,CAAYH,UAAZ,CAAuB,MAAvB,CAAP;AACA,qBAAUJ,OAAO,CAACO,GAAlB,cAAyBR,UAAzB,cAAuCJ,OAAvC,wBAA4DQ,OAA5D;AACD;;AAGD,MAAIK,iBAAJ,EAAc;AACZ,iCAAsBL,OAAtB;AACD;;AAED,2BAAkBJ,UAAlB,uBAAyCI,OAAzC;AACD;;SAEcD,mB;;;;;mFAAf,kBAAmCJ,UAAnC;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA,iBACMA,UAAU,CAACW,QAAX,CAAoB,MAApB,CADN;AAAA;AAAA;AAAA;;AAAA;AAAA,mBAE2BC,KAAK,CAACZ,UAAD,CAFhC;;AAAA;AAEUa,YAAAA,SAFV;AAAA;AAAA,mBAGiBA,SAAQ,CAACC,WAAT,EAHjB;;AAAA;AAAA;;AAAA;AAAA,gBAMON,kBANP;AAAA;AAAA;AAAA;;AAAA;AAAA,2BAQaO,IAAI,IAAIA,IAAI,CAACC,eAR1B;;AAAA;AAAA;AAAA;AAAA;;AAAA;AAAA,mBAQoDD,IAAI,CAACC,eAAL,CAAqBhB,UAArB,CARpD;;AAAA;AAAA;;AAAA;AAAA;;AAAA;AAAA;AAAA;AAAA,8CAUa,IAVb;;AAAA;AAAA,iBAaMU,iBAbN;AAAA;AAAA;AAAA;;AAAA,8CAcWO,aAAa,CAACjB,UAAD,CAdxB;;AAAA;AAAA;AAAA,mBAqByBY,KAAK,CAACZ,UAAD,CArB9B;;AAAA;AAqBQa,YAAAA,QArBR;AAAA;AAAA,mBAsB6BA,QAAQ,CAACK,IAAT,EAtB7B;;AAAA;AAsBQC,YAAAA,YAtBR;AAAA,8CAuBSC,qBAAqB,CAACD,YAAD,EAAenB,UAAf,CAvB9B;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,G;;;;AA4CA,SAASoB,qBAAT,CAA+BD,YAA/B,EAAqDE,EAArD,EAA6E;AAC3E,MAAI,CAACb,kBAAL,EAAgB;AACd,WAAOO,IAAI,CAACO,iBAAL,IAA0BP,IAAI,CAACO,iBAAL,CAAuBH,YAAvB,EAAqCE,EAArC,CAAjC;AACD;;AAED,MAAIX,iBAAJ,EAAc;AAEZa,IAAAA,IAAI,CAACC,IAAL,CAAUC,eAAV,EAAkBN,YAAlB;AAGA,WAAO,IAAP;AACD;;AAED,MAAMO,MAAM,GAAGC,QAAQ,CAACC,aAAT,CAAuB,QAAvB,CAAf;AACAF,EAAAA,MAAM,CAACL,EAAP,GAAYA,EAAZ;;AAEA,MAAI;AACFK,IAAAA,MAAM,CAACG,WAAP,CAAmBF,QAAQ,CAACG,cAAT,CAAwBX,YAAxB,CAAnB;AACD,GAFD,CAEE,OAAOY,CAAP,EAAU;AACVL,IAAAA,MAAM,CAACR,IAAP,GAAcC,YAAd;AACD;;AACDQ,EAAAA,QAAQ,CAACK,IAAT,CAAcH,WAAd,CAA0BH,MAA1B;AACA,SAAO,IAAP;AACD","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// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\nconst LATEST = 'latest';\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"],"file":"library-utils.js"}
1
+ {"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["LATEST","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","isBrowser","CDN","isWorker","endsWith","fetch","response","arrayBuffer","node","requireFromFile","importScripts","text","scriptSource","loadLibraryFromString","id","requireFromString","eval","call","global","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":"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","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// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\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"],"file":"library-utils.js"}
@@ -0,0 +1,35 @@
1
+ "use strict";
2
+
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
4
+
5
+ Object.defineProperty(exports, "__esModule", {
6
+ value: true
7
+ });
8
+ exports.parentPort = exports.Worker = void 0;
9
+
10
+ var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
11
+
12
+ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
13
+
14
+ var Worker = function () {
15
+ function Worker() {
16
+ (0, _classCallCheck2.default)(this, Worker);
17
+ }
18
+
19
+ (0, _createClass2.default)(Worker, [{
20
+ key: "on",
21
+ value: function on(message, cb) {}
22
+ }, {
23
+ key: "postMessage",
24
+ value: function postMessage() {}
25
+ }, {
26
+ key: "terminate",
27
+ value: function terminate() {}
28
+ }]);
29
+ return Worker;
30
+ }();
31
+
32
+ exports.Worker = Worker;
33
+ var parentPort = null;
34
+ exports.parentPort = parentPort;
35
+ //# sourceMappingURL=worker_threads-browser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../../src/lib/node/worker_threads-browser.js"],"names":["Worker","message","cb","parentPort"],"mappings":";;;;;;;;;;;;;IAIaA,M;;;;;;;WACX,YAAGC,OAAH,EAAYC,EAAZ,EAAgB,CAAE;;;WAClB,uBAAqB,CAAE;;;WACvB,qBAAY,CAAE;;;;;;AAGT,IAAMC,UAAU,GAAG,IAAnB","sourcesContent":["// Browser fills for Node.js built-in `worker_threads` module.\n// These fills are non-functional, and just intended to ensure that\n// `import 'worker_threads` doesn't break browser builds.\n// The replacement is done in package.json browser field\nexport class Worker {\n on(message, cb) {}\n postMessage(...args) {}\n terminate() {}\n}\n\nexport const parentPort = null;\n"],"file":"worker_threads-browser.js"}
@@ -22,7 +22,7 @@ var inputBatches;
22
22
  var options;
23
23
 
24
24
  function createWorker(process, processInBatches) {
25
- if (typeof self === 'undefined') {
25
+ if (!_workerBody.default.inWorkerThread()) {
26
26
  return;
27
27
  }
28
28
 
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/create-worker.ts"],"names":["requestId","inputBatches","options","createWorker","process","processInBatches","self","context","processOnMainThread","WorkerBody","onmessage","type","payload","Error","input","result","postMessage","AsyncQueue","resultIterator","batch","push","close","message","error","arrayBuffer","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"mappings":"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","sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n // Check that we are actually in a worker thread\n if (typeof self === 'undefined') {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n"],"file":"create-worker.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-api/create-worker.ts"],"names":["requestId","inputBatches","options","createWorker","process","processInBatches","WorkerBody","inWorkerThread","context","processOnMainThread","onmessage","type","payload","Error","input","result","postMessage","AsyncQueue","resultIterator","batch","push","close","message","error","arrayBuffer","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"mappings":"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","sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n"],"file":"create-worker.js"}
@@ -10,8 +10,8 @@ var _assert = require("../env-utils/assert");
10
10
 
11
11
  var _version = require("../env-utils/version");
12
12
 
13
- var NPM_TAG = 'latest';
14
- var VERSION = typeof "3.1.8" !== 'undefined' ? "3.1.8" : NPM_TAG;
13
+ var NPM_TAG = 'beta';
14
+ var VERSION = typeof "3.2.0-alpha.1" !== 'undefined' ? "3.2.0-alpha.1" : NPM_TAG;
15
15
 
16
16
  function getWorkerName(worker) {
17
17
  var warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["NPM_TAG","VERSION","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":";;;;;;;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,QAAhB;AACA,IAAMC,OAAO,GAAG,mBAAuB,WAAvB,aAAmDD,OAAnE;;AAKO,SAASE,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBJ,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUE,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;;AASM,SAASG,YAAT,CAAsBJ,MAAtB,EAAiF;AAAA,MAArCK,OAAqC,uEAAZ,EAAY;AACtF,MAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,MAAMC,UAAU,aAAMR,MAAM,CAACO,EAAb,eAAhB;AAEA,MAAIE,GAAG,GAAGH,aAAa,CAACI,SAAxB;;AAQA,MAAI,CAACD,GAAD,IAAQT,MAAM,CAACO,EAAP,KAAc,aAA1B,EAAyC;AACvCE,IAAAA,GAAG,GAAGJ,OAAO,CAACK,SAAd;AACD;;AAID,MAAIL,OAAO,CAACM,WAAR,KAAwB,MAA5B,EAAoC;AAClCF,IAAAA,GAAG,qBAAcT,MAAM,CAACY,MAArB,mBAAoCJ,UAApC,CAAH;AACD;;AAGD,MAAI,CAACC,GAAL,EAAU;AAER,QAAIP,OAAO,GAAGF,MAAM,CAACE,OAArB;;AAEA,QAAIA,OAAO,KAAK,QAAhB,EAA0B;AAExBA,MAAAA,OAAO,GAAGL,OAAV;AACD;;AACD,QAAMgB,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAED,sBAAOC,GAAP;AAGA,SAAOA,GAAP;AACD","sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'latest'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"file":"get-worker-url.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["NPM_TAG","VERSION","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":";;;;;;;;AACA;;AACA;;AAEA,IAAMA,OAAO,GAAG,MAAhB;AACA,IAAMC,OAAO,GAAG,2BAAuB,WAAvB,qBAAmDD,OAAnE;;AAKO,SAASE,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBJ,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUE,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;;AASM,SAASG,YAAT,CAAsBJ,MAAtB,EAAiF;AAAA,MAArCK,OAAqC,uEAAZ,EAAY;AACtF,MAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,MAAMC,UAAU,aAAMR,MAAM,CAACO,EAAb,eAAhB;AAEA,MAAIE,GAAG,GAAGH,aAAa,CAACI,SAAxB;;AAQA,MAAI,CAACD,GAAD,IAAQT,MAAM,CAACO,EAAP,KAAc,aAA1B,EAAyC;AACvCE,IAAAA,GAAG,GAAGJ,OAAO,CAACK,SAAd;AACD;;AAID,MAAIL,OAAO,CAACM,WAAR,KAAwB,MAA5B,EAAoC;AAClCF,IAAAA,GAAG,qBAAcT,MAAM,CAACY,MAArB,mBAAoCJ,UAApC,CAAH;AACD;;AAGD,MAAI,CAACC,GAAL,EAAU;AAER,QAAIP,OAAO,GAAGF,MAAM,CAACE,OAArB;;AAEA,QAAIA,OAAO,KAAK,QAAhB,EAA0B;AAExBA,MAAAA,OAAO,GAAGL,OAAV;AACD;;AACD,QAAMgB,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAED,sBAAOC,GAAP;AAGA,SAAOA,GAAP;AACD","sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // 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"],"file":"get-worker-url.js"}
@@ -13,6 +13,17 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
13
13
 
14
14
  var _getTransferList = require("../worker-utils/get-transfer-list");
15
15
 
16
+ function getParentPort() {
17
+ var parentPort;
18
+
19
+ try {
20
+ eval('globalThis.parentPort = require(\'worker_threads\').parentPort');
21
+ parentPort = globalThis.parentPort;
22
+ } catch (_unused) {}
23
+
24
+ return parentPort;
25
+ }
26
+
16
27
  var onMessageWrapperMap = new Map();
17
28
 
18
29
  var WorkerBody = function () {
@@ -21,18 +32,33 @@ var WorkerBody = function () {
21
32
  }
22
33
 
23
34
  (0, _createClass2.default)(WorkerBody, null, [{
35
+ key: "inWorkerThread",
36
+ value: function inWorkerThread() {
37
+ return typeof self !== 'undefined' || Boolean(getParentPort());
38
+ }
39
+ }, {
24
40
  key: "onmessage",
25
41
  set: function set(onMessage) {
26
- self.onmessage = function (message) {
27
- if (!isKnownMessage(message)) {
28
- return;
29
- }
30
-
31
- var _message$data = message.data,
32
- type = _message$data.type,
33
- payload = _message$data.payload;
42
+ function handleMessage(message) {
43
+ var parentPort = getParentPort();
44
+
45
+ var _ref = parentPort ? message : message.data,
46
+ type = _ref.type,
47
+ payload = _ref.payload;
48
+
34
49
  onMessage(type, payload);
35
- };
50
+ }
51
+
52
+ var parentPort = getParentPort();
53
+
54
+ if (parentPort) {
55
+ parentPort.on('message', handleMessage);
56
+ parentPort.on('exit', function () {
57
+ return console.debug('Node worker closing');
58
+ });
59
+ } else {
60
+ globalThis.onmessage = handleMessage;
61
+ }
36
62
  }
37
63
  }, {
38
64
  key: "addEventListener",
@@ -45,33 +71,52 @@ var WorkerBody = function () {
45
71
  return;
46
72
  }
47
73
 
48
- var _message$data2 = message.data,
49
- type = _message$data2.type,
50
- payload = _message$data2.payload;
74
+ var parentPort = getParentPort();
75
+
76
+ var _ref2 = parentPort ? message : message.data,
77
+ type = _ref2.type,
78
+ payload = _ref2.payload;
79
+
51
80
  onMessage(type, payload);
52
81
  };
53
82
  }
54
83
 
55
- self.addEventListener('message', onMessageWrapper);
84
+ var parentPort = getParentPort();
85
+
86
+ if (parentPort) {
87
+ console.error('not implemented');
88
+ } else {
89
+ globalThis.addEventListener('message', onMessageWrapper);
90
+ }
56
91
  }
57
92
  }, {
58
93
  key: "removeEventListener",
59
94
  value: function removeEventListener(onMessage) {
60
95
  var onMessageWrapper = onMessageWrapperMap.get(onMessage);
61
96
  onMessageWrapperMap.delete(onMessage);
62
- self.removeEventListener('message', onMessageWrapper);
97
+ var parentPort = getParentPort();
98
+
99
+ if (parentPort) {
100
+ console.error('not implemented');
101
+ } else {
102
+ globalThis.removeEventListener('message', onMessageWrapper);
103
+ }
63
104
  }
64
105
  }, {
65
106
  key: "postMessage",
66
107
  value: function postMessage(type, payload) {
67
- if (self) {
68
- var data = {
69
- source: 'loaders.gl',
70
- type: type,
71
- payload: payload
72
- };
73
- var transferList = (0, _getTransferList.getTransferList)(payload);
74
- self.postMessage(data, transferList);
108
+ var data = {
109
+ source: 'loaders.gl',
110
+ type: type,
111
+ payload: payload
112
+ };
113
+ var transferList = (0, _getTransferList.getTransferList)(payload);
114
+ var parentPort = getParentPort();
115
+
116
+ if (parentPort) {
117
+ parentPort.postMessage(data, transferList);
118
+ } else {
119
+ globalThis.postMessage(data, transferList);
75
120
  }
76
121
  }
77
122
  }]);
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"names":["onMessageWrapperMap","Map","WorkerBody","onMessage","self","onmessage","message","isKnownMessage","data","type","payload","onMessageWrapper","get","addEventListener","delete","removeEventListener","source","transferList","postMessage","startsWith"],"mappings":";;;;;;;;;;;;;AACA;;AAEA,IAAMA,mBAAmB,GAAG,IAAIC,GAAJ,EAA5B;;IAKqBC,U;;;;;;;SAInB,aAAqBC,SAArB,EAAiG;AAE/FC,MAAAA,IAAI,CAACC,SAAL,GAAiB,UAACC,OAAD,EAAa;AAC5B,YAAI,CAACC,cAAc,CAACD,OAAD,CAAnB,EAA8B;AAC5B;AACD;;AAGD,4BAAwBA,OAAO,CAACE,IAAhC;AAAA,YAAOC,IAAP,iBAAOA,IAAP;AAAA,YAAaC,OAAb,iBAAaA,OAAb;AACAP,QAAAA,SAAS,CAACM,IAAD,EAAOC,OAAP,CAAT;AACD,OARD;AASD;;;WAED,0BACEP,SADF,EAEE;AACA,UAAIQ,gBAAgB,GAAGX,mBAAmB,CAACY,GAApB,CAAwBT,SAAxB,CAAvB;;AAEA,UAAI,CAACQ,gBAAL,EAAuB;AACrBA,QAAAA,gBAAgB,GAAG,0BAACL,OAAD,EAAgC;AACjD,cAAI,CAACC,cAAc,CAACD,OAAD,CAAnB,EAA8B;AAC5B;AACD;;AAGD,+BAAwBA,OAAO,CAACE,IAAhC;AAAA,cAAOC,IAAP,kBAAOA,IAAP;AAAA,cAAaC,OAAb,kBAAaA,OAAb;AACAP,UAAAA,SAAS,CAACM,IAAD,EAAOC,OAAP,CAAT;AACD,SARD;AASD;;AAGDN,MAAAA,IAAI,CAACS,gBAAL,CAAsB,SAAtB,EAAiCF,gBAAjC;AACD;;;WAED,6BACER,SADF,EAEE;AACA,UAAMQ,gBAAgB,GAAGX,mBAAmB,CAACY,GAApB,CAAwBT,SAAxB,CAAzB;AACAH,MAAAA,mBAAmB,CAACc,MAApB,CAA2BX,SAA3B;AAEAC,MAAAA,IAAI,CAACW,mBAAL,CAAyB,SAAzB,EAAoCJ,gBAApC;AACD;;;WAOD,qBAAmBF,IAAnB,EAA4CC,OAA5C,EAAiF;AAC/E,UAAIN,IAAJ,EAAU;AACR,YAAMI,IAAuB,GAAG;AAACQ,UAAAA,MAAM,EAAE,YAAT;AAAuBP,UAAAA,IAAI,EAAJA,IAAvB;AAA6BC,UAAAA,OAAO,EAAPA;AAA7B,SAAhC;AACA,YAAMO,YAAY,GAAG,sCAAgBP,OAAhB,CAArB;AAGAN,QAAAA,IAAI,CAACc,WAAL,CAAiBV,IAAjB,EAAuBS,YAAvB;AACD;AACF;;;;;;;AAIH,SAASV,cAAT,CAAwBD,OAAxB,EAAoD;AAClD,MAAOG,IAAP,GAAqBH,OAArB,CAAOG,IAAP;AAAA,MAAaD,IAAb,GAAqBF,OAArB,CAAaE,IAAb;AACA,SACEC,IAAI,KAAK,SAAT,IACAD,IADA,IAEA,OAAOA,IAAI,CAACQ,MAAZ,KAAuB,QAFvB,IAGAR,IAAI,CAACQ,MAAL,CAAYG,UAAZ,CAAuB,YAAvB,CAJF;AAMD","sourcesContent":["import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n // eslint-disable-next-line no-restricted-globals\n self.onmessage = (message) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const {type, payload} = message.data;\n onMessage(type, payload);\n };\n }\n\n // eslint-disable-next-line no-restricted-globals\n self.addEventListener('message', onMessageWrapper);\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n // eslint-disable-next-line no-restricted-globals\n self.removeEventListener('message', onMessageWrapper);\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n if (self) {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n const transferList = getTransferList(payload);\n // eslint-disable-next-line no-restricted-globals\n // @ts-ignore\n self.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n"],"file":"worker-body.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"names":["getParentPort","parentPort","eval","globalThis","onMessageWrapperMap","Map","WorkerBody","self","Boolean","onMessage","handleMessage","message","data","type","payload","on","console","debug","onmessage","onMessageWrapper","get","isKnownMessage","error","addEventListener","delete","removeEventListener","source","transferList","postMessage","startsWith"],"mappings":"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","sourcesContent":["import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\n/** Vile hack to defeat over-zealous bundlers from stripping out the require */\nfunction getParentPort() {\n // const isNode = globalThis.process;\n let parentPort;\n try {\n // prettier-ignore\n eval('globalThis.parentPort = require(\\'worker_threads\\').parentPort'); // eslint-disable-line no-eval\n parentPort = globalThis.parentPort;\n // eslint-disable-next-line no-empty\n } catch {}\n return parentPort;\n}\n\nconst onMessageWrapperMap = new Map();\n\n/**\n * Type safe wrapper for worker code\n */\nexport default class WorkerBody {\n /** Check that we are actually in a worker thread */\n static inWorkerThread(): boolean {\n return typeof self !== 'undefined' || Boolean(getParentPort());\n }\n\n /*\n * (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n */\n static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {\n function handleMessage(message) {\n // Confusingly the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n // if (!isKnownMessage(message)) {\n // return;\n // }\n onMessage(type, payload);\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.on('message', handleMessage);\n // if (message == 'exit') { parentPort.unref(); }\n // eslint-disable-next-line\n parentPort.on('exit', () => console.debug('Node worker closing'));\n } else {\n // eslint-disable-next-line no-restricted-globals\n globalThis.onmessage = handleMessage;\n }\n }\n\n static addEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n let onMessageWrapper = onMessageWrapperMap.get(onMessage);\n\n if (!onMessageWrapper) {\n onMessageWrapper = (message: MessageEvent<any>) => {\n if (!isKnownMessage(message)) {\n return;\n }\n\n // Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'\n const parentPort = getParentPort();\n const {type, payload} = parentPort ? message : message.data;\n onMessage(type, payload);\n };\n }\n\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.addEventListener('message', onMessageWrapper);\n }\n }\n\n static removeEventListener(\n onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any\n ) {\n const onMessageWrapper = onMessageWrapperMap.get(onMessage);\n onMessageWrapperMap.delete(onMessage);\n const parentPort = getParentPort();\n if (parentPort) {\n console.error('not implemented'); // eslint-disable-line\n } else {\n globalThis.removeEventListener('message', onMessageWrapper);\n }\n }\n\n /**\n * Send a message from a worker to creating thread (main thread)\n * @param type\n * @param payload\n */\n static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n const data: WorkerMessageData = {source: 'loaders.gl', type, payload};\n // console.log('posting message', data);\n const transferList = getTransferList(payload);\n\n const parentPort = getParentPort();\n if (parentPort) {\n parentPort.postMessage(data, transferList);\n // console.log('posted message', data);\n } else {\n // @ts-ignore\n globalThis.postMessage(data, transferList);\n }\n }\n}\n\n// Filter out noise messages sent to workers\nfunction isKnownMessage(message: MessageEvent<any>) {\n const {type, data} = message;\n return (\n type === 'message' &&\n data &&\n typeof data.source === 'string' &&\n data.source.startsWith('loaders.gl')\n );\n}\n"],"file":"worker-body.js"}
@@ -30,8 +30,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
30
30
  var DEFAULT_PROPS = {
31
31
  maxConcurrency: 3,
32
32
  maxMobileConcurrency: 1,
33
- onDebug: function onDebug() {},
34
- reuseWorkers: true
33
+ reuseWorkers: true,
34
+ onDebug: function onDebug() {}
35
35
  };
36
36
 
37
37
  var WorkerFarm = function () {
@@ -60,6 +60,8 @@ var WorkerFarm = function () {
60
60
  } finally {
61
61
  _iterator.f();
62
62
  }
63
+
64
+ this.workerPools = new Map();
63
65
  }
64
66
  }, {
65
67
  key: "setProps",
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"names":["DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","onDebug","reuseWorkers","WorkerFarm","props","Map","setProps","workerPools","values","workerPool","destroy","_getWorkerPoolProps","options","name","source","url","get","WorkerPool","set","WorkerThread","isSupported","_workerFarm"],"mappings":";;;;;;;;;;;;;;;AAAA;;AACA;;;;;;;;;;;;AAYA,IAAMA,aAA8B,GAAG;AACrCC,EAAAA,cAAc,EAAE,CADqB;AAErCC,EAAAA,oBAAoB,EAAE,CAFe;AAGrCC,EAAAA,OAAO,EAAE,mBAAM,CAAE,CAHoB;AAIrCC,EAAAA,YAAY,EAAE;AAJuB,CAAvC;;IAUqBC,U;AAmBnB,sBAAoBC,KAApB,EAA4C;AAAA;AAAA;AAAA,uDAjBtB,IAAIC,GAAJ,EAiBsB;AAC1C,SAAKD,KAAL,qBAAiBN,aAAjB;AACA,SAAKQ,QAAL,CAAcF,KAAd;AAEA,SAAKG,WAAL,GAAmB,IAAIF,GAAJ,EAAnB;AACD;;;;WAMD,mBAAgB;AAAA,iDACW,KAAKE,WAAL,CAAiBC,MAAjB,EADX;AAAA;;AAAA;AACd,4DAAoD;AAAA,cAAzCC,UAAyC;AAClDA,UAAAA,UAAU,CAACC,OAAX;AACD;AAHa;AAAA;AAAA;AAAA;AAAA;AAIf;;;WAMD,kBAASN,KAAT,EAAuC;AACrC,WAAKA,KAAL,mCAAiB,KAAKA,KAAtB,GAAgCA,KAAhC;;AADqC,kDAGZ,KAAKG,WAAL,CAAiBC,MAAjB,EAHY;AAAA;;AAAA;AAGrC,+DAAoD;AAAA,cAAzCC,UAAyC;AAClDA,UAAAA,UAAU,CAACH,QAAX,CAAoB,KAAKK,mBAAL,EAApB;AACD;AALoC;AAAA;AAAA;AAAA;AAAA;AAMtC;;;WAWD,uBAAcC,OAAd,EAAkF;AAChF,UAAOC,IAAP,GAA4BD,OAA5B,CAAOC,IAAP;AAAA,UAAaC,MAAb,GAA4BF,OAA5B,CAAaE,MAAb;AAAA,UAAqBC,GAArB,GAA4BH,OAA5B,CAAqBG,GAArB;AACA,UAAIN,UAAU,GAAG,KAAKF,WAAL,CAAiBS,GAAjB,CAAqBH,IAArB,CAAjB;;AACA,UAAI,CAACJ,UAAL,EAAiB;AACfA,QAAAA,UAAU,GAAG,IAAIQ,mBAAJ,CAAe;AAC1BJ,UAAAA,IAAI,EAAJA,IAD0B;AAE1BC,UAAAA,MAAM,EAANA,MAF0B;AAG1BC,UAAAA,GAAG,EAAHA;AAH0B,SAAf,CAAb;AAKAN,QAAAA,UAAU,CAACH,QAAX,CAAoB,KAAKK,mBAAL,EAApB;AACA,aAAKJ,WAAL,CAAiBW,GAAjB,CAAqBL,IAArB,EAA2BJ,UAA3B;AACD;;AACD,aAAOA,UAAP;AACD;;;WAED,+BAAsB;AACpB,aAAO;AACLV,QAAAA,cAAc,EAAE,KAAKK,KAAL,CAAWL,cADtB;AAELC,QAAAA,oBAAoB,EAAE,KAAKI,KAAL,CAAWJ,oBAF5B;AAGLE,QAAAA,YAAY,EAAE,KAAKE,KAAL,CAAWF,YAHpB;AAILD,QAAAA,OAAO,EAAE,KAAKG,KAAL,CAAWH;AAJf,OAAP;AAMD;;;WAxED,uBAA8B;AAC5B,aAAOkB,sBAAaC,WAAb,EAAP;AACD;;;WAGD,yBAA8D;AAAA,UAAzChB,KAAyC,uEAAhB,EAAgB;AAC5DD,MAAAA,UAAU,CAACkB,WAAX,GAAyBlB,UAAU,CAACkB,WAAX,IAA0B,IAAIlB,UAAJ,CAAe,EAAf,CAAnD;;AACAA,MAAAA,UAAU,CAACkB,WAAX,CAAuBf,QAAvB,CAAgCF,KAAhC;;AACA,aAAOD,UAAU,CAACkB,WAAlB;AACD;;;;;;8BAhBkBlB,U","sourcesContent":["import WorkerPool from './worker-pool';\nimport WorkerThread from './worker-thread';\n\n/**\n * @param maxConcurrency {number} - max count of workers\n */\nexport type WorkerFarmProps = {\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n reuseWorkers?: boolean;\n onDebug?: () => void;\n};\n\nconst DEFAULT_PROPS: WorkerFarmProps = {\n maxConcurrency: 3,\n maxMobileConcurrency: 1,\n onDebug: () => {},\n reuseWorkers: true\n};\n\n/**\n * Process multiple jobs with a \"farm\" of different workers in worker pools.\n */\nexport default class WorkerFarm {\n private props: WorkerFarmProps;\n private workerPools = new Map<string, WorkerPool>();\n // singleton\n private static _workerFarm?: WorkerFarm;\n\n /** Check if Workers are supported */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /** Get the singleton instance of the global worker farm */\n static getWorkerFarm(props: WorkerFarmProps = {}): WorkerFarm {\n WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});\n WorkerFarm._workerFarm.setProps(props);\n return WorkerFarm._workerFarm;\n }\n\n /** get global instance with WorkerFarm.getWorkerFarm() */\n private constructor(props: WorkerFarmProps) {\n this.props = {...DEFAULT_PROPS};\n this.setProps(props);\n /** @type Map<string, WorkerPool>} */\n this.workerPools = new Map();\n }\n\n /**\n * Terminate all workers in the farm\n * @note Can free up significant memory\n */\n destroy(): void {\n for (const workerPool of this.workerPools.values()) {\n workerPool.destroy();\n }\n }\n\n /**\n * Set props used when initializing worker pools\n * @param props\n */\n setProps(props: WorkerFarmProps): void {\n this.props = {...this.props, ...props};\n // Update worker pool props\n for (const workerPool of this.workerPools.values()) {\n workerPool.setProps(this._getWorkerPoolProps());\n }\n }\n\n /**\n * Returns a worker pool for the specified worker\n * @param options - only used first time for a specific worker name\n * @param options.name - the name of the worker - used to identify worker pool\n * @param options.url -\n * @param options.source -\n * @example\n * const job = WorkerFarm.getWorkerFarm().getWorkerPool({name, url}).startJob(...);\n */\n getWorkerPool(options: {name: string; source?: string; url?: string}): WorkerPool {\n const {name, source, url} = options;\n let workerPool = this.workerPools.get(name);\n if (!workerPool) {\n workerPool = new WorkerPool({\n name,\n source,\n url\n });\n workerPool.setProps(this._getWorkerPoolProps());\n this.workerPools.set(name, workerPool);\n }\n return workerPool;\n }\n\n _getWorkerPoolProps() {\n return {\n maxConcurrency: this.props.maxConcurrency,\n maxMobileConcurrency: this.props.maxMobileConcurrency,\n reuseWorkers: this.props.reuseWorkers,\n onDebug: this.props.onDebug\n };\n }\n}\n"],"file":"worker-farm.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"names":["DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","WorkerFarm","props","Map","setProps","workerPools","values","workerPool","destroy","_getWorkerPoolProps","options","name","source","url","get","WorkerPool","set","WorkerThread","isSupported","_workerFarm"],"mappings":";;;;;;;;;;;;;;;AAAA;;AACA;;;;;;;;;;;;AAgBA,IAAMA,aAAwC,GAAG;AAC/CC,EAAAA,cAAc,EAAE,CAD+B;AAE/CC,EAAAA,oBAAoB,EAAE,CAFyB;AAG/CC,EAAAA,YAAY,EAAE,IAHiC;AAI/CC,EAAAA,OAAO,EAAE,mBAAM,CAAE;AAJ8B,CAAjD;;IAUqBC,U;AAmBnB,sBAAoBC,KAApB,EAA4C;AAAA;AAAA;AAAA,uDAjBtB,IAAIC,GAAJ,EAiBsB;AAC1C,SAAKD,KAAL,qBAAiBN,aAAjB;AACA,SAAKQ,QAAL,CAAcF,KAAd;AAEA,SAAKG,WAAL,GAAmB,IAAIF,GAAJ,EAAnB;AACD;;;;WAMD,mBAAgB;AAAA,iDACW,KAAKE,WAAL,CAAiBC,MAAjB,EADX;AAAA;;AAAA;AACd,4DAAoD;AAAA,cAAzCC,UAAyC;AAClDA,UAAAA,UAAU,CAACC,OAAX;AACD;AAHa;AAAA;AAAA;AAAA;AAAA;;AAId,WAAKH,WAAL,GAAmB,IAAIF,GAAJ,EAAnB;AACD;;;WAMD,kBAASD,KAAT,EAAuC;AACrC,WAAKA,KAAL,mCAAiB,KAAKA,KAAtB,GAAgCA,KAAhC;;AADqC,kDAGZ,KAAKG,WAAL,CAAiBC,MAAjB,EAHY;AAAA;;AAAA;AAGrC,+DAAoD;AAAA,cAAzCC,UAAyC;AAClDA,UAAAA,UAAU,CAACH,QAAX,CAAoB,KAAKK,mBAAL,EAApB;AACD;AALoC;AAAA;AAAA;AAAA;AAAA;AAMtC;;;WAWD,uBAAcC,OAAd,EAAkF;AAChF,UAAOC,IAAP,GAA4BD,OAA5B,CAAOC,IAAP;AAAA,UAAaC,MAAb,GAA4BF,OAA5B,CAAaE,MAAb;AAAA,UAAqBC,GAArB,GAA4BH,OAA5B,CAAqBG,GAArB;AACA,UAAIN,UAAU,GAAG,KAAKF,WAAL,CAAiBS,GAAjB,CAAqBH,IAArB,CAAjB;;AACA,UAAI,CAACJ,UAAL,EAAiB;AACfA,QAAAA,UAAU,GAAG,IAAIQ,mBAAJ,CAAe;AAC1BJ,UAAAA,IAAI,EAAJA,IAD0B;AAE1BC,UAAAA,MAAM,EAANA,MAF0B;AAG1BC,UAAAA,GAAG,EAAHA;AAH0B,SAAf,CAAb;AAKAN,QAAAA,UAAU,CAACH,QAAX,CAAoB,KAAKK,mBAAL,EAApB;AACA,aAAKJ,WAAL,CAAiBW,GAAjB,CAAqBL,IAArB,EAA2BJ,UAA3B;AACD;;AACD,aAAOA,UAAP;AACD;;;WAED,+BAAsB;AACpB,aAAO;AACLV,QAAAA,cAAc,EAAE,KAAKK,KAAL,CAAWL,cADtB;AAELC,QAAAA,oBAAoB,EAAE,KAAKI,KAAL,CAAWJ,oBAF5B;AAGLC,QAAAA,YAAY,EAAE,KAAKG,KAAL,CAAWH,YAHpB;AAILC,QAAAA,OAAO,EAAE,KAAKE,KAAL,CAAWF;AAJf,OAAP;AAMD;;;WAzED,uBAA8B;AAC5B,aAAOiB,sBAAaC,WAAb,EAAP;AACD;;;WAGD,yBAA8D;AAAA,UAAzChB,KAAyC,uEAAhB,EAAgB;AAC5DD,MAAAA,UAAU,CAACkB,WAAX,GAAyBlB,UAAU,CAACkB,WAAX,IAA0B,IAAIlB,UAAJ,CAAe,EAAf,CAAnD;;AACAA,MAAAA,UAAU,CAACkB,WAAX,CAAuBf,QAAvB,CAAgCF,KAAhC;;AACA,aAAOD,UAAU,CAACkB,WAAlB;AACD;;;;;;8BAhBkBlB,U","sourcesContent":["import WorkerPool from './worker-pool';\nimport WorkerThread from './worker-thread';\n\n/**\n * @param maxConcurrency - max count of workers\n * @param maxMobileConcurrency - max count of workers on mobile\n * @param maxConcurrency - max count of workers\n * @param reuseWorkers - if false, destroys workers when task is completed\n * @param onDebug - callback intended to allow application to log worker pool activity\n */\nexport type WorkerFarmProps = {\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n reuseWorkers?: boolean;\n onDebug?: () => void;\n};\n\nconst DEFAULT_PROPS: Required<WorkerFarmProps> = {\n maxConcurrency: 3,\n maxMobileConcurrency: 1,\n reuseWorkers: true,\n onDebug: () => {}\n};\n\n/**\n * Process multiple jobs with a \"farm\" of different workers in worker pools.\n */\nexport default class WorkerFarm {\n private props: WorkerFarmProps;\n private workerPools = new Map<string, WorkerPool>();\n // singleton\n private static _workerFarm?: WorkerFarm;\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /** Get the singleton instance of the global worker farm */\n static getWorkerFarm(props: WorkerFarmProps = {}): WorkerFarm {\n WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});\n WorkerFarm._workerFarm.setProps(props);\n return WorkerFarm._workerFarm;\n }\n\n /** get global instance with WorkerFarm.getWorkerFarm() */\n private constructor(props: WorkerFarmProps) {\n this.props = {...DEFAULT_PROPS};\n this.setProps(props);\n /** @type Map<string, WorkerPool>} */\n this.workerPools = new Map();\n }\n\n /**\n * Terminate all workers in the farm\n * @note Can free up significant memory\n */\n destroy(): void {\n for (const workerPool of this.workerPools.values()) {\n workerPool.destroy();\n }\n this.workerPools = new Map<string, WorkerPool>();\n }\n\n /**\n * Set props used when initializing worker pools\n * @param props\n */\n setProps(props: WorkerFarmProps): void {\n this.props = {...this.props, ...props};\n // Update worker pool props\n for (const workerPool of this.workerPools.values()) {\n workerPool.setProps(this._getWorkerPoolProps());\n }\n }\n\n /**\n * Returns a worker pool for the specified worker\n * @param options - only used first time for a specific worker name\n * @param options.name - the name of the worker - used to identify worker pool\n * @param options.url -\n * @param options.source -\n * @example\n * const job = WorkerFarm.getWorkerFarm().getWorkerPool({name, url}).startJob(...);\n */\n getWorkerPool(options: {name: string; source?: string; url?: string}): WorkerPool {\n const {name, source, url} = options;\n let workerPool = this.workerPools.get(name);\n if (!workerPool) {\n workerPool = new WorkerPool({\n name,\n source,\n url\n });\n workerPool.setProps(this._getWorkerPoolProps());\n this.workerPools.set(name, workerPool);\n }\n return workerPool;\n }\n\n _getWorkerPoolProps() {\n return {\n maxConcurrency: this.props.maxConcurrency,\n maxMobileConcurrency: this.props.maxMobileConcurrency,\n reuseWorkers: this.props.reuseWorkers,\n onDebug: this.props.onDebug\n };\n }\n}\n"],"file":"worker-farm.js"}
@@ -22,18 +22,12 @@ var WorkerJob = function () {
22
22
  (0, _classCallCheck2.default)(this, WorkerJob);
23
23
  (0, _defineProperty2.default)(this, "name", void 0);
24
24
  (0, _defineProperty2.default)(this, "workerThread", void 0);
25
- (0, _defineProperty2.default)(this, "isRunning", void 0);
25
+ (0, _defineProperty2.default)(this, "isRunning", true);
26
26
  (0, _defineProperty2.default)(this, "result", void 0);
27
- (0, _defineProperty2.default)(this, "_resolve", void 0);
28
- (0, _defineProperty2.default)(this, "_reject", void 0);
27
+ (0, _defineProperty2.default)(this, "_resolve", function () {});
28
+ (0, _defineProperty2.default)(this, "_reject", function () {});
29
29
  this.name = jobName;
30
30
  this.workerThread = workerThread;
31
- this.isRunning = true;
32
-
33
- this._resolve = function () {};
34
-
35
- this._reject = function () {};
36
-
37
31
  this.result = new Promise(function (resolve, reject) {
38
32
  _this._resolve = resolve;
39
33
  _this._reject = reject;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"names":["WorkerJob","jobName","workerThread","name","isRunning","_resolve","_reject","result","Promise","resolve","reject","type","payload","postMessage","source","value","error"],"mappings":";;;;;;;;;;;;;;;AAEA;;IAKqBA,S;AAUnB,qBAAYC,OAAZ,EAA6BC,YAA7B,EAAyD;AAAA;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AACvD,SAAKC,IAAL,GAAYF,OAAZ;AACA,SAAKC,YAAL,GAAoBA,YAApB;AACA,SAAKE,SAAL,GAAiB,IAAjB;;AACA,SAAKC,QAAL,GAAgB,YAAM,CAAE,CAAxB;;AACA,SAAKC,OAAL,GAAe,YAAM,CAAE,CAAvB;;AACA,SAAKC,MAAL,GAAc,IAAIC,OAAJ,CAAY,UAACC,OAAD,EAAUC,MAAV,EAAqB;AAC7C,MAAA,KAAI,CAACL,QAAL,GAAgBI,OAAhB;AACA,MAAA,KAAI,CAACH,OAAL,GAAeI,MAAf;AACD,KAHa,CAAd;AAID;;;;WAMD,qBAAYC,IAAZ,EAAqCC,OAArC,EAA0E;AACxE,WAAKV,YAAL,CAAkBW,WAAlB,CAA8B;AAC5BC,QAAAA,MAAM,EAAE,YADoB;AAE5BH,QAAAA,IAAI,EAAJA,IAF4B;AAG5BC,QAAAA,OAAO,EAAPA;AAH4B,OAA9B;AAKD;;;WAKD,cAAKG,KAAL,EAAuB;AACrB,0BAAO,KAAKX,SAAZ;AACA,WAAKA,SAAL,GAAiB,KAAjB;;AACA,WAAKC,QAAL,CAAcU,KAAd;AACD;;;WAKD,eAAMC,MAAN,EAA0B;AACxB,0BAAO,KAAKZ,SAAZ;AACA,WAAKA,SAAL,GAAiB,KAAjB;;AACA,WAAKE,OAAL,CAAaU,MAAb;AACD","sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport WorkerThread from './worker-thread';\nimport {assert} from '../env-utils/assert';\n\n/**\n * Represents one Job handled by a WorkerPool or WorkerFarm\n */\nexport default class WorkerJob {\n readonly name: string;\n readonly workerThread: WorkerThread;\n isRunning: boolean;\n /** Promise that resolves when Job is done */\n readonly result: Promise<any>;\n\n private _resolve: (value: any) => void;\n private _reject: (reason?: any) => void;\n\n constructor(jobName: string, workerThread: WorkerThread) {\n this.name = jobName;\n this.workerThread = workerThread;\n this.isRunning = true;\n this._resolve = () => {};\n this._reject = () => {};\n this.result = new Promise((resolve, reject) => {\n this._resolve = resolve;\n this._reject = reject;\n });\n }\n\n /**\n * Send a message to the job's worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n */\n postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n this.workerThread.postMessage({\n source: 'loaders.gl', // Lets worker ignore unrelated messages\n type,\n payload\n });\n }\n\n /**\n * Call to resolve the `result` Promise with the supplied value\n */\n done(value: any): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._resolve(value);\n }\n\n /**\n * Call to reject the `result` Promise with the supplied error\n */\n error(error: Error): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._reject(error);\n }\n}\n"],"file":"worker-job.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"names":["WorkerJob","jobName","workerThread","name","result","Promise","resolve","reject","_resolve","_reject","type","payload","postMessage","source","value","isRunning","error"],"mappings":";;;;;;;;;;;;;;;AAEA;;IAKqBA,S;AAUnB,qBAAYC,OAAZ,EAA6BC,YAA7B,EAAyD;AAAA;;AAAA;AAAA;AAAA;AAAA,qDAPpC,IAOoC;AAAA;AAAA,oDAHhB,YAAM,CAAE,CAGQ;AAAA,mDAFf,YAAM,CAAE,CAEO;AACvD,SAAKC,IAAL,GAAYF,OAAZ;AACA,SAAKC,YAAL,GAAoBA,YAApB;AACA,SAAKE,MAAL,GAAc,IAAIC,OAAJ,CAAY,UAACC,OAAD,EAAUC,MAAV,EAAqB;AAC7C,MAAA,KAAI,CAACC,QAAL,GAAgBF,OAAhB;AACA,MAAA,KAAI,CAACG,OAAL,GAAeF,MAAf;AACD,KAHa,CAAd;AAID;;;;WAMD,qBAAYG,IAAZ,EAAqCC,OAArC,EAA0E;AACxE,WAAKT,YAAL,CAAkBU,WAAlB,CAA8B;AAC5BC,QAAAA,MAAM,EAAE,YADoB;AAE5BH,QAAAA,IAAI,EAAJA,IAF4B;AAG5BC,QAAAA,OAAO,EAAPA;AAH4B,OAA9B;AAKD;;;WAKD,cAAKG,KAAL,EAAuB;AACrB,0BAAO,KAAKC,SAAZ;AACA,WAAKA,SAAL,GAAiB,KAAjB;;AACA,WAAKP,QAAL,CAAcM,KAAd;AACD;;;WAKD,eAAME,MAAN,EAA0B;AACxB,0BAAO,KAAKD,SAAZ;AACA,WAAKA,SAAL,GAAiB,KAAjB;;AACA,WAAKN,OAAL,CAAaO,MAAb;AACD","sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport WorkerThread from './worker-thread';\nimport {assert} from '../env-utils/assert';\n\n/**\n * Represents one Job handled by a WorkerPool or WorkerFarm\n */\nexport default class WorkerJob {\n readonly name: string;\n readonly workerThread: WorkerThread;\n isRunning: boolean = true;\n /** Promise that resolves when Job is done */\n readonly result: Promise<any>;\n\n private _resolve: (value: any) => void = () => {};\n private _reject: (reason?: any) => void = () => {};\n\n constructor(jobName: string, workerThread: WorkerThread) {\n this.name = jobName;\n this.workerThread = workerThread;\n this.result = new Promise((resolve, reject) => {\n this._resolve = resolve;\n this._reject = reject;\n });\n }\n\n /**\n * Send a message to the job's worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n */\n postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {\n this.workerThread.postMessage({\n source: 'loaders.gl', // Lets worker ignore unrelated messages\n type,\n payload\n });\n }\n\n /**\n * Call to resolve the `result` Promise with the supplied value\n */\n done(value: any): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._resolve(value);\n }\n\n /**\n * Call to reject the `result` Promise with the supplied error\n */\n error(error: Error): void {\n assert(this.isRunning);\n this.isRunning = false;\n this._reject(error);\n }\n}\n"],"file":"worker-job.js"}
@@ -248,6 +248,11 @@ var WorkerPool = function () {
248
248
  value: function _getMaxConcurrency() {
249
249
  return _globals.isMobile ? this.maxMobileConcurrency : this.maxConcurrency;
250
250
  }
251
+ }], [{
252
+ key: "isSupported",
253
+ value: function isSupported() {
254
+ return _workerThread.default.isSupported();
255
+ }
251
256
  }]);
252
257
  return WorkerPool;
253
258
  }();
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-pool.ts"],"names":["WorkerPool","props","source","url","setProps","idleQueue","forEach","worker","destroy","isDestroyed","name","undefined","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","onMessage","job","type","data","done","onError","error","startPromise","Promise","onStart","jobQueue","push","_startQueuedJob","length","workerThread","_getAvailableWorker","queuedJob","shift","message","backlog","WorkerJob","payload","result","returnWorkerToQueue","shouldDestroyWorker","count","_getMaxConcurrency","toLowerCase","WorkerThread","isMobile"],"mappings":"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","sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {isMobile} from '../env-utils/globals';\nimport WorkerThread from './worker-thread';\nimport WorkerJob from './worker-job';\n\n/** WorkerPool onDebug Callback Parameters */\ntype OnDebugParameters = {\n message: string;\n worker: string;\n name: string;\n job: string;\n backlog: number;\n workerThread: WorkerThread;\n};\n\n/** WorkerPool Properties */\nexport type WorkerPoolProps = {\n name?: string;\n source?: string; // | Function;\n url?: string;\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n onDebug?: (options: OnDebugParameters) => any;\n reuseWorkers?: boolean;\n};\n\n/** Private helper types */\ntype OnMessage = (job: WorkerJob, type: WorkerMessageType, payload: WorkerMessagePayload) => void;\ntype OnError = (job: WorkerJob, error: Error) => void;\n\ntype QueuedJob = {\n name: string;\n onMessage: OnMessage;\n onError: OnError;\n onStart: (value: any) => void; // Resolve job start promise\n};\n\n/**\n * Process multiple data messages with small pool of identical workers\n */\nexport default class WorkerPool {\n name: string = 'unnamed';\n source?: string; // | Function;\n url?: string;\n maxConcurrency: number = 1;\n maxMobileConcurrency: number = 1;\n onDebug: (options: OnDebugParameters) => any = () => {};\n reuseWorkers: boolean = true;\n\n private props: WorkerPoolProps = {};\n private jobQueue: QueuedJob[] = [];\n private idleQueue: WorkerThread[] = [];\n private count = 0;\n private isDestroyed = false;\n\n /**\n * @param processor - worker function\n * @param maxConcurrency - max count of workers\n */\n constructor(props: WorkerPoolProps) {\n this.source = props.source;\n this.url = props.url;\n this.setProps(props);\n }\n\n /**\n * Terminates all workers in the pool\n * @note Can free up significant memory\n */\n destroy(): void {\n // Destroy idle workers, active Workers will be destroyed on completion\n this.idleQueue.forEach((worker) => worker.destroy());\n this.isDestroyed = true;\n }\n\n setProps(props: WorkerPoolProps) {\n this.props = {...this.props, ...props};\n\n if (props.name !== undefined) {\n this.name = props.name;\n }\n if (props.maxConcurrency !== undefined) {\n this.maxConcurrency = props.maxConcurrency;\n }\n if (props.maxMobileConcurrency !== undefined) {\n this.maxMobileConcurrency = props.maxMobileConcurrency;\n }\n if (props.reuseWorkers !== undefined) {\n this.reuseWorkers = props.reuseWorkers;\n }\n if (props.onDebug !== undefined) {\n this.onDebug = props.onDebug;\n }\n }\n\n async startJob(\n name: string,\n onMessage: OnMessage = (job, type, data) => job.done(data),\n onError: OnError = (job, error) => job.error(error)\n ): Promise<WorkerJob> {\n // Promise resolves when thread starts working on this job\n const startPromise = new Promise<WorkerJob>((onStart) => {\n // Promise resolves when thread completes or fails working on this job\n this.jobQueue.push({name, onMessage, onError, onStart});\n return this;\n });\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n return await startPromise;\n }\n\n // PRIVATE\n\n /**\n * Starts first queued job if worker is available or can be created\n * Called when job is started and whenever a worker returns to the idleQueue\n */\n async _startQueuedJob(): Promise<void> {\n if (!this.jobQueue.length) {\n return;\n }\n\n const workerThread = this._getAvailableWorker();\n if (!workerThread) {\n return;\n }\n\n // We have a worker, dequeue and start the job\n const queuedJob = this.jobQueue.shift();\n if (queuedJob) {\n // Emit a debug event\n // @ts-ignore\n this.onDebug({\n message: 'Starting job',\n name: queuedJob.name,\n workerThread,\n backlog: this.jobQueue.length\n });\n\n // Create a worker job to let the app access thread and manage job completion\n const job = new WorkerJob(queuedJob.name, workerThread);\n\n // Set the worker thread's message handlers\n workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);\n workerThread.onError = (error) => queuedJob.onError(job, error);\n\n // Resolve the start promise so that the app can start sending messages to worker\n queuedJob.onStart(job);\n\n // Wait for the app to signal that the job is complete, then return worker to queue\n try {\n await job.result;\n } finally {\n this.returnWorkerToQueue(workerThread);\n }\n }\n }\n\n /**\n * Returns a worker to the idle queue\n * Destroys the worker if\n * - pool is destroyed\n * - if this pool doesn't reuse workers\n * - if maxConcurrency has been lowered\n * @param worker\n */\n returnWorkerToQueue(worker: WorkerThread) {\n const shouldDestroyWorker =\n this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();\n\n if (shouldDestroyWorker) {\n worker.destroy();\n this.count--;\n } else {\n this.idleQueue.push(worker);\n }\n\n if (!this.isDestroyed) {\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n /**\n * Returns idle worker or creates new worker if maxConcurrency has not been reached\n */\n _getAvailableWorker(): WorkerThread | null {\n // If a worker has completed and returned to the queue, it can be used\n if (this.idleQueue.length > 0) {\n return this.idleQueue.shift() || null;\n }\n\n // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source\n if (this.count < this._getMaxConcurrency()) {\n this.count++;\n const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;\n return new WorkerThread({name, source: this.source, url: this.url});\n }\n\n // No worker available, have to wait\n return null;\n }\n\n _getMaxConcurrency() {\n return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;\n }\n}\n"],"file":"worker-pool.js"}
1
+ {"version":3,"sources":["../../../../src/lib/worker-farm/worker-pool.ts"],"names":["WorkerPool","props","source","url","setProps","idleQueue","forEach","worker","destroy","isDestroyed","name","undefined","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","onMessage","job","type","data","done","onError","error","startPromise","Promise","onStart","jobQueue","push","_startQueuedJob","length","workerThread","_getAvailableWorker","queuedJob","shift","message","backlog","WorkerJob","payload","result","returnWorkerToQueue","shouldDestroyWorker","count","_getMaxConcurrency","toLowerCase","WorkerThread","isMobile","isSupported"],"mappings":"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","sourcesContent":["import type {WorkerMessageType, WorkerMessagePayload} from '../../types';\nimport {isMobile} from '../env-utils/globals';\nimport WorkerThread from './worker-thread';\nimport WorkerJob from './worker-job';\n\n/** WorkerPool onDebug Callback Parameters */\ntype OnDebugParameters = {\n message: string;\n worker: string;\n name: string;\n job: string;\n backlog: number;\n workerThread: WorkerThread;\n};\n\n/** WorkerPool Properties */\nexport type WorkerPoolProps = {\n name?: string;\n source?: string; // | Function;\n url?: string;\n maxConcurrency?: number;\n maxMobileConcurrency?: number;\n onDebug?: (options: OnDebugParameters) => any;\n reuseWorkers?: boolean;\n};\n\n/** Private helper types */\ntype OnMessage = (job: WorkerJob, type: WorkerMessageType, payload: WorkerMessagePayload) => void;\ntype OnError = (job: WorkerJob, error: Error) => void;\n\ntype QueuedJob = {\n name: string;\n onMessage: OnMessage;\n onError: OnError;\n onStart: (value: any) => void; // Resolve job start promise\n};\n\n/**\n * Process multiple data messages with small pool of identical workers\n */\nexport default class WorkerPool {\n name: string = 'unnamed';\n source?: string; // | Function;\n url?: string;\n maxConcurrency: number = 1;\n maxMobileConcurrency: number = 1;\n onDebug: (options: OnDebugParameters) => any = () => {};\n reuseWorkers: boolean = true;\n\n private props: WorkerPoolProps = {};\n private jobQueue: QueuedJob[] = [];\n private idleQueue: WorkerThread[] = [];\n private count = 0;\n private isDestroyed = false;\n\n /** Checks if workers are supported on this platform */\n static isSupported(): boolean {\n return WorkerThread.isSupported();\n }\n\n /**\n * @param processor - worker function\n * @param maxConcurrency - max count of workers\n */\n constructor(props: WorkerPoolProps) {\n this.source = props.source;\n this.url = props.url;\n this.setProps(props);\n }\n\n /**\n * Terminates all workers in the pool\n * @note Can free up significant memory\n */\n destroy(): void {\n // Destroy idle workers, active Workers will be destroyed on completion\n this.idleQueue.forEach((worker) => worker.destroy());\n this.isDestroyed = true;\n }\n\n setProps(props: WorkerPoolProps) {\n this.props = {...this.props, ...props};\n\n if (props.name !== undefined) {\n this.name = props.name;\n }\n if (props.maxConcurrency !== undefined) {\n this.maxConcurrency = props.maxConcurrency;\n }\n if (props.maxMobileConcurrency !== undefined) {\n this.maxMobileConcurrency = props.maxMobileConcurrency;\n }\n if (props.reuseWorkers !== undefined) {\n this.reuseWorkers = props.reuseWorkers;\n }\n if (props.onDebug !== undefined) {\n this.onDebug = props.onDebug;\n }\n }\n\n async startJob(\n name: string,\n onMessage: OnMessage = (job, type, data) => job.done(data),\n onError: OnError = (job, error) => job.error(error)\n ): Promise<WorkerJob> {\n // Promise resolves when thread starts working on this job\n const startPromise = new Promise<WorkerJob>((onStart) => {\n // Promise resolves when thread completes or fails working on this job\n this.jobQueue.push({name, onMessage, onError, onStart});\n return this;\n });\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n return await startPromise;\n }\n\n // PRIVATE\n\n /**\n * Starts first queued job if worker is available or can be created\n * Called when job is started and whenever a worker returns to the idleQueue\n */\n async _startQueuedJob(): Promise<void> {\n if (!this.jobQueue.length) {\n return;\n }\n\n const workerThread = this._getAvailableWorker();\n if (!workerThread) {\n return;\n }\n\n // We have a worker, dequeue and start the job\n const queuedJob = this.jobQueue.shift();\n if (queuedJob) {\n // Emit a debug event\n // @ts-ignore\n this.onDebug({\n message: 'Starting job',\n name: queuedJob.name,\n workerThread,\n backlog: this.jobQueue.length\n });\n\n // Create a worker job to let the app access thread and manage job completion\n const job = new WorkerJob(queuedJob.name, workerThread);\n\n // Set the worker thread's message handlers\n workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);\n workerThread.onError = (error) => queuedJob.onError(job, error);\n\n // Resolve the start promise so that the app can start sending messages to worker\n queuedJob.onStart(job);\n\n // Wait for the app to signal that the job is complete, then return worker to queue\n try {\n await job.result;\n } finally {\n this.returnWorkerToQueue(workerThread);\n }\n }\n }\n\n /**\n * Returns a worker to the idle queue\n * Destroys the worker if\n * - pool is destroyed\n * - if this pool doesn't reuse workers\n * - if maxConcurrency has been lowered\n * @param worker\n */\n returnWorkerToQueue(worker: WorkerThread) {\n const shouldDestroyWorker =\n this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();\n\n if (shouldDestroyWorker) {\n worker.destroy();\n this.count--;\n } else {\n this.idleQueue.push(worker);\n }\n\n if (!this.isDestroyed) {\n this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises\n }\n }\n\n /**\n * Returns idle worker or creates new worker if maxConcurrency has not been reached\n */\n _getAvailableWorker(): WorkerThread | null {\n // If a worker has completed and returned to the queue, it can be used\n if (this.idleQueue.length > 0) {\n return this.idleQueue.shift() || null;\n }\n\n // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source\n if (this.count < this._getMaxConcurrency()) {\n this.count++;\n const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;\n return new WorkerThread({name, source: this.source, url: this.url});\n }\n\n // No worker available, have to wait\n return null;\n }\n\n _getMaxConcurrency() {\n return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;\n }\n}\n"],"file":"worker-pool.js"}
@@ -13,6 +13,10 @@ var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
13
13
 
14
14
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
15
15
 
16
+ var _worker_threads = require("worker_threads");
17
+
18
+ var _globals = require("../env-utils/globals");
19
+
16
20
  var _assert = require("../env-utils/assert");
17
21
 
18
22
  var _getLoadableWorkerUrl = require("../worker-utils/get-loadable-worker-url");
@@ -45,7 +49,7 @@ var WorkerThread = function () {
45
49
  return console.log(error);
46
50
  };
47
51
 
48
- this.worker = this._createBrowserWorker();
52
+ this.worker = _globals.isBrowser ? this._createBrowserWorker() : this._createNodeWorker();
49
53
  }
50
54
 
51
55
  (0, _createClass2.default)(WorkerThread, [{
@@ -114,12 +118,42 @@ var WorkerThread = function () {
114
118
  return console.error(event);
115
119
  };
116
120
 
121
+ return worker;
122
+ }
123
+ }, {
124
+ key: "_createNodeWorker",
125
+ value: function _createNodeWorker() {
126
+ var _this2 = this;
127
+
128
+ var worker;
129
+
130
+ if (this.url) {
131
+ var absolute = this.url.includes(':/') || this.url.startsWith('/');
132
+ var url = absolute ? this.url : "./".concat(this.url);
133
+ worker = new _worker_threads.Worker(url, {
134
+ eval: false
135
+ });
136
+ } else if (this.source) {
137
+ worker = new _worker_threads.Worker(this.source, {
138
+ eval: true
139
+ });
140
+ } else {
141
+ throw new Error('no worker');
142
+ }
143
+
144
+ worker.on('message', function (data) {
145
+ _this2.onMessage(data);
146
+ });
147
+ worker.on('error', function (error) {
148
+ _this2.onError(error);
149
+ });
150
+ worker.on('exit', function (code) {});
117
151
  return worker;
118
152
  }
119
153
  }], [{
120
154
  key: "isSupported",
121
155
  value: function isSupported() {
122
- return typeof Worker !== 'undefined';
156
+ return typeof Worker !== 'undefined' && _globals.isBrowser;
123
157
  }
124
158
  }]);
125
159
  return WorkerThread;