@unpackjs/core 1.7.3 → 1.7.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/compiled/commander/index.d.ts +88 -12
- package/compiled/commander/index.js +367 -129
- package/compiled/commander/package.json +1 -1
- package/compiled/css-loader/index.js +22 -24
- package/compiled/less-loader/index.js +8 -8
- package/compiled/postcss-loader/index.js +10 -10
- package/compiled/sass-loader/index.js +9 -8
- package/compiled/sass-loader/package.json +1 -1
- package/compiled/style-loader/index.js +10 -10
- package/dist/bundler-config/chunkSplit.cjs +0 -4
- package/dist/bundler-config/chunkSplit.d.ts.map +1 -1
- package/dist/bundler-config/chunkSplit.js +0 -4
- package/dist/bundler-config/css.cjs +1 -2
- package/dist/bundler-config/css.d.ts.map +1 -1
- package/dist/bundler-config/css.js +1 -2
- package/dist/bundler-config/experimentCss.cjs +4 -1
- package/dist/bundler-config/experimentCss.d.ts.map +1 -1
- package/dist/bundler-config/experimentCss.js +4 -1
- package/dist/bundler-config/index.cjs +2 -1
- package/dist/bundler-config/index.d.ts.map +1 -1
- package/dist/bundler-config/index.js +2 -1
- package/dist/bundler-config/jsMinify.cjs +1 -1
- package/dist/bundler-config/jsMinify.js +1 -1
- package/dist/createUnpack.cjs +2 -2
- package/dist/createUnpack.js +2 -2
- package/dist/plugin-progress/webpack.d.ts.map +1 -1
- package/dist/prebundleDeps.cjs +2 -1
- package/dist/prebundleDeps.d.ts.map +1 -1
- package/dist/prebundleDeps.js +2 -1
- package/dist/run/dev.cjs +1 -1
- package/dist/run/dev.js +1 -1
- package/dist/types/config.d.ts +1 -6
- package/dist/types/config.d.ts.map +1 -1
- package/package.json +10 -11
- package/dist/thread-loader/WorkerError.cjs +0 -41
- package/dist/thread-loader/WorkerError.js +0 -31
- package/dist/thread-loader/WorkerPool.cjs +0 -407
- package/dist/thread-loader/WorkerPool.js +0 -387
- package/dist/thread-loader/index.cjs +0 -100
- package/dist/thread-loader/index.js +0 -85
- package/dist/thread-loader/readBuffer.cjs +0 -55
- package/dist/thread-loader/readBuffer.js +0 -45
- package/dist/thread-loader/serializer.cjs +0 -46
- package/dist/thread-loader/serializer.js +0 -31
- package/dist/thread-loader/utils.cjs +0 -84
- package/dist/thread-loader/utils.js +0 -60
- package/dist/thread-loader/worker.cjs +0 -377
- package/dist/thread-loader/worker.js +0 -382
- package/dist/thread-loader/workerPools.cjs +0 -57
- package/dist/thread-loader/workerPools.js +0 -33
|
@@ -23,7 +23,7 @@ class JsMinifyPlugin {
|
|
|
23
23
|
const { implementation, ...transformOptions } = this.options;
|
|
24
24
|
const meta = JSON.stringify({
|
|
25
25
|
name: PLUGIN_NAME,
|
|
26
|
-
version: "1.7.
|
|
26
|
+
version: "1.7.5",
|
|
27
27
|
options: transformOptions
|
|
28
28
|
});
|
|
29
29
|
compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
|
package/dist/createUnpack.cjs
CHANGED
|
@@ -81,7 +81,7 @@ function createUnpack() {
|
|
|
81
81
|
build: async (unpackConfig) => {
|
|
82
82
|
(0, import_utils.setNodeEnv)("production");
|
|
83
83
|
console.log(
|
|
84
|
-
import_colors.default.rainbow(`unpack v${"1.7.
|
|
84
|
+
import_colors.default.rainbow(`unpack v${"1.7.5"}`),
|
|
85
85
|
import_colors.default.green("building for production...")
|
|
86
86
|
);
|
|
87
87
|
const config = await resolveConfig(unpackConfig);
|
|
@@ -97,7 +97,7 @@ function createUnpack() {
|
|
|
97
97
|
watch: async (unpackConfig) => {
|
|
98
98
|
(0, import_utils.setNodeEnv)("development");
|
|
99
99
|
console.log(
|
|
100
|
-
import_colors.default.rainbow(`unpack v${"1.7.
|
|
100
|
+
import_colors.default.rainbow(`unpack v${"1.7.5"}`),
|
|
101
101
|
import_colors.default.green("building for development...")
|
|
102
102
|
);
|
|
103
103
|
const config = await resolveConfig(unpackConfig);
|
package/dist/createUnpack.js
CHANGED
|
@@ -58,7 +58,7 @@ function createUnpack() {
|
|
|
58
58
|
build: async (unpackConfig) => {
|
|
59
59
|
setNodeEnv("production");
|
|
60
60
|
console.log(
|
|
61
|
-
colors.rainbow(`unpack v${"1.7.
|
|
61
|
+
colors.rainbow(`unpack v${"1.7.5"}`),
|
|
62
62
|
colors.green("building for production...")
|
|
63
63
|
);
|
|
64
64
|
const config = await resolveConfig(unpackConfig);
|
|
@@ -74,7 +74,7 @@ function createUnpack() {
|
|
|
74
74
|
watch: async (unpackConfig) => {
|
|
75
75
|
setNodeEnv("development");
|
|
76
76
|
console.log(
|
|
77
|
-
colors.rainbow(`unpack v${"1.7.
|
|
77
|
+
colors.rainbow(`unpack v${"1.7.5"}`),
|
|
78
78
|
colors.green("building for development...")
|
|
79
79
|
);
|
|
80
80
|
const config = await resolveConfig(unpackConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../src/plugin-progress/webpack.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAG7C,OAAO,OAAO,MAAM,SAAS,CAAA;AAG7B,qBAAa,qBAAsB,SAAQ,OAAO,CAAC,cAAc;IAC/D,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACxC,WAAW,cAAoB;;IAiB/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI;
|
|
1
|
+
{"version":3,"file":"webpack.d.ts","sourceRoot":"","sources":["../../src/plugin-progress/webpack.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAG7C,OAAO,OAAO,MAAM,SAAS,CAAA;AAG7B,qBAAa,qBAAsB,SAAQ,OAAO,CAAC,cAAc;IAC/D,SAAS,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAY;IACxC,WAAW,cAAoB;;IAiB/B,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,GAAG,IAAI;CA+BxC"}
|
package/dist/prebundleDeps.cjs
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prebundleDeps.d.ts","sourceRoot":"","sources":["../src/prebundleDeps.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"prebundleDeps.d.ts","sourceRoot":"","sources":["../src/prebundleDeps.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AA8N3C,eAAO,MAAM,aAAa,sBAEvB;IACD,YAAY,EAAE,YAAY,CAAA;CAC3B,KAAG,OAAO,CAAC,YAAY,CA2GvB,CAAA"}
|
package/dist/prebundleDeps.js
CHANGED
package/dist/run/dev.cjs
CHANGED
|
@@ -62,7 +62,7 @@ async function bundlerDev(originalUnpackConfig) {
|
|
|
62
62
|
};
|
|
63
63
|
const server = new import_webpack_dev_server.default(devServerOptions, compiler);
|
|
64
64
|
import_logger.logger.greet(
|
|
65
|
-
` ${import_colors.default.green(`${import_colors.default.bold("UNPACK")} v${"1.7.
|
|
65
|
+
` ${import_colors.default.green(`${import_colors.default.bold("UNPACK")} v${"1.7.5"}`)} ${import_colors.default.dim(
|
|
66
66
|
`ready in ${import_colors.default.reset(
|
|
67
67
|
import_colors.default.bold(Math.ceil(performance.now() - global.__unpack_start_time))
|
|
68
68
|
)}ms`
|
package/dist/run/dev.js
CHANGED
|
@@ -39,7 +39,7 @@ async function bundlerDev(originalUnpackConfig) {
|
|
|
39
39
|
};
|
|
40
40
|
const server = new WebpackDevServer(devServerOptions, compiler);
|
|
41
41
|
logger.greet(
|
|
42
|
-
` ${colors.green(`${colors.bold("UNPACK")} v${"1.7.
|
|
42
|
+
` ${colors.green(`${colors.bold("UNPACK")} v${"1.7.5"}`)} ${colors.dim(
|
|
43
43
|
`ready in ${colors.reset(
|
|
44
44
|
colors.bold(Math.ceil(performance.now() - global.__unpack_start_time))
|
|
45
45
|
)}ms`
|
package/dist/types/config.d.ts
CHANGED
|
@@ -1,11 +1,10 @@
|
|
|
1
1
|
import type { RspackOptions as RspackConfiguration } from '@rspack/core';
|
|
2
2
|
import type SassLoader from '../../compiled/sass-loader/index.js';
|
|
3
3
|
import type { AcceptedPlugin, ProcessOptions } from 'postcss';
|
|
4
|
-
import type { Configuration as WebpackConfiguration } from 'webpack';
|
|
5
4
|
import type { ChunkSplit } from './chunkSplit';
|
|
6
5
|
import type { LightningcssMinifyPluginOptions, LightningcssTransformOptions } from './lightningcss';
|
|
7
6
|
import type { UnpackPlugin } from './plugin';
|
|
8
|
-
export type BundlerConfiguration = RspackConfiguration
|
|
7
|
+
export type BundlerConfiguration = RspackConfiguration;
|
|
9
8
|
type PostCSSOptions = ProcessOptions & {
|
|
10
9
|
/**
|
|
11
10
|
* Allows to set options using config files.
|
|
@@ -177,10 +176,6 @@ export type UnpackConfig = {
|
|
|
177
176
|
* @default false
|
|
178
177
|
*/
|
|
179
178
|
css?: boolean;
|
|
180
|
-
/**
|
|
181
|
-
* @default false
|
|
182
|
-
*/
|
|
183
|
-
incremental?: boolean;
|
|
184
179
|
};
|
|
185
180
|
mpa?: boolean | {
|
|
186
181
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,IAAI,mBAAmB,EAAE,MAAM,cAAc,CAAA;AACxE,OAAO,KAAK,UAAU,MAAM,+BAA+B,CAAA;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC7D,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/types/config.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@unpackjs/core",
|
|
3
|
-
"version": "1.7.
|
|
3
|
+
"version": "1.7.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"exports": {
|
|
@@ -69,39 +69,38 @@
|
|
|
69
69
|
},
|
|
70
70
|
"devDependencies": {
|
|
71
71
|
"@types/sass-loader": "8.0.9",
|
|
72
|
-
"commander": "
|
|
72
|
+
"commander": "13.0.0",
|
|
73
73
|
"css-loader": "7.1.2",
|
|
74
74
|
"less-loader": "12.2.0",
|
|
75
75
|
"line-diff": "2.1.1",
|
|
76
76
|
"portfinder": "1.0.32",
|
|
77
77
|
"postcss-loader": "8.1.1",
|
|
78
|
-
"sass-loader": "16.0.
|
|
78
|
+
"sass-loader": "16.0.4",
|
|
79
79
|
"semver": "7.6.3",
|
|
80
80
|
"style-loader": "4.0.0",
|
|
81
81
|
"webpack-bundle-analyzer": "4.10.2",
|
|
82
82
|
"webpack-merge": "6.0.1"
|
|
83
83
|
},
|
|
84
84
|
"dependencies": {
|
|
85
|
-
"@rspack/core": "1.1.
|
|
85
|
+
"@rspack/core": "1.1.8",
|
|
86
86
|
"@types/less": "3.0.7",
|
|
87
87
|
"copy-webpack-plugin": "12.0.2",
|
|
88
88
|
"cors": "2.8.5",
|
|
89
|
-
"esbuild": "0.24.
|
|
90
|
-
"express": "4.21.
|
|
89
|
+
"esbuild": "0.24.2",
|
|
90
|
+
"express": "4.21.2",
|
|
91
91
|
"html-webpack-plugin": "5.6.3",
|
|
92
92
|
"json5": "2.2.3",
|
|
93
93
|
"lightningcss": "1.28.2",
|
|
94
|
-
"loader-runner": "4.3.0",
|
|
95
94
|
"mini-css-extract-plugin": "2.9.2",
|
|
96
|
-
"neo-async": "2.6.2",
|
|
97
95
|
"open": "8.4.2",
|
|
98
96
|
"picocolors": "1.1.1",
|
|
99
97
|
"postcss": "8.4.49",
|
|
100
98
|
"tinyglobby": "0.2.10",
|
|
101
|
-
"ts-checker-rspack-plugin": "1.0
|
|
99
|
+
"ts-checker-rspack-plugin": "1.1.0",
|
|
102
100
|
"typed-css-modules": "0.9.1",
|
|
103
|
-
"webpack": "5.97.
|
|
104
|
-
"webpack-dev-server": "5.
|
|
101
|
+
"webpack": "5.97.1",
|
|
102
|
+
"webpack-dev-server": "5.2.0",
|
|
103
|
+
"thread-loader": "4.0.4"
|
|
105
104
|
},
|
|
106
105
|
"scripts": {
|
|
107
106
|
"dev": "modern build --watch",
|
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
var __defProp = Object.defineProperty;
|
|
2
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
3
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
4
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
5
|
-
var __export = (target, all) => {
|
|
6
|
-
for (var name in all)
|
|
7
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
8
|
-
};
|
|
9
|
-
var __copyProps = (to, from, except, desc) => {
|
|
10
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
11
|
-
for (let key of __getOwnPropNames(from))
|
|
12
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
13
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
14
|
-
}
|
|
15
|
-
return to;
|
|
16
|
-
};
|
|
17
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
18
|
-
var WorkerError_exports = {};
|
|
19
|
-
__export(WorkerError_exports, {
|
|
20
|
-
default: () => WorkerError_default
|
|
21
|
-
});
|
|
22
|
-
module.exports = __toCommonJS(WorkerError_exports);
|
|
23
|
-
const stack = (err, worker, workerId) => {
|
|
24
|
-
const originError = (err.stack || "").split("\n").filter((line) => line.trim().startsWith("at"));
|
|
25
|
-
const workerError = worker.split("\n").filter((line) => line.trim().startsWith("at"));
|
|
26
|
-
const diff = workerError.slice(0, workerError.length - originError.length).join("\n");
|
|
27
|
-
originError.unshift(diff);
|
|
28
|
-
originError.unshift(err.message);
|
|
29
|
-
originError.unshift(`Thread Loader (Worker ${workerId})`);
|
|
30
|
-
return originError.join("\n");
|
|
31
|
-
};
|
|
32
|
-
class WorkerError extends Error {
|
|
33
|
-
constructor(err, workerId) {
|
|
34
|
-
super(err);
|
|
35
|
-
this.name = err.name;
|
|
36
|
-
this.message = err.message;
|
|
37
|
-
Error.captureStackTrace(this, this.constructor);
|
|
38
|
-
this.stack = stack(err, this.stack, workerId);
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
var WorkerError_default = WorkerError;
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
import { createRequire } from 'node:module';
|
|
2
|
-
var require = createRequire(import.meta['url']);
|
|
3
|
-
|
|
4
|
-
import path from "path";
|
|
5
|
-
import { fileURLToPath } from "url";
|
|
6
|
-
var getFilename = () => fileURLToPath(import.meta.url);
|
|
7
|
-
var getDirname = () => path.dirname(getFilename());
|
|
8
|
-
var __dirname = /* @__PURE__ */ getDirname();
|
|
9
|
-
var __filename = /* @__PURE__ */ getFilename();
|
|
10
|
-
const stack = (err, worker, workerId) => {
|
|
11
|
-
const originError = (err.stack || "").split("\n").filter((line) => line.trim().startsWith("at"));
|
|
12
|
-
const workerError = worker.split("\n").filter((line) => line.trim().startsWith("at"));
|
|
13
|
-
const diff = workerError.slice(0, workerError.length - originError.length).join("\n");
|
|
14
|
-
originError.unshift(diff);
|
|
15
|
-
originError.unshift(err.message);
|
|
16
|
-
originError.unshift(`Thread Loader (Worker ${workerId})`);
|
|
17
|
-
return originError.join("\n");
|
|
18
|
-
};
|
|
19
|
-
class WorkerError extends Error {
|
|
20
|
-
constructor(err, workerId) {
|
|
21
|
-
super(err);
|
|
22
|
-
this.name = err.name;
|
|
23
|
-
this.message = err.message;
|
|
24
|
-
Error.captureStackTrace(this, this.constructor);
|
|
25
|
-
this.stack = stack(err, this.stack, workerId);
|
|
26
|
-
}
|
|
27
|
-
}
|
|
28
|
-
var WorkerError_default = WorkerError;
|
|
29
|
-
export {
|
|
30
|
-
WorkerError_default as default
|
|
31
|
-
};
|
|
@@ -1,407 +0,0 @@
|
|
|
1
|
-
var __create = Object.create;
|
|
2
|
-
var __defProp = Object.defineProperty;
|
|
3
|
-
var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
|
|
4
|
-
var __getOwnPropNames = Object.getOwnPropertyNames;
|
|
5
|
-
var __getProtoOf = Object.getPrototypeOf;
|
|
6
|
-
var __hasOwnProp = Object.prototype.hasOwnProperty;
|
|
7
|
-
var __export = (target, all) => {
|
|
8
|
-
for (var name in all)
|
|
9
|
-
__defProp(target, name, { get: all[name], enumerable: true });
|
|
10
|
-
};
|
|
11
|
-
var __copyProps = (to, from, except, desc) => {
|
|
12
|
-
if (from && typeof from === "object" || typeof from === "function") {
|
|
13
|
-
for (let key of __getOwnPropNames(from))
|
|
14
|
-
if (!__hasOwnProp.call(to, key) && key !== except)
|
|
15
|
-
__defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
|
|
16
|
-
}
|
|
17
|
-
return to;
|
|
18
|
-
};
|
|
19
|
-
var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
|
|
20
|
-
// If the importer is in node compatibility mode or this is not an ESM
|
|
21
|
-
// file that has been converted to a CommonJS file using a Babel-
|
|
22
|
-
// compatible transform (i.e. "__esModule" has not been set), then set
|
|
23
|
-
// "default" to the CommonJS "module.exports" for node compatibility.
|
|
24
|
-
isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
|
|
25
|
-
mod
|
|
26
|
-
));
|
|
27
|
-
var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
|
|
28
|
-
var WorkerPool_exports = {};
|
|
29
|
-
__export(WorkerPool_exports, {
|
|
30
|
-
default: () => WorkerPool
|
|
31
|
-
});
|
|
32
|
-
module.exports = __toCommonJS(WorkerPool_exports);
|
|
33
|
-
var import_node_child_process = __toESM(require("node:child_process"));
|
|
34
|
-
var import_WorkerError = __toESM(require("./WorkerError.cjs"));
|
|
35
|
-
var import_readBuffer = __toESM(require("./readBuffer.cjs"));
|
|
36
|
-
var import_serializer = require("./serializer.cjs");
|
|
37
|
-
const asyncMapSeries = require("neo-async/mapSeries.js");
|
|
38
|
-
const asyncQueue = require("neo-async/queue.js");
|
|
39
|
-
const workerPath = require.resolve("./worker");
|
|
40
|
-
let workerId = 0;
|
|
41
|
-
class PoolWorker {
|
|
42
|
-
constructor(options, onJobDone) {
|
|
43
|
-
this.disposed = false;
|
|
44
|
-
this.nextJobId = 0;
|
|
45
|
-
this.jobs = /* @__PURE__ */ Object.create(null);
|
|
46
|
-
this.activeJobs = 0;
|
|
47
|
-
this.onJobDone = onJobDone;
|
|
48
|
-
this.id = workerId;
|
|
49
|
-
workerId += 1;
|
|
50
|
-
const sanitizedNodeArgs = (options.nodeArgs || []).filter((opt) => !!opt);
|
|
51
|
-
this.worker = import_node_child_process.default.spawn(
|
|
52
|
-
process.execPath,
|
|
53
|
-
[].concat(sanitizedNodeArgs).concat(workerPath, options.parallelJobs),
|
|
54
|
-
{
|
|
55
|
-
detached: true,
|
|
56
|
-
stdio: ["ignore", "pipe", "pipe", "pipe", "pipe"]
|
|
57
|
-
}
|
|
58
|
-
);
|
|
59
|
-
this.worker.unref();
|
|
60
|
-
if (!this.worker.stdio) {
|
|
61
|
-
throw new Error(
|
|
62
|
-
`Failed to create the worker pool with workerId: ${workerId} and ${""}configuration: ${JSON.stringify(
|
|
63
|
-
options
|
|
64
|
-
)}. Please verify if you hit the OS open files limit.`
|
|
65
|
-
);
|
|
66
|
-
}
|
|
67
|
-
const [, , , readPipe, writePipe] = this.worker.stdio;
|
|
68
|
-
this.readPipe = readPipe;
|
|
69
|
-
this.writePipe = writePipe;
|
|
70
|
-
this.listenStdOutAndErrFromWorker(this.worker.stdout, this.worker.stderr);
|
|
71
|
-
this.readNextMessage();
|
|
72
|
-
}
|
|
73
|
-
listenStdOutAndErrFromWorker(workerStdout, workerStderr) {
|
|
74
|
-
if (workerStdout) {
|
|
75
|
-
workerStdout.on("data", this.writeToStdout);
|
|
76
|
-
}
|
|
77
|
-
if (workerStderr) {
|
|
78
|
-
workerStderr.on("data", this.writeToStderr);
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
ignoreStdOutAndErrFromWorker(workerStdout, workerStderr) {
|
|
82
|
-
if (workerStdout) {
|
|
83
|
-
workerStdout.removeListener("data", this.writeToStdout);
|
|
84
|
-
}
|
|
85
|
-
if (workerStderr) {
|
|
86
|
-
workerStderr.removeListener("data", this.writeToStderr);
|
|
87
|
-
}
|
|
88
|
-
}
|
|
89
|
-
writeToStdout(data) {
|
|
90
|
-
if (!this.disposed) {
|
|
91
|
-
process.stdout.write(data);
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
writeToStderr(data) {
|
|
95
|
-
if (!this.disposed) {
|
|
96
|
-
process.stderr.write(data);
|
|
97
|
-
}
|
|
98
|
-
}
|
|
99
|
-
run(data, callback) {
|
|
100
|
-
const jobId = this.nextJobId;
|
|
101
|
-
this.nextJobId += 1;
|
|
102
|
-
this.jobs[jobId] = { data, callback };
|
|
103
|
-
this.activeJobs += 1;
|
|
104
|
-
this.writeJson({
|
|
105
|
-
type: "job",
|
|
106
|
-
id: jobId,
|
|
107
|
-
data
|
|
108
|
-
});
|
|
109
|
-
}
|
|
110
|
-
warmup(requires) {
|
|
111
|
-
this.writeJson({
|
|
112
|
-
type: "warmup",
|
|
113
|
-
requires
|
|
114
|
-
});
|
|
115
|
-
}
|
|
116
|
-
writeJson(data) {
|
|
117
|
-
const lengthBuffer = Buffer.alloc(4);
|
|
118
|
-
const messageBuffer = Buffer.from(JSON.stringify(data, import_serializer.replacer), "utf-8");
|
|
119
|
-
lengthBuffer.writeInt32BE(messageBuffer.length, 0);
|
|
120
|
-
this.writePipe.write(lengthBuffer);
|
|
121
|
-
this.writePipe.write(messageBuffer);
|
|
122
|
-
}
|
|
123
|
-
writeEnd() {
|
|
124
|
-
const lengthBuffer = Buffer.alloc(4);
|
|
125
|
-
lengthBuffer.writeInt32BE(0, 0);
|
|
126
|
-
this.writePipe.write(lengthBuffer);
|
|
127
|
-
}
|
|
128
|
-
readNextMessage() {
|
|
129
|
-
this.state = "read length";
|
|
130
|
-
this.readBuffer(4, (lengthReadError, lengthBuffer) => {
|
|
131
|
-
if (lengthReadError) {
|
|
132
|
-
console.error(`Failed to communicate with worker (read length) ${lengthReadError}`);
|
|
133
|
-
return;
|
|
134
|
-
}
|
|
135
|
-
this.state = "length read";
|
|
136
|
-
const length = lengthBuffer.readInt32BE(0);
|
|
137
|
-
this.state = "read message";
|
|
138
|
-
this.readBuffer(length, (messageError, messageBuffer) => {
|
|
139
|
-
if (messageError) {
|
|
140
|
-
console.error(`Failed to communicate with worker (read message) ${messageError}`);
|
|
141
|
-
return;
|
|
142
|
-
}
|
|
143
|
-
this.state = "message read";
|
|
144
|
-
const messageString = messageBuffer.toString("utf-8");
|
|
145
|
-
const message = JSON.parse(messageString, import_serializer.reviver);
|
|
146
|
-
this.state = "process message";
|
|
147
|
-
this.onWorkerMessage(message, (err) => {
|
|
148
|
-
if (err) {
|
|
149
|
-
console.error(`Failed to communicate with worker (process message) ${err}`);
|
|
150
|
-
return;
|
|
151
|
-
}
|
|
152
|
-
this.state = "soon next";
|
|
153
|
-
setImmediate(() => this.readNextMessage());
|
|
154
|
-
});
|
|
155
|
-
});
|
|
156
|
-
});
|
|
157
|
-
}
|
|
158
|
-
onWorkerMessage(message, finalCallback) {
|
|
159
|
-
const { type, id } = message;
|
|
160
|
-
switch (type) {
|
|
161
|
-
case "job": {
|
|
162
|
-
const { data, error, result } = message;
|
|
163
|
-
asyncMapSeries(
|
|
164
|
-
data,
|
|
165
|
-
(length, callback) => this.readBuffer(length, callback),
|
|
166
|
-
(eachErr, buffers) => {
|
|
167
|
-
const { callback: jobCallback } = this.jobs[id];
|
|
168
|
-
const callback = (err, arg) => {
|
|
169
|
-
if (jobCallback) {
|
|
170
|
-
delete this.jobs[id];
|
|
171
|
-
this.activeJobs -= 1;
|
|
172
|
-
this.onJobDone();
|
|
173
|
-
if (err) {
|
|
174
|
-
jobCallback(err instanceof Error ? err : new Error(err), arg);
|
|
175
|
-
} else {
|
|
176
|
-
jobCallback(null, arg);
|
|
177
|
-
}
|
|
178
|
-
}
|
|
179
|
-
finalCallback();
|
|
180
|
-
};
|
|
181
|
-
if (eachErr) {
|
|
182
|
-
callback(eachErr);
|
|
183
|
-
return;
|
|
184
|
-
}
|
|
185
|
-
let bufferPosition = 0;
|
|
186
|
-
if (result.result) {
|
|
187
|
-
result.result = result.result.map((r) => {
|
|
188
|
-
if (r.buffer) {
|
|
189
|
-
const buffer = buffers[bufferPosition];
|
|
190
|
-
bufferPosition += 1;
|
|
191
|
-
if (r.string) {
|
|
192
|
-
return buffer.toString("utf-8");
|
|
193
|
-
}
|
|
194
|
-
return buffer;
|
|
195
|
-
}
|
|
196
|
-
return r.data;
|
|
197
|
-
});
|
|
198
|
-
}
|
|
199
|
-
if (error) {
|
|
200
|
-
callback(this.fromErrorObj(error), result);
|
|
201
|
-
return;
|
|
202
|
-
}
|
|
203
|
-
callback(null, result);
|
|
204
|
-
}
|
|
205
|
-
);
|
|
206
|
-
break;
|
|
207
|
-
}
|
|
208
|
-
case "loadModule": {
|
|
209
|
-
const { request, questionId } = message;
|
|
210
|
-
const { data } = this.jobs[id];
|
|
211
|
-
data.loadModule(request, (error, source, sourceMap) => {
|
|
212
|
-
this.writeJson({
|
|
213
|
-
type: "result",
|
|
214
|
-
id: questionId,
|
|
215
|
-
error: error ? {
|
|
216
|
-
message: error.message,
|
|
217
|
-
details: error.details,
|
|
218
|
-
missing: error.missing
|
|
219
|
-
} : null,
|
|
220
|
-
result: [
|
|
221
|
-
source,
|
|
222
|
-
sourceMap
|
|
223
|
-
// TODO: Serialize module?
|
|
224
|
-
// module,
|
|
225
|
-
]
|
|
226
|
-
});
|
|
227
|
-
});
|
|
228
|
-
finalCallback();
|
|
229
|
-
break;
|
|
230
|
-
}
|
|
231
|
-
case "resolve": {
|
|
232
|
-
const { context, request, options, questionId } = message;
|
|
233
|
-
const { data } = this.jobs[id];
|
|
234
|
-
if (options) {
|
|
235
|
-
data.getResolve(options)(context, request, (error, result) => {
|
|
236
|
-
this.writeJson({
|
|
237
|
-
type: "result",
|
|
238
|
-
id: questionId,
|
|
239
|
-
error: error ? {
|
|
240
|
-
message: error.message,
|
|
241
|
-
details: error.details,
|
|
242
|
-
missing: error.missing
|
|
243
|
-
} : null,
|
|
244
|
-
result
|
|
245
|
-
});
|
|
246
|
-
});
|
|
247
|
-
} else {
|
|
248
|
-
data.resolve(context, request, (error, result) => {
|
|
249
|
-
this.writeJson({
|
|
250
|
-
type: "result",
|
|
251
|
-
id: questionId,
|
|
252
|
-
error: error ? {
|
|
253
|
-
message: error.message,
|
|
254
|
-
details: error.details,
|
|
255
|
-
missing: error.missing
|
|
256
|
-
} : null,
|
|
257
|
-
result
|
|
258
|
-
});
|
|
259
|
-
});
|
|
260
|
-
}
|
|
261
|
-
finalCallback();
|
|
262
|
-
break;
|
|
263
|
-
}
|
|
264
|
-
case "emitWarning": {
|
|
265
|
-
const { data } = message;
|
|
266
|
-
const { data: jobData } = this.jobs[id];
|
|
267
|
-
jobData.emitWarning(this.fromErrorObj(data));
|
|
268
|
-
finalCallback();
|
|
269
|
-
break;
|
|
270
|
-
}
|
|
271
|
-
case "emitError": {
|
|
272
|
-
const { data } = message;
|
|
273
|
-
const { data: jobData } = this.jobs[id];
|
|
274
|
-
jobData.emitError(this.fromErrorObj(data));
|
|
275
|
-
finalCallback();
|
|
276
|
-
break;
|
|
277
|
-
}
|
|
278
|
-
case "getLogger": {
|
|
279
|
-
const { data } = message;
|
|
280
|
-
const { data: jobData } = this.jobs[id];
|
|
281
|
-
if (!Object.hasOwnProperty.call(jobData.loggers, data.name)) {
|
|
282
|
-
jobData.loggers[data.name] = jobData.getLogger(data.name);
|
|
283
|
-
}
|
|
284
|
-
finalCallback();
|
|
285
|
-
break;
|
|
286
|
-
}
|
|
287
|
-
case "logger": {
|
|
288
|
-
const { data } = message;
|
|
289
|
-
const { data: jobData } = this.jobs[id];
|
|
290
|
-
jobData.loggers[data.name][data.severity](data.message);
|
|
291
|
-
finalCallback();
|
|
292
|
-
break;
|
|
293
|
-
}
|
|
294
|
-
default: {
|
|
295
|
-
console.error(`Unexpected worker message ${type} in WorkerPool.`);
|
|
296
|
-
finalCallback();
|
|
297
|
-
break;
|
|
298
|
-
}
|
|
299
|
-
}
|
|
300
|
-
}
|
|
301
|
-
fromErrorObj(arg) {
|
|
302
|
-
let obj;
|
|
303
|
-
if (typeof arg === "string") {
|
|
304
|
-
obj = { message: arg };
|
|
305
|
-
} else {
|
|
306
|
-
obj = arg;
|
|
307
|
-
}
|
|
308
|
-
return new import_WorkerError.default(obj, this.id);
|
|
309
|
-
}
|
|
310
|
-
readBuffer(length, callback) {
|
|
311
|
-
(0, import_readBuffer.default)(this.readPipe, length, callback);
|
|
312
|
-
}
|
|
313
|
-
dispose() {
|
|
314
|
-
if (!this.disposed) {
|
|
315
|
-
this.disposed = true;
|
|
316
|
-
this.ignoreStdOutAndErrFromWorker(this.worker.stdout, this.worker.stderr);
|
|
317
|
-
this.writeEnd();
|
|
318
|
-
}
|
|
319
|
-
}
|
|
320
|
-
}
|
|
321
|
-
class WorkerPool {
|
|
322
|
-
constructor(options) {
|
|
323
|
-
this.options = options || {};
|
|
324
|
-
this.numberOfWorkers = options.numberOfWorkers;
|
|
325
|
-
this.poolTimeout = options.poolTimeout;
|
|
326
|
-
this.workerNodeArgs = options.workerNodeArgs;
|
|
327
|
-
this.workerParallelJobs = options.workerParallelJobs;
|
|
328
|
-
this.workers = /* @__PURE__ */ new Set();
|
|
329
|
-
this.activeJobs = 0;
|
|
330
|
-
this.timeout = null;
|
|
331
|
-
this.poolQueue = asyncQueue(this.distributeJob.bind(this), options.poolParallelJobs);
|
|
332
|
-
this.terminated = false;
|
|
333
|
-
this.setupLifeCycle();
|
|
334
|
-
}
|
|
335
|
-
isAbleToRun() {
|
|
336
|
-
return !this.terminated;
|
|
337
|
-
}
|
|
338
|
-
terminate() {
|
|
339
|
-
if (this.terminated) {
|
|
340
|
-
return;
|
|
341
|
-
}
|
|
342
|
-
this.terminated = true;
|
|
343
|
-
this.poolQueue.kill();
|
|
344
|
-
this.disposeWorkers(true);
|
|
345
|
-
}
|
|
346
|
-
setupLifeCycle() {
|
|
347
|
-
process.on("exit", () => {
|
|
348
|
-
this.terminate();
|
|
349
|
-
});
|
|
350
|
-
}
|
|
351
|
-
run(data, callback) {
|
|
352
|
-
if (this.timeout) {
|
|
353
|
-
clearTimeout(this.timeout);
|
|
354
|
-
this.timeout = null;
|
|
355
|
-
}
|
|
356
|
-
this.activeJobs += 1;
|
|
357
|
-
this.poolQueue.push(data, callback);
|
|
358
|
-
}
|
|
359
|
-
distributeJob(data, callback) {
|
|
360
|
-
let bestWorker;
|
|
361
|
-
for (const worker of this.workers) {
|
|
362
|
-
if (!bestWorker || worker.activeJobs < bestWorker.activeJobs) {
|
|
363
|
-
bestWorker = worker;
|
|
364
|
-
}
|
|
365
|
-
}
|
|
366
|
-
if (bestWorker && (bestWorker.activeJobs === 0 || this.workers.size >= this.numberOfWorkers)) {
|
|
367
|
-
bestWorker.run(data, callback);
|
|
368
|
-
return;
|
|
369
|
-
}
|
|
370
|
-
const newWorker = this.createWorker();
|
|
371
|
-
newWorker.run(data, callback);
|
|
372
|
-
}
|
|
373
|
-
createWorker() {
|
|
374
|
-
const newWorker = new PoolWorker(
|
|
375
|
-
{
|
|
376
|
-
nodeArgs: this.workerNodeArgs,
|
|
377
|
-
parallelJobs: this.workerParallelJobs
|
|
378
|
-
},
|
|
379
|
-
() => this.onJobDone()
|
|
380
|
-
);
|
|
381
|
-
this.workers.add(newWorker);
|
|
382
|
-
return newWorker;
|
|
383
|
-
}
|
|
384
|
-
warmup(requires) {
|
|
385
|
-
while (this.workers.size < this.numberOfWorkers) {
|
|
386
|
-
this.createWorker().warmup(requires);
|
|
387
|
-
}
|
|
388
|
-
}
|
|
389
|
-
onJobDone() {
|
|
390
|
-
this.activeJobs -= 1;
|
|
391
|
-
if (this.activeJobs === 0 && Number.isFinite(this.poolTimeout)) {
|
|
392
|
-
this.timeout = setTimeout(() => this.disposeWorkers(), this.poolTimeout);
|
|
393
|
-
}
|
|
394
|
-
}
|
|
395
|
-
disposeWorkers(fromTerminate) {
|
|
396
|
-
if (!this.options.poolRespawn && !fromTerminate) {
|
|
397
|
-
this.terminate();
|
|
398
|
-
return;
|
|
399
|
-
}
|
|
400
|
-
if (this.activeJobs === 0 || fromTerminate) {
|
|
401
|
-
for (const worker of this.workers) {
|
|
402
|
-
worker.dispose();
|
|
403
|
-
}
|
|
404
|
-
this.workers.clear();
|
|
405
|
-
}
|
|
406
|
-
}
|
|
407
|
-
}
|