@loaders.gl/worker-utils 4.0.0-alpha.5 → 4.0.0-alpha.7
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.
- package/dist/es5/index.js +148 -0
- package/dist/es5/index.js.map +1 -0
- package/dist/es5/lib/async-queue/async-queue.js +100 -0
- package/dist/es5/lib/async-queue/async-queue.js.map +1 -0
- package/dist/es5/lib/env-utils/assert.js +12 -0
- package/dist/es5/lib/env-utils/assert.js.map +1 -0
- package/dist/es5/lib/env-utils/globals.js +32 -0
- package/dist/es5/lib/env-utils/globals.js.map +1 -0
- package/dist/es5/lib/env-utils/version.js +13 -0
- package/dist/es5/lib/env-utils/version.js.map +1 -0
- package/dist/es5/lib/library-utils/library-utils.js +154 -0
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -0
- package/dist/es5/lib/node/require-utils.node.js +71 -0
- package/dist/es5/lib/node/require-utils.node.js.map +1 -0
- package/dist/es5/lib/node/worker_threads-browser.js +23 -0
- package/dist/es5/lib/node/worker_threads-browser.js.map +1 -0
- package/dist/es5/lib/node/worker_threads.js +27 -0
- package/dist/es5/lib/node/worker_threads.js.map +1 -0
- package/dist/es5/lib/process-utils/child-process-proxy.js +193 -0
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -0
- package/dist/es5/lib/process-utils/process-utils.js +33 -0
- package/dist/es5/lib/process-utils/process-utils.js.map +1 -0
- package/dist/es5/lib/worker-api/create-worker.js +166 -0
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -0
- package/dist/es5/lib/worker-api/get-worker-url.js +39 -0
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -0
- package/dist/es5/lib/worker-api/process-on-worker.js +137 -0
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -0
- package/dist/es5/lib/worker-api/validate-worker-version.js +25 -0
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-body.js +109 -0
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-farm.js +113 -0
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-job.js +56 -0
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-pool.js +211 -0
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -0
- package/dist/es5/lib/worker-farm/worker-thread.js +136 -0
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -0
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +41 -0
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -0
- package/dist/es5/lib/worker-utils/get-transfer-list.js +59 -0
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -0
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +25 -0
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -0
- package/dist/es5/types.js +2 -0
- package/dist/es5/types.js.map +1 -0
- package/dist/es5/workers/null-worker.js +23 -0
- package/dist/es5/workers/null-worker.js.map +1 -0
- package/dist/esm/index.js +26 -0
- package/dist/esm/index.js.map +1 -0
- package/dist/esm/lib/async-queue/async-queue.js +76 -0
- package/dist/esm/lib/async-queue/async-queue.js.map +1 -0
- package/dist/esm/lib/env-utils/assert.js +6 -0
- package/dist/esm/lib/env-utils/assert.js.map +1 -0
- package/dist/esm/lib/env-utils/globals.js +17 -0
- package/dist/esm/lib/env-utils/globals.js.map +1 -0
- package/dist/esm/lib/env-utils/version.js +6 -0
- package/dist/esm/lib/env-utils/version.js.map +1 -0
- package/dist/esm/lib/library-utils/library-utils.js +74 -0
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -0
- package/dist/esm/lib/node/require-utils.node.js +36 -0
- package/dist/esm/lib/node/require-utils.node.js.map +1 -0
- package/dist/esm/lib/node/worker_threads-browser.js +7 -0
- package/dist/esm/lib/node/worker_threads-browser.js.map +1 -0
- package/dist/esm/lib/node/worker_threads.js +4 -0
- package/dist/esm/lib/node/worker_threads.js.map +1 -0
- package/dist/esm/lib/process-utils/child-process-proxy.js +104 -0
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -0
- package/dist/esm/lib/process-utils/process-utils.js +26 -0
- package/dist/esm/lib/process-utils/process-utils.js.map +1 -0
- package/dist/esm/lib/worker-api/create-worker.js +84 -0
- package/dist/esm/lib/worker-api/create-worker.js.map +1 -0
- package/dist/esm/lib/worker-api/get-worker-url.js +32 -0
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -0
- package/dist/esm/lib/worker-api/process-on-worker.js +75 -0
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -0
- package/dist/esm/lib/worker-api/validate-worker-version.js +19 -0
- package/dist/esm/lib/worker-api/validate-worker-version.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-body.js +86 -0
- package/dist/esm/lib/worker-farm/worker-body.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-farm.js +72 -0
- package/dist/esm/lib/worker-farm/worker-farm.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-job.js +36 -0
- package/dist/esm/lib/worker-farm/worker-job.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-pool.js +124 -0
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -0
- package/dist/esm/lib/worker-farm/worker-thread.js +105 -0
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -0
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +35 -0
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -0
- package/dist/esm/lib/worker-utils/get-transfer-list.js +50 -0
- package/dist/esm/lib/worker-utils/get-transfer-list.js.map +1 -0
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +17 -0
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +1 -0
- package/dist/esm/types.js +2 -0
- package/dist/esm/types.js.map +1 -0
- package/dist/esm/workers/null-worker.js +5 -0
- package/dist/esm/workers/null-worker.js.map +1 -0
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +58 -25
- package/dist/lib/async-queue/async-queue.js +81 -91
- package/dist/lib/env-utils/assert.js +12 -5
- package/dist/lib/env-utils/globals.js +25 -10
- package/dist/lib/env-utils/version.js +10 -5
- package/dist/lib/library-utils/library-utils.d.ts.map +1 -1
- package/dist/lib/library-utils/library-utils.js +161 -79
- package/dist/lib/node/require-utils.node.js +58 -41
- package/dist/lib/node/worker_threads-browser.d.ts +7 -0
- package/dist/lib/node/worker_threads-browser.d.ts.map +1 -0
- package/dist/lib/node/worker_threads-browser.js +15 -0
- package/dist/lib/node/worker_threads.d.ts +6 -0
- package/dist/lib/node/worker_threads.d.ts.map +1 -0
- package/dist/lib/node/worker_threads.js +33 -0
- package/dist/lib/process-utils/child-process-proxy.d.ts +1 -1
- package/dist/lib/process-utils/child-process-proxy.d.ts.map +1 -1
- package/dist/lib/process-utils/child-process-proxy.js +126 -113
- package/dist/lib/process-utils/process-utils.js +33 -27
- package/dist/lib/worker-api/create-worker.d.ts +1 -1
- package/dist/lib/worker-api/create-worker.d.ts.map +1 -1
- package/dist/lib/worker-api/create-worker.js +84 -92
- package/dist/lib/worker-api/get-worker-url.d.ts.map +1 -1
- package/dist/lib/worker-api/get-worker-url.js +56 -33
- package/dist/lib/worker-api/process-on-worker.d.ts +1 -1
- package/dist/lib/worker-api/process-on-worker.d.ts.map +1 -1
- package/dist/lib/worker-api/process-on-worker.js +79 -71
- package/dist/lib/worker-api/validate-worker-version.js +32 -18
- package/dist/lib/worker-farm/worker-body.d.ts +2 -0
- package/dist/lib/worker-farm/worker-body.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-body.js +104 -58
- package/dist/lib/worker-farm/worker-farm.d.ts +7 -3
- package/dist/lib/worker-farm/worker-farm.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-farm.js +83 -77
- package/dist/lib/worker-farm/worker-job.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-job.js +46 -53
- package/dist/lib/worker-farm/worker-pool.d.ts +6 -4
- package/dist/lib/worker-farm/worker-pool.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-pool.js +154 -147
- package/dist/lib/worker-farm/worker-thread.d.ts +10 -3
- package/dist/lib/worker-farm/worker-thread.d.ts.map +1 -1
- package/dist/lib/worker-farm/worker-thread.js +128 -102
- package/dist/lib/worker-utils/get-loadable-worker-url.js +63 -33
- package/dist/lib/worker-utils/get-transfer-list.d.ts +5 -0
- package/dist/lib/worker-utils/get-transfer-list.d.ts.map +1 -1
- package/dist/lib/worker-utils/get-transfer-list.js +83 -36
- package/dist/lib/worker-utils/remove-nontransferable-options.d.ts +3 -3
- package/dist/lib/worker-utils/remove-nontransferable-options.d.ts.map +1 -1
- package/dist/lib/worker-utils/remove-nontransferable-options.js +25 -21
- package/dist/null-worker-node.js +244 -0
- package/dist/null-worker-node.js.map +7 -0
- package/dist/null-worker.js +45 -14
- package/dist/null-worker.js.map +2 -2
- package/dist/types.d.ts +16 -11
- package/dist/types.d.ts.map +1 -1
- package/dist/types.js +2 -2
- package/dist/workers/null-worker.js +6 -4
- package/package.json +11 -6
- package/src/index.ts +1 -1
- package/src/lib/library-utils/library-utils.ts +4 -1
- package/src/lib/node/worker_threads-browser.ts +13 -0
- package/src/lib/node/worker_threads.ts +6 -0
- package/src/lib/worker-api/create-worker.ts +1 -2
- package/src/lib/worker-api/get-worker-url.ts +5 -2
- package/src/lib/worker-api/process-on-worker.ts +8 -4
- package/src/lib/worker-farm/worker-body.ts +61 -19
- package/src/lib/worker-farm/worker-farm.ts +10 -5
- package/src/lib/worker-farm/worker-job.ts +3 -6
- package/src/lib/worker-farm/worker-pool.ts +15 -2
- package/src/lib/worker-farm/worker-thread.ts +45 -7
- package/src/lib/worker-utils/get-loadable-worker-url.ts +0 -2
- package/src/lib/worker-utils/get-transfer-list.ts +28 -0
- package/src/lib/worker-utils/remove-nontransferable-options.ts +17 -25
- package/src/types.ts +3 -2
- package/dist/index.js.map +0 -1
- package/dist/lib/async-queue/async-queue.js.map +0 -1
- package/dist/lib/env-utils/assert.js.map +0 -1
- package/dist/lib/env-utils/globals.js.map +0 -1
- package/dist/lib/env-utils/version.js.map +0 -1
- package/dist/lib/library-utils/library-utils.js.map +0 -1
- package/dist/lib/node/require-utils.node.js.map +0 -1
- package/dist/lib/process-utils/child-process-proxy.js.map +0 -1
- package/dist/lib/process-utils/process-utils.js.map +0 -1
- package/dist/lib/worker-api/create-worker.js.map +0 -1
- package/dist/lib/worker-api/get-worker-url.js.map +0 -1
- package/dist/lib/worker-api/process-on-worker.js.map +0 -1
- package/dist/lib/worker-api/validate-worker-version.js.map +0 -1
- package/dist/lib/worker-farm/worker-body.js.map +0 -1
- package/dist/lib/worker-farm/worker-farm.js.map +0 -1
- package/dist/lib/worker-farm/worker-job.js.map +0 -1
- package/dist/lib/worker-farm/worker-pool.js.map +0 -1
- package/dist/lib/worker-farm/worker-thread.js.map +0 -1
- package/dist/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
- package/dist/lib/worker-utils/get-transfer-list.js.map +0 -1
- package/dist/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
- package/dist/types.js.map +0 -1
- package/dist/workers/null-worker.js.map +0 -1
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
// Browser fills for Node.js built-in `worker_threads` module.
|
|
2
|
+
// These fills are non-functional, and just intended to ensure that
|
|
3
|
+
// `import 'worker_threads` doesn't break browser builds.
|
|
4
|
+
// The replacement is done in package.json browser field
|
|
5
|
+
export class Worker {
|
|
6
|
+
// eslint-disable-next-line @typescript-eslint/no-empty-function
|
|
7
|
+
terminate() {}
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
export {Worker as NodeWorker};
|
|
11
|
+
export {Worker as NodeWorkerType};
|
|
12
|
+
|
|
13
|
+
export const parentPort = null;
|
|
@@ -24,8 +24,7 @@ export type ProcessOnMainThread = (
|
|
|
24
24
|
* Set up a WebWorkerGlobalScope to talk with the main thread
|
|
25
25
|
*/
|
|
26
26
|
export function createWorker(process: Process, processInBatches?: ProcessInBatches): void {
|
|
27
|
-
|
|
28
|
-
if (typeof self === 'undefined') {
|
|
27
|
+
if (!WorkerBody.inWorkerThread()) {
|
|
29
28
|
return;
|
|
30
29
|
}
|
|
31
30
|
|
|
@@ -1,8 +1,11 @@
|
|
|
1
|
+
// loaders.gl, MIT license
|
|
2
|
+
|
|
1
3
|
import type {WorkerObject, WorkerOptions} from '../../types';
|
|
2
4
|
import {assert} from '../env-utils/assert';
|
|
5
|
+
import {isBrowser} from '../env-utils/globals';
|
|
3
6
|
import {VERSION as __VERSION__} from '../env-utils/version';
|
|
4
7
|
|
|
5
|
-
const NPM_TAG = 'beta'; //
|
|
8
|
+
const NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch
|
|
6
9
|
const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : NPM_TAG;
|
|
7
10
|
|
|
8
11
|
/**
|
|
@@ -23,7 +26,7 @@ export function getWorkerName(worker: WorkerObject): string {
|
|
|
23
26
|
export function getWorkerURL(worker: WorkerObject, options: WorkerOptions = {}): string {
|
|
24
27
|
const workerOptions = options[worker.id] || {};
|
|
25
28
|
|
|
26
|
-
const workerFile = `${worker.id}-worker.js`;
|
|
29
|
+
const workerFile = isBrowser ? `${worker.id}-worker.js` : `${worker.id}-worker-node.js`;
|
|
27
30
|
|
|
28
31
|
let url = workerOptions.workerUrl;
|
|
29
32
|
|
|
@@ -7,8 +7,8 @@ import type {
|
|
|
7
7
|
} from '../../types';
|
|
8
8
|
import type WorkerJob from '../worker-farm/worker-job';
|
|
9
9
|
import WorkerFarm from '../worker-farm/worker-farm';
|
|
10
|
-
import {removeNontransferableOptions} from '../worker-utils/remove-nontransferable-options';
|
|
11
10
|
import {getWorkerURL, getWorkerName} from './get-worker-url';
|
|
11
|
+
import {getTransferListForWriter} from '../worker-utils/get-transfer-list';
|
|
12
12
|
|
|
13
13
|
type ProcessOnWorkerOptions = WorkerOptions & {
|
|
14
14
|
jobName?: string;
|
|
@@ -41,10 +41,14 @@ export async function processOnWorker(
|
|
|
41
41
|
context: WorkerContext = {}
|
|
42
42
|
): Promise<any> {
|
|
43
43
|
const name = getWorkerName(worker);
|
|
44
|
-
const url = getWorkerURL(worker, options);
|
|
45
44
|
|
|
46
45
|
const workerFarm = WorkerFarm.getWorkerFarm(options);
|
|
47
|
-
const
|
|
46
|
+
const {source} = options;
|
|
47
|
+
const workerPoolProps: {name: string; source?: string; url?: string} = {name, source};
|
|
48
|
+
if (!source) {
|
|
49
|
+
workerPoolProps.url = getWorkerURL(worker, options);
|
|
50
|
+
}
|
|
51
|
+
const workerPool = workerFarm.getWorkerPool(workerPoolProps);
|
|
48
52
|
|
|
49
53
|
const jobName = options.jobName || worker.name;
|
|
50
54
|
const job = await workerPool.startJob(
|
|
@@ -54,7 +58,7 @@ export async function processOnWorker(
|
|
|
54
58
|
);
|
|
55
59
|
|
|
56
60
|
// Kick off the processing in the worker
|
|
57
|
-
const transferableOptions =
|
|
61
|
+
const transferableOptions = getTransferListForWriter(options);
|
|
58
62
|
job.postMessage('process', {input: data, options: transferableOptions});
|
|
59
63
|
|
|
60
64
|
const result = await job.result;
|
|
@@ -1,26 +1,54 @@
|
|
|
1
1
|
import type {WorkerMessageData, WorkerMessageType, WorkerMessagePayload} from '../../types';
|
|
2
2
|
import {getTransferList} from '../worker-utils/get-transfer-list';
|
|
3
3
|
|
|
4
|
+
/** Vile hack to defeat over-zealous bundlers from stripping out the require */
|
|
5
|
+
function getParentPort() {
|
|
6
|
+
// const isNode = globalThis.process;
|
|
7
|
+
let parentPort;
|
|
8
|
+
try {
|
|
9
|
+
// prettier-ignore
|
|
10
|
+
eval('globalThis.parentPort = require(\'worker_threads\').parentPort'); // eslint-disable-line no-eval
|
|
11
|
+
parentPort = globalThis.parentPort;
|
|
12
|
+
// eslint-disable-next-line no-empty
|
|
13
|
+
} catch {}
|
|
14
|
+
return parentPort;
|
|
15
|
+
}
|
|
16
|
+
|
|
4
17
|
const onMessageWrapperMap = new Map();
|
|
5
18
|
|
|
6
19
|
/**
|
|
7
20
|
* Type safe wrapper for worker code
|
|
8
21
|
*/
|
|
9
22
|
export default class WorkerBody {
|
|
23
|
+
/** Check that we are actually in a worker thread */
|
|
24
|
+
static inWorkerThread(): boolean {
|
|
25
|
+
return typeof self !== 'undefined' || Boolean(getParentPort());
|
|
26
|
+
}
|
|
27
|
+
|
|
10
28
|
/*
|
|
11
29
|
* (type: WorkerMessageType, payload: WorkerMessagePayload) => any
|
|
12
30
|
*/
|
|
13
31
|
static set onmessage(onMessage: (type: WorkerMessageType, payload: WorkerMessagePayload) => any) {
|
|
14
|
-
|
|
15
|
-
self.onmessage = (message) => {
|
|
16
|
-
if (!isKnownMessage(message)) {
|
|
17
|
-
return;
|
|
18
|
-
}
|
|
19
|
-
|
|
32
|
+
function handleMessage(message) {
|
|
20
33
|
// Confusingly the message itself also has a 'type' field which is always set to 'message'
|
|
21
|
-
const
|
|
34
|
+
const parentPort = getParentPort();
|
|
35
|
+
const {type, payload} = parentPort ? message : message.data;
|
|
36
|
+
// if (!isKnownMessage(message)) {
|
|
37
|
+
// return;
|
|
38
|
+
// }
|
|
22
39
|
onMessage(type, payload);
|
|
23
|
-
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
const parentPort = getParentPort();
|
|
43
|
+
if (parentPort) {
|
|
44
|
+
parentPort.on('message', handleMessage);
|
|
45
|
+
// if (message == 'exit') { parentPort.unref(); }
|
|
46
|
+
// eslint-disable-next-line
|
|
47
|
+
parentPort.on('exit', () => console.debug('Node worker closing'));
|
|
48
|
+
} else {
|
|
49
|
+
// eslint-disable-next-line no-restricted-globals
|
|
50
|
+
globalThis.onmessage = handleMessage;
|
|
51
|
+
}
|
|
24
52
|
}
|
|
25
53
|
|
|
26
54
|
static addEventListener(
|
|
@@ -34,14 +62,19 @@ export default class WorkerBody {
|
|
|
34
62
|
return;
|
|
35
63
|
}
|
|
36
64
|
|
|
37
|
-
// Confusingly the message itself also has a 'type' field which is always set to 'message'
|
|
38
|
-
const
|
|
65
|
+
// Confusingly in the browser, the message itself also has a 'type' field which is always set to 'message'
|
|
66
|
+
const parentPort = getParentPort();
|
|
67
|
+
const {type, payload} = parentPort ? message : message.data;
|
|
39
68
|
onMessage(type, payload);
|
|
40
69
|
};
|
|
41
70
|
}
|
|
42
71
|
|
|
43
|
-
|
|
44
|
-
|
|
72
|
+
const parentPort = getParentPort();
|
|
73
|
+
if (parentPort) {
|
|
74
|
+
console.error('not implemented'); // eslint-disable-line
|
|
75
|
+
} else {
|
|
76
|
+
globalThis.addEventListener('message', onMessageWrapper);
|
|
77
|
+
}
|
|
45
78
|
}
|
|
46
79
|
|
|
47
80
|
static removeEventListener(
|
|
@@ -49,8 +82,12 @@ export default class WorkerBody {
|
|
|
49
82
|
) {
|
|
50
83
|
const onMessageWrapper = onMessageWrapperMap.get(onMessage);
|
|
51
84
|
onMessageWrapperMap.delete(onMessage);
|
|
52
|
-
|
|
53
|
-
|
|
85
|
+
const parentPort = getParentPort();
|
|
86
|
+
if (parentPort) {
|
|
87
|
+
console.error('not implemented'); // eslint-disable-line
|
|
88
|
+
} else {
|
|
89
|
+
globalThis.removeEventListener('message', onMessageWrapper);
|
|
90
|
+
}
|
|
54
91
|
}
|
|
55
92
|
|
|
56
93
|
/**
|
|
@@ -59,12 +96,17 @@ export default class WorkerBody {
|
|
|
59
96
|
* @param payload
|
|
60
97
|
*/
|
|
61
98
|
static postMessage(type: WorkerMessageType, payload: WorkerMessagePayload): void {
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
99
|
+
const data: WorkerMessageData = {source: 'loaders.gl', type, payload};
|
|
100
|
+
// console.log('posting message', data);
|
|
101
|
+
const transferList = getTransferList(payload);
|
|
102
|
+
|
|
103
|
+
const parentPort = getParentPort();
|
|
104
|
+
if (parentPort) {
|
|
105
|
+
parentPort.postMessage(data, transferList);
|
|
106
|
+
// console.log('posted message', data);
|
|
107
|
+
} else {
|
|
66
108
|
// @ts-ignore
|
|
67
|
-
|
|
109
|
+
globalThis.postMessage(data, transferList);
|
|
68
110
|
}
|
|
69
111
|
}
|
|
70
112
|
}
|
|
@@ -2,7 +2,11 @@ import WorkerPool from './worker-pool';
|
|
|
2
2
|
import WorkerThread from './worker-thread';
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
|
-
* @param maxConcurrency
|
|
5
|
+
* @param maxConcurrency - max count of workers
|
|
6
|
+
* @param maxMobileConcurrency - max count of workers on mobile
|
|
7
|
+
* @param maxConcurrency - max count of workers
|
|
8
|
+
* @param reuseWorkers - if false, destroys workers when task is completed
|
|
9
|
+
* @param onDebug - callback intended to allow application to log worker pool activity
|
|
6
10
|
*/
|
|
7
11
|
export type WorkerFarmProps = {
|
|
8
12
|
maxConcurrency?: number;
|
|
@@ -11,11 +15,11 @@ export type WorkerFarmProps = {
|
|
|
11
15
|
onDebug?: () => void;
|
|
12
16
|
};
|
|
13
17
|
|
|
14
|
-
const DEFAULT_PROPS: WorkerFarmProps = {
|
|
18
|
+
const DEFAULT_PROPS: Required<WorkerFarmProps> = {
|
|
15
19
|
maxConcurrency: 3,
|
|
16
20
|
maxMobileConcurrency: 1,
|
|
17
|
-
|
|
18
|
-
|
|
21
|
+
reuseWorkers: true,
|
|
22
|
+
onDebug: () => {}
|
|
19
23
|
};
|
|
20
24
|
|
|
21
25
|
/**
|
|
@@ -27,7 +31,7 @@ export default class WorkerFarm {
|
|
|
27
31
|
// singleton
|
|
28
32
|
private static _workerFarm?: WorkerFarm;
|
|
29
33
|
|
|
30
|
-
/**
|
|
34
|
+
/** Checks if workers are supported on this platform */
|
|
31
35
|
static isSupported(): boolean {
|
|
32
36
|
return WorkerThread.isSupported();
|
|
33
37
|
}
|
|
@@ -55,6 +59,7 @@ export default class WorkerFarm {
|
|
|
55
59
|
for (const workerPool of this.workerPools.values()) {
|
|
56
60
|
workerPool.destroy();
|
|
57
61
|
}
|
|
62
|
+
this.workerPools = new Map<string, WorkerPool>();
|
|
58
63
|
}
|
|
59
64
|
|
|
60
65
|
/**
|
|
@@ -8,19 +8,16 @@ import {assert} from '../env-utils/assert';
|
|
|
8
8
|
export default class WorkerJob {
|
|
9
9
|
readonly name: string;
|
|
10
10
|
readonly workerThread: WorkerThread;
|
|
11
|
-
isRunning: boolean;
|
|
11
|
+
isRunning: boolean = true;
|
|
12
12
|
/** Promise that resolves when Job is done */
|
|
13
13
|
readonly result: Promise<any>;
|
|
14
14
|
|
|
15
|
-
private _resolve: (value: any) => void;
|
|
16
|
-
private _reject: (reason?: any) => void;
|
|
15
|
+
private _resolve: (value: any) => void = () => {};
|
|
16
|
+
private _reject: (reason?: any) => void = () => {};
|
|
17
17
|
|
|
18
18
|
constructor(jobName: string, workerThread: WorkerThread) {
|
|
19
19
|
this.name = jobName;
|
|
20
20
|
this.workerThread = workerThread;
|
|
21
|
-
this.isRunning = true;
|
|
22
|
-
this._resolve = () => {};
|
|
23
|
-
this._reject = () => {};
|
|
24
21
|
this.result = new Promise((resolve, reject) => {
|
|
25
22
|
this._resolve = resolve;
|
|
26
23
|
this._reject = reject;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type {WorkerMessageType, WorkerMessagePayload} from '../../types';
|
|
2
|
-
import {isMobile} from '../env-utils/globals';
|
|
2
|
+
import {isMobile, isBrowser} from '../env-utils/globals';
|
|
3
3
|
import WorkerThread from './worker-thread';
|
|
4
4
|
import WorkerJob from './worker-job';
|
|
5
5
|
|
|
@@ -53,6 +53,11 @@ export default class WorkerPool {
|
|
|
53
53
|
private count = 0;
|
|
54
54
|
private isDestroyed = false;
|
|
55
55
|
|
|
56
|
+
/** Checks if workers are supported on this platform */
|
|
57
|
+
static isSupported(): boolean {
|
|
58
|
+
return WorkerThread.isSupported();
|
|
59
|
+
}
|
|
60
|
+
|
|
56
61
|
/**
|
|
57
62
|
* @param processor - worker function
|
|
58
63
|
* @param maxConcurrency - max count of workers
|
|
@@ -165,7 +170,15 @@ export default class WorkerPool {
|
|
|
165
170
|
*/
|
|
166
171
|
returnWorkerToQueue(worker: WorkerThread) {
|
|
167
172
|
const shouldDestroyWorker =
|
|
168
|
-
|
|
173
|
+
// Workers on Node.js prevent the process from exiting.
|
|
174
|
+
// Until we figure out how to close them before exit, we always destroy them
|
|
175
|
+
!isBrowser ||
|
|
176
|
+
// If the pool is destroyed, there is no reason to keep the worker around
|
|
177
|
+
this.isDestroyed ||
|
|
178
|
+
// If the app has disabled worker reuse, any completed workers should be destroyed
|
|
179
|
+
!this.reuseWorkers ||
|
|
180
|
+
// If concurrency has been lowered, this worker might be surplus to requirements
|
|
181
|
+
this.count > this._getMaxConcurrency();
|
|
169
182
|
|
|
170
183
|
if (shouldDestroyWorker) {
|
|
171
184
|
worker.destroy();
|
|
@@ -1,3 +1,7 @@
|
|
|
1
|
+
// loaders.gl, MIT license
|
|
2
|
+
|
|
3
|
+
import {NodeWorker, NodeWorkerType} from '../node/worker_threads';
|
|
4
|
+
import {isBrowser} from '../env-utils/globals';
|
|
1
5
|
import {assert} from '../env-utils/assert';
|
|
2
6
|
import {getLoadableWorkerURL} from '../worker-utils/get-loadable-worker-url';
|
|
3
7
|
import {getTransferList} from '../worker-utils/get-transfer-list';
|
|
@@ -18,14 +22,18 @@ export default class WorkerThread {
|
|
|
18
22
|
readonly source: string | undefined;
|
|
19
23
|
readonly url: string | undefined;
|
|
20
24
|
terminated: boolean = false;
|
|
21
|
-
worker: Worker;
|
|
25
|
+
worker: Worker | NodeWorkerType;
|
|
22
26
|
onMessage: (message: any) => void;
|
|
23
27
|
onError: (error: Error) => void;
|
|
24
28
|
|
|
25
29
|
private _loadableURL: string = '';
|
|
26
30
|
|
|
31
|
+
/** Checks if workers are supported on this platform */
|
|
27
32
|
static isSupported(): boolean {
|
|
28
|
-
return
|
|
33
|
+
return (
|
|
34
|
+
(typeof Worker !== 'undefined' && isBrowser) ||
|
|
35
|
+
(typeof NodeWorker !== 'undefined' && !isBrowser)
|
|
36
|
+
);
|
|
29
37
|
}
|
|
30
38
|
|
|
31
39
|
constructor(props: WorkerThreadProps) {
|
|
@@ -37,7 +45,7 @@ export default class WorkerThread {
|
|
|
37
45
|
this.onMessage = NOOP;
|
|
38
46
|
this.onError = (error) => console.log(error); // eslint-disable-line
|
|
39
47
|
|
|
40
|
-
this.worker = this._createBrowserWorker();
|
|
48
|
+
this.worker = isBrowser ? this._createBrowserWorker() : this._createNodeWorker();
|
|
41
49
|
}
|
|
42
50
|
|
|
43
51
|
/**
|
|
@@ -47,8 +55,7 @@ export default class WorkerThread {
|
|
|
47
55
|
destroy(): void {
|
|
48
56
|
this.onMessage = NOOP;
|
|
49
57
|
this.onError = NOOP;
|
|
50
|
-
// @
|
|
51
|
-
this.worker.terminate();
|
|
58
|
+
this.worker.terminate(); // eslint-disable-line @typescript-eslint/no-floating-promises
|
|
52
59
|
this.terminated = true;
|
|
53
60
|
}
|
|
54
61
|
|
|
@@ -71,7 +78,7 @@ export default class WorkerThread {
|
|
|
71
78
|
|
|
72
79
|
/**
|
|
73
80
|
* Generate a standard Error from an ErrorEvent
|
|
74
|
-
* @param
|
|
81
|
+
* @param event
|
|
75
82
|
*/
|
|
76
83
|
_getErrorFromErrorEvent(event: ErrorEvent): Error {
|
|
77
84
|
// Note Error object does not have the expected fields if loading failed completely
|
|
@@ -93,7 +100,7 @@ export default class WorkerThread {
|
|
|
93
100
|
/**
|
|
94
101
|
* Creates a worker thread on the browser
|
|
95
102
|
*/
|
|
96
|
-
_createBrowserWorker() {
|
|
103
|
+
_createBrowserWorker(): Worker {
|
|
97
104
|
this._loadableURL = getLoadableWorkerURL({source: this.source, url: this.url});
|
|
98
105
|
const worker = new Worker(this._loadableURL, {name: this.name});
|
|
99
106
|
|
|
@@ -114,4 +121,35 @@ export default class WorkerThread {
|
|
|
114
121
|
|
|
115
122
|
return worker;
|
|
116
123
|
}
|
|
124
|
+
|
|
125
|
+
/**
|
|
126
|
+
* Creates a worker thread in node.js
|
|
127
|
+
* @todo https://nodejs.org/api/async_hooks.html#async-resource-worker-pool
|
|
128
|
+
*/
|
|
129
|
+
_createNodeWorker(): NodeWorkerType {
|
|
130
|
+
let worker: NodeWorkerType;
|
|
131
|
+
if (this.url) {
|
|
132
|
+
// Make sure relative URLs start with './'
|
|
133
|
+
const absolute = this.url.includes(':/') || this.url.startsWith('/');
|
|
134
|
+
const url = absolute ? this.url : `./${this.url}`;
|
|
135
|
+
// console.log('Starting work from', url);
|
|
136
|
+
worker = new NodeWorker(url, {eval: false});
|
|
137
|
+
} else if (this.source) {
|
|
138
|
+
worker = new NodeWorker(this.source, {eval: true});
|
|
139
|
+
} else {
|
|
140
|
+
throw new Error('no worker');
|
|
141
|
+
}
|
|
142
|
+
worker.on('message', (data) => {
|
|
143
|
+
// console.error('message', data);
|
|
144
|
+
this.onMessage(data);
|
|
145
|
+
});
|
|
146
|
+
worker.on('error', (error) => {
|
|
147
|
+
// console.error('error', error);
|
|
148
|
+
this.onError(error);
|
|
149
|
+
});
|
|
150
|
+
worker.on('exit', (code) => {
|
|
151
|
+
// console.error('exit', code);
|
|
152
|
+
});
|
|
153
|
+
return worker;
|
|
154
|
+
}
|
|
117
155
|
}
|
|
@@ -54,8 +54,6 @@ function getLoadableWorkerURLFromURL(url: string): string {
|
|
|
54
54
|
* @returns loadable url
|
|
55
55
|
*/
|
|
56
56
|
function getLoadableWorkerURLFromSource(workerSource: string): string {
|
|
57
|
-
// NOTE: webworkify was previously used
|
|
58
|
-
// const blob = webworkify(workerSource, {bare: true});
|
|
59
57
|
const blob = new Blob([workerSource], {type: 'application/javascript'});
|
|
60
58
|
return URL.createObjectURL(blob);
|
|
61
59
|
}
|
|
@@ -59,3 +59,31 @@ function isTransferable(object: unknown) {
|
|
|
59
59
|
}
|
|
60
60
|
return false;
|
|
61
61
|
}
|
|
62
|
+
|
|
63
|
+
/**
|
|
64
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
65
|
+
* @param object
|
|
66
|
+
*/
|
|
67
|
+
export function getTransferListForWriter(object: object | null): object {
|
|
68
|
+
if (object === null) {
|
|
69
|
+
return {};
|
|
70
|
+
}
|
|
71
|
+
const clone = Object.assign({}, object);
|
|
72
|
+
|
|
73
|
+
Object.keys(clone).forEach((key) => {
|
|
74
|
+
// Typed Arrays and Arrays are passed with no change
|
|
75
|
+
if (
|
|
76
|
+
typeof object[key] === 'object' &&
|
|
77
|
+
!ArrayBuffer.isView(object[key]) &&
|
|
78
|
+
!(object[key] instanceof Array)
|
|
79
|
+
) {
|
|
80
|
+
clone[key] = getTransferListForWriter(object[key]);
|
|
81
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
82
|
+
clone[key] = {};
|
|
83
|
+
} else {
|
|
84
|
+
clone[key] = object[key];
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
return clone;
|
|
89
|
+
}
|
|
@@ -1,31 +1,23 @@
|
|
|
1
1
|
/**
|
|
2
|
-
*
|
|
3
|
-
* @param
|
|
2
|
+
* Recursively drop non serializable values like functions and regexps.
|
|
3
|
+
* @param object
|
|
4
4
|
*/
|
|
5
|
-
export function removeNontransferableOptions(object: object): object {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
}
|
|
5
|
+
export function removeNontransferableOptions(object: object | null): object {
|
|
6
|
+
if (object === null) {
|
|
7
|
+
return {};
|
|
8
|
+
}
|
|
9
|
+
const clone = Object.assign({}, object);
|
|
11
10
|
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
return JSON.parse(JSON.stringify(value));
|
|
21
|
-
} catch (err) {
|
|
22
|
-
// discard key if value cannot be deduped
|
|
23
|
-
return undefined;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
// Store value in our set
|
|
27
|
-
cache.add(value);
|
|
11
|
+
Object.keys(clone).forEach((key) => {
|
|
12
|
+
// Checking if it is an object and not a typed array.
|
|
13
|
+
if (typeof object[key] === 'object' && !ArrayBuffer.isView(object[key])) {
|
|
14
|
+
clone[key] = removeNontransferableOptions(object[key]);
|
|
15
|
+
} else if (typeof clone[key] === 'function' || clone[key] instanceof RegExp) {
|
|
16
|
+
clone[key] = {};
|
|
17
|
+
} else {
|
|
18
|
+
clone[key] = object[key];
|
|
28
19
|
}
|
|
29
|
-
return value;
|
|
30
20
|
});
|
|
21
|
+
|
|
22
|
+
return clone;
|
|
31
23
|
}
|
package/src/types.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*/
|
|
4
4
|
export type WorkerOptions = {
|
|
5
5
|
// Worker farm options
|
|
6
|
-
CDN?: string;
|
|
6
|
+
CDN?: string | null;
|
|
7
7
|
worker?: boolean;
|
|
8
8
|
maxConcurrency?: number;
|
|
9
9
|
maxMobileConcurrency?: number;
|
|
@@ -35,7 +35,7 @@ export type WorkerObject = {
|
|
|
35
35
|
module: string;
|
|
36
36
|
version: string;
|
|
37
37
|
worker?: string | boolean;
|
|
38
|
-
options:
|
|
38
|
+
options: {[key: string]: any};
|
|
39
39
|
deprecatedOptions?: object;
|
|
40
40
|
|
|
41
41
|
process?: Process;
|
|
@@ -71,6 +71,7 @@ export type WorkerMessageType =
|
|
|
71
71
|
export type WorkerMessagePayload = {
|
|
72
72
|
id?: number;
|
|
73
73
|
options?: {[key: string]: any};
|
|
74
|
+
context?: {[key: string]: any};
|
|
74
75
|
input?: any; // Transferable;
|
|
75
76
|
result?: any; // Transferable
|
|
76
77
|
error?: string;
|
package/dist/index.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../src/index.ts"],"names":["VERSION","assert","isBrowser","isWorker","default","WorkerJob","WorkerThread","WorkerFarm","WorkerPool","WorkerBody","processOnWorker","canProcessOnWorker","createWorker","getWorkerURL","validateWorkerVersion","getTransferList","getLibraryUrl","loadLibrary","AsyncQueue","ChildProcessProxy","NullWorker","id","name","module","version","options","null"],"mappings":"AACA,SAAQA,OAAR,QAAsB,yBAAtB;AAcA,SAAQC,MAAR,QAAqB,wBAArB;AACA,SAAQC,SAAR,EAAmBC,QAAnB,QAAkC,yBAAlC;AAGA,SAAQC,OAAO,IAAIC,SAAnB,QAAmC,8BAAnC;AACA,SAAQD,OAAO,IAAIE,YAAnB,QAAsC,iCAAtC;AAGA,SAAQF,OAAO,IAAIG,UAAnB,QAAoC,+BAApC;AACA,SAAQH,OAAO,IAAII,UAAnB,QAAoC,+BAApC;AACA,SAAQJ,OAAO,IAAIK,UAAnB,QAAoC,+BAApC;AAEA,SAAQC,eAAR,EAAyBC,kBAAzB,QAAkD,oCAAlD;AACA,SAAQC,YAAR,QAA2B,gCAA3B;AAGA,SAAQC,YAAR,QAA2B,iCAA3B;AACA,SAAQC,qBAAR,QAAoC,0CAApC;AACA,SAAQC,eAAR,QAA8B,sCAA9B;AAGA,SAAQC,aAAR,EAAuBC,WAAvB,QAAyC,mCAAzC;AAGA,SAAQb,OAAO,IAAIc,UAAnB,QAAoC,+BAApC;AAGA,SAAQd,OAAO,IAAIe,iBAAnB,QAA2C,yCAA3C;AAKA,OAAO,MAAMC,UAAwB,GAAG;AACtCC,EAAAA,EAAE,EAAE,MADkC;AAEtCC,EAAAA,IAAI,EAAE,MAFgC;AAGtCC,EAAAA,MAAM,EAAE,cAH8B;AAItCC,EAAAA,OAAO,EAAExB,OAJ6B;AAKtCyB,EAAAA,OAAO,EAAE;AACPC,IAAAA,IAAI,EAAE;AADC;AAL6B,CAAjC","sourcesContent":["import type {WorkerObject} from './types';\nimport {VERSION} from './lib/env-utils/version';\n\n// TYPES\nexport type {\n WorkerObject,\n WorkerOptions,\n // Protocol\n WorkerMessage,\n WorkerMessageType,\n WorkerMessageData,\n WorkerMessagePayload\n} from './types';\n\n// GENERAL UTILS\nexport {assert} from './lib/env-utils/assert';\nexport {isBrowser, isWorker} from './lib/env-utils/globals';\n\n// WORKER UTILS - TYPES\nexport {default as WorkerJob} from './lib/worker-farm/worker-job';\nexport {default as WorkerThread} from './lib/worker-farm/worker-thread';\n\n// WORKER FARMS\nexport {default as WorkerFarm} from './lib/worker-farm/worker-farm';\nexport {default as WorkerPool} from './lib/worker-farm/worker-pool';\nexport {default as WorkerBody} from './lib/worker-farm/worker-body';\n\nexport {processOnWorker, canProcessOnWorker} from './lib/worker-api/process-on-worker';\nexport {createWorker} from './lib/worker-api/create-worker';\n\n// WORKER UTILS - EXPORTS\nexport {getWorkerURL} from './lib/worker-api/get-worker-url';\nexport {validateWorkerVersion} from './lib/worker-api/validate-worker-version';\nexport {getTransferList} from './lib/worker-utils/get-transfer-list';\n\n// LIBRARY UTILS\nexport {getLibraryUrl, loadLibrary} from './lib/library-utils/library-utils';\n\n// PARSER UTILS\nexport {default as AsyncQueue} from './lib/async-queue/async-queue';\n\n// PROCESS UTILS\nexport {default as ChildProcessProxy} from './lib/process-utils/child-process-proxy';\n\n// WORKER OBJECTS\n\n/** A null worker to test that worker processing is functional */\nexport const NullWorker: WorkerObject = {\n id: 'null',\n name: 'null',\n module: 'worker-utils',\n version: VERSION,\n options: {\n null: {}\n }\n};\n"],"file":"index.js"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/async-queue/async-queue.ts"],"names":["Symbol","asyncIterator","AsyncQueue","constructor","_values","_settlers","_closed","push","value","enqueue","Error","length","settler","shift","reject","resolve","close","done","next","Promise","undefined"],"mappings":";;;;wBA2BGA,MAAM,CAACC,a;AAZV,eAAe,MAAMC,UAAN,CAAoB;AAKjCC,EAAAA,WAAW,GAAG;AAAA;;AAAA;;AAAA;;AACZ,SAAKC,OAAL,GAAe,EAAf;AACA,SAAKC,SAAL,GAAiB,EAAjB;AACA,SAAKC,OAAL,GAAe,KAAf;AACD;;AAGD,4BAA2C;AACzC,WAAO,IAAP;AACD;;AAGDC,EAAAA,IAAI,CAACC,KAAD,EAAiB;AACnB,WAAO,KAAKC,OAAL,CAAaD,KAAb,CAAP;AACD;;AAMDC,EAAAA,OAAO,CAACD,KAAD,EAAyB;AAC9B,QAAI,KAAKF,OAAT,EAAkB;AAChB,YAAM,IAAII,KAAJ,CAAU,QAAV,CAAN;AACD;;AAED,QAAI,KAAKL,SAAL,CAAeM,MAAf,GAAwB,CAA5B,EAA+B;AAC7B,UAAI,KAAKP,OAAL,CAAaO,MAAb,GAAsB,CAA1B,EAA6B;AAC3B,cAAM,IAAID,KAAJ,CAAU,wBAAV,CAAN;AACD;;AACD,YAAME,OAAO,GAAG,KAAKP,SAAL,CAAeQ,KAAf,EAAhB;;AACA,UAAIL,KAAK,YAAYE,KAArB,EAA4B;AAC1BE,QAAAA,OAAO,CAACE,MAAR,CAAeN,KAAf;AACD,OAFD,MAEO;AACLI,QAAAA,OAAO,CAACG,OAAR,CAAgB;AAACP,UAAAA;AAAD,SAAhB;AACD;AACF,KAVD,MAUO;AACL,WAAKJ,OAAL,CAAaG,IAAb,CAAkBC,KAAlB;AACD;AACF;;AAGDQ,EAAAA,KAAK,GAAS;AACZ,WAAO,KAAKX,SAAL,CAAeM,MAAf,GAAwB,CAA/B,EAAkC;AAChC,YAAMC,OAAO,GAAG,KAAKP,SAAL,CAAeQ,KAAf,EAAhB;;AACAD,MAAAA,OAAO,CAACG,OAAR,CAAgB;AAACE,QAAAA,IAAI,EAAE;AAAP,OAAhB;AACD;;AACD,SAAKX,OAAL,GAAe,IAAf;AACD;;AAKDY,EAAAA,IAAI,GAAoC;AAEtC,QAAI,KAAKd,OAAL,CAAaO,MAAb,GAAsB,CAA1B,EAA6B;AAC3B,YAAMH,KAAK,GAAG,KAAKJ,OAAL,CAAaS,KAAb,EAAd;;AACA,UAAIL,KAAK,YAAYE,KAArB,EAA4B;AAC1B,eAAOS,OAAO,CAACL,MAAR,CAAeN,KAAf,CAAP;AACD;;AACD,aAAOW,OAAO,CAACJ,OAAR,CAAgB;AAACE,QAAAA,IAAI,EAAE,KAAP;AAAcT,QAAAA;AAAd,OAAhB,CAAP;AACD;;AAGD,QAAI,KAAKF,OAAT,EAAkB;AAChB,UAAI,KAAKD,SAAL,CAAeM,MAAf,GAAwB,CAA5B,EAA+B;AAC7B,cAAM,IAAID,KAAJ,CAAU,wBAAV,CAAN;AACD;;AACD,aAAOS,OAAO,CAACJ,OAAR,CAAgB;AAACE,QAAAA,IAAI,EAAE,IAAP;AAAaT,QAAAA,KAAK,EAAEY;AAApB,OAAhB,CAAP;AACD;;AAGD,WAAO,IAAID,OAAJ,CAAY,CAACJ,OAAD,EAAUD,MAAV,KAAqB;AACtC,WAAKT,SAAL,CAAeE,IAAf,CAAoB;AAACQ,QAAAA,OAAD;AAAUD,QAAAA;AAAV,OAApB;AACD,KAFM,CAAP;AAGD;;AA/EgC","sourcesContent":["// From https://github.com/rauschma/async-iter-demo/tree/master/src under MIT license\n// http://2ality.com/2016/10/asynchronous-iteration.html\n\n/**\n * Async Queue\n * - AsyncIterable: An async iterator can be\n * - Values can be pushed onto the queue\n * @example\n * const asyncQueue = new AsyncQueue();\n * setTimeout(() => asyncQueue.enqueue('tick'), 1000);\n * setTimeout(() => asyncQueue.enqueue(new Error('done')), 10000);\n * for await (const value of asyncQueue) {\n * console.log(value); // tick\n * }\n */\nexport default class AsyncQueue<T> {\n private _values: any[];\n private _settlers: any[];\n private _closed: boolean;\n\n constructor() {\n this._values = []; // enqueues > dequeues\n this._settlers = []; // dequeues > enqueues\n this._closed = false;\n }\n\n /** Return an async iterator for this queue */\n [Symbol.asyncIterator](): AsyncIterator<T> {\n return this;\n }\n\n /** Push a new value - the async iterator will yield a promise resolved to this value */\n push(value: T): void {\n return this.enqueue(value);\n }\n\n /**\n * Push a new value - the async iterator will yield a promise resolved to this value\n * Add an error - the async iterator will yield a promise rejected with this value\n */\n enqueue(value: T | Error): void {\n if (this._closed) {\n throw new Error('Closed');\n }\n\n if (this._settlers.length > 0) {\n if (this._values.length > 0) {\n throw new Error('Illegal internal state');\n }\n const settler = this._settlers.shift();\n if (value instanceof Error) {\n settler.reject(value);\n } else {\n settler.resolve({value});\n }\n } else {\n this._values.push(value);\n }\n }\n\n /** Indicate that we not waiting for more values - The async iterator will be done */\n close(): void {\n while (this._settlers.length > 0) {\n const settler = this._settlers.shift();\n settler.resolve({done: true});\n }\n this._closed = true;\n }\n\n // ITERATOR IMPLEMENTATION\n\n /** @returns a Promise for an IteratorResult */\n next(): Promise<IteratorResult<T, any>> {\n // If values in queue, yield the first value\n if (this._values.length > 0) {\n const value = this._values.shift();\n if (value instanceof Error) {\n return Promise.reject(value);\n }\n return Promise.resolve({done: false, value});\n }\n\n // If queue is closed, the iterator is done\n if (this._closed) {\n if (this._settlers.length > 0) {\n throw new Error('Illegal internal state');\n }\n return Promise.resolve({done: true, value: undefined});\n }\n\n // Yield a promise that waits for new values to be enqueued\n return new Promise((resolve, reject) => {\n this._settlers.push({resolve, reject});\n });\n }\n}\n"],"file":"async-queue.js"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/env-utils/assert.ts"],"names":["assert","condition","message","Error"],"mappings":"AAKA,OAAO,SAASA,MAAT,CAAgBC,SAAhB,EAAgCC,OAAhC,EAAwD;AAC7D,MAAI,CAACD,SAAL,EAAgB;AACd,UAAM,IAAIE,KAAJ,CAAUD,OAAO,IAAI,8BAArB,CAAN;AACD;AACF","sourcesContent":["// Replacement for the external assert method to reduce bundle size\n// Note: We don't use the second \"message\" argument in calling code,\n// so no need to support it here\n\n/** Throws an `Error` with the optional `message` if `condition` is falsy */\nexport function assert(condition: any, message?: string): void {\n if (!condition) {\n throw new Error(message || 'loaders.gl assertion failed.');\n }\n}\n"],"file":"assert.js"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/env-utils/globals.ts"],"names":["globals","self","window","global","document","self_","window_","global_","document_","isBrowser","process","String","browser","isWorker","importScripts","isMobile","orientation","matches","version","exec","nodeVersion","parseFloat"],"mappings":"AAIA,MAAMA,OAAO,GAAG;AACdC,EAAAA,IAAI,EAAE,OAAOA,IAAP,KAAgB,WAAhB,IAA+BA,IADvB;AAEdC,EAAAA,MAAM,EAAE,OAAOA,MAAP,KAAkB,WAAlB,IAAiCA,MAF3B;AAGdC,EAAAA,MAAM,EAAE,OAAOA,MAAP,KAAkB,WAAlB,IAAiCA,MAH3B;AAIdC,EAAAA,QAAQ,EAAE,OAAOA,QAAP,KAAoB,WAApB,IAAmCA;AAJ/B,CAAhB;AAOA,MAAMC,KAA2B,GAAGL,OAAO,CAACC,IAAR,IAAgBD,OAAO,CAACE,MAAxB,IAAkCF,OAAO,CAACG,MAA1C,IAAoD,EAAxF;AACA,MAAMG,OAA6B,GAAGN,OAAO,CAACE,MAAR,IAAkBF,OAAO,CAACC,IAA1B,IAAkCD,OAAO,CAACG,MAA1C,IAAoD,EAA1F;AACA,MAAMI,OAA6B,GAAGP,OAAO,CAACG,MAAR,IAAkBH,OAAO,CAACC,IAA1B,IAAkCD,OAAO,CAACE,MAA1C,IAAoD,EAA1F;AACA,MAAMM,SAA+B,GAAGR,OAAO,CAACI,QAAR,IAAoB,EAA5D;AAEA,SAAQC,KAAK,IAAIJ,IAAjB,EAAuBK,OAAO,IAAIJ,MAAlC,EAA0CK,OAAO,IAAIJ,MAArD,EAA6DK,SAAS,IAAIJ,QAA1E;AAGA,OAAO,MAAMK,SAAkB,GAE7B,OAAOC,OAAP,KAAmB,QAAnB,IAA+BC,MAAM,CAACD,OAAD,CAAN,KAAoB,kBAAnD,IAAyEA,OAAO,CAACE,OAF5E;AAKP,OAAO,MAAMC,QAAiB,GAAG,OAAOC,aAAP,KAAyB,UAAnD;AAGP,OAAO,MAAMC,QAAiB,GAC5B,OAAOb,MAAP,KAAkB,WAAlB,IAAiC,OAAOA,MAAM,CAACc,WAAd,KAA8B,WAD1D;AAIP,MAAMC,OAAO,GACX,OAAOP,OAAP,KAAmB,WAAnB,IAAkCA,OAAO,CAACQ,OAA1C,IAAqD,YAAYC,IAAZ,CAAiBT,OAAO,CAACQ,OAAzB,CADvD;AAIA,OAAO,MAAME,WAAmB,GAAIH,OAAO,IAAII,UAAU,CAACJ,OAAO,CAAC,CAAD,CAAR,CAAtB,IAAuC,CAAnE","sourcesContent":["// Purpose: include this in your module to avoids adding dependencies on\n// micro modules like 'global' and 'is-browser';\n\n/* eslint-disable no-restricted-globals */\nconst globals = {\n self: typeof self !== 'undefined' && self,\n window: typeof window !== 'undefined' && window,\n global: typeof global !== 'undefined' && global,\n document: typeof document !== 'undefined' && document\n};\n\nconst self_: {[key: string]: any} = globals.self || globals.window || globals.global || {};\nconst window_: {[key: string]: any} = globals.window || globals.self || globals.global || {};\nconst global_: {[key: string]: any} = globals.global || globals.self || globals.window || {};\nconst document_: {[key: string]: any} = globals.document || {};\n\nexport {self_ as self, window_ as window, global_ as global, document_ as document};\n\n/** true if running in the browser, false if running in Node.js */\nexport const isBrowser: boolean =\n // @ts-ignore process.browser\n typeof process !== 'object' || String(process) !== '[object process]' || process.browser;\n\n/** true if running on a worker thread */\nexport const isWorker: boolean = typeof importScripts === 'function';\n\n/** true if running on a mobile device */\nexport const isMobile: boolean =\n typeof window !== 'undefined' && typeof window.orientation !== 'undefined';\n\n// Extract node major version\nconst matches =\n typeof process !== 'undefined' && process.version && /v([0-9]*)/.exec(process.version);\n\n/** Version of Node.js if running under Node, otherwise 0 */\nexport const nodeVersion: number = (matches && parseFloat(matches[1])) || 0;\n"],"file":"globals.js"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/env-utils/version.ts"],"names":["DEFAULT_VERSION","VERSION","console","error"],"mappings":"AAIA,MAAMA,eAAe,GAAG,MAAxB;AAEA,OAAO,MAAMC,OAAO,GAAG,2BAAuB,WAAvB,qBAAmDD,eAAnE;;AACP,IAAI,2BAAuB,WAA3B,EAAwC;AAEtCE,EAAAA,OAAO,CAACC,KAAR,CACE,iIADF;AAGD","sourcesContent":["// Version constant cannot be imported, it needs to correspond to the build version of **this** module.\n// __VERSION__ is injected by babel-plugin-version-inline\n\n// Change to `latest` on production branches\nconst DEFAULT_VERSION = 'beta';\ndeclare let __VERSION__: string;\nexport const VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : DEFAULT_VERSION;\nif (typeof __VERSION__ === 'undefined') {\n // eslint-disable-next-line\n console.error(\n 'loaders.gl: The __VERSION__ variable is not injected using babel plugin. Latest unstable workers would be fetched from the CDN.'\n );\n}\n"],"file":"version.js"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/library-utils/library-utils.ts"],"names":["global","isBrowser","isWorker","node","assert","VERSION","__VERSION__","LATEST","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","CDN","endsWith","response","fetch","arrayBuffer","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","script","document","createElement","appendChild","createTextNode","e","body"],"mappings":"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","sourcesContent":["/* global importScripts */\nimport {global, isBrowser, isWorker} from '../env-utils/globals';\nimport * as node from '../node/require-utils.node';\nimport {assert} from '../env-utils/assert';\nimport {VERSION as __VERSION__} from '../env-utils/version';\n\n// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...\nconst LATEST = 'beta';\nconst VERSION = typeof __VERSION__ !== 'undefined' ? __VERSION__ : LATEST;\n\nconst loadLibraryPromises: Record<string, Promise<any>> = {}; // promises\n\n/**\n * Dynamically loads a library (\"module\")\n *\n * - wasm library: Array buffer is returned\n * - js library: Parse JS is returned\n *\n * Method depends on environment\n * - browser - script element is created and installed on document\n * - worker - eval is called on global context\n * - node - file is required\n *\n * @param libraryUrl\n * @param moduleName\n * @param options\n */\nexport async function loadLibrary(\n libraryUrl: string,\n moduleName: string | null = null,\n options: object = {}\n): Promise<any> {\n if (moduleName) {\n libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);\n }\n\n // Ensure libraries are only loaded once\n\n loadLibraryPromises[libraryUrl] =\n // eslint-disable-next-line @typescript-eslint/no-misused-promises\n loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);\n return await loadLibraryPromises[libraryUrl];\n}\n\n// TODO - sort out how to resolve paths for main/worker and dev/prod\nexport function getLibraryUrl(library: string, moduleName?: string, options?: any): string {\n // Check if already a URL\n if (library.startsWith('http')) {\n return library;\n }\n\n // Allow application to import and supply libraries through `options.modules`\n const modules = options.modules || {};\n if (modules[library]) {\n return modules[library];\n }\n\n // Load from local files, not from CDN scripts in Node.js\n // TODO - needs to locate the modules directory when installed!\n if (!isBrowser) {\n return `modules/${moduleName}/dist/libs/${library}`;\n }\n\n // In browser, load from external scripts\n if (options.CDN) {\n assert(options.CDN.startsWith('http'));\n return `${options.CDN}/${moduleName}@${VERSION}/dist/libs/${library}`;\n }\n\n // TODO - loading inside workers requires paths relative to worker script location...\n if (isWorker) {\n return `../src/libs/${library}`;\n }\n\n return `modules/${moduleName}/src/libs/${library}`;\n}\n\nasync function loadLibraryFromFile(libraryUrl: string): Promise<any> {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n try {\n return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));\n } catch {\n return null;\n }\n }\n if (isWorker) {\n return importScripts(libraryUrl);\n }\n // TODO - fix - should be more secure than string parsing since observes CORS\n // if (isBrowser) {\n // return await loadScriptFromFile(libraryUrl);\n // }\n\n const response = await fetch(libraryUrl);\n const scriptSource = await response.text();\n return loadLibraryFromString(scriptSource, libraryUrl);\n}\n\n/*\nasync function loadScriptFromFile(libraryUrl) {\n const script = document.createElement('script');\n script.src = libraryUrl;\n return await new Promise((resolve, reject) => {\n script.onload = data => {\n resolve(data);\n };\n script.onerror = reject;\n });\n}\n*/\n\n// TODO - Needs security audit...\n// - Raw eval call\n// - Potentially bypasses CORS\n// Upside is that this separates fetching and parsing\n// we could create a`LibraryLoader` or`ModuleLoader`\nfunction loadLibraryFromString(scriptSource: string, id: string): null | any {\n if (!isBrowser) {\n return node.requireFromString && node.requireFromString(scriptSource, id);\n }\n\n if (isWorker) {\n // Use lvalue trick to make eval run in global scope\n eval.call(global, scriptSource); // eslint-disable-line no-eval\n // https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript\n // http://perfectionkills.com/global-eval-what-are-the-options/\n return null;\n }\n\n const script = document.createElement('script');\n script.id = id;\n // most browsers like a separate text node but some throw an error. The second method covers those.\n try {\n script.appendChild(document.createTextNode(scriptSource));\n } catch (e) {\n script.text = scriptSource;\n }\n document.body.appendChild(script);\n return null;\n}\n\n// TODO - technique for module injection into worker, from THREE.DracoLoader...\n/*\nfunction combineWorkerWithLibrary(worker, jsContent) {\n var fn = wWorker.toString();\n var body = [\n '// injected',\n jsContent,\n '',\n '// worker',\n fn.substring(fn.indexOf('{') + 1, fn.lastIndexOf('}'))\n ].join('\\n');\n this.workerSourceURL = URL.createObjectURL(new Blob([body]));\n}\n*/\n"],"file":"library-utils.js"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/node/require-utils.node.ts"],"names":["Module","path","requireFromFile","filename","startsWith","response","fetch","code","text","requireFromString","process","cwd","require","options","Error","paths","_nodeModulePaths","dirname","parent","module","newModule","concat","prependPaths","appendPaths","_compile","children","splice","indexOf","exports"],"mappings":"AAMA,OAAOA,MAAP,MAAmB,QAAnB;AACA,OAAOC,IAAP,MAAiB,MAAjB;AAMA,OAAO,eAAeC,eAAf,CAA+BC,QAA/B,EAA+D;AACpE,MAAIA,QAAQ,CAACC,UAAT,CAAoB,MAApB,CAAJ,EAAiC;AAC/B,UAAMC,QAAQ,GAAG,MAAMC,KAAK,CAACH,QAAD,CAA5B;AACA,UAAMI,IAAI,GAAG,MAAMF,QAAQ,CAACG,IAAT,EAAnB;AACA,WAAOC,iBAAiB,CAACF,IAAD,CAAxB;AACD;;AAED,MAAI,CAACJ,QAAQ,CAACC,UAAT,CAAoB,GAApB,CAAL,EAA+B;AAC7BD,IAAAA,QAAQ,aAAMO,OAAO,CAACC,GAAR,EAAN,cAAuBR,QAAvB,CAAR;AACD;;AACD,SAAOS,OAAO,CAACT,QAAD,CAAd;AACD;AAQD,OAAO,SAASM,iBAAT,CACLF,IADK,EAELJ,QAAQ,GAAG,EAFN,EAGLU,OAHK,EAOA;AAAA;;AACL,MAAI,OAAOV,QAAP,KAAoB,QAAxB,EAAkC;AAChCU,IAAAA,OAAO,GAAGV,QAAV;AACAA,IAAAA,QAAQ,GAAG,EAAX;AACD;;AAED,MAAI,OAAOI,IAAP,KAAgB,QAApB,EAA8B;AAC5B,UAAM,IAAIO,KAAJ,sCAAwC,OAAOP,IAA/C,EAAN;AACD;;AAGD,QAAMQ,KAAK,GAAGf,MAAM,CAACgB,gBAAP,CAAwBf,IAAI,CAACgB,OAAL,CAAad,QAAb,CAAxB,CAAd;;AAEA,QAAMe,MAAM,GAAGC,MAAM,CAACD,MAAtB;AAEA,QAAME,SAAS,GAAG,IAAIpB,MAAJ,CAAWG,QAAX,EAAqBe,MAArB,CAAlB;AACAE,EAAAA,SAAS,CAACjB,QAAV,GAAqBA,QAArB;AACAiB,EAAAA,SAAS,CAACL,KAAV,GAAmB,EAAD,CACfM,MADe,CACR,aAAAR,OAAO,UAAP,4CAASS,YAAT,KAAyB,EADjB,EAEfD,MAFe,CAERN,KAFQ,EAGfM,MAHe,CAGR,cAAAR,OAAO,UAAP,8CAASU,WAAT,KAAwB,EAHhB,CAAlB;;AAKAH,EAAAA,SAAS,CAACI,QAAV,CAAmBjB,IAAnB,EAAyBJ,QAAzB;;AAEA,MAAIe,MAAM,IAAIA,MAAM,CAACO,QAArB,EAA+B;AAC7BP,IAAAA,MAAM,CAACO,QAAP,CAAgBC,MAAhB,CAAuBR,MAAM,CAACO,QAAP,CAAgBE,OAAhB,CAAwBP,SAAxB,CAAvB,EAA2D,CAA3D;AACD;;AAED,SAAOA,SAAS,CAACQ,OAAjB;AACD","sourcesContent":["// Fork of https://github.com/floatdrop/require-from-string/blob/master/index.js\n// Copyright (c) Vsevolod Strukchinsky <floatdrop@gmail.com> (github.com/floatdrop)\n// MIT license\n\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\n\nimport Module from 'module';\nimport path from 'path';\n\n// Node.js Dynamically require from file\n// Relative names are resolved relative to cwd\n// This indirect function is provided because webpack will try to bundle `module.require`.\n// this file is not visible to webpack (it is excluded in the package.json \"browser\" field).\nexport async function requireFromFile(filename: string): Promise<any> {\n if (filename.startsWith('http')) {\n const response = await fetch(filename);\n const code = await response.text();\n return requireFromString(code);\n }\n\n if (!filename.startsWith('/')) {\n filename = `${process.cwd()}/${filename}`;\n }\n return require(filename);\n}\n\n// Dynamically require from string\n// - `code` - Required - Type: string - Module code.\n// - `filename` - Type: string - Default: '' - Optional filename.\n// - `options.appendPaths` Type: Array List of paths, that will be appended to module paths.\n// Useful, when you want to be able require modules from these paths.\n// - `options.prependPaths` Type: Array Same as appendPaths, but paths will be prepended.\nexport function requireFromString(\n code: string,\n filename = '',\n options?: {\n prependPaths?: string[];\n appendPaths?: string[];\n }\n): any {\n if (typeof filename === 'object') {\n options = filename;\n filename = '';\n }\n\n if (typeof code !== 'string') {\n throw new Error(`code must be a string, not ${typeof code}`);\n }\n\n // @ts-ignore\n const paths = Module._nodeModulePaths(path.dirname(filename));\n\n const parent = module.parent;\n // @ts-ignore\n const newModule = new Module(filename, parent);\n newModule.filename = filename;\n newModule.paths = ([] as string[])\n .concat(options?.prependPaths || [])\n .concat(paths)\n .concat(options?.appendPaths || []);\n // @ts-ignore\n newModule._compile(code, filename);\n\n if (parent && parent.children) {\n parent.children.splice(parent.children.indexOf(newModule), 1);\n }\n\n return newModule.exports;\n}\n"],"file":"require-utils.node.js"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../src/lib/process-utils/child-process-proxy.ts"],"names":["ChildProcess","getAvailablePort","DEFAULT_PROPS","command","arguments","port","autoPort","wait","onSuccess","processProxy","console","log","props","ChildProcessProxy","constructor","id","start","args","Number","portArg","push","String","Promise","resolve","reject","_setTimeout","join","childProcess","spawn","stdout","on","data","toString","stderr","_clearTimeout","Error","error","code","stop","kill","exit","statusCode","process","message","callback","successTimer","setTimeout","clearTimeout"],"mappings":"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","sourcesContent":["/* eslint-disable no-console */\n// Avoid using named imports for Node builtins to help with \"empty\" resolution\n// for bundlers targeting browser environments. Access imports & types\n// through the `ChildProcess` object (e.g. `ChildProcess.spawn`, `ChildProcess.ChildProcess`).\nimport * as ChildProcess from 'child_process';\nimport {getAvailablePort} from './process-utils';\n\nexport type ChildProcessProxyProps = {\n command: string;\n arguments: string[];\n /** Whether to add a port specified arg */\n portArg?: string;\n /** Base port number */\n port?: number;\n /** Whether to search for an available port if the base port is occupied */\n autoPort?: boolean;\n /** Number of milliseconds to wait until concluding success */\n /** wait: 0 - infinity */\n wait?: number;\n /** Options passed on to Node'.js `spawn` */\n spawn?: ChildProcess.SpawnOptionsWithoutStdio;\n /** Callback when the */\n onStart?: (proxy: ChildProcessProxy) => void;\n onSuccess?: (proxy: ChildProcessProxy) => void;\n};\n\nconst DEFAULT_PROPS: ChildProcessProxyProps = {\n command: '',\n arguments: [],\n port: 5000,\n autoPort: true,\n wait: 2000,\n onSuccess: (processProxy) => {\n console.log(`Started ${processProxy.props.command}`);\n }\n};\n\n/**\n * Manager for a Node.js child process\n * Prepares arguments, starts, stops and tracks output\n */\nexport default class ChildProcessProxy {\n id: string;\n props: ChildProcessProxyProps = {...DEFAULT_PROPS};\n private childProcess: ChildProcess.ChildProcess | null = null;\n private port: number = 0;\n private successTimer?: any; // NodeJS.Timeout;\n\n // constructor(props?: {id?: string});\n constructor({id = 'browser-driver'} = {}) {\n this.id = id;\n }\n\n /** Starts a child process with the provided props */\n async start(props: ChildProcessProxyProps): Promise<object> {\n props = {...DEFAULT_PROPS, ...props};\n this.props = props;\n\n const args = [...props.arguments];\n\n // If portArg is set, we can look up an available port\n this.port = Number(props.port);\n if (props.portArg) {\n if (props.autoPort) {\n this.port = await getAvailablePort(props.port);\n }\n args.push(props.portArg, String(this.port));\n }\n\n return await new Promise((resolve, reject) => {\n try {\n this._setTimeout(() => {\n if (props.onSuccess) {\n props.onSuccess(this);\n }\n resolve({});\n });\n\n console.log(`Spawning ${props.command} ${props.arguments.join(' ')}`);\n const childProcess = ChildProcess.spawn(props.command, args, props.spawn);\n this.childProcess = childProcess;\n\n childProcess.stdout.on('data', (data) => {\n console.log(data.toString());\n });\n // TODO - add option regarding whether stderr should be treated as data\n childProcess.stderr.on('data', (data) => {\n console.log(`Child process wrote to stderr: \"${data}\".`);\n this._clearTimeout();\n reject(new Error(data));\n });\n childProcess.on('error', (error) => {\n console.log(`Child process errored with ${error}`);\n this._clearTimeout();\n reject(error);\n });\n childProcess.on('close', (code) => {\n console.log(`Child process exited with ${code}`);\n this.childProcess = null;\n this._clearTimeout();\n resolve({});\n });\n } catch (error) {\n reject(error);\n }\n });\n }\n\n /** Stops a running child process */\n async stop(): Promise<void> {\n if (this.childProcess) {\n this.childProcess.kill();\n this.childProcess = null;\n }\n }\n\n /** Exits this process */\n async exit(statusCode: number = 0): Promise<void> {\n try {\n await this.stop();\n // eslint-disable-next-line no-process-exit\n process.exit(statusCode);\n } catch (error) {\n console.error((error as Error).message || error);\n // eslint-disable-next-line no-process-exit\n process.exit(1);\n }\n }\n\n _setTimeout(callback: (...args: any[]) => void) {\n if (Number(this.props.wait) > 0) {\n this.successTimer = setTimeout(callback, this.props.wait);\n }\n }\n\n _clearTimeout() {\n if (this.successTimer) {\n clearTimeout(this.successTimer);\n }\n }\n}\n"],"file":"child-process-proxy.js"}
|