@loaders.gl/worker-utils 3.1.0-alpha.4 → 3.1.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/es5/index.js +19 -19
- package/dist/es5/index.js.map +1 -1
- package/dist/es5/lib/async-queue/async-queue.js +62 -76
- package/dist/es5/lib/async-queue/async-queue.js.map +1 -1
- package/dist/es5/lib/env-utils/globals.js +10 -15
- package/dist/es5/lib/env-utils/globals.js.map +1 -1
- package/dist/es5/lib/env-utils/version.js +3 -3
- package/dist/es5/lib/env-utils/version.js.map +1 -1
- package/dist/es5/lib/library-utils/library-utils.js +29 -127
- package/dist/es5/lib/library-utils/library-utils.js.map +1 -1
- package/dist/es5/lib/node/require-utils.node.js +20 -65
- package/dist/es5/lib/node/require-utils.node.js.map +1 -1
- package/dist/es5/lib/process-utils/child-process-proxy.js +90 -199
- package/dist/es5/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/es5/lib/process-utils/process-utils.js +8 -9
- package/dist/es5/lib/process-utils/process-utils.js.map +1 -1
- package/dist/es5/lib/worker-api/create-worker.js +52 -162
- package/dist/es5/lib/worker-api/create-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/get-worker-url.js +9 -10
- package/dist/es5/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-api/process-on-worker.js +59 -130
- package/dist/es5/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/es5/lib/worker-api/validate-worker-version.js +3 -4
- package/dist/es5/lib/worker-api/validate-worker-version.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-body.js +46 -58
- package/dist/es5/lib/worker-farm/worker-body.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-farm.js +60 -99
- package/dist/es5/lib/worker-farm/worker-farm.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-job.js +28 -40
- package/dist/es5/lib/worker-farm/worker-job.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-pool.js +108 -204
- package/dist/es5/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/es5/lib/worker-farm/worker-thread.js +67 -85
- package/dist/es5/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js +4 -4
- package/dist/es5/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/es5/lib/worker-utils/get-transfer-list.js +4 -10
- package/dist/es5/lib/worker-utils/get-transfer-list.js.map +1 -1
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js +3 -7
- package/dist/es5/lib/worker-utils/remove-nontransferable-options.js.map +1 -1
- package/dist/es5/workers/null-worker.js +3 -26
- package/dist/es5/workers/null-worker.js.map +1 -1
- package/dist/esm/lib/env-utils/version.js +2 -2
- package/dist/esm/lib/library-utils/library-utils.js +5 -5
- package/dist/esm/lib/library-utils/library-utils.js.map +1 -1
- package/dist/esm/lib/node/require-utils.node.js +2 -2
- package/dist/esm/lib/node/require-utils.node.js.map +1 -1
- package/dist/esm/lib/process-utils/child-process-proxy.js +5 -5
- package/dist/esm/lib/process-utils/child-process-proxy.js.map +1 -1
- package/dist/esm/lib/worker-api/get-worker-url.js +7 -7
- package/dist/esm/lib/worker-api/get-worker-url.js.map +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js +1 -1
- package/dist/esm/lib/worker-api/process-on-worker.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js +1 -1
- package/dist/esm/lib/worker-farm/worker-pool.js.map +1 -1
- package/dist/esm/lib/worker-farm/worker-thread.js +3 -3
- package/dist/esm/lib/worker-farm/worker-thread.js.map +1 -1
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js +1 -7
- package/dist/esm/lib/worker-utils/get-loadable-worker-url.js.map +1 -1
- package/dist/index.d.ts +19 -0
- package/dist/lib/async-queue/async-queue.d.ts +31 -0
- package/dist/lib/env-utils/assert.d.ts +2 -0
- package/dist/lib/env-utils/globals.d.ts +21 -0
- package/dist/lib/env-utils/version.d.ts +1 -0
- package/dist/lib/library-utils/library-utils.d.ts +17 -0
- package/dist/lib/node/require-utils.node.d.ts +2 -0
- package/dist/lib/process-utils/child-process-proxy.d.ts +42 -0
- package/dist/lib/process-utils/process-utils.d.ts +1 -0
- package/dist/lib/worker-api/create-worker.d.ts +8 -0
- package/dist/lib/worker-api/get-worker-url.d.ts +13 -0
- package/dist/lib/worker-api/process-on-worker.d.ts +19 -0
- package/dist/lib/worker-api/validate-worker-version.d.ts +8 -0
- package/dist/lib/worker-farm/worker-body.d.ts +15 -0
- package/dist/lib/worker-farm/worker-farm.d.ts +54 -0
- package/dist/lib/worker-farm/worker-job.d.ts +28 -0
- package/dist/lib/worker-farm/worker-pool.d.ts +74 -0
- package/dist/lib/worker-farm/worker-thread.d.ts +41 -0
- package/dist/lib/worker-utils/get-loadable-worker-url.d.ts +13 -0
- package/dist/lib/worker-utils/get-transfer-list.d.ts +9 -0
- package/dist/lib/worker-utils/remove-nontransferable-options.d.ts +5 -0
- package/dist/null-worker.js +3 -3
- package/dist/null-worker.js.map +1 -1
- package/dist/types.d.ts +55 -0
- package/dist/workers/null-worker.d.ts +1 -0
- package/package.json +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["LATEST","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","isBrowser","CDN","isWorker","endsWith","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/library-utils/library-utils.ts"],"names":["LATEST","VERSION","loadLibraryPromises","loadLibrary","libraryUrl","moduleName","options","getLibraryUrl","loadLibraryFromFile","library","startsWith","modules","isBrowser","CDN","isWorker","endsWith","response","fetch","arrayBuffer","node","requireFromFile","importScripts","scriptSource","text","loadLibraryFromString","id","requireFromString","eval","call","global","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 = {}; // 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 loadLibraryPromises[libraryUrl] =\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, moduleName?: string, options?): 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) {\n if (libraryUrl.endsWith('wasm')) {\n const response = await fetch(libraryUrl);\n return await response.arrayBuffer();\n }\n\n if (!isBrowser) {\n return node.requireFromFile && (await node.requireFromFile(libraryUrl));\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, id) {\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"}
|
|
@@ -8,89 +8,44 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.requireFromFile = requireFromFile;
|
|
9
9
|
exports.requireFromString = requireFromString;
|
|
10
10
|
|
|
11
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
12
|
-
|
|
13
|
-
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
14
|
-
|
|
15
|
-
var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
|
|
16
|
-
|
|
17
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
18
|
-
|
|
19
11
|
var _module = _interopRequireDefault(require("module"));
|
|
20
12
|
|
|
21
13
|
var _path = _interopRequireDefault(require("path"));
|
|
22
14
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
}
|
|
30
|
-
|
|
31
|
-
function _requireFromFile() {
|
|
32
|
-
_requireFromFile = (0, _asyncToGenerator2.default)(_regenerator.default.mark(function _callee(filename) {
|
|
33
|
-
var response, code;
|
|
34
|
-
return _regenerator.default.wrap(function _callee$(_context) {
|
|
35
|
-
while (1) {
|
|
36
|
-
switch (_context.prev = _context.next) {
|
|
37
|
-
case 0:
|
|
38
|
-
if (!filename.startsWith('http')) {
|
|
39
|
-
_context.next = 8;
|
|
40
|
-
break;
|
|
41
|
-
}
|
|
42
|
-
|
|
43
|
-
_context.next = 3;
|
|
44
|
-
return fetch(filename);
|
|
45
|
-
|
|
46
|
-
case 3:
|
|
47
|
-
response = _context.sent;
|
|
48
|
-
_context.next = 6;
|
|
49
|
-
return response.text();
|
|
50
|
-
|
|
51
|
-
case 6:
|
|
52
|
-
code = _context.sent;
|
|
53
|
-
return _context.abrupt("return", requireFromString(code));
|
|
54
|
-
|
|
55
|
-
case 8:
|
|
56
|
-
if (!filename.startsWith('/')) {
|
|
57
|
-
filename = "".concat(process.cwd(), "/").concat(filename);
|
|
58
|
-
}
|
|
15
|
+
async function requireFromFile(filename) {
|
|
16
|
+
if (filename.startsWith('http')) {
|
|
17
|
+
const response = await fetch(filename);
|
|
18
|
+
const code = await response.text();
|
|
19
|
+
return requireFromString(code);
|
|
20
|
+
}
|
|
59
21
|
|
|
60
|
-
|
|
22
|
+
if (!filename.startsWith('/')) {
|
|
23
|
+
filename = "".concat(process.cwd(), "/").concat(filename);
|
|
24
|
+
}
|
|
61
25
|
|
|
62
|
-
|
|
63
|
-
case "end":
|
|
64
|
-
return _context.stop();
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
}, _callee);
|
|
68
|
-
}));
|
|
69
|
-
return _requireFromFile.apply(this, arguments);
|
|
26
|
+
return require(filename);
|
|
70
27
|
}
|
|
71
28
|
|
|
72
|
-
function requireFromString(code) {
|
|
73
|
-
|
|
74
|
-
var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
|
|
75
|
-
|
|
76
|
-
if ((0, _typeof2.default)(filename) === 'object') {
|
|
29
|
+
function requireFromString(code, filename = '', options = {}) {
|
|
30
|
+
if (typeof filename === 'object') {
|
|
77
31
|
options = filename;
|
|
78
32
|
filename = '';
|
|
79
33
|
}
|
|
80
34
|
|
|
81
|
-
options =
|
|
35
|
+
options = {
|
|
82
36
|
appendPaths: [],
|
|
83
|
-
prependPaths: []
|
|
84
|
-
|
|
37
|
+
prependPaths: [],
|
|
38
|
+
...options
|
|
39
|
+
};
|
|
85
40
|
|
|
86
41
|
if (typeof code !== 'string') {
|
|
87
|
-
throw new Error("code must be a string, not ".concat(
|
|
42
|
+
throw new Error("code must be a string, not ".concat(typeof code));
|
|
88
43
|
}
|
|
89
44
|
|
|
90
|
-
|
|
45
|
+
const paths = _module.default._nodeModulePaths(_path.default.dirname(filename));
|
|
91
46
|
|
|
92
|
-
|
|
93
|
-
|
|
47
|
+
const parent = module.parent;
|
|
48
|
+
const newModule = new _module.default(filename, parent);
|
|
94
49
|
newModule.filename = filename;
|
|
95
50
|
newModule.paths = [].concat(options.prependPaths).concat(paths).concat(options.appendPaths);
|
|
96
51
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/node/require-utils.node.js"],"names":["requireFromFile","filename","startsWith","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/node/require-utils.node.js"],"names":["requireFromFile","filename","startsWith","response","fetch","code","text","requireFromString","process","cwd","require","options","appendPaths","prependPaths","Error","paths","Module","_nodeModulePaths","path","dirname","parent","module","newModule","concat","_compile","children","splice","indexOf","exports"],"mappings":";;;;;;;;;;AAMA;;AACA;;AAMO,eAAeA,eAAf,CAA+BC,QAA/B,EAAyC;AAC9C,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;;AAQM,SAASM,iBAAT,CAA2BF,IAA3B,EAAiCJ,QAAQ,GAAG,EAA5C,EAAgDU,OAAO,GAAG,EAA1D,EAA8D;AACnE,MAAI,OAAOV,QAAP,KAAoB,QAAxB,EAAkC;AAChCU,IAAAA,OAAO,GAAGV,QAAV;AACAA,IAAAA,QAAQ,GAAG,EAAX;AACD;;AAEDU,EAAAA,OAAO,GAAG;AACRC,IAAAA,WAAW,EAAE,EADL;AAERC,IAAAA,YAAY,EAAE,EAFN;AAGR,OAAGF;AAHK,GAAV;;AAMA,MAAI,OAAON,IAAP,KAAgB,QAApB,EAA8B;AAC5B,UAAM,IAAIS,KAAJ,sCAAwC,OAAOT,IAA/C,EAAN;AACD;;AAGD,QAAMU,KAAK,GAAGC,gBAAOC,gBAAP,CAAwBC,cAAKC,OAAL,CAAalB,QAAb,CAAxB,CAAd;;AAEA,QAAMmB,MAAM,GAAGC,MAAM,CAACD,MAAtB;AAEA,QAAME,SAAS,GAAG,IAAIN,eAAJ,CAAWf,QAAX,EAAqBmB,MAArB,CAAlB;AACAE,EAAAA,SAAS,CAACrB,QAAV,GAAqBA,QAArB;AACAqB,EAAAA,SAAS,CAACP,KAAV,GAAkB,GAAGQ,MAAH,CAAUZ,OAAO,CAACE,YAAlB,EAAgCU,MAAhC,CAAuCR,KAAvC,EAA8CQ,MAA9C,CAAqDZ,OAAO,CAACC,WAA7D,CAAlB;;AAEAU,EAAAA,SAAS,CAACE,QAAV,CAAmBnB,IAAnB,EAAyBJ,QAAzB;;AAEA,MAAImB,MAAM,IAAIA,MAAM,CAACK,QAArB,EAA+B;AAC7BL,IAAAA,MAAM,CAACK,QAAP,CAAgBC,MAAhB,CAAuBN,MAAM,CAACK,QAAP,CAAgBE,OAAhB,CAAwBL,SAAxB,CAAvB,EAA2D,CAA3D;AACD;;AAED,SAAOA,SAAS,CAACM,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) {\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(code, filename = '', options = {}) {\n if (typeof filename === 'object') {\n options = filename;\n filename = '';\n }\n\n options = {\n appendPaths: [],\n prependPaths: [],\n ...options\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 = [].concat(options.prependPaths).concat(paths).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"}
|
|
@@ -2,244 +2,135 @@
|
|
|
2
2
|
|
|
3
3
|
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
4
|
|
|
5
|
-
var _typeof = require("@babel/runtime/helpers/typeof");
|
|
6
|
-
|
|
7
5
|
Object.defineProperty(exports, "__esModule", {
|
|
8
6
|
value: true
|
|
9
7
|
});
|
|
10
8
|
exports.default = void 0;
|
|
11
9
|
|
|
12
|
-
var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
|
|
13
|
-
|
|
14
|
-
var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
|
|
15
|
-
|
|
16
|
-
var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
|
|
17
|
-
|
|
18
|
-
var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
|
|
19
|
-
|
|
20
|
-
var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
|
|
21
|
-
|
|
22
10
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
23
11
|
|
|
24
12
|
var ChildProcess = _interopRequireWildcard(require("child_process"));
|
|
25
13
|
|
|
26
14
|
var _processUtils = require("./process-utils");
|
|
27
15
|
|
|
28
|
-
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function
|
|
29
|
-
|
|
30
|
-
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
16
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
31
17
|
|
|
32
|
-
function
|
|
18
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
33
19
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
var DEFAULT_PROPS = {
|
|
20
|
+
const DEFAULT_PROPS = {
|
|
37
21
|
command: '',
|
|
38
22
|
arguments: [],
|
|
39
23
|
port: 5000,
|
|
40
24
|
autoPort: true,
|
|
41
25
|
wait: 2000,
|
|
42
|
-
onSuccess:
|
|
26
|
+
onSuccess: processProxy => {
|
|
43
27
|
console.log("Started ".concat(processProxy.props.command));
|
|
44
28
|
}
|
|
45
29
|
};
|
|
46
30
|
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
id = _ref$id === void 0 ? 'browser-driver' : _ref$id;
|
|
52
|
-
|
|
53
|
-
(0, _classCallCheck2.default)(this, ChildProcessProxy);
|
|
31
|
+
class ChildProcessProxy {
|
|
32
|
+
constructor({
|
|
33
|
+
id = 'browser-driver'
|
|
34
|
+
} = {}) {
|
|
54
35
|
(0, _defineProperty2.default)(this, "id", void 0);
|
|
55
|
-
(0, _defineProperty2.default)(this, "props",
|
|
36
|
+
(0, _defineProperty2.default)(this, "props", { ...DEFAULT_PROPS
|
|
37
|
+
});
|
|
56
38
|
(0, _defineProperty2.default)(this, "childProcess", null);
|
|
57
39
|
(0, _defineProperty2.default)(this, "port", 0);
|
|
58
40
|
(0, _defineProperty2.default)(this, "successTimer", void 0);
|
|
59
41
|
this.id = id;
|
|
60
42
|
}
|
|
61
43
|
|
|
62
|
-
(
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
props = _objectSpread(_objectSpread({}, DEFAULT_PROPS), props);
|
|
74
|
-
this.props = props;
|
|
75
|
-
args = (0, _toConsumableArray2.default)(props.arguments);
|
|
76
|
-
this.port = Number(props.port);
|
|
77
|
-
|
|
78
|
-
if (!props.portArg) {
|
|
79
|
-
_context.next = 10;
|
|
80
|
-
break;
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
if (!props.autoPort) {
|
|
84
|
-
_context.next = 9;
|
|
85
|
-
break;
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
_context.next = 8;
|
|
89
|
-
return (0, _processUtils.getAvailablePort)(props.port);
|
|
90
|
-
|
|
91
|
-
case 8:
|
|
92
|
-
this.port = _context.sent;
|
|
93
|
-
|
|
94
|
-
case 9:
|
|
95
|
-
args.push(props.portArg, String(this.port));
|
|
96
|
-
|
|
97
|
-
case 10:
|
|
98
|
-
_context.next = 12;
|
|
99
|
-
return new Promise(function (resolve, reject) {
|
|
100
|
-
try {
|
|
101
|
-
_this._setTimeout(function () {
|
|
102
|
-
if (props.onSuccess) {
|
|
103
|
-
props.onSuccess(_this);
|
|
104
|
-
}
|
|
105
|
-
|
|
106
|
-
resolve({});
|
|
107
|
-
});
|
|
108
|
-
|
|
109
|
-
console.log("Spawning ".concat(props.command, " ").concat(props.arguments.join(' ')));
|
|
110
|
-
var childProcess = ChildProcess.spawn(props.command, args, props.spawn);
|
|
111
|
-
_this.childProcess = childProcess;
|
|
112
|
-
childProcess.stdout.on('data', function (data) {
|
|
113
|
-
console.log(data.toString());
|
|
114
|
-
});
|
|
115
|
-
childProcess.stderr.on('data', function (data) {
|
|
116
|
-
console.log("Child process wrote to stderr: \"".concat(data, "\"."));
|
|
117
|
-
|
|
118
|
-
_this._clearTimeout();
|
|
119
|
-
|
|
120
|
-
reject(new Error(data));
|
|
121
|
-
});
|
|
122
|
-
childProcess.on('error', function (error) {
|
|
123
|
-
console.log("Child process errored with ".concat(error));
|
|
124
|
-
|
|
125
|
-
_this._clearTimeout();
|
|
126
|
-
|
|
127
|
-
reject(error);
|
|
128
|
-
});
|
|
129
|
-
childProcess.on('close', function (code) {
|
|
130
|
-
console.log("Child process exited with ".concat(code));
|
|
131
|
-
_this.childProcess = null;
|
|
132
|
-
|
|
133
|
-
_this._clearTimeout();
|
|
134
|
-
|
|
135
|
-
resolve({});
|
|
136
|
-
});
|
|
137
|
-
} catch (error) {
|
|
138
|
-
reject(error);
|
|
139
|
-
}
|
|
140
|
-
});
|
|
141
|
-
|
|
142
|
-
case 12:
|
|
143
|
-
return _context.abrupt("return", _context.sent);
|
|
144
|
-
|
|
145
|
-
case 13:
|
|
146
|
-
case "end":
|
|
147
|
-
return _context.stop();
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
}, _callee, this);
|
|
151
|
-
}));
|
|
152
|
-
|
|
153
|
-
function start(_x) {
|
|
154
|
-
return _start.apply(this, arguments);
|
|
44
|
+
async start(props) {
|
|
45
|
+
props = { ...DEFAULT_PROPS,
|
|
46
|
+
...props
|
|
47
|
+
};
|
|
48
|
+
this.props = props;
|
|
49
|
+
const args = [...props.arguments];
|
|
50
|
+
this.port = Number(props.port);
|
|
51
|
+
|
|
52
|
+
if (props.portArg) {
|
|
53
|
+
if (props.autoPort) {
|
|
54
|
+
this.port = await (0, _processUtils.getAvailablePort)(props.port);
|
|
155
55
|
}
|
|
156
56
|
|
|
157
|
-
|
|
158
|
-
}
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
switch (_context2.prev = _context2.next) {
|
|
166
|
-
case 0:
|
|
167
|
-
if (this.childProcess) {
|
|
168
|
-
this.childProcess.kill();
|
|
169
|
-
this.childProcess = null;
|
|
170
|
-
}
|
|
171
|
-
|
|
172
|
-
case 1:
|
|
173
|
-
case "end":
|
|
174
|
-
return _context2.stop();
|
|
175
|
-
}
|
|
57
|
+
args.push(props.portArg, String(this.port));
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return await new Promise((resolve, reject) => {
|
|
61
|
+
try {
|
|
62
|
+
this._setTimeout(() => {
|
|
63
|
+
if (props.onSuccess) {
|
|
64
|
+
props.onSuccess(this);
|
|
176
65
|
}
|
|
177
|
-
}, _callee2, this);
|
|
178
|
-
}));
|
|
179
66
|
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
}
|
|
67
|
+
resolve({});
|
|
68
|
+
});
|
|
183
69
|
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
return _regenerator.default.wrap(function _callee3$(_context3) {
|
|
193
|
-
while (1) {
|
|
194
|
-
switch (_context3.prev = _context3.next) {
|
|
195
|
-
case 0:
|
|
196
|
-
statusCode = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : 0;
|
|
197
|
-
_context3.prev = 1;
|
|
198
|
-
_context3.next = 4;
|
|
199
|
-
return this.stop();
|
|
200
|
-
|
|
201
|
-
case 4:
|
|
202
|
-
process.exit(statusCode);
|
|
203
|
-
_context3.next = 11;
|
|
204
|
-
break;
|
|
205
|
-
|
|
206
|
-
case 7:
|
|
207
|
-
_context3.prev = 7;
|
|
208
|
-
_context3.t0 = _context3["catch"](1);
|
|
209
|
-
console.error(_context3.t0.message || _context3.t0);
|
|
210
|
-
process.exit(1);
|
|
211
|
-
|
|
212
|
-
case 11:
|
|
213
|
-
case "end":
|
|
214
|
-
return _context3.stop();
|
|
215
|
-
}
|
|
216
|
-
}
|
|
217
|
-
}, _callee3, this, [[1, 7]]);
|
|
218
|
-
}));
|
|
70
|
+
console.log("Spawning ".concat(props.command, " ").concat(props.arguments.join(' ')));
|
|
71
|
+
const childProcess = ChildProcess.spawn(props.command, args, props.spawn);
|
|
72
|
+
this.childProcess = childProcess;
|
|
73
|
+
childProcess.stdout.on('data', data => {
|
|
74
|
+
console.log(data.toString());
|
|
75
|
+
});
|
|
76
|
+
childProcess.stderr.on('data', data => {
|
|
77
|
+
console.log("Child process wrote to stderr: \"".concat(data, "\"."));
|
|
219
78
|
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
|
|
79
|
+
this._clearTimeout();
|
|
80
|
+
|
|
81
|
+
reject(new Error(data));
|
|
82
|
+
});
|
|
83
|
+
childProcess.on('error', error => {
|
|
84
|
+
console.log("Child process errored with ".concat(error));
|
|
223
85
|
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
86
|
+
this._clearTimeout();
|
|
87
|
+
|
|
88
|
+
reject(error);
|
|
89
|
+
});
|
|
90
|
+
childProcess.on('close', code => {
|
|
91
|
+
console.log("Child process exited with ".concat(code));
|
|
92
|
+
this.childProcess = null;
|
|
93
|
+
|
|
94
|
+
this._clearTimeout();
|
|
95
|
+
|
|
96
|
+
resolve({});
|
|
97
|
+
});
|
|
98
|
+
} catch (error) {
|
|
99
|
+
reject(error);
|
|
231
100
|
}
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
async stop() {
|
|
105
|
+
if (this.childProcess) {
|
|
106
|
+
this.childProcess.kill();
|
|
107
|
+
this.childProcess = null;
|
|
232
108
|
}
|
|
233
|
-
}
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
109
|
+
}
|
|
110
|
+
|
|
111
|
+
async exit(statusCode = 0) {
|
|
112
|
+
try {
|
|
113
|
+
await this.stop();
|
|
114
|
+
process.exit(statusCode);
|
|
115
|
+
} catch (error) {
|
|
116
|
+
console.error(error.message || error);
|
|
117
|
+
process.exit(1);
|
|
239
118
|
}
|
|
240
|
-
}
|
|
241
|
-
|
|
242
|
-
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
_setTimeout(callback) {
|
|
122
|
+
if (Number(this.props.wait) > 0) {
|
|
123
|
+
this.successTimer = setTimeout(callback, this.props.wait);
|
|
124
|
+
}
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
_clearTimeout() {
|
|
128
|
+
if (this.successTimer) {
|
|
129
|
+
clearTimeout(this.successTimer);
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
|
|
133
|
+
}
|
|
243
134
|
|
|
244
135
|
exports.default = ChildProcessProxy;
|
|
245
136
|
//# sourceMappingURL=child-process-proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/process-utils/child-process-proxy.ts"],"names":["DEFAULT_PROPS","command","arguments","port","autoPort","wait","onSuccess","processProxy","console","log","props","ChildProcessProxy","id","args","Number","portArg","push","String","Promise","resolve","reject","_setTimeout","join","childProcess","ChildProcess","spawn","stdout","on","data","toString","stderr","_clearTimeout","Error","error","code","
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/process-utils/child-process-proxy.ts"],"names":["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","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?;\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"}
|
|
@@ -9,25 +9,24 @@ exports.getAvailablePort = getAvailablePort;
|
|
|
9
9
|
|
|
10
10
|
var _child_process = _interopRequireDefault(require("child_process"));
|
|
11
11
|
|
|
12
|
-
function getAvailablePort() {
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
_child_process.default.exec('lsof -i -P -n | grep LISTEN', function (error, stdout) {
|
|
12
|
+
function getAvailablePort(defaultPort = 3000) {
|
|
13
|
+
return new Promise(resolve => {
|
|
14
|
+
_child_process.default.exec('lsof -i -P -n | grep LISTEN', (error, stdout) => {
|
|
16
15
|
if (error) {
|
|
17
16
|
resolve(defaultPort);
|
|
18
17
|
return;
|
|
19
18
|
}
|
|
20
19
|
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
stdout.split('\n').forEach(
|
|
24
|
-
|
|
20
|
+
const portsInUse = [];
|
|
21
|
+
const regex = /:(\d+) \(LISTEN\)/;
|
|
22
|
+
stdout.split('\n').forEach(line => {
|
|
23
|
+
const match = regex.exec(line);
|
|
25
24
|
|
|
26
25
|
if (match) {
|
|
27
26
|
portsInUse.push(Number(match[1]));
|
|
28
27
|
}
|
|
29
28
|
});
|
|
30
|
-
|
|
29
|
+
let port = defaultPort;
|
|
31
30
|
|
|
32
31
|
while (portsInUse.includes(port)) {
|
|
33
32
|
port++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"sources":["../../../../src/lib/process-utils/process-utils.ts"],"names":["getAvailablePort","defaultPort","Promise","resolve","ChildProcess","exec","error","stdout","portsInUse","regex","split","forEach","line","match","push","Number","port","includes"],"mappings":";;;;;;;;;AAAA;;AAIO,SAASA,gBAAT,
|
|
1
|
+
{"version":3,"sources":["../../../../src/lib/process-utils/process-utils.ts"],"names":["getAvailablePort","defaultPort","Promise","resolve","ChildProcess","exec","error","stdout","portsInUse","regex","split","forEach","line","match","push","Number","port","includes"],"mappings":";;;;;;;;;AAAA;;AAIO,SAASA,gBAAT,CAA0BC,WAAmB,GAAG,IAAhD,EAAuE;AAC5E,SAAO,IAAIC,OAAJ,CAAaC,OAAD,IAAa;AAE9BC,2BAAaC,IAAb,CAAkB,6BAAlB,EAAiD,CAACC,KAAD,EAAQC,MAAR,KAAmB;AAClE,UAAID,KAAJ,EAAW;AAETH,QAAAA,OAAO,CAACF,WAAD,CAAP;AACA;AACD;;AAED,YAAMO,UAAoB,GAAG,EAA7B;AACA,YAAMC,KAAK,GAAG,mBAAd;AACAF,MAAAA,MAAM,CAACG,KAAP,CAAa,IAAb,EAAmBC,OAAnB,CAA4BC,IAAD,IAAU;AACnC,cAAMC,KAAK,GAAGJ,KAAK,CAACJ,IAAN,CAAWO,IAAX,CAAd;;AACA,YAAIC,KAAJ,EAAW;AACTL,UAAAA,UAAU,CAACM,IAAX,CAAgBC,MAAM,CAACF,KAAK,CAAC,CAAD,CAAN,CAAtB;AACD;AACF,OALD;AAMA,UAAIG,IAAI,GAAGf,WAAX;;AACA,aAAOO,UAAU,CAACS,QAAX,CAAoBD,IAApB,CAAP,EAAkC;AAChCA,QAAAA,IAAI;AACL;;AACDb,MAAAA,OAAO,CAACa,IAAD,CAAP;AACD,KApBD;AAqBD,GAvBM,CAAP;AAwBD","sourcesContent":["import ChildProcess from 'child_process';\n\n// Get an available port\n// Works on Unix systems\nexport function getAvailablePort(defaultPort: number = 3000): Promise<number> {\n return new Promise((resolve) => {\n // Get a list of all ports in use\n ChildProcess.exec('lsof -i -P -n | grep LISTEN', (error, stdout) => {\n if (error) {\n // likely no permission, e.g. CI\n resolve(defaultPort);\n return;\n }\n\n const portsInUse: number[] = [];\n const regex = /:(\\d+) \\(LISTEN\\)/;\n stdout.split('\\n').forEach((line) => {\n const match = regex.exec(line);\n if (match) {\n portsInUse.push(Number(match[1]));\n }\n });\n let port = defaultPort;\n while (portsInUse.includes(port)) {\n port++;\n }\n resolve(port);\n });\n });\n}\n"],"file":"process-utils.js"}
|