@loaders.gl/worker-utils 4.0.0-alpha.5 → 4.0.0-alpha.6
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 +38 -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 +31 -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 +55 -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 +145 -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.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 +8 -4
- 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 +3 -1
- 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 +5 -0
- 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
|
@@ -1,122 +1,135 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
26
|
+
/* eslint-disable no-console */
|
|
27
|
+
// Avoid using named imports for Node builtins to help with "empty" resolution
|
|
28
|
+
// for bundlers targeting browser environments. Access imports & types
|
|
29
|
+
// through the `ChildProcess` object (e.g. `ChildProcess.spawn`, `ChildProcess.ChildProcess`).
|
|
30
|
+
const ChildProcess = __importStar(require("child_process"));
|
|
31
|
+
const process_utils_1 = require("./process-utils");
|
|
4
32
|
const DEFAULT_PROPS = {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
33
|
+
command: '',
|
|
34
|
+
arguments: [],
|
|
35
|
+
port: 5000,
|
|
36
|
+
autoPort: true,
|
|
37
|
+
wait: 2000,
|
|
38
|
+
onSuccess: (processProxy) => {
|
|
39
|
+
console.log(`Started ${processProxy.props.command}`);
|
|
40
|
+
}
|
|
13
41
|
};
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
_defineProperty(this, "port", 0);
|
|
26
|
-
|
|
27
|
-
_defineProperty(this, "successTimer", void 0);
|
|
28
|
-
|
|
29
|
-
this.id = id;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
async start(props) {
|
|
33
|
-
props = { ...DEFAULT_PROPS,
|
|
34
|
-
...props
|
|
35
|
-
};
|
|
36
|
-
this.props = props;
|
|
37
|
-
const args = [...props.arguments];
|
|
38
|
-
this.port = Number(props.port);
|
|
39
|
-
|
|
40
|
-
if (props.portArg) {
|
|
41
|
-
if (props.autoPort) {
|
|
42
|
-
this.port = await getAvailablePort(props.port);
|
|
43
|
-
}
|
|
44
|
-
|
|
45
|
-
args.push(props.portArg, String(this.port));
|
|
42
|
+
/**
|
|
43
|
+
* Manager for a Node.js child process
|
|
44
|
+
* Prepares arguments, starts, stops and tracks output
|
|
45
|
+
*/
|
|
46
|
+
class ChildProcessProxy {
|
|
47
|
+
// constructor(props?: {id?: string});
|
|
48
|
+
constructor({ id = 'browser-driver' } = {}) {
|
|
49
|
+
this.props = { ...DEFAULT_PROPS };
|
|
50
|
+
this.childProcess = null;
|
|
51
|
+
this.port = 0;
|
|
52
|
+
this.id = id;
|
|
46
53
|
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
this.
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
54
|
+
/** Starts a child process with the provided props */
|
|
55
|
+
async start(props) {
|
|
56
|
+
props = { ...DEFAULT_PROPS, ...props };
|
|
57
|
+
this.props = props;
|
|
58
|
+
const args = [...props.arguments];
|
|
59
|
+
// If portArg is set, we can look up an available port
|
|
60
|
+
this.port = Number(props.port);
|
|
61
|
+
if (props.portArg) {
|
|
62
|
+
if (props.autoPort) {
|
|
63
|
+
this.port = await (0, process_utils_1.getAvailablePort)(props.port);
|
|
64
|
+
}
|
|
65
|
+
args.push(props.portArg, String(this.port));
|
|
66
|
+
}
|
|
67
|
+
return await new Promise((resolve, reject) => {
|
|
68
|
+
try {
|
|
69
|
+
this._setTimeout(() => {
|
|
70
|
+
if (props.onSuccess) {
|
|
71
|
+
props.onSuccess(this);
|
|
72
|
+
}
|
|
73
|
+
resolve({});
|
|
74
|
+
});
|
|
75
|
+
console.log(`Spawning ${props.command} ${props.arguments.join(' ')}`);
|
|
76
|
+
const childProcess = ChildProcess.spawn(props.command, args, props.spawn);
|
|
77
|
+
this.childProcess = childProcess;
|
|
78
|
+
childProcess.stdout.on('data', (data) => {
|
|
79
|
+
console.log(data.toString());
|
|
80
|
+
});
|
|
81
|
+
// TODO - add option regarding whether stderr should be treated as data
|
|
82
|
+
childProcess.stderr.on('data', (data) => {
|
|
83
|
+
console.log(`Child process wrote to stderr: "${data}".`);
|
|
84
|
+
this._clearTimeout();
|
|
85
|
+
reject(new Error(data));
|
|
86
|
+
});
|
|
87
|
+
childProcess.on('error', (error) => {
|
|
88
|
+
console.log(`Child process errored with ${error}`);
|
|
89
|
+
this._clearTimeout();
|
|
90
|
+
reject(error);
|
|
91
|
+
});
|
|
92
|
+
childProcess.on('close', (code) => {
|
|
93
|
+
console.log(`Child process exited with ${code}`);
|
|
94
|
+
this.childProcess = null;
|
|
95
|
+
this._clearTimeout();
|
|
96
|
+
resolve({});
|
|
97
|
+
});
|
|
98
|
+
}
|
|
99
|
+
catch (error) {
|
|
100
|
+
reject(error);
|
|
101
|
+
}
|
|
63
102
|
});
|
|
64
|
-
childProcess.stderr.on('data', data => {
|
|
65
|
-
console.log("Child process wrote to stderr: \"".concat(data, "\"."));
|
|
66
|
-
|
|
67
|
-
this._clearTimeout();
|
|
68
|
-
|
|
69
|
-
reject(new Error(data));
|
|
70
|
-
});
|
|
71
|
-
childProcess.on('error', error => {
|
|
72
|
-
console.log("Child process errored with ".concat(error));
|
|
73
|
-
|
|
74
|
-
this._clearTimeout();
|
|
75
|
-
|
|
76
|
-
reject(error);
|
|
77
|
-
});
|
|
78
|
-
childProcess.on('close', code => {
|
|
79
|
-
console.log("Child process exited with ".concat(code));
|
|
80
|
-
this.childProcess = null;
|
|
81
|
-
|
|
82
|
-
this._clearTimeout();
|
|
83
|
-
|
|
84
|
-
resolve({});
|
|
85
|
-
});
|
|
86
|
-
} catch (error) {
|
|
87
|
-
reject(error);
|
|
88
|
-
}
|
|
89
|
-
});
|
|
90
|
-
}
|
|
91
|
-
|
|
92
|
-
async stop() {
|
|
93
|
-
if (this.childProcess) {
|
|
94
|
-
this.childProcess.kill();
|
|
95
|
-
this.childProcess = null;
|
|
96
103
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
|
|
104
|
+
/** Stops a running child process */
|
|
105
|
+
async stop() {
|
|
106
|
+
if (this.childProcess) {
|
|
107
|
+
this.childProcess.kill();
|
|
108
|
+
this.childProcess = null;
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
/** Exits this process */
|
|
112
|
+
async exit(statusCode = 0) {
|
|
113
|
+
try {
|
|
114
|
+
await this.stop();
|
|
115
|
+
// eslint-disable-next-line no-process-exit
|
|
116
|
+
process.exit(statusCode);
|
|
117
|
+
}
|
|
118
|
+
catch (error) {
|
|
119
|
+
console.error(error.message || error);
|
|
120
|
+
// eslint-disable-next-line no-process-exit
|
|
121
|
+
process.exit(1);
|
|
122
|
+
}
|
|
106
123
|
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
this.successTimer = setTimeout(callback, this.props.wait);
|
|
124
|
+
_setTimeout(callback) {
|
|
125
|
+
if (Number(this.props.wait) > 0) {
|
|
126
|
+
this.successTimer = setTimeout(callback, this.props.wait);
|
|
127
|
+
}
|
|
112
128
|
}
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
clearTimeout(this.successTimer);
|
|
129
|
+
_clearTimeout() {
|
|
130
|
+
if (this.successTimer) {
|
|
131
|
+
clearTimeout(this.successTimer);
|
|
132
|
+
}
|
|
118
133
|
}
|
|
119
|
-
}
|
|
120
|
-
|
|
121
134
|
}
|
|
122
|
-
|
|
135
|
+
exports.default = ChildProcessProxy;
|
|
@@ -1,29 +1,35 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.getAvailablePort = void 0;
|
|
7
|
+
const child_process_1 = __importDefault(require("child_process"));
|
|
8
|
+
// Get an available port
|
|
9
|
+
// Works on Unix systems
|
|
10
|
+
function getAvailablePort(defaultPort = 3000) {
|
|
11
|
+
return new Promise((resolve) => {
|
|
12
|
+
// Get a list of all ports in use
|
|
13
|
+
child_process_1.default.exec('lsof -i -P -n | grep LISTEN', (error, stdout) => {
|
|
14
|
+
if (error) {
|
|
15
|
+
// likely no permission, e.g. CI
|
|
16
|
+
resolve(defaultPort);
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
const portsInUse = [];
|
|
20
|
+
const regex = /:(\d+) \(LISTEN\)/;
|
|
21
|
+
stdout.split('\n').forEach((line) => {
|
|
22
|
+
const match = regex.exec(line);
|
|
23
|
+
if (match) {
|
|
24
|
+
portsInUse.push(Number(match[1]));
|
|
25
|
+
}
|
|
26
|
+
});
|
|
27
|
+
let port = defaultPort;
|
|
28
|
+
while (portsInUse.includes(port)) {
|
|
29
|
+
port++;
|
|
30
|
+
}
|
|
31
|
+
resolve(port);
|
|
32
|
+
});
|
|
26
33
|
});
|
|
27
|
-
});
|
|
28
34
|
}
|
|
29
|
-
|
|
35
|
+
exports.getAvailablePort = getAvailablePort;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { WorkerContext, Process, ProcessInBatches } from '../../types';
|
|
2
|
-
export
|
|
2
|
+
export type ProcessOnMainThread = (data: any, options?: {
|
|
3
3
|
[key: string]: any;
|
|
4
4
|
}, context?: WorkerContext) => any;
|
|
5
5
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/create-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,aAAa,EACb,OAAO,EACP,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAUrB,
|
|
1
|
+
{"version":3,"file":"create-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/create-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,aAAa,EACb,OAAO,EACP,gBAAgB,EACjB,MAAM,aAAa,CAAC;AAUrB,MAAM,MAAM,mBAAmB,GAAG,CAChC,IAAI,EAAE,GAAG,EACT,OAAO,CAAC,EAAE;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,EAC9B,OAAO,CAAC,EAAE,aAAa,KACpB,GAAG,CAAC;AAET;;GAEG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,gBAAgB,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAiDxF"}
|
|
@@ -1,99 +1,91 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.createWorker = void 0;
|
|
7
|
+
const async_queue_1 = __importDefault(require("../async-queue/async-queue"));
|
|
8
|
+
const worker_body_1 = __importDefault(require("../worker-farm/worker-body"));
|
|
9
|
+
// import {validateWorkerVersion} from './validate-worker-version.js';
|
|
10
|
+
/** Counter for jobs */
|
|
3
11
|
let requestId = 0;
|
|
4
12
|
let inputBatches;
|
|
5
13
|
let options;
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
const context = {
|
|
12
|
-
process: processOnMainThread
|
|
13
|
-
};
|
|
14
|
-
|
|
15
|
-
WorkerBody.onmessage = async (type, payload) => {
|
|
16
|
-
try {
|
|
17
|
-
switch (type) {
|
|
18
|
-
case 'process':
|
|
19
|
-
if (!process) {
|
|
20
|
-
throw new Error('Worker does not support atomic processing');
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
const result = await process(payload.input, payload.options || {}, context);
|
|
24
|
-
WorkerBody.postMessage('done', {
|
|
25
|
-
result
|
|
26
|
-
});
|
|
27
|
-
break;
|
|
28
|
-
|
|
29
|
-
case 'process-in-batches':
|
|
30
|
-
if (!processInBatches) {
|
|
31
|
-
throw new Error('Worker does not support batched processing');
|
|
32
|
-
}
|
|
33
|
-
|
|
34
|
-
inputBatches = new AsyncQueue();
|
|
35
|
-
options = payload.options || {};
|
|
36
|
-
const resultIterator = processInBatches(inputBatches, options, context);
|
|
37
|
-
|
|
38
|
-
for await (const batch of resultIterator) {
|
|
39
|
-
WorkerBody.postMessage('output-batch', {
|
|
40
|
-
result: batch
|
|
41
|
-
});
|
|
42
|
-
}
|
|
43
|
-
|
|
44
|
-
WorkerBody.postMessage('done', {});
|
|
45
|
-
break;
|
|
46
|
-
|
|
47
|
-
case 'input-batch':
|
|
48
|
-
inputBatches.push(payload.input);
|
|
49
|
-
break;
|
|
50
|
-
|
|
51
|
-
case 'input-done':
|
|
52
|
-
inputBatches.close();
|
|
53
|
-
break;
|
|
54
|
-
|
|
55
|
-
default:
|
|
56
|
-
}
|
|
57
|
-
} catch (error) {
|
|
58
|
-
const message = error instanceof Error ? error.message : '';
|
|
59
|
-
WorkerBody.postMessage('error', {
|
|
60
|
-
error: message
|
|
61
|
-
});
|
|
62
|
-
}
|
|
63
|
-
};
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
function processOnMainThread(arrayBuffer, options = {}) {
|
|
67
|
-
return new Promise((resolve, reject) => {
|
|
68
|
-
const id = requestId++;
|
|
69
|
-
|
|
70
|
-
const onMessage = (type, payload) => {
|
|
71
|
-
if (payload.id !== id) {
|
|
14
|
+
/**
|
|
15
|
+
* Set up a WebWorkerGlobalScope to talk with the main thread
|
|
16
|
+
*/
|
|
17
|
+
function createWorker(process, processInBatches) {
|
|
18
|
+
if (!worker_body_1.default.inWorkerThread()) {
|
|
72
19
|
return;
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
case 'done':
|
|
77
|
-
WorkerBody.removeEventListener(onMessage);
|
|
78
|
-
resolve(payload.result);
|
|
79
|
-
break;
|
|
80
|
-
|
|
81
|
-
case 'error':
|
|
82
|
-
WorkerBody.removeEventListener(onMessage);
|
|
83
|
-
reject(payload.error);
|
|
84
|
-
break;
|
|
85
|
-
|
|
86
|
-
default:
|
|
87
|
-
}
|
|
20
|
+
}
|
|
21
|
+
const context = {
|
|
22
|
+
process: processOnMainThread
|
|
88
23
|
};
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
24
|
+
// eslint-disable-next-line complexity
|
|
25
|
+
worker_body_1.default.onmessage = async (type, payload) => {
|
|
26
|
+
try {
|
|
27
|
+
switch (type) {
|
|
28
|
+
case 'process':
|
|
29
|
+
if (!process) {
|
|
30
|
+
throw new Error('Worker does not support atomic processing');
|
|
31
|
+
}
|
|
32
|
+
const result = await process(payload.input, payload.options || {}, context);
|
|
33
|
+
worker_body_1.default.postMessage('done', { result });
|
|
34
|
+
break;
|
|
35
|
+
case 'process-in-batches':
|
|
36
|
+
if (!processInBatches) {
|
|
37
|
+
throw new Error('Worker does not support batched processing');
|
|
38
|
+
}
|
|
39
|
+
inputBatches = new async_queue_1.default();
|
|
40
|
+
options = payload.options || {};
|
|
41
|
+
const resultIterator = processInBatches(inputBatches, options, context);
|
|
42
|
+
for await (const batch of resultIterator) {
|
|
43
|
+
worker_body_1.default.postMessage('output-batch', { result: batch });
|
|
44
|
+
}
|
|
45
|
+
worker_body_1.default.postMessage('done', {});
|
|
46
|
+
break;
|
|
47
|
+
case 'input-batch':
|
|
48
|
+
inputBatches.push(payload.input);
|
|
49
|
+
break;
|
|
50
|
+
case 'input-done':
|
|
51
|
+
inputBatches.close();
|
|
52
|
+
break;
|
|
53
|
+
default:
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
const message = error instanceof Error ? error.message : '';
|
|
58
|
+
worker_body_1.default.postMessage('error', { error: message });
|
|
59
|
+
}
|
|
95
60
|
};
|
|
96
|
-
WorkerBody.postMessage('process', payload);
|
|
97
|
-
});
|
|
98
61
|
}
|
|
99
|
-
|
|
62
|
+
exports.createWorker = createWorker;
|
|
63
|
+
function processOnMainThread(arrayBuffer, options = {}) {
|
|
64
|
+
return new Promise((resolve, reject) => {
|
|
65
|
+
const id = requestId++;
|
|
66
|
+
/**
|
|
67
|
+
*/
|
|
68
|
+
const onMessage = (type, payload) => {
|
|
69
|
+
if (payload.id !== id) {
|
|
70
|
+
// not ours
|
|
71
|
+
return;
|
|
72
|
+
}
|
|
73
|
+
switch (type) {
|
|
74
|
+
case 'done':
|
|
75
|
+
worker_body_1.default.removeEventListener(onMessage);
|
|
76
|
+
resolve(payload.result);
|
|
77
|
+
break;
|
|
78
|
+
case 'error':
|
|
79
|
+
worker_body_1.default.removeEventListener(onMessage);
|
|
80
|
+
reject(payload.error);
|
|
81
|
+
break;
|
|
82
|
+
default:
|
|
83
|
+
// ignore
|
|
84
|
+
}
|
|
85
|
+
};
|
|
86
|
+
worker_body_1.default.addEventListener(onMessage);
|
|
87
|
+
// Ask the main thread to decode data
|
|
88
|
+
const payload = { id, input: arrayBuffer, options };
|
|
89
|
+
worker_body_1.default.postMessage('process', payload);
|
|
90
|
+
});
|
|
91
|
+
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"get-worker-url.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/get-worker-url.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,YAAY,EAAE,aAAa,EAAC,MAAM,aAAa,CAAC;AAO7D;;GAEG;AACH,wBAAgB,aAAa,CAAC,MAAM,EAAE,YAAY,GAAG,MAAM,CAG1D;AAED;;;;;;GAMG;AACH,wBAAgB,YAAY,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,GAAE,aAAkB,GAAG,MAAM,CAwCtF"}
|
|
@@ -1,36 +1,58 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
// loaders.gl, MIT license
|
|
3
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
+
exports.getWorkerURL = exports.getWorkerName = void 0;
|
|
5
|
+
const assert_1 = require("../env-utils/assert");
|
|
6
|
+
const version_1 = require("../env-utils/version");
|
|
7
|
+
const NPM_TAG = 'beta'; // 'beta', or 'latest' on release-branch
|
|
8
|
+
const VERSION = typeof version_1.VERSION !== 'undefined' ? version_1.VERSION : NPM_TAG;
|
|
9
|
+
/**
|
|
10
|
+
* Gets worker object's name (for debugging in Chrome thread inspector window)
|
|
11
|
+
*/
|
|
12
|
+
function getWorkerName(worker) {
|
|
13
|
+
const warning = worker.version !== VERSION ? ` (worker-utils@${VERSION})` : '';
|
|
14
|
+
return `${worker.name}@${worker.version}${warning}`;
|
|
8
15
|
}
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
16
|
+
exports.getWorkerName = getWorkerName;
|
|
17
|
+
/**
|
|
18
|
+
* Generate a worker URL based on worker object and options
|
|
19
|
+
* @returns A URL to one of the following:
|
|
20
|
+
* - a published worker on unpkg CDN
|
|
21
|
+
* - a local test worker
|
|
22
|
+
* - a URL provided by the user in options
|
|
23
|
+
*/
|
|
24
|
+
function getWorkerURL(worker, options = {}) {
|
|
25
|
+
const workerOptions = options[worker.id] || {};
|
|
26
|
+
const workerFile = `${worker.id}-worker.js`;
|
|
27
|
+
let url = workerOptions.workerUrl;
|
|
28
|
+
// HACK: Allow for non-nested workerUrl for the CompressionWorker.
|
|
29
|
+
// For the compression worker, workerOptions is currently not nested correctly. For most loaders,
|
|
30
|
+
// you'd have options within an object, i.e. `{mvt: {coordinates: ...}}` but the CompressionWorker
|
|
31
|
+
// puts options at the top level, not within a `compression` key (its `id`). For this reason, the
|
|
32
|
+
// above `workerOptions` will always be a string (i.e. `'gzip'`) for the CompressionWorker. To not
|
|
33
|
+
// break backwards compatibility, we allow the CompressionWorker to have options at the top level.
|
|
34
|
+
if (!url && worker.id === 'compression') {
|
|
35
|
+
url = options.workerUrl;
|
|
27
36
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
37
|
+
// If URL is test, generate local loaders.gl url
|
|
38
|
+
// @ts-ignore _workerType
|
|
39
|
+
if (options._workerType === 'test') {
|
|
40
|
+
url = `modules/${worker.module}/dist/${workerFile}`;
|
|
41
|
+
}
|
|
42
|
+
// If url override is not provided, generate a URL to published version on npm CDN unpkg.com
|
|
43
|
+
if (!url) {
|
|
44
|
+
// GENERATE
|
|
45
|
+
let version = worker.version;
|
|
46
|
+
// On master we need to load npm alpha releases published with the `beta` tag
|
|
47
|
+
if (version === 'latest') {
|
|
48
|
+
// throw new Error('latest worker version specified');
|
|
49
|
+
version = NPM_TAG;
|
|
50
|
+
}
|
|
51
|
+
const versionTag = version ? `@${version}` : '';
|
|
52
|
+
url = `https://unpkg.com/@loaders.gl/${worker.module}${versionTag}/dist/${workerFile}`;
|
|
53
|
+
}
|
|
54
|
+
(0, assert_1.assert)(url);
|
|
55
|
+
// Allow user to override location
|
|
56
|
+
return url;
|
|
35
57
|
}
|
|
36
|
-
|
|
58
|
+
exports.getWorkerURL = getWorkerURL;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"process-on-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/process-on-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,aAAa,EAGd,MAAM,aAAa,CAAC;AAMrB,
|
|
1
|
+
{"version":3,"file":"process-on-worker.d.ts","sourceRoot":"","sources":["../../../src/lib/worker-api/process-on-worker.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,aAAa,EAGd,MAAM,aAAa,CAAC;AAMrB,KAAK,sBAAsB,GAAG,aAAa,GAAG;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE,aAAa,4BAM/E;AAED;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,MAAM,EAAE,YAAY,EACpB,IAAI,EAAE,GAAG,EACT,OAAO,GAAE,sBAA2B,EACpC,OAAO,GAAE,aAAkB,GAC1B,OAAO,CAAC,GAAG,CAAC,CAwBd"}
|