@eggjs/cluster 3.1.0-beta.9 → 4.0.0-beta.13

package/dist/agent_worker.d.ts

@@ -0,0 +1 @@
+export { };

package/dist/agent_worker.js

@@ -0,0 +1,55 @@
+import { AgentProcessWorker } from "./utils/mode/impl/process/agent.js";
+import { AgentThreadWorker } from "./utils/mode/impl/worker_threads/agent.js";
+import { debuglog } from "node:util";
+import { EggConsoleLogger } from "egg-logger";
+import { importModule } from "@eggjs/utils";
+
+//#region src/agent_worker.ts
+const debug = debuglog("egg/cluster/agent_worker");
+/**
+* agent worker is child_process forked by master.
+*
+* agent worker only exit in two cases:
+*  - receive signal SIGTERM, exit code 0 (exit gracefully)
+*  - receive disconnect event, exit code 110 (maybe master exit in accident)
+*/
+async function main() {
+	const options = JSON.parse(process.argv[2]);
+	if (options.require) for (const mod of options.require) await importModule(mod, { paths: [options.baseDir] });
+	let AgentWorker;
+	if (options.startMode === "worker_threads") AgentWorker = AgentThreadWorker;
+	else AgentWorker = AgentProcessWorker;
+	const consoleLogger = new EggConsoleLogger({ level: process.env.EGG_AGENT_WORKER_LOGGER_LEVEL });
+	const { Agent } = await importModule(options.framework, { paths: [options.baseDir] });
+	debug("new Agent with options %j", options);
+	let agent;
+	try {
+		agent = new Agent(options);
+	} catch (err) {
+		consoleLogger.error(err);
+		throw err;
+	}
+	function startErrorHandler(err) {
+		consoleLogger.error(err);
+		consoleLogger.error("[agent_worker] start error, exiting with code:1");
+		AgentWorker.kill();
+	}
+	agent.ready((err) => {
+		if (err) return;
+		agent.removeListener("error", startErrorHandler);
+		AgentWorker.send({
+			action: "agent-start",
+			to: "master"
+		});
+	});
+	agent.once("error", startErrorHandler);
+	AgentWorker.gracefulExit({
+		logger: consoleLogger,
+		label: "agent_worker",
+		beforeExit: () => agent.close()
+	});
+}
+main();
+
+//#endregion
+export {  };

package/dist/app_worker.d.ts

@@ -0,0 +1 @@
+export { };

package/dist/app_worker.js

@@ -0,0 +1,131 @@
+import { AppProcessWorker } from "./utils/mode/impl/process/app.js";
+import { AppThreadWorker } from "./utils/mode/impl/worker_threads/app.js";
+import { debuglog } from "node:util";
+import fs from "node:fs";
+import { EggConsoleLogger } from "egg-logger";
+import { importModule } from "@eggjs/utils";
+import { createServer } from "node:http";
+import { createServer as createServer$1 } from "node:https";
+
+//#region src/app_worker.ts
+const debug = debuglog("egg/cluster/app_worker");
+async function main() {
+	const options = JSON.parse(process.argv[2]);
+	if (options.require) for (const mod of options.require) await importModule(mod, { paths: [options.baseDir] });
+	let AppWorker;
+	if (options.startMode === "worker_threads") AppWorker = AppThreadWorker;
+	else AppWorker = AppProcessWorker;
+	const consoleLogger = new EggConsoleLogger({ level: process.env.EGG_APP_WORKER_LOGGER_LEVEL });
+	const { Application } = await importModule(options.framework, { paths: [options.baseDir] });
+	debug("[app_worker:%s] new Application with options %j", process.pid, options);
+	let app;
+	try {
+		app = new Application(options);
+	} catch (err) {
+		consoleLogger.error(err);
+		throw err;
+	}
+	app.ready(startServer);
+	function exitProcess() {
+		AppWorker.kill();
+	}
+	app.once("startTimeout", startTimeoutHandler);
+	function startTimeoutHandler() {
+		consoleLogger.error("[app_worker] start timeout, exiting with code:1");
+		exitProcess();
+	}
+	function startServer(err) {
+		if (err) {
+			consoleLogger.error(err);
+			consoleLogger.error("[app_worker] start error, exiting with code:1");
+			exitProcess();
+			return;
+		}
+		const clusterConfig = app.config.cluster ?? {};
+		const listenConfig = clusterConfig.listen ?? {};
+		const httpsOptions = {
+			...clusterConfig.https,
+			...options.https
+		};
+		const port = app.options.port = options.port || listenConfig.port;
+		const debugPort = options.debugPort;
+		const protocol = httpsOptions.key && httpsOptions.cert ? "https" : "http";
+		debug("[app_worker:%s] listenConfig: %j, real port: %o, protocol: %o, debugPort: %o", process.pid, listenConfig, port, protocol, debugPort);
+		AppWorker.send({
+			to: "master",
+			action: "realport",
+			data: {
+				port,
+				protocol
+			}
+		});
+		app.removeListener("startTimeout", startTimeoutHandler);
+		let server;
+		let debugPortServer;
+		if (protocol === "https") {
+			httpsOptions.key = fs.readFileSync(httpsOptions.key);
+			httpsOptions.cert = fs.readFileSync(httpsOptions.cert);
+			httpsOptions.ca = httpsOptions.ca && fs.readFileSync(httpsOptions.ca);
+			server = createServer$1(httpsOptions, app.callback());
+			if (debugPort) debugPortServer = createServer(app.callback());
+		} else {
+			server = createServer(app.callback());
+			if (debugPort) debugPortServer = server;
+		}
+		server.once("error", (err$1) => {
+			consoleLogger.error("[app_worker] server got error: %s, code: %s", err$1.message, err$1.code);
+			exitProcess();
+		});
+		app.emit("server", server);
+		if (options.sticky && options.stickyWorkerPort) {
+			server.listen(options.stickyWorkerPort, "127.0.0.1");
+			AppWorker.on("message", (message, connection) => {
+				if (message !== "sticky-session:connection") return;
+				server.emit("connection", connection);
+				connection.resume();
+			});
+		} else {
+			if (listenConfig.path) server.listen(listenConfig.path);
+			else {
+				if (typeof port !== "number") {
+					consoleLogger.error("[app_worker:%s] port should be number, but got %s(%s)", process.pid, port, typeof port);
+					exitProcess();
+					return;
+				}
+				const args = [port];
+				if (listenConfig.hostname) args.push(listenConfig.hostname);
+				debug("listen options %j", args);
+				server.listen(...args);
+			}
+			if (debugPortServer) {
+				debug("listen on debug port: %s", debugPort);
+				debugPortServer.listen(debugPort);
+			}
+		}
+		server.once("listening", () => {
+			let address = server.address() || { port };
+			if (typeof address === "string") address = {
+				address,
+				addressType: -1
+			};
+			debug("[app_worker:%s] listening at %j", process.pid, address);
+			AppWorker.send({
+				to: "master",
+				action: "app-start",
+				data: {
+					address,
+					workerId: AppWorker.workerId
+				}
+			});
+		});
+	}
+	AppWorker.gracefulExit({
+		logger: consoleLogger,
+		label: "app_worker",
+		beforeExit: () => app.close()
+	});
+}
+main();
+
+//#endregion
+export {  };

package/dist/utils/mode/impl/process/agent.js

@@ -90,4 +90,4 @@ var AgentProcessUtils = class extends BaseAgentUtils {
 };
 
 //#endregion
-export { AgentProcessUtils };
+export { AgentProcessUtils, AgentProcessWorker };

package/dist/utils/mode/impl/process/app.js

@@ -114,4 +114,4 @@ var AppProcessUtils = class extends BaseAppUtils {
 };
 
 //#endregion
-export { AppProcessUtils };
+export { AppProcessUtils, AppProcessWorker };

package/dist/utils/mode/impl/worker_threads/agent.js

@@ -76,4 +76,4 @@ var AgentThreadUtils = class extends BaseAgentUtils {
 };
 
 //#endregion
-export { AgentThreadUtils };
+export { AgentThreadUtils, AgentThreadWorker };

package/dist/utils/mode/impl/worker_threads/app.js

@@ -125,4 +125,4 @@ var AppThreadUtils = class extends BaseAppUtils {
 };
 
 //#endregion
-export { AppThreadUtils };
+export { AppThreadUtils, AppThreadWorker };

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "@eggjs/cluster",
-  "version": "3.1.0-beta.9",
+  "version": "4.0.0-beta.13",
   "publishConfig": {
     "access": "public"
   },
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
+    "./agent_worker": "./dist/agent_worker.js",
+    "./app_worker": "./dist/app_worker.js",
     "./package.json": "./package.json"
   },
   "main": "./dist/index.js",
@@ -43,23 +45,22 @@
     "sendmessage": "^3.0.1",
     "terminal-link": "^5.0.0",
     "utility": "^2.5.0",
-    "@eggjs/utils": "4.5.0-beta.9"
+    "@eggjs/utils": "5.0.0-beta.13"
   },
   "devDependencies": {
-    "@types/node": "24.5.2",
     "address": "2",
     "coffee": "5",
     "egg-errors": "^2.3.2",
-    "tsdown": "0.15.3",
+    "tsdown": "^0.15.4",
     "typescript": "5.9.2",
     "urllib": "^4.6.11",
-    "@eggjs/supertest": "8.3.0-beta.9",
-    "@eggjs/tsconfig": "3.1.0-beta.9",
-    "egg": "4.1.0-beta.9",
-    "@eggjs/mock": "6.1.0-beta.9"
+    "vitest": "4.0.0-beta.13",
+    "@eggjs/mock": "7.0.0-beta.13",
+    "@eggjs/tsconfig": "3.1.0-beta.13",
+    "@eggjs/supertest": "9.0.0-beta.13"
   },
   "engines": {
-    "node": ">= 20.19.0"
+    "node": ">=22.18.0"
   },
   "scripts": {
     "build": "tsdown",