@loaders.gl/worker-utils 3.1.3 → 4.0.0-alpha.5

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 (140) hide show
  1. package/dist/index.js +25 -57
  2. package/dist/index.js.map +1 -0
  3. package/dist/lib/async-queue/async-queue.js +91 -81
  4. package/dist/lib/async-queue/async-queue.js.map +1 -0
  5. package/dist/lib/env-utils/assert.js +5 -12
  6. package/dist/lib/env-utils/assert.js.map +1 -0
  7. package/dist/lib/env-utils/globals.js +10 -25
  8. package/dist/lib/env-utils/globals.js.map +1 -0
  9. package/dist/lib/env-utils/version.js +6 -11
  10. package/dist/lib/env-utils/version.js.map +1 -0
  11. package/dist/lib/library-utils/library-utils.js +80 -155
  12. package/dist/lib/library-utils/library-utils.js.map +1 -0
  13. package/dist/lib/node/require-utils.node.js +41 -58
  14. package/dist/lib/node/require-utils.node.js.map +1 -0
  15. package/dist/lib/process-utils/child-process-proxy.js +113 -122
  16. package/dist/lib/process-utils/child-process-proxy.js.map +1 -0
  17. package/dist/lib/process-utils/process-utils.js +27 -33
  18. package/dist/lib/process-utils/process-utils.js.map +1 -0
  19. package/dist/lib/worker-api/create-worker.js +92 -85
  20. package/dist/lib/worker-api/create-worker.js.map +1 -0
  21. package/dist/lib/worker-api/get-worker-url.js +33 -54
  22. package/dist/lib/worker-api/get-worker-url.js.map +1 -0
  23. package/dist/lib/worker-api/process-on-worker.js +71 -75
  24. package/dist/lib/worker-api/process-on-worker.js.map +1 -0
  25. package/dist/lib/worker-api/validate-worker-version.js +18 -32
  26. package/dist/lib/worker-api/validate-worker-version.js.map +1 -0
  27. package/dist/lib/worker-farm/worker-body.js +58 -60
  28. package/dist/{es5/lib → lib}/worker-farm/worker-body.js.map +1 -1
  29. package/dist/lib/worker-farm/worker-farm.js +77 -82
  30. package/dist/lib/worker-farm/worker-farm.js.map +1 -0
  31. package/dist/lib/worker-farm/worker-job.js +53 -46
  32. package/dist/lib/worker-farm/worker-job.js.map +1 -0
  33. package/dist/lib/worker-farm/worker-pool.js +148 -142
  34. package/dist/lib/worker-farm/worker-pool.js.map +1 -0
  35. package/dist/lib/worker-farm/worker-thread.js +102 -92
  36. package/dist/lib/worker-farm/worker-thread.js.map +1 -0
  37. package/dist/lib/worker-utils/get-loadable-worker-url.js +33 -65
  38. package/dist/lib/worker-utils/get-loadable-worker-url.js.map +1 -0
  39. package/dist/lib/worker-utils/get-transfer-list.js +36 -57
  40. package/dist/lib/worker-utils/get-transfer-list.js.map +1 -0
  41. package/dist/lib/worker-utils/remove-nontransferable-options.js +19 -31
  42. package/dist/lib/worker-utils/remove-nontransferable-options.js.map +1 -0
  43. package/dist/types.js +2 -2
  44. package/dist/{es5/types.js.map → types.js.map} +0 -0
  45. package/dist/workers/null-worker.js +4 -6
  46. package/dist/workers/null-worker.js.map +1 -0
  47. package/package.json +5 -5
  48. package/src/lib/env-utils/version.ts +1 -1
  49. package/src/lib/library-utils/library-utils.ts +1 -1
  50. package/src/lib/worker-api/get-worker-url.ts +1 -1
  51. package/dist/es5/index.js +0 -160
  52. package/dist/es5/index.js.map +0 -1
  53. package/dist/es5/lib/async-queue/async-queue.js +0 -120
  54. package/dist/es5/lib/async-queue/async-queue.js.map +0 -1
  55. package/dist/es5/lib/env-utils/assert.js +0 -13
  56. package/dist/es5/lib/env-utils/assert.js.map +0 -1
  57. package/dist/es5/lib/env-utils/globals.js +0 -35
  58. package/dist/es5/lib/env-utils/globals.js.map +0 -1
  59. package/dist/es5/lib/env-utils/version.js +0 -14
  60. package/dist/es5/lib/env-utils/version.js.map +0 -1
  61. package/dist/es5/lib/library-utils/library-utils.js +0 -206
  62. package/dist/es5/lib/library-utils/library-utils.js.map +0 -1
  63. package/dist/es5/lib/node/require-utils.node.js +0 -96
  64. package/dist/es5/lib/node/require-utils.node.js.map +0 -1
  65. package/dist/es5/lib/process-utils/child-process-proxy.js +0 -245
  66. package/dist/es5/lib/process-utils/child-process-proxy.js.map +0 -1
  67. package/dist/es5/lib/process-utils/process-utils.js +0 -40
  68. package/dist/es5/lib/process-utils/process-utils.js.map +0 -1
  69. package/dist/es5/lib/worker-api/create-worker.js +0 -229
  70. package/dist/es5/lib/worker-api/create-worker.js.map +0 -1
  71. package/dist/es5/lib/worker-api/get-worker-url.js +0 -49
  72. package/dist/es5/lib/worker-api/get-worker-url.js.map +0 -1
  73. package/dist/es5/lib/worker-api/process-on-worker.js +0 -162
  74. package/dist/es5/lib/worker-api/process-on-worker.js.map +0 -1
  75. package/dist/es5/lib/worker-api/validate-worker-version.js +0 -31
  76. package/dist/es5/lib/worker-api/validate-worker-version.js.map +0 -1
  77. package/dist/es5/lib/worker-farm/worker-body.js +0 -88
  78. package/dist/es5/lib/worker-farm/worker-farm.js +0 -134
  79. package/dist/es5/lib/worker-farm/worker-farm.js.map +0 -1
  80. package/dist/es5/lib/worker-farm/worker-job.js +0 -73
  81. package/dist/es5/lib/worker-farm/worker-job.js.map +0 -1
  82. package/dist/es5/lib/worker-farm/worker-pool.js +0 -256
  83. package/dist/es5/lib/worker-farm/worker-pool.js.map +0 -1
  84. package/dist/es5/lib/worker-farm/worker-thread.js +0 -129
  85. package/dist/es5/lib/worker-farm/worker-thread.js.map +0 -1
  86. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +0 -51
  87. package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
  88. package/dist/es5/lib/worker-utils/get-transfer-list.js +0 -53
  89. package/dist/es5/lib/worker-utils/get-transfer-list.js.map +0 -1
  90. package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +0 -34
  91. package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
  92. package/dist/es5/types.js +0 -2
  93. package/dist/es5/workers/null-worker.js +0 -31
  94. package/dist/es5/workers/null-worker.js.map +0 -1
  95. package/dist/esm/index.js +0 -26
  96. package/dist/esm/index.js.map +0 -1
  97. package/dist/esm/lib/async-queue/async-queue.js +0 -97
  98. package/dist/esm/lib/async-queue/async-queue.js.map +0 -1
  99. package/dist/esm/lib/env-utils/assert.js +0 -6
  100. package/dist/esm/lib/env-utils/assert.js.map +0 -1
  101. package/dist/esm/lib/env-utils/globals.js +0 -17
  102. package/dist/esm/lib/env-utils/globals.js.map +0 -1
  103. package/dist/esm/lib/env-utils/version.js +0 -7
  104. package/dist/esm/lib/env-utils/version.js.map +0 -1
  105. package/dist/esm/lib/library-utils/library-utils.js +0 -88
  106. package/dist/esm/lib/library-utils/library-utils.js.map +0 -1
  107. package/dist/esm/lib/node/require-utils.node.js +0 -43
  108. package/dist/esm/lib/node/require-utils.node.js.map +0 -1
  109. package/dist/esm/lib/process-utils/child-process-proxy.js +0 -122
  110. package/dist/esm/lib/process-utils/child-process-proxy.js.map +0 -1
  111. package/dist/esm/lib/process-utils/process-utils.js +0 -29
  112. package/dist/esm/lib/process-utils/process-utils.js.map +0 -1
  113. package/dist/esm/lib/worker-api/create-worker.js +0 -99
  114. package/dist/esm/lib/worker-api/create-worker.js.map +0 -1
  115. package/dist/esm/lib/worker-api/get-worker-url.js +0 -36
  116. package/dist/esm/lib/worker-api/get-worker-url.js.map +0 -1
  117. package/dist/esm/lib/worker-api/process-on-worker.js +0 -75
  118. package/dist/esm/lib/worker-api/process-on-worker.js.map +0 -1
  119. package/dist/esm/lib/worker-api/validate-worker-version.js +0 -21
  120. package/dist/esm/lib/worker-api/validate-worker-version.js.map +0 -1
  121. package/dist/esm/lib/worker-farm/worker-body.js +0 -65
  122. package/dist/esm/lib/worker-farm/worker-body.js.map +0 -1
  123. package/dist/esm/lib/worker-farm/worker-farm.js +0 -83
  124. package/dist/esm/lib/worker-farm/worker-farm.js.map +0 -1
  125. package/dist/esm/lib/worker-farm/worker-job.js +0 -54
  126. package/dist/esm/lib/worker-farm/worker-job.js.map +0 -1
  127. package/dist/esm/lib/worker-farm/worker-pool.js +0 -157
  128. package/dist/esm/lib/worker-farm/worker-pool.js.map +0 -1
  129. package/dist/esm/lib/worker-farm/worker-thread.js +0 -105
  130. package/dist/esm/lib/worker-farm/worker-thread.js.map +0 -1
  131. package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +0 -42
  132. package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
  133. package/dist/esm/lib/worker-utils/get-transfer-list.js +0 -40
  134. package/dist/esm/lib/worker-utils/get-transfer-list.js.map +0 -1
  135. package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +0 -23
  136. package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
  137. package/dist/esm/types.js +0 -2
  138. package/dist/esm/types.js.map +0 -1
  139. package/dist/esm/workers/null-worker.js +0 -5
  140. package/dist/esm/workers/null-worker.js.map +0 -1
@@ -1,151 +1,157 @@
1
- "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
- Object.defineProperty(exports, "__esModule", { value: true });
6
- const globals_1 = require("../env-utils/globals");
7
- const worker_thread_1 = __importDefault(require("./worker-thread"));
8
- const worker_job_1 = __importDefault(require("./worker-job"));
9
- /**
10
- * Process multiple data messages with small pool of identical workers
11
- */
12
- class WorkerPool {
13
- /**
14
- * @param processor - worker function
15
- * @param maxConcurrency - max count of workers
16
- */
17
- constructor(props) {
18
- this.name = 'unnamed';
19
- this.maxConcurrency = 1;
20
- this.maxMobileConcurrency = 1;
21
- this.onDebug = () => { };
22
- this.reuseWorkers = true;
23
- this.props = {};
24
- this.jobQueue = [];
25
- this.idleQueue = [];
26
- this.count = 0;
27
- this.isDestroyed = false;
28
- this.source = props.source;
29
- this.url = props.url;
30
- this.setProps(props);
1
+ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
+ import { isMobile } from '../env-utils/globals';
3
+ import WorkerThread from './worker-thread';
4
+ import WorkerJob from './worker-job';
5
+ export default class WorkerPool {
6
+ constructor(props) {
7
+ _defineProperty(this, "name", 'unnamed');
8
+
9
+ _defineProperty(this, "source", void 0);
10
+
11
+ _defineProperty(this, "url", void 0);
12
+
13
+ _defineProperty(this, "maxConcurrency", 1);
14
+
15
+ _defineProperty(this, "maxMobileConcurrency", 1);
16
+
17
+ _defineProperty(this, "onDebug", () => {});
18
+
19
+ _defineProperty(this, "reuseWorkers", true);
20
+
21
+ _defineProperty(this, "props", {});
22
+
23
+ _defineProperty(this, "jobQueue", []);
24
+
25
+ _defineProperty(this, "idleQueue", []);
26
+
27
+ _defineProperty(this, "count", 0);
28
+
29
+ _defineProperty(this, "isDestroyed", false);
30
+
31
+ this.source = props.source;
32
+ this.url = props.url;
33
+ this.setProps(props);
34
+ }
35
+
36
+ destroy() {
37
+ this.idleQueue.forEach(worker => worker.destroy());
38
+ this.isDestroyed = true;
39
+ }
40
+
41
+ setProps(props) {
42
+ this.props = { ...this.props,
43
+ ...props
44
+ };
45
+
46
+ if (props.name !== undefined) {
47
+ this.name = props.name;
31
48
  }
32
- /**
33
- * Terminates all workers in the pool
34
- * @note Can free up significant memory
35
- */
36
- destroy() {
37
- // Destroy idle workers, active Workers will be destroyed on completion
38
- this.idleQueue.forEach((worker) => worker.destroy());
39
- this.isDestroyed = true;
49
+
50
+ if (props.maxConcurrency !== undefined) {
51
+ this.maxConcurrency = props.maxConcurrency;
40
52
  }
41
- setProps(props) {
42
- this.props = { ...this.props, ...props };
43
- if (props.name !== undefined) {
44
- this.name = props.name;
45
- }
46
- if (props.maxConcurrency !== undefined) {
47
- this.maxConcurrency = props.maxConcurrency;
48
- }
49
- if (props.maxMobileConcurrency !== undefined) {
50
- this.maxMobileConcurrency = props.maxMobileConcurrency;
51
- }
52
- if (props.reuseWorkers !== undefined) {
53
- this.reuseWorkers = props.reuseWorkers;
54
- }
55
- if (props.onDebug !== undefined) {
56
- this.onDebug = props.onDebug;
57
- }
53
+
54
+ if (props.maxMobileConcurrency !== undefined) {
55
+ this.maxMobileConcurrency = props.maxMobileConcurrency;
58
56
  }
59
- async startJob(name, onMessage = (job, type, data) => job.done(data), onError = (job, error) => job.error(error)) {
60
- // Promise resolves when thread starts working on this job
61
- const startPromise = new Promise((onStart) => {
62
- // Promise resolves when thread completes or fails working on this job
63
- this.jobQueue.push({ name, onMessage, onError, onStart });
64
- return this;
65
- });
66
- this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises
67
- return await startPromise;
57
+
58
+ if (props.reuseWorkers !== undefined) {
59
+ this.reuseWorkers = props.reuseWorkers;
68
60
  }
69
- // PRIVATE
70
- /**
71
- * Starts first queued job if worker is available or can be created
72
- * Called when job is started and whenever a worker returns to the idleQueue
73
- */
74
- async _startQueuedJob() {
75
- if (!this.jobQueue.length) {
76
- return;
77
- }
78
- const workerThread = this._getAvailableWorker();
79
- if (!workerThread) {
80
- return;
81
- }
82
- // We have a worker, dequeue and start the job
83
- const queuedJob = this.jobQueue.shift();
84
- if (queuedJob) {
85
- // Emit a debug event
86
- // @ts-ignore
87
- this.onDebug({
88
- message: 'Starting job',
89
- name: queuedJob.name,
90
- workerThread,
91
- backlog: this.jobQueue.length
92
- });
93
- // Create a worker job to let the app access thread and manage job completion
94
- const job = new worker_job_1.default(queuedJob.name, workerThread);
95
- // Set the worker thread's message handlers
96
- workerThread.onMessage = (data) => queuedJob.onMessage(job, data.type, data.payload);
97
- workerThread.onError = (error) => queuedJob.onError(job, error);
98
- // Resolve the start promise so that the app can start sending messages to worker
99
- queuedJob.onStart(job);
100
- // Wait for the app to signal that the job is complete, then return worker to queue
101
- try {
102
- await job.result;
103
- }
104
- finally {
105
- this.returnWorkerToQueue(workerThread);
106
- }
107
- }
61
+
62
+ if (props.onDebug !== undefined) {
63
+ this.onDebug = props.onDebug;
108
64
  }
109
- /**
110
- * Returns a worker to the idle queue
111
- * Destroys the worker if
112
- * - pool is destroyed
113
- * - if this pool doesn't reuse workers
114
- * - if maxConcurrency has been lowered
115
- * @param worker
116
- */
117
- returnWorkerToQueue(worker) {
118
- const shouldDestroyWorker = this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();
119
- if (shouldDestroyWorker) {
120
- worker.destroy();
121
- this.count--;
122
- }
123
- else {
124
- this.idleQueue.push(worker);
125
- }
126
- if (!this.isDestroyed) {
127
- this._startQueuedJob(); // eslint-disable-line @typescript-eslint/no-floating-promises
128
- }
65
+ }
66
+
67
+ async startJob(name, onMessage = (job, type, data) => job.done(data), onError = (job, error) => job.error(error)) {
68
+ const startPromise = new Promise(onStart => {
69
+ this.jobQueue.push({
70
+ name,
71
+ onMessage,
72
+ onError,
73
+ onStart
74
+ });
75
+ return this;
76
+ });
77
+
78
+ this._startQueuedJob();
79
+
80
+ return await startPromise;
81
+ }
82
+
83
+ async _startQueuedJob() {
84
+ if (!this.jobQueue.length) {
85
+ return;
129
86
  }
130
- /**
131
- * Returns idle worker or creates new worker if maxConcurrency has not been reached
132
- */
133
- _getAvailableWorker() {
134
- // If a worker has completed and returned to the queue, it can be used
135
- if (this.idleQueue.length > 0) {
136
- return this.idleQueue.shift() || null;
137
- }
138
- // Create fresh worker if we haven't yet created the max amount of worker threads for this worker source
139
- if (this.count < this._getMaxConcurrency()) {
140
- this.count++;
141
- const name = `${this.name.toLowerCase()} (#${this.count} of ${this.maxConcurrency})`;
142
- return new worker_thread_1.default({ name, source: this.source, url: this.url });
143
- }
144
- // No worker available, have to wait
145
- return null;
87
+
88
+ const workerThread = this._getAvailableWorker();
89
+
90
+ if (!workerThread) {
91
+ return;
146
92
  }
147
- _getMaxConcurrency() {
148
- return globals_1.isMobile ? this.maxMobileConcurrency : this.maxConcurrency;
93
+
94
+ const queuedJob = this.jobQueue.shift();
95
+
96
+ if (queuedJob) {
97
+ this.onDebug({
98
+ message: 'Starting job',
99
+ name: queuedJob.name,
100
+ workerThread,
101
+ backlog: this.jobQueue.length
102
+ });
103
+ const job = new WorkerJob(queuedJob.name, workerThread);
104
+
105
+ workerThread.onMessage = data => queuedJob.onMessage(job, data.type, data.payload);
106
+
107
+ workerThread.onError = error => queuedJob.onError(job, error);
108
+
109
+ queuedJob.onStart(job);
110
+
111
+ try {
112
+ await job.result;
113
+ } finally {
114
+ this.returnWorkerToQueue(workerThread);
115
+ }
149
116
  }
117
+ }
118
+
119
+ returnWorkerToQueue(worker) {
120
+ const shouldDestroyWorker = this.isDestroyed || !this.reuseWorkers || this.count > this._getMaxConcurrency();
121
+
122
+ if (shouldDestroyWorker) {
123
+ worker.destroy();
124
+ this.count--;
125
+ } else {
126
+ this.idleQueue.push(worker);
127
+ }
128
+
129
+ if (!this.isDestroyed) {
130
+ this._startQueuedJob();
131
+ }
132
+ }
133
+
134
+ _getAvailableWorker() {
135
+ if (this.idleQueue.length > 0) {
136
+ return this.idleQueue.shift() || null;
137
+ }
138
+
139
+ if (this.count < this._getMaxConcurrency()) {
140
+ this.count++;
141
+ const name = "".concat(this.name.toLowerCase(), " (#").concat(this.count, " of ").concat(this.maxConcurrency, ")");
142
+ return new WorkerThread({
143
+ name,
144
+ source: this.source,
145
+ url: this.url
146
+ });
147
+ }
148
+
149
+ return null;
150
+ }
151
+
152
+ _getMaxConcurrency() {
153
+ return isMobile ? this.maxMobileConcurrency : this.maxConcurrency;
154
+ }
155
+
150
156
  }
151
- exports.default = WorkerPool;
157
+ //# sourceMappingURL=worker-pool.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../src/lib/worker-farm/worker-pool.ts"],"names":["isMobile","WorkerThread","WorkerJob","WorkerPool","constructor","props","source","url","setProps","destroy","idleQueue","forEach","worker","isDestroyed","name","undefined","maxConcurrency","maxMobileConcurrency","reuseWorkers","onDebug","startJob","onMessage","job","type","data","done","onError","error","startPromise","Promise","onStart","jobQueue","push","_startQueuedJob","length","workerThread","_getAvailableWorker","queuedJob","shift","message","backlog","payload","result","returnWorkerToQueue","shouldDestroyWorker","count","_getMaxConcurrency","toLowerCase"],"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,95 +1,105 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- const assert_1 = require("../env-utils/assert");
4
- const get_loadable_worker_url_1 = require("../worker-utils/get-loadable-worker-url");
5
- const get_transfer_list_1 = require("../worker-utils/get-transfer-list");
6
- const NOOP = () => { };
7
- /**
8
- * Represents one worker thread
9
- */
10
- class WorkerThread {
11
- constructor(props) {
12
- this.terminated = false;
13
- this._loadableURL = '';
14
- const { name, source, url } = props;
15
- (0, assert_1.assert)(source || url); // Either source or url must be defined
16
- this.name = name;
17
- this.source = source;
18
- this.url = url;
19
- this.onMessage = NOOP;
20
- this.onError = (error) => console.log(error); // eslint-disable-line
21
- this.worker = this._createBrowserWorker();
1
+ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
2
+ import { assert } from '../env-utils/assert';
3
+ import { getLoadableWorkerURL } from '../worker-utils/get-loadable-worker-url';
4
+ import { getTransferList } from '../worker-utils/get-transfer-list';
5
+
6
+ const NOOP = () => {};
7
+
8
+ export default class WorkerThread {
9
+ static isSupported() {
10
+ return typeof Worker !== 'undefined';
11
+ }
12
+
13
+ constructor(props) {
14
+ _defineProperty(this, "name", void 0);
15
+
16
+ _defineProperty(this, "source", void 0);
17
+
18
+ _defineProperty(this, "url", void 0);
19
+
20
+ _defineProperty(this, "terminated", false);
21
+
22
+ _defineProperty(this, "worker", void 0);
23
+
24
+ _defineProperty(this, "onMessage", void 0);
25
+
26
+ _defineProperty(this, "onError", void 0);
27
+
28
+ _defineProperty(this, "_loadableURL", '');
29
+
30
+ const {
31
+ name,
32
+ source,
33
+ url
34
+ } = props;
35
+ assert(source || url);
36
+ this.name = name;
37
+ this.source = source;
38
+ this.url = url;
39
+ this.onMessage = NOOP;
40
+
41
+ this.onError = error => console.log(error);
42
+
43
+ this.worker = this._createBrowserWorker();
44
+ }
45
+
46
+ destroy() {
47
+ this.onMessage = NOOP;
48
+ this.onError = NOOP;
49
+ this.worker.terminate();
50
+ this.terminated = true;
51
+ }
52
+
53
+ get isRunning() {
54
+ return Boolean(this.onMessage);
55
+ }
56
+
57
+ postMessage(data, transferList) {
58
+ transferList = transferList || getTransferList(data);
59
+ this.worker.postMessage(data, transferList);
60
+ }
61
+
62
+ _getErrorFromErrorEvent(event) {
63
+ let message = 'Failed to load ';
64
+ message += "worker ".concat(this.name, " from ").concat(this.url, ". ");
65
+
66
+ if (event.message) {
67
+ message += "".concat(event.message, " in ");
22
68
  }
23
- static isSupported() {
24
- return typeof Worker !== 'undefined';
25
- }
26
- /**
27
- * Terminate this worker thread
28
- * @note Can free up significant memory
29
- */
30
- destroy() {
31
- this.onMessage = NOOP;
32
- this.onError = NOOP;
33
- // @ts-ignore
34
- this.worker.terminate();
35
- this.terminated = true;
36
- }
37
- get isRunning() {
38
- return Boolean(this.onMessage);
39
- }
40
- /**
41
- * Send a message to this worker thread
42
- * @param data any data structure, ideally consisting mostly of transferrable objects
43
- * @param transferList If not supplied, calculated automatically by traversing data
44
- */
45
- postMessage(data, transferList) {
46
- transferList = transferList || (0, get_transfer_list_1.getTransferList)(data);
47
- // @ts-ignore
48
- this.worker.postMessage(data, transferList);
49
- }
50
- // PRIVATE
51
- /**
52
- * Generate a standard Error from an ErrorEvent
53
- * @param {ErrorEvent} event
54
- */
55
- _getErrorFromErrorEvent(event) {
56
- // Note Error object does not have the expected fields if loading failed completely
57
- // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers
58
- // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent
59
- let message = 'Failed to load ';
60
- message += `worker ${this.name} from ${this.url}. `;
61
- if (event.message) {
62
- message += `${event.message} in `;
63
- }
64
- // const hasFilename = event.filename && !event.filename.startsWith('blob:');
65
- // message += hasFilename ? event.filename : this.source.slice(0, 100);
66
- if (event.lineno) {
67
- message += `:${event.lineno}:${event.colno}`;
68
- }
69
- return new Error(message);
70
- }
71
- /**
72
- * Creates a worker thread on the browser
73
- */
74
- _createBrowserWorker() {
75
- this._loadableURL = (0, get_loadable_worker_url_1.getLoadableWorkerURL)({ source: this.source, url: this.url });
76
- const worker = new Worker(this._loadableURL, { name: this.name });
77
- worker.onmessage = (event) => {
78
- if (!event.data) {
79
- this.onError(new Error('No data received'));
80
- }
81
- else {
82
- this.onMessage(event.data);
83
- }
84
- };
85
- // This callback represents an uncaught exception in the worker thread
86
- worker.onerror = (error) => {
87
- this.onError(this._getErrorFromErrorEvent(error));
88
- this.terminated = true;
89
- };
90
- // TODO - not clear when this would be called, for now just log in case it happens
91
- worker.onmessageerror = (event) => console.error(event); // eslint-disable-line
92
- return worker;
69
+
70
+ if (event.lineno) {
71
+ message += ":".concat(event.lineno, ":").concat(event.colno);
93
72
  }
73
+
74
+ return new Error(message);
75
+ }
76
+
77
+ _createBrowserWorker() {
78
+ this._loadableURL = getLoadableWorkerURL({
79
+ source: this.source,
80
+ url: this.url
81
+ });
82
+ const worker = new Worker(this._loadableURL, {
83
+ name: this.name
84
+ });
85
+
86
+ worker.onmessage = event => {
87
+ if (!event.data) {
88
+ this.onError(new Error('No data received'));
89
+ } else {
90
+ this.onMessage(event.data);
91
+ }
92
+ };
93
+
94
+ worker.onerror = error => {
95
+ this.onError(this._getErrorFromErrorEvent(error));
96
+ this.terminated = true;
97
+ };
98
+
99
+ worker.onmessageerror = event => console.error(event);
100
+
101
+ return worker;
102
+ }
103
+
94
104
  }
95
- exports.default = WorkerThread;
105
+ //# sourceMappingURL=worker-thread.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../src/lib/worker-farm/worker-thread.ts"],"names":["assert","getLoadableWorkerURL","getTransferList","NOOP","WorkerThread","isSupported","Worker","constructor","props","name","source","url","onMessage","onError","error","console","log","worker","_createBrowserWorker","destroy","terminate","terminated","isRunning","Boolean","postMessage","data","transferList","_getErrorFromErrorEvent","event","message","lineno","colno","Error","_loadableURL","onmessage","onerror","onmessageerror"],"mappings":"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","sourcesContent":["import {assert} from '../env-utils/assert';\nimport {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';\nimport {getTransferList} from '../worker-utils/get-transfer-list';\n\nconst NOOP = () => {};\n\nexport type WorkerThreadProps = {\n name: string;\n source?: string;\n url?: string;\n};\n\n/**\n * Represents one worker thread\n */\nexport default class WorkerThread {\n readonly name: string;\n readonly source: string | undefined;\n readonly url: string | undefined;\n terminated: boolean = false;\n worker: Worker;\n onMessage: (message: any) => void;\n onError: (error: Error) => void;\n\n private _loadableURL: string = '';\n\n static isSupported(): boolean {\n return typeof Worker !== 'undefined';\n }\n\n constructor(props: WorkerThreadProps) {\n const {name, source, url} = props;\n assert(source || url); // Either source or url must be defined\n this.name = name;\n this.source = source;\n this.url = url;\n this.onMessage = NOOP;\n this.onError = (error) => console.log(error); // eslint-disable-line\n\n this.worker = this._createBrowserWorker();\n }\n\n /**\n * Terminate this worker thread\n * @note Can free up significant memory\n */\n destroy(): void {\n this.onMessage = NOOP;\n this.onError = NOOP;\n // @ts-ignore\n this.worker.terminate();\n this.terminated = true;\n }\n\n get isRunning() {\n return Boolean(this.onMessage);\n }\n\n /**\n * Send a message to this worker thread\n * @param data any data structure, ideally consisting mostly of transferrable objects\n * @param transferList If not supplied, calculated automatically by traversing data\n */\n postMessage(data: any, transferList?: any[]): void {\n transferList = transferList || getTransferList(data);\n // @ts-ignore\n this.worker.postMessage(data, transferList);\n }\n\n // PRIVATE\n\n /**\n * Generate a standard Error from an ErrorEvent\n * @param {ErrorEvent} event\n */\n _getErrorFromErrorEvent(event: ErrorEvent): Error {\n // Note Error object does not have the expected fields if loading failed completely\n // https://developer.mozilla.org/en-US/docs/Web/API/Worker#Event_handlers\n // https://developer.mozilla.org/en-US/docs/Web/API/ErrorEvent\n let message = 'Failed to load ';\n message += `worker ${this.name} from ${this.url}. `;\n if (event.message) {\n message += `${event.message} in `;\n }\n // const hasFilename = event.filename && !event.filename.startsWith('blob:');\n // message += hasFilename ? event.filename : this.source.slice(0, 100);\n if (event.lineno) {\n message += `:${event.lineno}:${event.colno}`;\n }\n return new Error(message);\n }\n\n /**\n * Creates a worker thread on the browser\n */\n _createBrowserWorker() {\n this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});\n const worker = new Worker(this._loadableURL, {name: this.name});\n\n worker.onmessage = (event) => {\n if (!event.data) {\n this.onError(new Error('No data received'));\n } else {\n this.onMessage(event.data);\n }\n };\n // This callback represents an uncaught exception in the worker thread\n worker.onerror = (error: ErrorEvent): void => {\n this.onError(this._getErrorFromErrorEvent(error));\n this.terminated = true;\n };\n // TODO - not clear when this would be called, for now just log in case it happens\n worker.onmessageerror = (event) => console.error(event); // eslint-disable-line\n\n return worker;\n }\n}\n"],"file":"worker-thread.js"}
@@ -1,74 +1,42 @@
1
- "use strict";
2
- Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.getLoadableWorkerURL = void 0;
4
- const assert_1 = require("../env-utils/assert");
1
+ import { assert } from '../env-utils/assert';
5
2
  const workerURLCache = new Map();
6
- /**
7
- * Creates a loadable URL from worker source or URL
8
- * that can be used to create `Worker` instances.
9
- * Due to CORS issues it may be necessary to wrap a URL in a small importScripts
10
- * @param props
11
- * @param props.source Worker source
12
- * @param props.url Worker URL
13
- * @returns loadable url
14
- */
15
- function getLoadableWorkerURL(props) {
16
- (0, assert_1.assert)((props.source && !props.url) || (!props.source && props.url)); // Either source or url must be defined
17
- let workerURL = workerURLCache.get(props.source || props.url);
18
- if (!workerURL) {
19
- // Differentiate worker urls from worker source code
20
- if (props.url) {
21
- workerURL = getLoadableWorkerURLFromURL(props.url);
22
- workerURLCache.set(props.url, workerURL);
23
- }
24
- if (props.source) {
25
- workerURL = getLoadableWorkerURLFromSource(props.source);
26
- workerURLCache.set(props.source, workerURL);
27
- }
3
+ export function getLoadableWorkerURL(props) {
4
+ assert(props.source && !props.url || !props.source && props.url);
5
+ let workerURL = workerURLCache.get(props.source || props.url);
6
+
7
+ if (!workerURL) {
8
+ if (props.url) {
9
+ workerURL = getLoadableWorkerURLFromURL(props.url);
10
+ workerURLCache.set(props.url, workerURL);
28
11
  }
29
- (0, assert_1.assert)(workerURL);
30
- return workerURL;
12
+
13
+ if (props.source) {
14
+ workerURL = getLoadableWorkerURLFromSource(props.source);
15
+ workerURLCache.set(props.source, workerURL);
16
+ }
17
+ }
18
+
19
+ assert(workerURL);
20
+ return workerURL;
31
21
  }
32
- exports.getLoadableWorkerURL = getLoadableWorkerURL;
33
- /**
34
- * Build a loadable worker URL from worker URL
35
- * @param url
36
- * @returns loadable URL
37
- */
22
+
38
23
  function getLoadableWorkerURLFromURL(url) {
39
- // A local script url, we can use it to initialize a Worker directly
40
- if (!url.startsWith('http')) {
41
- return url;
42
- }
43
- // A remote script, we need to use `importScripts` to load from different origin
44
- const workerSource = buildScriptSource(url);
45
- return getLoadableWorkerURLFromSource(workerSource);
24
+ if (!url.startsWith('http')) {
25
+ return url;
26
+ }
27
+
28
+ const workerSource = buildScriptSource(url);
29
+ return getLoadableWorkerURLFromSource(workerSource);
46
30
  }
47
- /**
48
- * Build a loadable worker URL from worker source
49
- * @param workerSource
50
- * @returns loadable url
51
- */
31
+
52
32
  function getLoadableWorkerURLFromSource(workerSource) {
53
- // NOTE: webworkify was previously used
54
- // const blob = webworkify(workerSource, {bare: true});
55
- const blob = new Blob([workerSource], { type: 'application/javascript' });
56
- return URL.createObjectURL(blob);
33
+ const blob = new Blob([workerSource], {
34
+ type: 'application/javascript'
35
+ });
36
+ return URL.createObjectURL(blob);
57
37
  }
58
- /**
59
- * Per spec, worker cannot be initialized with a script from a different origin
60
- * However a local worker script can still import scripts from other origins,
61
- * so we simply build a wrapper script.
62
- *
63
- * @param workerUrl
64
- * @returns source
65
- */
38
+
66
39
  function buildScriptSource(workerUrl) {
67
- return `\
68
- try {
69
- importScripts('${workerUrl}');
70
- } catch (error) {
71
- console.error(error);
72
- throw error;
73
- }`;
40
+ return "try {\n importScripts('".concat(workerUrl, "');\n} catch (error) {\n console.error(error);\n throw error;\n}");
74
41
  }
42
+ //# sourceMappingURL=get-loadable-worker-url.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"sources":["../../../src/lib/worker-utils/get-loadable-worker-url.ts"],"names":["assert","workerURLCache","Map","getLoadableWorkerURL","props","source","url","workerURL","get","getLoadableWorkerURLFromURL","set","getLoadableWorkerURLFromSource","startsWith","workerSource","buildScriptSource","blob","Blob","type","URL","createObjectURL","workerUrl"],"mappings":"AAAA,SAAQA,MAAR,QAAqB,qBAArB;AAEA,MAAMC,cAAc,GAAG,IAAIC,GAAJ,EAAvB;AAWA,OAAO,SAASC,oBAAT,CAA8BC,KAA9B,EAAsE;AAC3EJ,EAAAA,MAAM,CAAEI,KAAK,CAACC,MAAN,IAAgB,CAACD,KAAK,CAACE,GAAxB,IAAiC,CAACF,KAAK,CAACC,MAAP,IAAiBD,KAAK,CAACE,GAAzD,CAAN;AAEA,MAAIC,SAAS,GAAGN,cAAc,CAACO,GAAf,CAAmBJ,KAAK,CAACC,MAAN,IAAgBD,KAAK,CAACE,GAAzC,CAAhB;;AACA,MAAI,CAACC,SAAL,EAAgB;AAEd,QAAIH,KAAK,CAACE,GAAV,EAAe;AACbC,MAAAA,SAAS,GAAGE,2BAA2B,CAACL,KAAK,CAACE,GAAP,CAAvC;AACAL,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACE,GAAzB,EAA8BC,SAA9B;AACD;;AAED,QAAIH,KAAK,CAACC,MAAV,EAAkB;AAChBE,MAAAA,SAAS,GAAGI,8BAA8B,CAACP,KAAK,CAACC,MAAP,CAA1C;AACAJ,MAAAA,cAAc,CAACS,GAAf,CAAmBN,KAAK,CAACC,MAAzB,EAAiCE,SAAjC;AACD;AACF;;AAEDP,EAAAA,MAAM,CAACO,SAAD,CAAN;AACA,SAAOA,SAAP;AACD;;AAOD,SAASE,2BAAT,CAAqCH,GAArC,EAA0D;AAExD,MAAI,CAACA,GAAG,CAACM,UAAJ,CAAe,MAAf,CAAL,EAA6B;AAC3B,WAAON,GAAP;AACD;;AAGD,QAAMO,YAAY,GAAGC,iBAAiB,CAACR,GAAD,CAAtC;AACA,SAAOK,8BAA8B,CAACE,YAAD,CAArC;AACD;;AAOD,SAASF,8BAAT,CAAwCE,YAAxC,EAAsE;AAGpE,QAAME,IAAI,GAAG,IAAIC,IAAJ,CAAS,CAACH,YAAD,CAAT,EAAyB;AAACI,IAAAA,IAAI,EAAE;AAAP,GAAzB,CAAb;AACA,SAAOC,GAAG,CAACC,eAAJ,CAAoBJ,IAApB,CAAP;AACD;;AAUD,SAASD,iBAAT,CAA2BM,SAA3B,EAAsD;AACpD,2CAEiBA,SAFjB;AAOD","sourcesContent":["import {assert} from '../env-utils/assert';\n\nconst workerURLCache = new Map();\n\n/**\n * Creates a loadable URL from worker source or URL\n * that can be used to create `Worker` instances.\n * Due to CORS issues it may be necessary to wrap a URL in a small importScripts\n * @param props\n * @param props.source Worker source\n * @param props.url Worker URL\n * @returns loadable url\n */\nexport function getLoadableWorkerURL(props: {source?: string; url?: string}) {\n assert((props.source && !props.url) || (!props.source && props.url)); // Either source or url must be defined\n\n let workerURL = workerURLCache.get(props.source || props.url);\n if (!workerURL) {\n // Differentiate worker urls from worker source code\n if (props.url) {\n workerURL = getLoadableWorkerURLFromURL(props.url);\n workerURLCache.set(props.url, workerURL);\n }\n\n if (props.source) {\n workerURL = getLoadableWorkerURLFromSource(props.source);\n workerURLCache.set(props.source, workerURL);\n }\n }\n\n assert(workerURL);\n return workerURL;\n}\n\n/**\n * Build a loadable worker URL from worker URL\n * @param url\n * @returns loadable URL\n */\nfunction getLoadableWorkerURLFromURL(url: string): string {\n // A local script url, we can use it to initialize a Worker directly\n if (!url.startsWith('http')) {\n return url;\n }\n\n // A remote script, we need to use `importScripts` to load from different origin\n const workerSource = buildScriptSource(url);\n return getLoadableWorkerURLFromSource(workerSource);\n}\n\n/**\n * Build a loadable worker URL from worker source\n * @param workerSource\n * @returns loadable url\n */\nfunction getLoadableWorkerURLFromSource(workerSource: string): string {\n // NOTE: webworkify was previously used\n // const blob = webworkify(workerSource, {bare: true});\n const blob = new Blob([workerSource], {type: 'application/javascript'});\n return URL.createObjectURL(blob);\n}\n\n/**\n * Per spec, worker cannot be initialized with a script from a different origin\n * However a local worker script can still import scripts from other origins,\n * so we simply build a wrapper script.\n *\n * @param workerUrl\n * @returns source\n */\nfunction buildScriptSource(workerUrl: string): string {\n return `\\\ntry {\n importScripts('${workerUrl}');\n} catch (error) {\n console.error(error);\n throw error;\n}`;\n}\n"],"file":"get-loadable-worker-url.js"}