@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.
- package/dist/index.js +25 -57
- package/dist/index.js.map +1 -0
- package/dist/lib/async-queue/async-queue.js +91 -81
- package/dist/lib/async-queue/async-queue.js.map +1 -0
- package/dist/lib/env-utils/assert.js +5 -12
- package/dist/lib/env-utils/assert.js.map +1 -0
- package/dist/lib/env-utils/globals.js +10 -25
- package/dist/lib/env-utils/globals.js.map +1 -0
- package/dist/lib/env-utils/version.js +6 -11
- package/dist/lib/env-utils/version.js.map +1 -0
- package/dist/lib/library-utils/library-utils.js +80 -155
- package/dist/lib/library-utils/library-utils.js.map +1 -0
- package/dist/lib/node/require-utils.node.js +41 -58
- package/dist/lib/node/require-utils.node.js.map +1 -0
- package/dist/lib/process-utils/child-process-proxy.js +113 -122
- package/dist/lib/process-utils/child-process-proxy.js.map +1 -0
- package/dist/lib/process-utils/process-utils.js +27 -33
- package/dist/lib/process-utils/process-utils.js.map +1 -0
- package/dist/lib/worker-api/create-worker.js +92 -85
- package/dist/lib/worker-api/create-worker.js.map +1 -0
- package/dist/lib/worker-api/get-worker-url.js +33 -54
- package/dist/lib/worker-api/get-worker-url.js.map +1 -0
- package/dist/lib/worker-api/process-on-worker.js +71 -75
- package/dist/lib/worker-api/process-on-worker.js.map +1 -0
- package/dist/lib/worker-api/validate-worker-version.js +18 -32
- package/dist/lib/worker-api/validate-worker-version.js.map +1 -0
- package/dist/lib/worker-farm/worker-body.js +58 -60
- package/dist/{es5/lib → lib}/worker-farm/worker-body.js.map +1 -1
- package/dist/lib/worker-farm/worker-farm.js +77 -82
- package/dist/lib/worker-farm/worker-farm.js.map +1 -0
- package/dist/lib/worker-farm/worker-job.js +53 -46
- package/dist/lib/worker-farm/worker-job.js.map +1 -0
- package/dist/lib/worker-farm/worker-pool.js +148 -142
- package/dist/lib/worker-farm/worker-pool.js.map +1 -0
- package/dist/lib/worker-farm/worker-thread.js +102 -92
- package/dist/lib/worker-farm/worker-thread.js.map +1 -0
- package/dist/lib/worker-utils/get-loadable-worker-url.js +33 -65
- package/dist/lib/worker-utils/get-loadable-worker-url.js.map +1 -0
- package/dist/lib/worker-utils/get-transfer-list.js +36 -57
- package/dist/lib/worker-utils/get-transfer-list.js.map +1 -0
- package/dist/lib/worker-utils/remove-nontransferable-options.js +19 -31
- package/dist/lib/worker-utils/remove-nontransferable-options.js.map +1 -0
- package/dist/types.js +2 -2
- package/dist/{es5/types.js.map → types.js.map} +0 -0
- package/dist/workers/null-worker.js +4 -6
- package/dist/workers/null-worker.js.map +1 -0
- package/package.json +5 -5
- package/src/lib/env-utils/version.ts +1 -1
- package/src/lib/library-utils/library-utils.ts +1 -1
- package/src/lib/worker-api/get-worker-url.ts +1 -1
- package/dist/es5/index.js +0 -160
- package/dist/es5/index.js.map +0 -1
- package/dist/es5/lib/async-queue/async-queue.js +0 -120
- package/dist/es5/lib/async-queue/async-queue.js.map +0 -1
- package/dist/es5/lib/env-utils/assert.js +0 -13
- package/dist/es5/lib/env-utils/assert.js.map +0 -1
- package/dist/es5/lib/env-utils/globals.js +0 -35
- package/dist/es5/lib/env-utils/globals.js.map +0 -1
- package/dist/es5/lib/env-utils/version.js +0 -14
- package/dist/es5/lib/env-utils/version.js.map +0 -1
- package/dist/es5/lib/library-utils/library-utils.js +0 -206
- package/dist/es5/lib/library-utils/library-utils.js.map +0 -1
- package/dist/es5/lib/node/require-utils.node.js +0 -96
- package/dist/es5/lib/node/require-utils.node.js.map +0 -1
- package/dist/es5/lib/process-utils/child-process-proxy.js +0 -245
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +0 -1
- package/dist/es5/lib/process-utils/process-utils.js +0 -40
- package/dist/es5/lib/process-utils/process-utils.js.map +0 -1
- package/dist/es5/lib/worker-api/create-worker.js +0 -229
- package/dist/es5/lib/worker-api/create-worker.js.map +0 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +0 -49
- package/dist/es5/lib/worker-api/get-worker-url.js.map +0 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +0 -162
- package/dist/es5/lib/worker-api/process-on-worker.js.map +0 -1
- package/dist/es5/lib/worker-api/validate-worker-version.js +0 -31
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-body.js +0 -88
- package/dist/es5/lib/worker-farm/worker-farm.js +0 -134
- package/dist/es5/lib/worker-farm/worker-farm.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-job.js +0 -73
- package/dist/es5/lib/worker-farm/worker-job.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +0 -256
- package/dist/es5/lib/worker-farm/worker-pool.js.map +0 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +0 -129
- package/dist/es5/lib/worker-farm/worker-thread.js.map +0 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +0 -51
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +0 -53
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +0 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +0 -34
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
- package/dist/es5/types.js +0 -2
- package/dist/es5/workers/null-worker.js +0 -31
- package/dist/es5/workers/null-worker.js.map +0 -1
- package/dist/esm/index.js +0 -26
- package/dist/esm/index.js.map +0 -1
- package/dist/esm/lib/async-queue/async-queue.js +0 -97
- package/dist/esm/lib/async-queue/async-queue.js.map +0 -1
- package/dist/esm/lib/env-utils/assert.js +0 -6
- package/dist/esm/lib/env-utils/assert.js.map +0 -1
- package/dist/esm/lib/env-utils/globals.js +0 -17
- package/dist/esm/lib/env-utils/globals.js.map +0 -1
- package/dist/esm/lib/env-utils/version.js +0 -7
- package/dist/esm/lib/env-utils/version.js.map +0 -1
- package/dist/esm/lib/library-utils/library-utils.js +0 -88
- package/dist/esm/lib/library-utils/library-utils.js.map +0 -1
- package/dist/esm/lib/node/require-utils.node.js +0 -43
- package/dist/esm/lib/node/require-utils.node.js.map +0 -1
- package/dist/esm/lib/process-utils/child-process-proxy.js +0 -122
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +0 -1
- package/dist/esm/lib/process-utils/process-utils.js +0 -29
- package/dist/esm/lib/process-utils/process-utils.js.map +0 -1
- package/dist/esm/lib/worker-api/create-worker.js +0 -99
- package/dist/esm/lib/worker-api/create-worker.js.map +0 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +0 -36
- package/dist/esm/lib/worker-api/get-worker-url.js.map +0 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +0 -75
- package/dist/esm/lib/worker-api/process-on-worker.js.map +0 -1
- package/dist/esm/lib/worker-api/validate-worker-version.js +0 -21
- package/dist/esm/lib/worker-api/validate-worker-version.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-body.js +0 -65
- package/dist/esm/lib/worker-farm/worker-body.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-farm.js +0 -83
- package/dist/esm/lib/worker-farm/worker-farm.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-job.js +0 -54
- package/dist/esm/lib/worker-farm/worker-job.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +0 -157
- package/dist/esm/lib/worker-farm/worker-pool.js.map +0 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +0 -105
- package/dist/esm/lib/worker-farm/worker-thread.js.map +0 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +0 -42
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +0 -1
- package/dist/esm/lib/worker-utils/get-transfer-list.js +0 -40
- package/dist/esm/lib/worker-utils/get-transfer-list.js.map +0 -1
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js +0 -23
- package/dist/esm/lib/worker-utils/remove-nontransferable-options.js.map +0 -1
- package/dist/esm/types.js +0 -2
- package/dist/esm/types.js.map +0 -1
- package/dist/esm/workers/null-worker.js +0 -5
- package/dist/esm/workers/null-worker.js.map +0 -1
|
@@ -1,163 +1,88 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
})
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
if (mod && mod.__esModule) return mod;
|
|
16
|
-
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
-
__setModuleDefault(result, mod);
|
|
19
|
-
return result;
|
|
20
|
-
};
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
exports.getLibraryUrl = exports.loadLibrary = void 0;
|
|
23
|
-
/* global importScripts */
|
|
24
|
-
const globals_1 = require("../env-utils/globals");
|
|
25
|
-
const node = __importStar(require("../node/require-utils.node"));
|
|
26
|
-
const assert_1 = require("../env-utils/assert");
|
|
27
|
-
const version_1 = require("../env-utils/version");
|
|
28
|
-
// TODO - unpkg.com doesn't seem to have a `latest` specifier for alpha releases...
|
|
29
|
-
const LATEST = 'latest';
|
|
30
|
-
const VERSION = typeof version_1.VERSION !== 'undefined' ? version_1.VERSION : LATEST;
|
|
31
|
-
const loadLibraryPromises = {}; // promises
|
|
32
|
-
/**
|
|
33
|
-
* Dynamically loads a library ("module")
|
|
34
|
-
*
|
|
35
|
-
* - wasm library: Array buffer is returned
|
|
36
|
-
* - js library: Parse JS is returned
|
|
37
|
-
*
|
|
38
|
-
* Method depends on environment
|
|
39
|
-
* - browser - script element is created and installed on document
|
|
40
|
-
* - worker - eval is called on global context
|
|
41
|
-
* - node - file is required
|
|
42
|
-
*
|
|
43
|
-
* @param libraryUrl
|
|
44
|
-
* @param moduleName
|
|
45
|
-
* @param options
|
|
46
|
-
*/
|
|
47
|
-
async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
|
|
48
|
-
if (moduleName) {
|
|
49
|
-
libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
|
|
50
|
-
}
|
|
51
|
-
// Ensure libraries are only loaded once
|
|
52
|
-
loadLibraryPromises[libraryUrl] =
|
|
53
|
-
// eslint-disable-next-line @typescript-eslint/no-misused-promises
|
|
54
|
-
loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
|
|
55
|
-
return await loadLibraryPromises[libraryUrl];
|
|
1
|
+
import { global, isBrowser, isWorker } from '../env-utils/globals';
|
|
2
|
+
import * as node from '../node/require-utils.node';
|
|
3
|
+
import { assert } from '../env-utils/assert';
|
|
4
|
+
import { VERSION as __VERSION__ } from '../env-utils/version';
|
|
5
|
+
const LATEST = 'beta';
|
|
6
|
+
const VERSION = typeof "4.0.0-alpha.5" !== 'undefined' ? "4.0.0-alpha.5" : LATEST;
|
|
7
|
+
const loadLibraryPromises = {};
|
|
8
|
+
export async function loadLibrary(libraryUrl, moduleName = null, options = {}) {
|
|
9
|
+
if (moduleName) {
|
|
10
|
+
libraryUrl = getLibraryUrl(libraryUrl, moduleName, options);
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
loadLibraryPromises[libraryUrl] = loadLibraryPromises[libraryUrl] || loadLibraryFromFile(libraryUrl);
|
|
14
|
+
return await loadLibraryPromises[libraryUrl];
|
|
56
15
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
}
|
|
83
|
-
return `modules/${moduleName}/src/libs/${library}`;
|
|
16
|
+
export function getLibraryUrl(library, moduleName, options) {
|
|
17
|
+
if (library.startsWith('http')) {
|
|
18
|
+
return library;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
const modules = options.modules || {};
|
|
22
|
+
|
|
23
|
+
if (modules[library]) {
|
|
24
|
+
return modules[library];
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
if (!isBrowser) {
|
|
28
|
+
return "modules/".concat(moduleName, "/dist/libs/").concat(library);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
if (options.CDN) {
|
|
32
|
+
assert(options.CDN.startsWith('http'));
|
|
33
|
+
return "".concat(options.CDN, "/").concat(moduleName, "@").concat(VERSION, "/dist/libs/").concat(library);
|
|
34
|
+
}
|
|
35
|
+
|
|
36
|
+
if (isWorker) {
|
|
37
|
+
return "../src/libs/".concat(library);
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
return "modules/".concat(moduleName, "/src/libs/").concat(library);
|
|
84
41
|
}
|
|
85
|
-
|
|
42
|
+
|
|
86
43
|
async function loadLibraryFromFile(libraryUrl) {
|
|
87
|
-
|
|
88
|
-
const response = await fetch(libraryUrl);
|
|
89
|
-
return await response.arrayBuffer();
|
|
90
|
-
}
|
|
91
|
-
if (!globals_1.isBrowser) {
|
|
92
|
-
try {
|
|
93
|
-
return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));
|
|
94
|
-
}
|
|
95
|
-
catch {
|
|
96
|
-
return null;
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
if (globals_1.isWorker) {
|
|
100
|
-
return importScripts(libraryUrl);
|
|
101
|
-
}
|
|
102
|
-
// TODO - fix - should be more secure than string parsing since observes CORS
|
|
103
|
-
// if (isBrowser) {
|
|
104
|
-
// return await loadScriptFromFile(libraryUrl);
|
|
105
|
-
// }
|
|
44
|
+
if (libraryUrl.endsWith('wasm')) {
|
|
106
45
|
const response = await fetch(libraryUrl);
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
async function loadScriptFromFile(libraryUrl) {
|
|
112
|
-
const script = document.createElement('script');
|
|
113
|
-
script.src = libraryUrl;
|
|
114
|
-
return await new Promise((resolve, reject) => {
|
|
115
|
-
script.onload = data => {
|
|
116
|
-
resolve(data);
|
|
117
|
-
};
|
|
118
|
-
script.onerror = reject;
|
|
119
|
-
});
|
|
120
|
-
}
|
|
121
|
-
*/
|
|
122
|
-
// TODO - Needs security audit...
|
|
123
|
-
// - Raw eval call
|
|
124
|
-
// - Potentially bypasses CORS
|
|
125
|
-
// Upside is that this separates fetching and parsing
|
|
126
|
-
// we could create a`LibraryLoader` or`ModuleLoader`
|
|
127
|
-
function loadLibraryFromString(scriptSource, id) {
|
|
128
|
-
if (!globals_1.isBrowser) {
|
|
129
|
-
return node.requireFromString && node.requireFromString(scriptSource, id);
|
|
130
|
-
}
|
|
131
|
-
if (globals_1.isWorker) {
|
|
132
|
-
// Use lvalue trick to make eval run in global scope
|
|
133
|
-
eval.call(globals_1.global, scriptSource); // eslint-disable-line no-eval
|
|
134
|
-
// https://stackoverflow.com/questions/9107240/1-evalthis-vs-evalthis-in-javascript
|
|
135
|
-
// http://perfectionkills.com/global-eval-what-are-the-options/
|
|
136
|
-
return null;
|
|
137
|
-
}
|
|
138
|
-
const script = document.createElement('script');
|
|
139
|
-
script.id = id;
|
|
140
|
-
// most browsers like a separate text node but some throw an error. The second method covers those.
|
|
46
|
+
return await response.arrayBuffer();
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
if (!isBrowser) {
|
|
141
50
|
try {
|
|
142
|
-
|
|
51
|
+
return node && node.requireFromFile && (await node.requireFromFile(libraryUrl));
|
|
52
|
+
} catch {
|
|
53
|
+
return null;
|
|
143
54
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
if (isWorker) {
|
|
58
|
+
return importScripts(libraryUrl);
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
const response = await fetch(libraryUrl);
|
|
62
|
+
const scriptSource = await response.text();
|
|
63
|
+
return loadLibraryFromString(scriptSource, libraryUrl);
|
|
149
64
|
}
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
65
|
+
|
|
66
|
+
function loadLibraryFromString(scriptSource, id) {
|
|
67
|
+
if (!isBrowser) {
|
|
68
|
+
return node.requireFromString && node.requireFromString(scriptSource, id);
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
if (isWorker) {
|
|
72
|
+
eval.call(global, scriptSource);
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
|
|
76
|
+
const script = document.createElement('script');
|
|
77
|
+
script.id = id;
|
|
78
|
+
|
|
79
|
+
try {
|
|
80
|
+
script.appendChild(document.createTextNode(scriptSource));
|
|
81
|
+
} catch (e) {
|
|
82
|
+
script.text = scriptSource;
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
document.body.appendChild(script);
|
|
86
|
+
return null;
|
|
162
87
|
}
|
|
163
|
-
|
|
88
|
+
//# sourceMappingURL=library-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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,60 +1,43 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
// This indirect function is provided because webpack will try to bundle `module.require`.
|
|
16
|
-
// this file is not visible to webpack (it is excluded in the package.json "browser" field).
|
|
17
|
-
async function requireFromFile(filename) {
|
|
18
|
-
if (filename.startsWith('http')) {
|
|
19
|
-
const response = await fetch(filename);
|
|
20
|
-
const code = await response.text();
|
|
21
|
-
return requireFromString(code);
|
|
22
|
-
}
|
|
23
|
-
if (!filename.startsWith('/')) {
|
|
24
|
-
filename = `${process.cwd()}/${filename}`;
|
|
25
|
-
}
|
|
26
|
-
return require(filename);
|
|
1
|
+
import Module from 'module';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
export async function requireFromFile(filename) {
|
|
4
|
+
if (filename.startsWith('http')) {
|
|
5
|
+
const response = await fetch(filename);
|
|
6
|
+
const code = await response.text();
|
|
7
|
+
return requireFromString(code);
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
if (!filename.startsWith('/')) {
|
|
11
|
+
filename = "".concat(process.cwd(), "/").concat(filename);
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
return require(filename);
|
|
27
15
|
}
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
newModule._compile(code, filename);
|
|
55
|
-
if (parent && parent.children) {
|
|
56
|
-
parent.children.splice(parent.children.indexOf(newModule), 1);
|
|
57
|
-
}
|
|
58
|
-
return newModule.exports;
|
|
16
|
+
export function requireFromString(code, filename = '', options) {
|
|
17
|
+
var _options, _options2;
|
|
18
|
+
|
|
19
|
+
if (typeof filename === 'object') {
|
|
20
|
+
options = filename;
|
|
21
|
+
filename = '';
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
if (typeof code !== 'string') {
|
|
25
|
+
throw new Error("code must be a string, not ".concat(typeof code));
|
|
26
|
+
}
|
|
27
|
+
|
|
28
|
+
const paths = Module._nodeModulePaths(path.dirname(filename));
|
|
29
|
+
|
|
30
|
+
const parent = module.parent;
|
|
31
|
+
const newModule = new Module(filename, parent);
|
|
32
|
+
newModule.filename = filename;
|
|
33
|
+
newModule.paths = [].concat(((_options = options) === null || _options === void 0 ? void 0 : _options.prependPaths) || []).concat(paths).concat(((_options2 = options) === null || _options2 === void 0 ? void 0 : _options2.appendPaths) || []);
|
|
34
|
+
|
|
35
|
+
newModule._compile(code, filename);
|
|
36
|
+
|
|
37
|
+
if (parent && parent.children) {
|
|
38
|
+
parent.children.splice(parent.children.indexOf(newModule), 1);
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
return newModule.exports;
|
|
59
42
|
}
|
|
60
|
-
|
|
43
|
+
//# sourceMappingURL=require-utils.node.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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,131 +1,122 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
-
}) : (function(o, m, k, k2) {
|
|
6
|
-
if (k2 === undefined) k2 = k;
|
|
7
|
-
o[k2] = m[k];
|
|
8
|
-
}));
|
|
9
|
-
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
10
|
-
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
11
|
-
}) : function(o, v) {
|
|
12
|
-
o["default"] = v;
|
|
13
|
-
});
|
|
14
|
-
var __importStar = (this && this.__importStar) || function (mod) {
|
|
15
|
-
if (mod && mod.__esModule) return mod;
|
|
16
|
-
var result = {};
|
|
17
|
-
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
18
|
-
__setModuleDefault(result, mod);
|
|
19
|
-
return result;
|
|
20
|
-
};
|
|
21
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
|
-
/* eslint-disable no-console */
|
|
23
|
-
// Avoid using named imports for Node builtins to help with "empty" resolution
|
|
24
|
-
// for bundlers targeting browser environments. Access imports & types
|
|
25
|
-
// through the `ChildProcess` object (e.g. `ChildProcess.spawn`, `ChildProcess.ChildProcess`).
|
|
26
|
-
const ChildProcess = __importStar(require("child_process"));
|
|
27
|
-
const process_utils_1 = require("./process-utils");
|
|
1
|
+
import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
|
|
2
|
+
import * as ChildProcess from 'child_process';
|
|
3
|
+
import { getAvailablePort } from './process-utils';
|
|
28
4
|
const DEFAULT_PROPS = {
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
5
|
+
command: '',
|
|
6
|
+
arguments: [],
|
|
7
|
+
port: 5000,
|
|
8
|
+
autoPort: true,
|
|
9
|
+
wait: 2000,
|
|
10
|
+
onSuccess: processProxy => {
|
|
11
|
+
console.log("Started ".concat(processProxy.props.command));
|
|
12
|
+
}
|
|
37
13
|
};
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
14
|
+
export default class ChildProcessProxy {
|
|
15
|
+
constructor({
|
|
16
|
+
id = 'browser-driver'
|
|
17
|
+
} = {}) {
|
|
18
|
+
_defineProperty(this, "id", void 0);
|
|
19
|
+
|
|
20
|
+
_defineProperty(this, "props", { ...DEFAULT_PROPS
|
|
21
|
+
});
|
|
22
|
+
|
|
23
|
+
_defineProperty(this, "childProcess", null);
|
|
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));
|
|
49
46
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
this.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
this.port = await (0, process_utils_1.getAvailablePort)(props.port);
|
|
60
|
-
}
|
|
61
|
-
args.push(props.portArg, String(this.port));
|
|
62
|
-
}
|
|
63
|
-
return await new Promise((resolve, reject) => {
|
|
64
|
-
try {
|
|
65
|
-
this._setTimeout(() => {
|
|
66
|
-
if (props.onSuccess) {
|
|
67
|
-
props.onSuccess(this);
|
|
68
|
-
}
|
|
69
|
-
resolve({});
|
|
70
|
-
});
|
|
71
|
-
console.log(`Spawning ${props.command} ${props.arguments.join(' ')}`);
|
|
72
|
-
const childProcess = ChildProcess.spawn(props.command, args, props.spawn);
|
|
73
|
-
this.childProcess = childProcess;
|
|
74
|
-
childProcess.stdout.on('data', (data) => {
|
|
75
|
-
console.log(data.toString());
|
|
76
|
-
});
|
|
77
|
-
// TODO - add option regarding whether stderr should be treated as data
|
|
78
|
-
childProcess.stderr.on('data', (data) => {
|
|
79
|
-
console.log(`Child process wrote to stderr: "${data}".`);
|
|
80
|
-
this._clearTimeout();
|
|
81
|
-
reject(new Error(data));
|
|
82
|
-
});
|
|
83
|
-
childProcess.on('error', (error) => {
|
|
84
|
-
console.log(`Child process errored with ${error}`);
|
|
85
|
-
this._clearTimeout();
|
|
86
|
-
reject(error);
|
|
87
|
-
});
|
|
88
|
-
childProcess.on('close', (code) => {
|
|
89
|
-
console.log(`Child process exited with ${code}`);
|
|
90
|
-
this.childProcess = null;
|
|
91
|
-
this._clearTimeout();
|
|
92
|
-
resolve({});
|
|
93
|
-
});
|
|
94
|
-
}
|
|
95
|
-
catch (error) {
|
|
96
|
-
reject(error);
|
|
97
|
-
}
|
|
47
|
+
|
|
48
|
+
return await new Promise((resolve, reject) => {
|
|
49
|
+
try {
|
|
50
|
+
this._setTimeout(() => {
|
|
51
|
+
if (props.onSuccess) {
|
|
52
|
+
props.onSuccess(this);
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
resolve({});
|
|
98
56
|
});
|
|
57
|
+
|
|
58
|
+
console.log("Spawning ".concat(props.command, " ").concat(props.arguments.join(' ')));
|
|
59
|
+
const childProcess = ChildProcess.spawn(props.command, args, props.spawn);
|
|
60
|
+
this.childProcess = childProcess;
|
|
61
|
+
childProcess.stdout.on('data', data => {
|
|
62
|
+
console.log(data.toString());
|
|
63
|
+
});
|
|
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;
|
|
99
96
|
}
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
}
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
try {
|
|
110
|
-
await this.stop();
|
|
111
|
-
// eslint-disable-next-line no-process-exit
|
|
112
|
-
process.exit(statusCode);
|
|
113
|
-
}
|
|
114
|
-
catch (error) {
|
|
115
|
-
console.error(error.message || error);
|
|
116
|
-
// eslint-disable-next-line no-process-exit
|
|
117
|
-
process.exit(1);
|
|
118
|
-
}
|
|
97
|
+
}
|
|
98
|
+
|
|
99
|
+
async exit(statusCode = 0) {
|
|
100
|
+
try {
|
|
101
|
+
await this.stop();
|
|
102
|
+
process.exit(statusCode);
|
|
103
|
+
} catch (error) {
|
|
104
|
+
console.error(error.message || error);
|
|
105
|
+
process.exit(1);
|
|
119
106
|
}
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
_setTimeout(callback) {
|
|
110
|
+
if (Number(this.props.wait) > 0) {
|
|
111
|
+
this.successTimer = setTimeout(callback, this.props.wait);
|
|
124
112
|
}
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
_clearTimeout() {
|
|
116
|
+
if (this.successTimer) {
|
|
117
|
+
clearTimeout(this.successTimer);
|
|
129
118
|
}
|
|
119
|
+
}
|
|
120
|
+
|
|
130
121
|
}
|
|
131
|
-
|
|
122
|
+
//# sourceMappingURL=child-process-proxy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|