@loaders.gl/worker-utils 3.2.12 → 3.3.0-alpha.10

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 (125) hide show
  1. package/dist/es5/index.js +35 -52
  2. package/dist/es5/index.js.map +1 -1
  3. package/dist/es5/lib/async-queue/async-queue.js +15 -22
  4. package/dist/es5/lib/async-queue/async-queue.js.map +1 -1
  5. package/dist/es5/lib/env-utils/assert.js.map +1 -1
  6. package/dist/es5/lib/env-utils/globals.js +7 -4
  7. package/dist/es5/lib/env-utils/globals.js.map +1 -1
  8. package/dist/es5/lib/env-utils/version.js +4 -4
  9. package/dist/es5/lib/env-utils/version.js.map +1 -1
  10. package/dist/es5/lib/library-utils/library-utils.js +7 -46
  11. package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
  12. package/dist/es5/lib/node/require-utils.node.js +0 -22
  13. package/dist/es5/lib/node/require-utils.node.js.map +1 -1
  14. package/dist/es5/lib/node/worker_threads-browser.js +3 -6
  15. package/dist/es5/lib/node/worker_threads-browser.js.map +1 -1
  16. package/dist/es5/lib/node/worker_threads.js +0 -2
  17. package/dist/es5/lib/node/worker_threads.js.map +1 -1
  18. package/dist/es5/lib/process-utils/child-process-proxy.js +6 -49
  19. package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
  20. package/dist/es5/lib/process-utils/process-utils.js +0 -7
  21. package/dist/es5/lib/process-utils/process-utils.js.map +1 -1
  22. package/dist/es5/lib/worker-api/create-worker.js +40 -96
  23. package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
  24. package/dist/es5/lib/worker-api/get-worker-url.js +3 -8
  25. package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
  26. package/dist/es5/lib/worker-api/process-on-worker.js +13 -39
  27. package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
  28. package/dist/es5/lib/worker-api/validate-worker-version.js +0 -4
  29. package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -1
  30. package/dist/es5/lib/worker-farm/worker-body.js +13 -30
  31. package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
  32. package/dist/es5/lib/worker-farm/worker-farm.js +21 -32
  33. package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
  34. package/dist/es5/lib/worker-farm/worker-job.js +9 -13
  35. package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
  36. package/dist/es5/lib/worker-farm/worker-pool.js +18 -51
  37. package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
  38. package/dist/es5/lib/worker-farm/worker-thread.js +21 -33
  39. package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
  40. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +1 -5
  41. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
  42. package/dist/es5/lib/worker-utils/get-transfer-list.js +5 -12
  43. package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
  44. package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +0 -4
  45. package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
  46. package/dist/es5/types.js.map +1 -1
  47. package/dist/es5/workers/null-worker.js +0 -6
  48. package/dist/es5/workers/null-worker.js.map +1 -1
  49. package/dist/esm/index.js +8 -0
  50. package/dist/esm/index.js.map +1 -1
  51. package/dist/esm/lib/async-queue/async-queue.js +1 -14
  52. package/dist/esm/lib/async-queue/async-queue.js.map +1 -1
  53. package/dist/esm/lib/env-utils/assert.js +2 -0
  54. package/dist/esm/lib/env-utils/assert.js.map +1 -1
  55. package/dist/esm/lib/env-utils/globals.js +9 -1
  56. package/dist/esm/lib/env-utils/globals.js.map +1 -1
  57. package/dist/esm/lib/env-utils/version.js +4 -3
  58. package/dist/esm/lib/env-utils/version.js.map +1 -1
  59. package/dist/esm/lib/library-utils/library-utils.js +11 -13
  60. package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
  61. package/dist/esm/lib/node/require-utils.node.js +7 -9
  62. package/dist/esm/lib/node/require-utils.node.js.map +1 -1
  63. package/dist/esm/lib/node/worker_threads-browser.js +1 -0
  64. package/dist/esm/lib/node/worker_threads-browser.js.map +1 -1
  65. package/dist/esm/lib/node/worker_threads.js.map +1 -1
  66. package/dist/esm/lib/process-utils/child-process-proxy.js +13 -25
  67. package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
  68. package/dist/esm/lib/process-utils/process-utils.js +3 -5
  69. package/dist/esm/lib/process-utils/process-utils.js.map +1 -1
  70. package/dist/esm/lib/worker-api/create-worker.js +4 -14
  71. package/dist/esm/lib/worker-api/create-worker.js.map +1 -1
  72. package/dist/esm/lib/worker-api/get-worker-url.js +7 -6
  73. package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
  74. package/dist/esm/lib/worker-api/process-on-worker.js +7 -11
  75. package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
  76. package/dist/esm/lib/worker-api/validate-worker-version.js +3 -2
  77. package/dist/esm/lib/worker-api/validate-worker-version.js.map +1 -1
  78. package/dist/esm/lib/worker-farm/worker-body.js +1 -13
  79. package/dist/esm/lib/worker-farm/worker-body.js.map +1 -1
  80. package/dist/esm/lib/worker-farm/worker-farm.js +9 -14
  81. package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -1
  82. package/dist/esm/lib/worker-farm/worker-job.js +2 -9
  83. package/dist/esm/lib/worker-farm/worker-job.js.map +1 -1
  84. package/dist/esm/lib/worker-farm/worker-pool.js +8 -31
  85. package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
  86. package/dist/esm/lib/worker-farm/worker-thread.js +2 -23
  87. package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
  88. package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +2 -3
  89. package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
  90. package/dist/esm/lib/worker-utils/get-transfer-list.js +10 -11
  91. package/dist/esm/lib/worker-utils/get-transfer-list.js.map +1 -1
  92. package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +1 -1
  93. package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
  94. package/dist/esm/types.js.map +1 -1
  95. package/dist/esm/workers/null-worker.js.map +1 -1
  96. package/dist/lib/env-utils/version.js +1 -1
  97. package/dist/lib/library-utils/library-utils.js +6 -2
  98. package/dist/lib/node/worker_threads.js +5 -1
  99. package/dist/lib/process-utils/child-process-proxy.d.ts +1 -1
  100. package/dist/lib/process-utils/child-process-proxy.d.ts.map +1 -1
  101. package/dist/lib/process-utils/child-process-proxy.js +5 -1
  102. package/dist/lib/worker-api/create-worker.d.ts +1 -1
  103. package/dist/lib/worker-api/create-worker.d.ts.map +1 -1
  104. package/dist/lib/worker-api/get-worker-url.js +1 -1
  105. package/dist/lib/worker-api/process-on-worker.d.ts +1 -1
  106. package/dist/lib/worker-api/process-on-worker.d.ts.map +1 -1
  107. package/dist/lib/worker-farm/worker-farm.d.ts +1 -1
  108. package/dist/lib/worker-farm/worker-farm.d.ts.map +1 -1
  109. package/dist/lib/worker-farm/worker-farm.js +8 -8
  110. package/dist/lib/worker-farm/worker-pool.d.ts +4 -4
  111. package/dist/lib/worker-farm/worker-pool.d.ts.map +1 -1
  112. package/dist/lib/worker-farm/worker-pool.js +4 -4
  113. package/dist/lib/worker-farm/worker-thread.d.ts +1 -1
  114. package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
  115. package/dist/lib/worker-farm/worker-thread.js +5 -5
  116. package/dist/lib/worker-utils/get-transfer-list.d.ts.map +1 -1
  117. package/dist/lib/worker-utils/get-transfer-list.js +4 -2
  118. package/dist/null-worker.js.map +1 -1
  119. package/dist/types.d.ts +9 -9
  120. package/dist/types.d.ts.map +1 -1
  121. package/package.json +2 -2
  122. package/src/lib/env-utils/version.ts +1 -1
  123. package/src/lib/library-utils/library-utils.ts +1 -1
  124. package/src/lib/worker-api/get-worker-url.ts +1 -1
  125. package/src/lib/worker-utils/get-transfer-list.ts +6 -2
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/create-worker.ts"],"names":["AsyncQueue","WorkerBody","requestId","inputBatches","options","createWorker","process","processInBatches","inWorkerThread","context","processOnMainThread","onmessage","type","payload","Error","result","input","postMessage","resultIterator","batch","push","close","error","message","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"}
1
+ {"version":3,"file":"create-worker.js","names":["AsyncQueue","WorkerBody","requestId","inputBatches","options","createWorker","process","processInBatches","inWorkerThread","context","processOnMainThread","onmessage","type","payload","Error","result","input","postMessage","resultIterator","batch","push","close","error","message","arrayBuffer","Promise","resolve","reject","id","onMessage","removeEventListener","addEventListener"],"sources":["../../../../src/lib/worker-api/create-worker.ts"],"sourcesContent":["import type {\n WorkerMessageType,\n WorkerMessagePayload,\n WorkerContext,\n Process,\n ProcessInBatches\n} from '../../types';\nimport AsyncQueue from '../async-queue/async-queue';\nimport WorkerBody from '../worker-farm/worker-body';\n// import {validateWorkerVersion} from './validate-worker-version';\n\n/** Counter for jobs */\nlet requestId = 0;\nlet inputBatches: AsyncQueue<any>;\nlet options: {[key: string]: any};\n\nexport type ProcessOnMainThread = (\n data: any,\n options?: {[key: string]: any},\n context?: WorkerContext\n) => any;\n\n/**\n * Set up a WebWorkerGlobalScope to talk with the main thread\n */\nexport function createWorker(process: Process, processInBatches?: ProcessInBatches): void {\n if (!WorkerBody.inWorkerThread()) {\n return;\n }\n\n const context: WorkerContext = {\n process: processOnMainThread\n };\n\n // eslint-disable-next-line complexity\n WorkerBody.onmessage = async (type: WorkerMessageType, payload: WorkerMessagePayload) => {\n try {\n switch (type) {\n case 'process':\n if (!process) {\n throw new Error('Worker does not support atomic processing');\n }\n const result = await process(payload.input, payload.options || {}, context);\n WorkerBody.postMessage('done', {result});\n break;\n\n case 'process-in-batches':\n if (!processInBatches) {\n throw new Error('Worker does not support batched processing');\n }\n inputBatches = new AsyncQueue<any>();\n options = payload.options || {};\n const resultIterator = processInBatches(inputBatches, options, context);\n for await (const batch of resultIterator) {\n WorkerBody.postMessage('output-batch', {result: batch});\n }\n WorkerBody.postMessage('done', {});\n break;\n\n case 'input-batch':\n inputBatches.push(payload.input);\n break;\n\n case 'input-done':\n inputBatches.close();\n break;\n\n default:\n }\n } catch (error) {\n const message = error instanceof Error ? error.message : '';\n WorkerBody.postMessage('error', {error: message});\n }\n };\n}\n\nfunction processOnMainThread(arrayBuffer: ArrayBuffer, options = {}) {\n return new Promise((resolve, reject) => {\n const id = requestId++;\n\n /**\n */\n const onMessage = (type: string, payload: WorkerMessagePayload) => {\n if (payload.id !== id) {\n // not ours\n return;\n }\n\n switch (type) {\n case 'done':\n WorkerBody.removeEventListener(onMessage);\n resolve(payload.result);\n break;\n\n case 'error':\n WorkerBody.removeEventListener(onMessage);\n reject(payload.error);\n break;\n\n default:\n // ignore\n }\n };\n\n WorkerBody.addEventListener(onMessage);\n\n // Ask the main thread to decode data\n const payload = {id, input: arrayBuffer, options};\n WorkerBody.postMessage('process', payload);\n });\n}\n"],"mappings":"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"}
@@ -1,12 +1,15 @@
1
1
  import { assert } from '../env-utils/assert';
2
2
  import { VERSION as __VERSION__ } from '../env-utils/version';
3
- const NPM_TAG = 'latest';
4
- const VERSION = typeof "3.2.12" !== 'undefined' ? "3.2.12" : NPM_TAG;
3
+ const NPM_TAG = 'beta';
4
+ const VERSION = typeof "3.3.0-alpha.10" !== 'undefined' ? "3.3.0-alpha.10" : NPM_TAG;
5
+
5
6
  export function getWorkerName(worker) {
6
7
  const warning = worker.version !== VERSION ? " (worker-utils@".concat(VERSION, ")") : '';
7
8
  return "".concat(worker.name, "@").concat(worker.version).concat(warning);
8
9
  }
9
- export function getWorkerURL(worker, options = {}) {
10
+
11
+ export function getWorkerURL(worker) {
12
+ let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
10
13
  const workerOptions = options[worker.id] || {};
11
14
  const workerFile = "".concat(worker.id, "-worker.js");
12
15
  let url = workerOptions.workerUrl;
@@ -21,16 +24,14 @@ export function getWorkerURL(worker, options = {}) {
21
24
 
22
25
  if (!url) {
23
26
  let version = worker.version;
24
-
25
27
  if (version === 'latest') {
26
28
  version = NPM_TAG;
27
29
  }
28
-
29
30
  const versionTag = version ? "@".concat(version) : '';
30
31
  url = "https://unpkg.com/@loaders.gl/".concat(worker.module).concat(versionTag, "/dist/").concat(workerFile);
31
32
  }
32
-
33
33
  assert(url);
34
+
34
35
  return url;
35
36
  }
36
37
  //# sourceMappingURL=get-worker-url.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAO,IAAIC,WAAnB,QAAqC,sBAArC;AAEA,MAAMC,OAAO,GAAG,QAAhB;AACA,MAAMF,OAAO,GAAG,oBAAuB,WAAvB,cAAmDE,OAAnE;AAKA,OAAO,SAASC,aAAT,CAAuBC,MAAvB,EAAqD;AAC1D,QAAMC,OAAO,GAAGD,MAAM,CAACE,OAAP,KAAmBN,OAAnB,4BAA+CA,OAA/C,SAA4D,EAA5E;AACA,mBAAUI,MAAM,CAACG,IAAjB,cAAyBH,MAAM,CAACE,OAAhC,SAA0CD,OAA1C;AACD;AASD,OAAO,SAASG,YAAT,CAAsBJ,MAAtB,EAA4CK,OAAsB,GAAG,EAArE,EAAiF;AACtF,QAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAR,CAAP,IAAsB,EAA5C;AAEA,QAAMC,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,GAAGJ,OAAV;AACD;;AACD,UAAMe,UAAU,GAAGX,OAAO,cAAOA,OAAP,IAAmB,EAA7C;AACAO,IAAAA,GAAG,2CAAoCT,MAAM,CAACY,MAA3C,SAAoDC,UAApD,mBAAuEL,UAAvE,CAAH;AACD;;AAEDb,EAAAA,MAAM,CAACc,GAAD,CAAN;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,"file":"get-worker-url.js","names":["assert","VERSION","__VERSION__","NPM_TAG","getWorkerName","worker","warning","version","name","getWorkerURL","options","workerOptions","id","workerFile","url","workerUrl","_workerType","module","versionTag"],"sources":["../../../../src/lib/worker-api/get-worker-url.ts"],"sourcesContent":["import type {WorkerObject, WorkerOptions} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\nconst NPM_TAG = 'beta'; // Change to 'latest' on release-branch\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;\n\n/**\n * Gets worker object's name (for debugging in Chrome thread inspector window)\n */\nexport function getWorkerName(worker: WorkerObject): string {\n const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';\n return `${worker.name}@${worker.version}${warning}`;\n}\n\n/**\n * Generate a worker URL based on worker object and options\n * @returns A URL to one of the following:\n * - a published worker on unpkg CDN\n * - a local test worker\n * - a URL provided by the user in options\n */\nexport function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {\n const workerOptions = options[worker.id] || {};\n\n const workerFile = `${worker.id}-worker.js`;\n\n let url = workerOptions.workerUrl;\n\n // HACK: Allow for non-nested workerUrl for the CompressionWorker.\n // For the compression worker, workerOptions is currently not nested correctly. For most loaders,\n // you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker\n // puts options at the top level, not within a `compression` key (its `id`). For this reason, the\n // above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not\n // break backwards compatibility, we allow the CompressionWorker to have options at the top level.\n if (!url && worker.id === 'compression') {\n url = options.workerUrl;\n }\n\n // If URL is test, generate local loaders.gl url\n // @ts-ignore _workerType\n if (options._workerType === 'test') {\n url = `modules/${worker.module}/dist/${workerFile}`;\n }\n\n // If url override is not provided, generate a URL to published version on npm CDN unpkg.com\n if (!url) {\n // GENERATE\n let version = worker.version;\n // On master we need to load npm alpha releases published with the `beta` tag\n if (version === 'latest') {\n // throw new Error('latest worker version specified');\n version = NPM_TAG;\n }\n const versionTag = version ? `@${version}` : '';\n url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;\n }\n\n assert(url);\n\n // Allow user to override location\n return url;\n}\n"],"mappings":"AACA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,OAAO,IAAIC,WAAW,QAAO,sBAAsB;AAE3D,MAAMC,OAAO,GAAG,MAAM;AACtB,MAAMF,OAAO,GAAG,uBAAkB,KAAK,WAAW,sBAAiBE,OAAO;;AAK1E,OAAO,SAASC,aAAa,CAACC,MAAoB,EAAU;EAC1D,MAAMC,OAAO,GAAGD,MAAM,CAACE,OAAO,KAAKN,OAAO,4BAAqBA,OAAO,SAAM,EAAE;EAC9E,iBAAUI,MAAM,CAACG,IAAI,cAAIH,MAAM,CAACE,OAAO,SAAGD,OAAO;AACnD;;AASA,OAAO,SAASG,YAAY,CAACJ,MAAoB,EAAuC;EAAA,IAArCK,OAAsB,uEAAG,CAAC,CAAC;EAC5E,MAAMC,aAAa,GAAGD,OAAO,CAACL,MAAM,CAACO,EAAE,CAAC,IAAI,CAAC,CAAC;EAE9C,MAAMC,UAAU,aAAMR,MAAM,CAACO,EAAE,eAAY;EAE3C,IAAIE,GAAG,GAAGH,aAAa,CAACI,SAAS;;EAQjC,IAAI,CAACD,GAAG,IAAIT,MAAM,CAACO,EAAE,KAAK,aAAa,EAAE;IACvCE,GAAG,GAAGJ,OAAO,CAACK,SAAS;EACzB;;EAIA,IAAIL,OAAO,CAACM,WAAW,KAAK,MAAM,EAAE;IAClCF,GAAG,qBAAcT,MAAM,CAACY,MAAM,mBAASJ,UAAU,CAAE;EACrD;;EAGA,IAAI,CAACC,GAAG,EAAE;IAER,IAAIP,OAAO,GAAGF,MAAM,CAACE,OAAO;IAE5B,IAAIA,OAAO,KAAK,QAAQ,EAAE;MAExBA,OAAO,GAAGJ,OAAO;IACnB;IACA,MAAMe,UAAU,GAAGX,OAAO,cAAOA,OAAO,IAAK,EAAE;IAC/CO,GAAG,2CAAoCT,MAAM,CAACY,MAAM,SAAGC,UAAU,mBAASL,UAAU,CAAE;EACxF;EAEAb,MAAM,CAACc,GAAG,CAAC;;EAGX,OAAOA,GAAG;AACZ"}
@@ -5,10 +5,12 @@ export function canProcessOnWorker(worker, options) {
5
5
  if (!WorkerFarm.isSupported()) {
6
6
  return false;
7
7
  }
8
-
9
8
  return worker.worker && (options === null || options === void 0 ? void 0 : options.worker);
10
9
  }
11
- export async function processOnWorker(worker, data, options = {}, context = {}) {
10
+
11
+ export async function processOnWorker(worker, data) {
12
+ let options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
13
+ let context = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
12
14
  const name = getWorkerName(worker);
13
15
  const workerFarm = WorkerFarm.getWorkerFarm(options);
14
16
  const {
@@ -18,14 +20,14 @@ export async function processOnWorker(worker, data, options = {}, context = {})
18
20
  name,
19
21
  source
20
22
  };
21
-
22
23
  if (!source) {
23
24
  workerPoolProps.url = getWorkerURL(worker, options);
24
25
  }
25
-
26
26
  const workerPool = workerFarm.getWorkerPool(workerPoolProps);
27
27
  const jobName = options.jobName || worker.name;
28
- const job = await workerPool.startJob(jobName, onMessage.bind(null, context));
28
+ const job = await workerPool.startJob(jobName,
29
+ onMessage.bind(null, context));
30
+
29
31
  const transferableOptions = getTransferListForWriter(options);
30
32
  job.postMessage('process', {
31
33
  input: data,
@@ -40,18 +42,15 @@ async function onMessage(context, job, type, payload) {
40
42
  case 'done':
41
43
  job.done(payload);
42
44
  break;
43
-
44
45
  case 'error':
45
46
  job.error(new Error(payload.error));
46
47
  break;
47
-
48
48
  case 'process':
49
49
  const {
50
50
  id,
51
51
  input,
52
52
  options
53
53
  } = payload;
54
-
55
54
  try {
56
55
  if (!context.process) {
57
56
  job.postMessage('error', {
@@ -60,7 +59,6 @@ async function onMessage(context, job, type, payload) {
60
59
  });
61
60
  return;
62
61
  }
63
-
64
62
  const result = await context.process(input, options);
65
63
  job.postMessage('done', {
66
64
  id,
@@ -73,9 +71,7 @@ async function onMessage(context, job, type, payload) {
73
71
  error: message
74
72
  });
75
73
  }
76
-
77
74
  break;
78
-
79
75
  default:
80
76
  console.warn("process-on-worker: unknown message ".concat(type));
81
77
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"names":["WorkerFarm","getWorkerURL","getWorkerName","getTransferListForWriter","canProcessOnWorker","worker","options","isSupported","processOnWorker","data","context","name","workerFarm","getWorkerFarm","source","workerPoolProps","url","workerPool","getWorkerPool","jobName","job","startJob","onMessage","bind","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"mappings":"AAQA,OAAOA,UAAP,MAAuB,4BAAvB;AACA,SAAQC,YAAR,EAAsBC,aAAtB,QAA0C,kBAA1C;AACA,SAAQC,wBAAR,QAAuC,mCAAvC;AAaA,OAAO,SAASC,kBAAT,CAA4BC,MAA5B,EAAkDC,OAAlD,EAA2E;AAChF,MAAI,CAACN,UAAU,CAACO,WAAX,EAAL,EAA+B;AAC7B,WAAO,KAAP;AACD;;AAED,SAAOF,MAAM,CAACA,MAAP,KAAiBC,OAAjB,aAAiBA,OAAjB,uBAAiBA,OAAO,CAAED,MAA1B,CAAP;AACD;AAOD,OAAO,eAAeG,eAAf,CACLH,MADK,EAELI,IAFK,EAGLH,OAA+B,GAAG,EAH7B,EAILI,OAAsB,GAAG,EAJpB,EAKS;AACd,QAAMC,IAAI,GAAGT,aAAa,CAACG,MAAD,CAA1B;AAEA,QAAMO,UAAU,GAAGZ,UAAU,CAACa,aAAX,CAAyBP,OAAzB,CAAnB;AACA,QAAM;AAACQ,IAAAA;AAAD,MAAWR,OAAjB;AACA,QAAMS,eAA8D,GAAG;AAACJ,IAAAA,IAAD;AAAOG,IAAAA;AAAP,GAAvE;;AACA,MAAI,CAACA,MAAL,EAAa;AACXC,IAAAA,eAAe,CAACC,GAAhB,GAAsBf,YAAY,CAACI,MAAD,EAASC,OAAT,CAAlC;AACD;;AACD,QAAMW,UAAU,GAAGL,UAAU,CAACM,aAAX,CAAyBH,eAAzB,CAAnB;AAEA,QAAMI,OAAO,GAAGb,OAAO,CAACa,OAAR,IAAmBd,MAAM,CAACM,IAA1C;AACA,QAAMS,GAAG,GAAG,MAAMH,UAAU,CAACI,QAAX,CAChBF,OADgB,EAGhBG,SAAS,CAACC,IAAV,CAAe,IAAf,EAAqBb,OAArB,CAHgB,CAAlB;AAOA,QAAMc,mBAAmB,GAAGrB,wBAAwB,CAACG,OAAD,CAApD;AACAc,EAAAA,GAAG,CAACK,WAAJ,CAAgB,SAAhB,EAA2B;AAACC,IAAAA,KAAK,EAAEjB,IAAR;AAAcH,IAAAA,OAAO,EAAEkB;AAAvB,GAA3B;AAEA,QAAMG,MAAM,GAAG,MAAMP,GAAG,CAACO,MAAzB;AACA,SAAOA,MAAM,CAACA,MAAd;AACD;;AAOD,eAAeL,SAAf,CACEZ,OADF,EAEEU,GAFF,EAGEQ,IAHF,EAIEC,OAJF,EAKE;AACA,UAAQD,IAAR;AACE,SAAK,MAAL;AAEER,MAAAA,GAAG,CAACU,IAAJ,CAASD,OAAT;AACA;;AAEF,SAAK,OAAL;AAEET,MAAAA,GAAG,CAACW,KAAJ,CAAU,IAAIC,KAAJ,CAAUH,OAAO,CAACE,KAAlB,CAAV;AACA;;AAEF,SAAK,SAAL;AAEE,YAAM;AAACE,QAAAA,EAAD;AAAKP,QAAAA,KAAL;AAAYpB,QAAAA;AAAZ,UAAuBuB,OAA7B;;AACA,UAAI;AACF,YAAI,CAACnB,OAAO,CAACwB,OAAb,EAAsB;AACpBd,UAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACQ,YAAAA,EAAD;AAAKF,YAAAA,KAAK,EAAE;AAAZ,WAAzB;AACA;AACD;;AACD,cAAMJ,MAAM,GAAG,MAAMjB,OAAO,CAACwB,OAAR,CAAgBR,KAAhB,EAAuBpB,OAAvB,CAArB;AACAc,QAAAA,GAAG,CAACK,WAAJ,CAAgB,MAAhB,EAAwB;AAACQ,UAAAA,EAAD;AAAKN,UAAAA;AAAL,SAAxB;AACD,OAPD,CAOE,OAAOI,KAAP,EAAc;AACd,cAAMI,OAAO,GAAGJ,KAAK,YAAYC,KAAjB,GAAyBD,KAAK,CAACI,OAA/B,GAAyC,eAAzD;AACAf,QAAAA,GAAG,CAACK,WAAJ,CAAgB,OAAhB,EAAyB;AAACQ,UAAAA,EAAD;AAAKF,UAAAA,KAAK,EAAEI;AAAZ,SAAzB;AACD;;AACD;;AAEF;AAEEC,MAAAA,OAAO,CAACC,IAAR,8CAAmDT,IAAnD;AA7BJ;AA+BD","sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\nimport {getTransferListForWriter} from '../worker-utils/get-transfer-list';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const {source} = options;\n const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};\n if (!source) {\n workerPoolProps.url = getWorkerURL(worker, options);\n }\n const workerPool = workerFarm.getWorkerPool(workerPoolProps);\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = getTransferListForWriter(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"file":"process-on-worker.js"}
1
+ {"version":3,"file":"process-on-worker.js","names":["WorkerFarm","getWorkerURL","getWorkerName","getTransferListForWriter","canProcessOnWorker","worker","options","isSupported","processOnWorker","data","context","name","workerFarm","getWorkerFarm","source","workerPoolProps","url","workerPool","getWorkerPool","jobName","job","startJob","onMessage","bind","transferableOptions","postMessage","input","result","type","payload","done","error","Error","id","process","message","console","warn"],"sources":["../../../../src/lib/worker-api/process-on-worker.ts"],"sourcesContent":["import type {\n WorkerObject,\n WorkerOptions,\n WorkerContext,\n WorkerMessageType,\n WorkerMessagePayload\n} from '../../types';\nimport type WorkerJob from '../worker-farm/worker-job';\nimport WorkerFarm from '../worker-farm/worker-farm';\nimport {getWorkerURL, getWorkerName} from './get-worker-url';\nimport {getTransferListForWriter} from '../worker-utils/get-transfer-list';\n\ntype ProcessOnWorkerOptions = WorkerOptions & {\n jobName?: string;\n [key: string]: any;\n};\n\n/**\n * Determines if we can parse with worker\n * @param loader\n * @param data\n * @param options\n */\nexport function canProcessOnWorker(worker: WorkerObject, options?: WorkerOptions) {\n if (!WorkerFarm.isSupported()) {\n return false;\n }\n\n return worker.worker && options?.worker;\n}\n\n/**\n * This function expects that the worker thread sends certain messages,\n * Creating such a worker can be automated if the worker is wrapper by a call to\n * createWorker in @loaders.gl/worker-utils.\n */\nexport async function processOnWorker(\n worker: WorkerObject,\n data: any,\n options: ProcessOnWorkerOptions = {},\n context: WorkerContext = {}\n): Promise<any> {\n const name = getWorkerName(worker);\n\n const workerFarm = WorkerFarm.getWorkerFarm(options);\n const {source} = options;\n const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};\n if (!source) {\n workerPoolProps.url = getWorkerURL(worker, options);\n }\n const workerPool = workerFarm.getWorkerPool(workerPoolProps);\n\n const jobName = options.jobName || worker.name;\n const job = await workerPool.startJob(\n jobName,\n // eslint-disable-next-line\n onMessage.bind(null, context)\n );\n\n // Kick off the processing in the worker\n const transferableOptions = getTransferListForWriter(options);\n job.postMessage('process', {input: data, options: transferableOptions});\n\n const result = await job.result;\n return result.result;\n}\n\n/**\n * Job completes when we receive the result\n * @param job\n * @param message\n */\nasync function onMessage(\n context: WorkerContext,\n job: WorkerJob,\n type: WorkerMessageType,\n payload: WorkerMessagePayload\n) {\n switch (type) {\n case 'done':\n // Worker is done\n job.done(payload);\n break;\n\n case 'error':\n // Worker encountered an error\n job.error(new Error(payload.error));\n break;\n\n case 'process':\n // Worker is asking for us (main thread) to process something\n const {id, input, options} = payload;\n try {\n if (!context.process) {\n job.postMessage('error', {id, error: 'Worker not set up to process on main thread'});\n return;\n }\n const result = await context.process(input, options);\n job.postMessage('done', {id, result});\n } catch (error) {\n const message = error instanceof Error ? error.message : 'unknown error';\n job.postMessage('error', {id, error: message});\n }\n break;\n\n default:\n // eslint-disable-next-line\n console.warn(`process-on-worker: unknown message ${type}`);\n }\n}\n"],"mappings":"AAQA,OAAOA,UAAU,MAAM,4BAA4B;AACnD,SAAQC,YAAY,EAAEC,aAAa,QAAO,kBAAkB;AAC5D,SAAQC,wBAAwB,QAAO,mCAAmC;AAa1E,OAAO,SAASC,kBAAkB,CAACC,MAAoB,EAAEC,OAAuB,EAAE;EAChF,IAAI,CAACN,UAAU,CAACO,WAAW,EAAE,EAAE;IAC7B,OAAO,KAAK;EACd;EAEA,OAAOF,MAAM,CAACA,MAAM,KAAIC,OAAO,aAAPA,OAAO,uBAAPA,OAAO,CAAED,MAAM;AACzC;;AAOA,OAAO,eAAeG,eAAe,CACnCH,MAAoB,EACpBI,IAAS,EAGK;EAAA,IAFdH,OAA+B,uEAAG,CAAC,CAAC;EAAA,IACpCI,OAAsB,uEAAG,CAAC,CAAC;EAE3B,MAAMC,IAAI,GAAGT,aAAa,CAACG,MAAM,CAAC;EAElC,MAAMO,UAAU,GAAGZ,UAAU,CAACa,aAAa,CAACP,OAAO,CAAC;EACpD,MAAM;IAACQ;EAAM,CAAC,GAAGR,OAAO;EACxB,MAAMS,eAA8D,GAAG;IAACJ,IAAI;IAAEG;EAAM,CAAC;EACrF,IAAI,CAACA,MAAM,EAAE;IACXC,eAAe,CAACC,GAAG,GAAGf,YAAY,CAACI,MAAM,EAAEC,OAAO,CAAC;EACrD;EACA,MAAMW,UAAU,GAAGL,UAAU,CAACM,aAAa,CAACH,eAAe,CAAC;EAE5D,MAAMI,OAAO,GAAGb,OAAO,CAACa,OAAO,IAAId,MAAM,CAACM,IAAI;EAC9C,MAAMS,GAAG,GAAG,MAAMH,UAAU,CAACI,QAAQ,CACnCF,OAAO;EAEPG,SAAS,CAACC,IAAI,CAAC,IAAI,EAAEb,OAAO,CAAC,CAC9B;;EAGD,MAAMc,mBAAmB,GAAGrB,wBAAwB,CAACG,OAAO,CAAC;EAC7Dc,GAAG,CAACK,WAAW,CAAC,SAAS,EAAE;IAACC,KAAK,EAAEjB,IAAI;IAAEH,OAAO,EAAEkB;EAAmB,CAAC,CAAC;EAEvE,MAAMG,MAAM,GAAG,MAAMP,GAAG,CAACO,MAAM;EAC/B,OAAOA,MAAM,CAACA,MAAM;AACtB;;AAOA,eAAeL,SAAS,CACtBZ,OAAsB,EACtBU,GAAc,EACdQ,IAAuB,EACvBC,OAA6B,EAC7B;EACA,QAAQD,IAAI;IACV,KAAK,MAAM;MAETR,GAAG,CAACU,IAAI,CAACD,OAAO,CAAC;MACjB;IAEF,KAAK,OAAO;MAEVT,GAAG,CAACW,KAAK,CAAC,IAAIC,KAAK,CAACH,OAAO,CAACE,KAAK,CAAC,CAAC;MACnC;IAEF,KAAK,SAAS;MAEZ,MAAM;QAACE,EAAE;QAAEP,KAAK;QAAEpB;MAAO,CAAC,GAAGuB,OAAO;MACpC,IAAI;QACF,IAAI,CAACnB,OAAO,CAACwB,OAAO,EAAE;UACpBd,GAAG,CAACK,WAAW,CAAC,OAAO,EAAE;YAACQ,EAAE;YAAEF,KAAK,EAAE;UAA6C,CAAC,CAAC;UACpF;QACF;QACA,MAAMJ,MAAM,GAAG,MAAMjB,OAAO,CAACwB,OAAO,CAACR,KAAK,EAAEpB,OAAO,CAAC;QACpDc,GAAG,CAACK,WAAW,CAAC,MAAM,EAAE;UAACQ,EAAE;UAAEN;QAAM,CAAC,CAAC;MACvC,CAAC,CAAC,OAAOI,KAAK,EAAE;QACd,MAAMI,OAAO,GAAGJ,KAAK,YAAYC,KAAK,GAAGD,KAAK,CAACI,OAAO,GAAG,eAAe;QACxEf,GAAG,CAACK,WAAW,CAAC,OAAO,EAAE;UAACQ,EAAE;UAAEF,KAAK,EAAEI;QAAO,CAAC,CAAC;MAChD;MACA;IAEF;MAEEC,OAAO,CAACC,IAAI,8CAAuCT,IAAI,EAAG;EAAC;AAEjE"}
@@ -1,9 +1,10 @@
1
1
  import { assert } from '../env-utils/assert';
2
2
  import { VERSION } from '../env-utils/version';
3
- export function validateWorkerVersion(worker, coreVersion = VERSION) {
3
+
4
+ export function validateWorkerVersion(worker) {
5
+ let coreVersion = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : VERSION;
4
6
  assert(worker, 'no worker provided');
5
7
  const workerVersion = worker.version;
6
-
7
8
  if (!coreVersion || !workerVersion) {
8
9
  return false;
9
10
  }
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-api/validate-worker-version.ts"],"names":["assert","VERSION","validateWorkerVersion","worker","coreVersion","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"mappings":"AACA,SAAQA,MAAR,QAAqB,qBAArB;AACA,SAAQC,OAAR,QAAsB,sBAAtB;AAQA,OAAO,SAASC,qBAAT,CACLC,MADK,EAELC,WAAmB,GAAGH,OAFjB,EAGI;AACTD,EAAAA,MAAM,CAACG,MAAD,EAAS,oBAAT,CAAN;AAEA,QAAME,aAAa,GAAGF,MAAM,CAACG,OAA7B;;AACA,MAAI,CAACF,WAAD,IAAgB,CAACC,aAArB,EAAoC;AAClC,WAAO,KAAP;AACD;;AAYD,SAAO,IAAP;AACD;;AAID,SAASE,YAAT,CAAsBD,OAAtB,EAA+B;AAC7B,QAAME,KAAK,GAAGF,OAAO,CAACG,KAAR,CAAc,GAAd,EAAmBC,GAAnB,CAAuBC,MAAvB,CAAd;AACA,SAAO;AAACC,IAAAA,KAAK,EAAEJ,KAAK,CAAC,CAAD,CAAb;AAAkBK,IAAAA,KAAK,EAAEL,KAAK,CAAC,CAAD;AAA9B,GAAP;AACD","sourcesContent":["import type {WorkerObject} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\n/**\n * Check if worker is compatible with this library version\n * @param worker\n * @param libVersion\n * @returns `true` if the two versions are compatible\n */\nexport function validateWorkerVersion(\n worker: WorkerObject,\n coreVersion: string = VERSION\n): boolean {\n assert(worker, 'no worker provided');\n\n const workerVersion = worker.version;\n if (!coreVersion || !workerVersion) {\n return false;\n }\n\n // TODO enable when fix the __version__ injection\n // const coreVersions = parseVersion(coreVersion);\n // const workerVersions = parseVersion(workerVersion);\n // assert(\n // coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,\n // `worker: ${worker.name} is not compatible. ${coreVersion.major}.${\n // coreVersion.minor\n // }+ is required.`\n // );\n\n return true;\n}\n\n// @ts-ignore\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction parseVersion(version) {\n const parts = version.split('.').map(Number);\n return {major: parts[0], minor: parts[1]};\n}\n"],"file":"validate-worker-version.js"}
1
+ {"version":3,"file":"validate-worker-version.js","names":["assert","VERSION","validateWorkerVersion","worker","coreVersion","workerVersion","version","parseVersion","parts","split","map","Number","major","minor"],"sources":["../../../../src/lib/worker-api/validate-worker-version.ts"],"sourcesContent":["import type {WorkerObject} from '../../types';\nimport {assert} from '../env-utils/assert';\nimport {VERSION} from '../env-utils/version';\n\n/**\n * Check if worker is compatible with this library version\n * @param worker\n * @param libVersion\n * @returns `true` if the two versions are compatible\n */\nexport function validateWorkerVersion(\n worker: WorkerObject,\n coreVersion: string = VERSION\n): boolean {\n assert(worker, 'no worker provided');\n\n const workerVersion = worker.version;\n if (!coreVersion || !workerVersion) {\n return false;\n }\n\n // TODO enable when fix the __version__ injection\n // const coreVersions = parseVersion(coreVersion);\n // const workerVersions = parseVersion(workerVersion);\n // assert(\n // coreVersion.major === workerVersion.major && coreVersion.minor <= workerVersion.minor,\n // `worker: ${worker.name} is not compatible. ${coreVersion.major}.${\n // coreVersion.minor\n // }+ is required.`\n // );\n\n return true;\n}\n\n// @ts-ignore\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nfunction parseVersion(version) {\n const parts = version.split('.').map(Number);\n return {major: parts[0], minor: parts[1]};\n}\n"],"mappings":"AACA,SAAQA,MAAM,QAAO,qBAAqB;AAC1C,SAAQC,OAAO,QAAO,sBAAsB;;AAQ5C,OAAO,SAASC,qBAAqB,CACnCC,MAAoB,EAEX;EAAA,IADTC,WAAmB,uEAAGH,OAAO;EAE7BD,MAAM,CAACG,MAAM,EAAE,oBAAoB,CAAC;EAEpC,MAAME,aAAa,GAAGF,MAAM,CAACG,OAAO;EACpC,IAAI,CAACF,WAAW,IAAI,CAACC,aAAa,EAAE;IAClC,OAAO,KAAK;EACd;;EAYA,OAAO,IAAI;AACb;;AAIA,SAASE,YAAY,CAACD,OAAO,EAAE;EAC7B,MAAME,KAAK,GAAGF,OAAO,CAACG,KAAK,CAAC,GAAG,CAAC,CAACC,GAAG,CAACC,MAAM,CAAC;EAC5C,OAAO;IAACC,KAAK,EAAEJ,KAAK,CAAC,CAAC,CAAC;IAAEK,KAAK,EAAEL,KAAK,CAAC,CAAC;EAAC,CAAC;AAC3C"}
@@ -2,16 +2,14 @@ import { getTransferList } from '../worker-utils/get-transfer-list';
2
2
 
3
3
  function getParentPort() {
4
4
  let parentPort;
5
-
6
5
  try {
7
6
  eval('globalThis.parentPort = require(\'worker_threads\').parentPort');
8
7
  parentPort = globalThis.parentPort;
9
8
  } catch {}
10
-
11
9
  return parentPort;
12
10
  }
13
-
14
11
  const onMessageWrapperMap = new Map();
12
+
15
13
  export default class WorkerBody {
16
14
  static inWorkerThread() {
17
15
  return typeof self !== 'undefined' || Boolean(getParentPort());
@@ -26,9 +24,7 @@ export default class WorkerBody {
26
24
  } = parentPort ? message : message.data;
27
25
  onMessage(type, payload);
28
26
  }
29
-
30
27
  const parentPort = getParentPort();
31
-
32
28
  if (parentPort) {
33
29
  parentPort.on('message', handleMessage);
34
30
  parentPort.on('exit', () => console.debug('Node worker closing'));
@@ -36,10 +32,8 @@ export default class WorkerBody {
36
32
  globalThis.onmessage = handleMessage;
37
33
  }
38
34
  }
39
-
40
35
  static addEventListener(onMessage) {
41
36
  let onMessageWrapper = onMessageWrapperMap.get(onMessage);
42
-
43
37
  if (!onMessageWrapper) {
44
38
  onMessageWrapper = message => {
45
39
  if (!isKnownMessage(message)) {
@@ -54,21 +48,17 @@ export default class WorkerBody {
54
48
  onMessage(type, payload);
55
49
  };
56
50
  }
57
-
58
51
  const parentPort = getParentPort();
59
-
60
52
  if (parentPort) {
61
53
  console.error('not implemented');
62
54
  } else {
63
55
  globalThis.addEventListener('message', onMessageWrapper);
64
56
  }
65
57
  }
66
-
67
58
  static removeEventListener(onMessage) {
68
59
  const onMessageWrapper = onMessageWrapperMap.get(onMessage);
69
60
  onMessageWrapperMap.delete(onMessage);
70
61
  const parentPort = getParentPort();
71
-
72
62
  if (parentPort) {
73
63
  console.error('not implemented');
74
64
  } else {
@@ -84,14 +74,12 @@ export default class WorkerBody {
84
74
  };
85
75
  const transferList = getTransferList(payload);
86
76
  const parentPort = getParentPort();
87
-
88
77
  if (parentPort) {
89
78
  parentPort.postMessage(data, transferList);
90
79
  } else {
91
80
  globalThis.postMessage(data, transferList);
92
81
  }
93
82
  }
94
-
95
83
  }
96
84
 
97
85
  function isKnownMessage(message) {
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"names":["getTransferList","getParentPort","parentPort","eval","globalThis","onMessageWrapperMap","Map","WorkerBody","inWorkerThread","self","Boolean","onmessage","onMessage","handleMessage","message","type","payload","data","on","console","debug","addEventListener","onMessageWrapper","get","isKnownMessage","error","removeEventListener","delete","postMessage","source","transferList","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"}
1
+ {"version":3,"file":"worker-body.js","names":["getTransferList","getParentPort","parentPort","eval","globalThis","onMessageWrapperMap","Map","WorkerBody","inWorkerThread","self","Boolean","onmessage","onMessage","handleMessage","message","type","payload","data","on","console","debug","addEventListener","onMessageWrapper","get","isKnownMessage","error","removeEventListener","delete","postMessage","source","transferList","startsWith"],"sources":["../../../../src/lib/worker-farm/worker-body.ts"],"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"],"mappings":"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"}
@@ -1,31 +1,32 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import WorkerPool from './worker-pool';
3
3
  import WorkerThread from './worker-thread';
4
+
4
5
  const DEFAULT_PROPS = {
5
6
  maxConcurrency: 3,
6
7
  maxMobileConcurrency: 1,
7
8
  reuseWorkers: true,
8
9
  onDebug: () => {}
9
10
  };
11
+
10
12
  export default class WorkerFarm {
13
+
11
14
  static isSupported() {
12
15
  return WorkerThread.isSupported();
13
16
  }
14
17
 
15
- static getWorkerFarm(props = {}) {
18
+ static getWorkerFarm() {
19
+ let props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
16
20
  WorkerFarm._workerFarm = WorkerFarm._workerFarm || new WorkerFarm({});
17
-
18
21
  WorkerFarm._workerFarm.setProps(props);
19
-
20
22
  return WorkerFarm._workerFarm;
21
23
  }
22
24
 
23
25
  constructor(props) {
24
26
  _defineProperty(this, "props", void 0);
25
-
26
27
  _defineProperty(this, "workerPools", new Map());
27
-
28
- this.props = { ...DEFAULT_PROPS
28
+ this.props = {
29
+ ...DEFAULT_PROPS
29
30
  };
30
31
  this.setProps(props);
31
32
  this.workerPools = new Map();
@@ -35,15 +36,14 @@ export default class WorkerFarm {
35
36
  for (const workerPool of this.workerPools.values()) {
36
37
  workerPool.destroy();
37
38
  }
38
-
39
39
  this.workerPools = new Map();
40
40
  }
41
41
 
42
42
  setProps(props) {
43
- this.props = { ...this.props,
43
+ this.props = {
44
+ ...this.props,
44
45
  ...props
45
46
  };
46
-
47
47
  for (const workerPool of this.workerPools.values()) {
48
48
  workerPool.setProps(this._getWorkerPoolProps());
49
49
  }
@@ -56,7 +56,6 @@ export default class WorkerFarm {
56
56
  url
57
57
  } = options;
58
58
  let workerPool = this.workerPools.get(name);
59
-
60
59
  if (!workerPool) {
61
60
  workerPool = new WorkerPool({
62
61
  name,
@@ -66,10 +65,8 @@ export default class WorkerFarm {
66
65
  workerPool.setProps(this._getWorkerPoolProps());
67
66
  this.workerPools.set(name, workerPool);
68
67
  }
69
-
70
68
  return workerPool;
71
69
  }
72
-
73
70
  _getWorkerPoolProps() {
74
71
  return {
75
72
  maxConcurrency: this.props.maxConcurrency,
@@ -78,8 +75,6 @@ export default class WorkerFarm {
78
75
  onDebug: this.props.onDebug
79
76
  };
80
77
  }
81
-
82
78
  }
83
-
84
79
  _defineProperty(WorkerFarm, "_workerFarm", void 0);
85
80
  //# sourceMappingURL=worker-farm.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"names":["WorkerPool","WorkerThread","DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","WorkerFarm","isSupported","getWorkerFarm","props","_workerFarm","setProps","constructor","Map","workerPools","destroy","workerPool","values","_getWorkerPoolProps","getWorkerPool","options","name","source","url","get","set"],"mappings":";AAAA,OAAOA,UAAP,MAAuB,eAAvB;AACA,OAAOC,YAAP,MAAyB,iBAAzB;AAgBA,MAAMC,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,MAAM,CAAE;AAJ8B,CAAjD;AAUA,eAAe,MAAMC,UAAN,CAAiB;AAOZ,SAAXC,WAAW,GAAY;AAC5B,WAAOP,YAAY,CAACO,WAAb,EAAP;AACD;;AAGmB,SAAbC,aAAa,CAACC,KAAsB,GAAG,EAA1B,EAA0C;AAC5DH,IAAAA,UAAU,CAACI,WAAX,GAAyBJ,UAAU,CAACI,WAAX,IAA0B,IAAIJ,UAAJ,CAAe,EAAf,CAAnD;;AACAA,IAAAA,UAAU,CAACI,WAAX,CAAuBC,QAAvB,CAAgCF,KAAhC;;AACA,WAAOH,UAAU,CAACI,WAAlB;AACD;;AAGOE,EAAAA,WAAW,CAACH,KAAD,EAAyB;AAAA;;AAAA,yCAjBtB,IAAII,GAAJ,EAiBsB;;AAC1C,SAAKJ,KAAL,GAAa,EAAC,GAAGR;AAAJ,KAAb;AACA,SAAKU,QAAL,CAAcF,KAAd;AAEA,SAAKK,WAAL,GAAmB,IAAID,GAAJ,EAAnB;AACD;;AAMDE,EAAAA,OAAO,GAAS;AACd,SAAK,MAAMC,UAAX,IAAyB,KAAKF,WAAL,CAAiBG,MAAjB,EAAzB,EAAoD;AAClDD,MAAAA,UAAU,CAACD,OAAX;AACD;;AACD,SAAKD,WAAL,GAAmB,IAAID,GAAJ,EAAnB;AACD;;AAMDF,EAAAA,QAAQ,CAACF,KAAD,EAA+B;AACrC,SAAKA,KAAL,GAAa,EAAC,GAAG,KAAKA,KAAT;AAAgB,SAAGA;AAAnB,KAAb;;AAEA,SAAK,MAAMO,UAAX,IAAyB,KAAKF,WAAL,CAAiBG,MAAjB,EAAzB,EAAoD;AAClDD,MAAAA,UAAU,CAACL,QAAX,CAAoB,KAAKO,mBAAL,EAApB;AACD;AACF;;AAWDC,EAAAA,aAAa,CAACC,OAAD,EAAqE;AAChF,UAAM;AAACC,MAAAA,IAAD;AAAOC,MAAAA,MAAP;AAAeC,MAAAA;AAAf,QAAsBH,OAA5B;AACA,QAAIJ,UAAU,GAAG,KAAKF,WAAL,CAAiBU,GAAjB,CAAqBH,IAArB,CAAjB;;AACA,QAAI,CAACL,UAAL,EAAiB;AACfA,MAAAA,UAAU,GAAG,IAAIjB,UAAJ,CAAe;AAC1BsB,QAAAA,IAD0B;AAE1BC,QAAAA,MAF0B;AAG1BC,QAAAA;AAH0B,OAAf,CAAb;AAKAP,MAAAA,UAAU,CAACL,QAAX,CAAoB,KAAKO,mBAAL,EAApB;AACA,WAAKJ,WAAL,CAAiBW,GAAjB,CAAqBJ,IAArB,EAA2BL,UAA3B;AACD;;AACD,WAAOA,UAAP;AACD;;AAEDE,EAAAA,mBAAmB,GAAG;AACpB,WAAO;AACLhB,MAAAA,cAAc,EAAE,KAAKO,KAAL,CAAWP,cADtB;AAELC,MAAAA,oBAAoB,EAAE,KAAKM,KAAL,CAAWN,oBAF5B;AAGLC,MAAAA,YAAY,EAAE,KAAKK,KAAL,CAAWL,YAHpB;AAILC,MAAAA,OAAO,EAAE,KAAKI,KAAL,CAAWJ;AAJf,KAAP;AAMD;;AAhF6B;;gBAAXC,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"}
1
+ {"version":3,"file":"worker-farm.js","names":["WorkerPool","WorkerThread","DEFAULT_PROPS","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","WorkerFarm","isSupported","getWorkerFarm","props","_workerFarm","setProps","constructor","Map","workerPools","destroy","workerPool","values","_getWorkerPoolProps","getWorkerPool","options","name","source","url","get","set"],"sources":["../../../../src/lib/worker-farm/worker-farm.ts"],"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"],"mappings":";AAAA,OAAOA,UAAU,MAAM,eAAe;AACtC,OAAOC,YAAY,MAAM,iBAAiB;;AAgB1C,MAAMC,aAAwC,GAAG;EAC/CC,cAAc,EAAE,CAAC;EACjBC,oBAAoB,EAAE,CAAC;EACvBC,YAAY,EAAE,IAAI;EAClBC,OAAO,EAAE,MAAM,CAAC;AAClB,CAAC;;AAKD,eAAe,MAAMC,UAAU,CAAC;;EAO9B,OAAOC,WAAW,GAAY;IAC5B,OAAOP,YAAY,CAACO,WAAW,EAAE;EACnC;;EAGA,OAAOC,aAAa,GAA0C;IAAA,IAAzCC,KAAsB,uEAAG,CAAC,CAAC;IAC9CH,UAAU,CAACI,WAAW,GAAGJ,UAAU,CAACI,WAAW,IAAI,IAAIJ,UAAU,CAAC,CAAC,CAAC,CAAC;IACrEA,UAAU,CAACI,WAAW,CAACC,QAAQ,CAACF,KAAK,CAAC;IACtC,OAAOH,UAAU,CAACI,WAAW;EAC/B;;EAGQE,WAAW,CAACH,KAAsB,EAAE;IAAA;IAAA,qCAjBtB,IAAII,GAAG,EAAsB;IAkBjD,IAAI,CAACJ,KAAK,GAAG;MAAC,GAAGR;IAAa,CAAC;IAC/B,IAAI,CAACU,QAAQ,CAACF,KAAK,CAAC;IAEpB,IAAI,CAACK,WAAW,GAAG,IAAID,GAAG,EAAE;EAC9B;;EAMAE,OAAO,GAAS;IACd,KAAK,MAAMC,UAAU,IAAI,IAAI,CAACF,WAAW,CAACG,MAAM,EAAE,EAAE;MAClDD,UAAU,CAACD,OAAO,EAAE;IACtB;IACA,IAAI,CAACD,WAAW,GAAG,IAAID,GAAG,EAAsB;EAClD;;EAMAF,QAAQ,CAACF,KAAsB,EAAQ;IACrC,IAAI,CAACA,KAAK,GAAG;MAAC,GAAG,IAAI,CAACA,KAAK;MAAE,GAAGA;IAAK,CAAC;IAEtC,KAAK,MAAMO,UAAU,IAAI,IAAI,CAACF,WAAW,CAACG,MAAM,EAAE,EAAE;MAClDD,UAAU,CAACL,QAAQ,CAAC,IAAI,CAACO,mBAAmB,EAAE,CAAC;IACjD;EACF;;EAWAC,aAAa,CAACC,OAAsD,EAAc;IAChF,MAAM;MAACC,IAAI;MAAEC,MAAM;MAAEC;IAAG,CAAC,GAAGH,OAAO;IACnC,IAAIJ,UAAU,GAAG,IAAI,CAACF,WAAW,CAACU,GAAG,CAACH,IAAI,CAAC;IAC3C,IAAI,CAACL,UAAU,EAAE;MACfA,UAAU,GAAG,IAAIjB,UAAU,CAAC;QAC1BsB,IAAI;QACJC,MAAM;QACNC;MACF,CAAC,CAAC;MACFP,UAAU,CAACL,QAAQ,CAAC,IAAI,CAACO,mBAAmB,EAAE,CAAC;MAC/C,IAAI,CAACJ,WAAW,CAACW,GAAG,CAACJ,IAAI,EAAEL,UAAU,CAAC;IACxC;IACA,OAAOA,UAAU;EACnB;EAEAE,mBAAmB,GAAG;IACpB,OAAO;MACLhB,cAAc,EAAE,IAAI,CAACO,KAAK,CAACP,cAAc;MACzCC,oBAAoB,EAAE,IAAI,CAACM,KAAK,CAACN,oBAAoB;MACrDC,YAAY,EAAE,IAAI,CAACK,KAAK,CAACL,YAAY;MACrCC,OAAO,EAAE,IAAI,CAACI,KAAK,CAACJ;IACtB,CAAC;EACH;AACF;AAAC,gBAjFoBC,UAAU"}
@@ -1,19 +1,15 @@
1
1
  import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import { assert } from '../env-utils/assert';
3
+
3
4
  export default class WorkerJob {
5
+
4
6
  constructor(jobName, workerThread) {
5
7
  _defineProperty(this, "name", void 0);
6
-
7
8
  _defineProperty(this, "workerThread", void 0);
8
-
9
9
  _defineProperty(this, "isRunning", true);
10
-
11
10
  _defineProperty(this, "result", void 0);
12
-
13
11
  _defineProperty(this, "_resolve", () => {});
14
-
15
12
  _defineProperty(this, "_reject", () => {});
16
-
17
13
  this.name = jobName;
18
14
  this.workerThread = workerThread;
19
15
  this.result = new Promise((resolve, reject) => {
@@ -33,16 +29,13 @@ export default class WorkerJob {
33
29
  done(value) {
34
30
  assert(this.isRunning);
35
31
  this.isRunning = false;
36
-
37
32
  this._resolve(value);
38
33
  }
39
34
 
40
35
  error(error) {
41
36
  assert(this.isRunning);
42
37
  this.isRunning = false;
43
-
44
38
  this._reject(error);
45
39
  }
46
-
47
40
  }
48
41
  //# sourceMappingURL=worker-job.js.map
@@ -1 +1 @@
1
- {"version":3,"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"names":["assert","WorkerJob","constructor","jobName","workerThread","name","result","Promise","resolve","reject","_resolve","_reject","postMessage","type","payload","source","done","value","isRunning","error"],"mappings":";AAEA,SAAQA,MAAR,QAAqB,qBAArB;AAKA,eAAe,MAAMC,SAAN,CAAgB;AAU7BC,EAAAA,WAAW,CAACC,OAAD,EAAkBC,YAAlB,EAA8C;AAAA;;AAAA;;AAAA,uCAPpC,IAOoC;;AAAA;;AAAA,sCAHhB,MAAM,CAAE,CAGQ;;AAAA,qCAFf,MAAM,CAAE,CAEO;;AACvD,SAAKC,IAAL,GAAYF,OAAZ;AACA,SAAKC,YAAL,GAAoBA,YAApB;AACA,SAAKE,MAAL,GAAc,IAAIC,OAAJ,CAAY,CAACC,OAAD,EAAUC,MAAV,KAAqB;AAC7C,WAAKC,QAAL,GAAgBF,OAAhB;AACA,WAAKG,OAAL,GAAeF,MAAf;AACD,KAHa,CAAd;AAID;;AAMDG,EAAAA,WAAW,CAACC,IAAD,EAA0BC,OAA1B,EAA+D;AACxE,SAAKV,YAAL,CAAkBQ,WAAlB,CAA8B;AAC5BG,MAAAA,MAAM,EAAE,YADoB;AAE5BF,MAAAA,IAF4B;AAG5BC,MAAAA;AAH4B,KAA9B;AAKD;;AAKDE,EAAAA,IAAI,CAACC,KAAD,EAAmB;AACrBjB,IAAAA,MAAM,CAAC,KAAKkB,SAAN,CAAN;AACA,SAAKA,SAAL,GAAiB,KAAjB;;AACA,SAAKR,QAAL,CAAcO,KAAd;AACD;;AAKDE,EAAAA,KAAK,CAACA,KAAD,EAAqB;AACxBnB,IAAAA,MAAM,CAAC,KAAKkB,SAAN,CAAN;AACA,SAAKA,SAAL,GAAiB,KAAjB;;AACA,SAAKP,OAAL,CAAaQ,KAAb;AACD;;AA/C4B","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"}
1
+ {"version":3,"file":"worker-job.js","names":["assert","WorkerJob","constructor","jobName","workerThread","name","result","Promise","resolve","reject","_resolve","_reject","postMessage","type","payload","source","done","value","isRunning","error"],"sources":["../../../../src/lib/worker-farm/worker-job.ts"],"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"],"mappings":";AAEA,SAAQA,MAAM,QAAO,qBAAqB;;AAK1C,eAAe,MAAMC,SAAS,CAAC;;EAU7BC,WAAW,CAACC,OAAe,EAAEC,YAA0B,EAAE;IAAA;IAAA;IAAA,mCAPpC,IAAI;IAAA;IAAA,kCAIgB,MAAM,CAAC,CAAC;IAAA,iCACP,MAAM,CAAC,CAAC;IAGhD,IAAI,CAACC,IAAI,GAAGF,OAAO;IACnB,IAAI,CAACC,YAAY,GAAGA,YAAY;IAChC,IAAI,CAACE,MAAM,GAAG,IAAIC,OAAO,CAAC,CAACC,OAAO,EAAEC,MAAM,KAAK;MAC7C,IAAI,CAACC,QAAQ,GAAGF,OAAO;MACvB,IAAI,CAACG,OAAO,GAAGF,MAAM;IACvB,CAAC,CAAC;EACJ;;EAMAG,WAAW,CAACC,IAAuB,EAAEC,OAA6B,EAAQ;IACxE,IAAI,CAACV,YAAY,CAACQ,WAAW,CAAC;MAC5BG,MAAM,EAAE,YAAY;MACpBF,IAAI;MACJC;IACF,CAAC,CAAC;EACJ;;EAKAE,IAAI,CAACC,KAAU,EAAQ;IACrBjB,MAAM,CAAC,IAAI,CAACkB,SAAS,CAAC;IACtB,IAAI,CAACA,SAAS,GAAG,KAAK;IACtB,IAAI,CAACR,QAAQ,CAACO,KAAK,CAAC;EACtB;;EAKAE,KAAK,CAACA,KAAY,EAAQ;IACxBnB,MAAM,CAAC,IAAI,CAACkB,SAAS,CAAC;IACtB,IAAI,CAACA,SAAS,GAAG,KAAK;IACtB,IAAI,CAACP,OAAO,CAACQ,KAAK,CAAC;EACrB;AACF"}
@@ -2,36 +2,26 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
2
  import { isMobile } from '../env-utils/globals';
3
3
  import WorkerThread from './worker-thread';
4
4
  import WorkerJob from './worker-job';
5
+
5
6
  export default class WorkerPool {
7
+
6
8
  static isSupported() {
7
9
  return WorkerThread.isSupported();
8
10
  }
9
11
 
10
12
  constructor(props) {
11
13
  _defineProperty(this, "name", 'unnamed');
12
-
13
14
  _defineProperty(this, "source", void 0);
14
-
15
15
  _defineProperty(this, "url", void 0);
16
-
17
16
  _defineProperty(this, "maxConcurrency", 1);
18
-
19
17
  _defineProperty(this, "maxMobileConcurrency", 1);
20
-
21
18
  _defineProperty(this, "onDebug", () => {});
22
-
23
19
  _defineProperty(this, "reuseWorkers", true);
24
-
25
20
  _defineProperty(this, "props", {});
26
-
27
21
  _defineProperty(this, "jobQueue", []);
28
-
29
22
  _defineProperty(this, "idleQueue", []);
30
-
31
23
  _defineProperty(this, "count", 0);
32
-
33
24
  _defineProperty(this, "isDestroyed", false);
34
-
35
25
  this.source = props.source;
36
26
  this.url = props.url;
37
27
  this.setProps(props);
@@ -41,34 +31,30 @@ export default class WorkerPool {
41
31
  this.idleQueue.forEach(worker => worker.destroy());
42
32
  this.isDestroyed = true;
43
33
  }
44
-
45
34
  setProps(props) {
46
- this.props = { ...this.props,
35
+ this.props = {
36
+ ...this.props,
47
37
  ...props
48
38
  };
49
-
50
39
  if (props.name !== undefined) {
51
40
  this.name = props.name;
52
41
  }
53
-
54
42
  if (props.maxConcurrency !== undefined) {
55
43
  this.maxConcurrency = props.maxConcurrency;
56
44
  }
57
-
58
45
  if (props.maxMobileConcurrency !== undefined) {
59
46
  this.maxMobileConcurrency = props.maxMobileConcurrency;
60
47
  }
61
-
62
48
  if (props.reuseWorkers !== undefined) {
63
49
  this.reuseWorkers = props.reuseWorkers;
64
50
  }
65
-
66
51
  if (props.onDebug !== undefined) {
67
52
  this.onDebug = props.onDebug;
68
53
  }
69
54
  }
70
-
71
- async startJob(name, onMessage = (job, type, data) => job.done(data), onError = (job, error) => job.error(error)) {
55
+ async startJob(name) {
56
+ let onMessage = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : (job, type, data) => job.done(data);
57
+ let onError = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : (job, error) => job.error(error);
72
58
  const startPromise = new Promise(onStart => {
73
59
  this.jobQueue.push({
74
60
  name,
@@ -78,9 +64,7 @@ export default class WorkerPool {
78
64
  });
79
65
  return this;
80
66
  });
81
-
82
67
  this._startQueuedJob();
83
-
84
68
  return await startPromise;
85
69
  }
86
70
 
@@ -88,15 +72,12 @@ export default class WorkerPool {
88
72
  if (!this.jobQueue.length) {
89
73
  return;
90
74
  }
91
-
92
75
  const workerThread = this._getAvailableWorker();
93
-
94
76
  if (!workerThread) {
95
77
  return;
96
78
  }
97
79
 
98
80
  const queuedJob = this.jobQueue.shift();
99
-
100
81
  if (queuedJob) {
101
82
  this.onDebug({
102
83
  message: 'Starting job',
@@ -104,10 +85,10 @@ export default class WorkerPool {
104
85
  workerThread,
105
86
  backlog: this.jobQueue.length
106
87
  });
88
+
107
89
  const job = new WorkerJob(queuedJob.name, workerThread);
108
90
 
109
91
  workerThread.onMessage = data => queuedJob.onMessage(job, data.type, data.payload);
110
-
111
92
  workerThread.onError = error => queuedJob.onError(job, error);
112
93
 
113
94
  queuedJob.onStart(job);
@@ -122,14 +103,12 @@ export default class WorkerPool {
122
103
 
123
104
  returnWorkerToQueue(worker) {
124
105
  const shouldDestroyWorker = this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();
125
-
126
106
  if (shouldDestroyWorker) {
127
107
  worker.destroy();
128
108
  this.count--;
129
109
  } else {
130
110
  this.idleQueue.push(worker);
131
111
  }
132
-
133
112
  if (!this.isDestroyed) {
134
113
  this._startQueuedJob();
135
114
  }
@@ -152,10 +131,8 @@ export default class WorkerPool {
152
131
 
153
132
  return null;
154
133
  }
155
-
156
134
  _getMaxConcurrency() {
157
135
  return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;
158
136
  }
159
-
160
137
  }
161
138
  //# sourceMappingURL=worker-pool.js.map