@eggjs/cluster 4.0.0-beta.34 → 4.0.0-beta.36

package/dist/utils/worker_manager.js

@@ -1,74 +1,68 @@
-import { EventEmitter } from 'node:events';
-import { BaseAgentWorker } from "./mode/base/agent.js";
-import { BaseAppWorker } from "./mode/base/app.js";
-// worker manager to record agent and worker forked by egg-cluster
-// can do some check stuff here to monitor the healthy
-export class WorkerManager extends EventEmitter {
-    agent;
-    workers = new Map();
-    exception = 0;
-    timer;
-    constructor() {
-        super();
-        this.agent = null;
-    }
-    getWorkers() {
-        return Array.from(this.workers.keys());
-    }
-    setAgent(agent) {
-        this.agent = agent;
-    }
-    getAgent() {
-        return this.agent;
-    }
-    deleteAgent() {
-        this.agent = null;
-    }
-    setWorker(worker) {
-        this.workers.set(worker.workerId, worker);
-    }
-    getWorker(workerId) {
-        return this.workers.get(workerId);
-    }
-    deleteWorker(workerId) {
-        this.workers.delete(workerId);
-    }
-    listWorkerIds() {
-        return Array.from(this.workers.keys());
-    }
-    listWorkers() {
-        return Array.from(this.workers.values());
-    }
-    getListeningWorkerIds() {
-        const keys = [];
-        for (const [id, worker] of this.workers.entries()) {
-            if (worker.state === 'listening') {
-                keys.push(id);
-            }
-        }
-        return keys;
-    }
-    count() {
-        return {
-            agent: this.agent?.status === 'started' ? 1 : 0,
-            worker: this.listWorkerIds().length,
-        };
-    }
-    // check agent and worker must both alive
-    // if exception appear 3 times, emit an exception event
-    startCheck() {
-        this.timer = setInterval(() => {
-            const count = this.count();
-            if (count.agent > 0 && count.worker > 0) {
-                this.exception = 0;
-                return;
-            }
-            this.exception++;
-            if (this.exception >= 3) {
-                this.emit('exception', count);
-                clearInterval(this.timer);
-            }
-        }, 10000);
-    }
-}
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoid29ya2VyX21hbmFnZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvd29ya2VyX21hbmFnZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxFQUFFLFlBQVksRUFBRSxNQUFNLGFBQWEsQ0FBQztBQUUzQyxPQUFPLEVBQUUsZUFBZSxFQUFFLE1BQU0sc0JBQXNCLENBQUM7QUFDdkQsT0FBTyxFQUFFLGFBQWEsRUFBRSxNQUFNLG9CQUFvQixDQUFDO0FBRW5ELGtFQUFrRTtBQUNsRSxzREFBc0Q7QUFDdEQsTUFBTSxPQUFPLGFBQWMsU0FBUSxZQUFZO0lBQzdDLEtBQUssQ0FBeUI7SUFDOUIsT0FBTyxHQUErQixJQUFJLEdBQUcsRUFBeUIsQ0FBQztJQUN2RSxTQUFTLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsS0FBSyxDQUFpQjtJQUV0QjtRQUNFLEtBQUssRUFBRSxDQUFDO1FBQ1IsSUFBSSxDQUFDLEtBQUssR0FBRyxJQUFJLENBQUM7SUFDcEIsQ0FBQztJQUVELFVBQVU7UUFDUixPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxRQUFRLENBQUMsS0FBc0I7UUFDN0IsSUFBSSxDQUFDLEtBQUssR0FBRyxLQUFLLENBQUM7SUFDckIsQ0FBQztJQUVELFFBQVE7UUFDTixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUM7SUFDcEIsQ0FBQztJQUVELFdBQVc7UUFDVCxJQUFJLENBQUMsS0FBSyxHQUFHLElBQUksQ0FBQztJQUNwQixDQUFDO0lBRUQsU0FBUyxDQUFDLE1BQXFCO1FBQzdCLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7SUFDNUMsQ0FBQztJQUVELFNBQVMsQ0FBQyxRQUFnQjtRQUN4QixPQUFPLElBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQyxDQUFDO0lBQ3BDLENBQUM7SUFFRCxZQUFZLENBQUMsUUFBZ0I7UUFDM0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLENBQUM7SUFDaEMsQ0FBQztJQUVELGFBQWE7UUFDWCxPQUFPLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFDO0lBQ3pDLENBQUM7SUFFRCxXQUFXO1FBQ1QsT0FBTyxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQztJQUMzQyxDQUFDO0lBRUQscUJBQXFCO1FBQ25CLE1BQU0sSUFBSSxHQUFHLEVBQUUsQ0FBQztRQUNoQixLQUFLLE1BQU0sQ0FBQyxFQUFFLEVBQUUsTUFBTSxDQUFDLElBQUksSUFBSSxDQUFDLE9BQU8sQ0FBQyxPQUFPLEVBQUUsRUFBRSxDQUFDO1lBQ2xELElBQUksTUFBTSxDQUFDLEtBQUssS0FBSyxXQUFXLEVBQUUsQ0FBQztnQkFDakMsSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztZQUNoQixDQUFDO1FBQ0gsQ0FBQztRQUNELE9BQU8sSUFBSSxDQUFDO0lBQ2QsQ0FBQztJQUVELEtBQUs7UUFDSCxPQUFPO1lBQ0wsS0FBSyxFQUFFLElBQUksQ0FBQyxLQUFLLEVBQUUsTUFBTSxLQUFLLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQy9DLE1BQU0sRUFBRSxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUMsTUFBTTtTQUNwQyxDQUFDO0lBQ0osQ0FBQztJQUVELHlDQUF5QztJQUN6Qyx1REFBdUQ7SUFDdkQsVUFBVTtRQUNSLElBQUksQ0FBQyxLQUFLLEdBQUcsV0FBVyxDQUFDLEdBQUcsRUFBRTtZQUM1QixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDM0IsSUFBSSxLQUFLLENBQUMsS0FBSyxHQUFHLENBQUMsSUFBSSxLQUFLLENBQUMsTUFBTSxHQUFHLENBQUMsRUFBRSxDQUFDO2dCQUN4QyxJQUFJLENBQUMsU0FBUyxHQUFHLENBQUMsQ0FBQztnQkFDbkIsT0FBTztZQUNULENBQUM7WUFDRCxJQUFJLENBQUMsU0FBUyxFQUFFLENBQUM7WUFDakIsSUFBSSxJQUFJLENBQUMsU0FBUyxJQUFJLENBQUMsRUFBRSxDQUFDO2dCQUN4QixJQUFJLENBQUMsSUFBSSxDQUFDLFdBQVcsRUFBRSxLQUFLLENBQUMsQ0FBQztnQkFDOUIsYUFBYSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUM1QixDQUFDO1FBQ0gsQ0FBQyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQ1osQ0FBQztDQUNGIn0=
+import { EventEmitter } from "node:events";
+
+//#region src/utils/worker_manager.ts
+var WorkerManager = class extends EventEmitter {
+	agent;
+	workers = /* @__PURE__ */ new Map();
+	exception = 0;
+	timer;
+	constructor() {
+		super();
+		this.agent = null;
+	}
+	getWorkers() {
+		return Array.from(this.workers.keys());
+	}
+	setAgent(agent) {
+		this.agent = agent;
+	}
+	getAgent() {
+		return this.agent;
+	}
+	deleteAgent() {
+		this.agent = null;
+	}
+	setWorker(worker) {
+		this.workers.set(worker.workerId, worker);
+	}
+	getWorker(workerId) {
+		return this.workers.get(workerId);
+	}
+	deleteWorker(workerId) {
+		this.workers.delete(workerId);
+	}
+	listWorkerIds() {
+		return Array.from(this.workers.keys());
+	}
+	listWorkers() {
+		return Array.from(this.workers.values());
+	}
+	getListeningWorkerIds() {
+		const keys = [];
+		for (const [id, worker] of this.workers.entries()) if (worker.state === "listening") keys.push(id);
+		return keys;
+	}
+	count() {
+		return {
+			agent: this.agent?.status === "started" ? 1 : 0,
+			worker: this.listWorkerIds().length
+		};
+	}
+	startCheck() {
+		this.timer = setInterval(() => {
+			const count = this.count();
+			if (count.agent > 0 && count.worker > 0) {
+				this.exception = 0;
+				return;
+			}
+			this.exception++;
+			if (this.exception >= 3) {
+				this.emit("exception", count);
+				clearInterval(this.timer);
+			}
+		}, 1e4);
+	}
+};
+
+//#endregion
+export { WorkerManager };

package/package.json

@@ -1,39 +1,39 @@
 {
   "name": "@eggjs/cluster",
-  "version": "4.0.0-beta.34",
-  "publishConfig": {
-    "access": "public"
+  "version": "4.0.0-beta.36",
+  "description": "cluster manager for egg",
+  "keywords": [
+    "cluster",
+    "egg",
+    "process"
+  ],
+  "homepage": "https://github.com/eggjs/egg/tree/next/packages/cluster",
+  "bugs": {
+    "url": "https://github.com/eggjs/egg/issues"
   },
+  "license": "MIT",
+  "author": "dead-horse <dead_horse@qq.com>",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/eggjs/egg.git",
+    "directory": "packages/cluster"
+  },
+  "files": [
+    "dist"
+  ],
   "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": "./dist/index.js",
     "./agent_worker": "./dist/agent_worker.js",
     "./app_worker": "./dist/app_worker.js",
     "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "description": "cluster manager for egg",
-  "files": [
-    "dist"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/eggjs/egg.git",
-    "directory": "packages/cluster"
-  },
-  "keywords": [
-    "egg",
-    "cluster",
-    "process"
-  ],
-  "author": "dead-horse <dead_horse@qq.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/eggjs/egg/issues"
+  "publishConfig": {
+    "access": "public"
   },
-  "homepage": "https://github.com/eggjs/egg/tree/next/packages/cluster",
   "dependencies": {
     "@fengmk2/ps-tree": "^2.0.1",
     "cfork": "^2.0.0",
@@ -45,27 +45,26 @@
     "sendmessage": "^3.0.1",
     "terminal-link": "^5.0.0",
     "utility": "^2.5.0",
-    "@eggjs/utils": "5.0.0-beta.34"
+    "@eggjs/utils": "5.0.0-beta.36"
   },
   "devDependencies": {
     "address": "2",
     "coffee": "5",
-    "tsdown": "0.15.11",
+    "tsdown": "^0.18.2",
     "typescript": "^5.9.3",
     "urllib": "^4.8.2",
-    "vitest": "4.0.5",
-    "@eggjs/mock": "7.0.0-beta.34",
-    "@eggjs/errors": "3.0.0-beta.34",
-    "@eggjs/supertest": "9.0.0-beta.34",
-    "@eggjs/tsconfig": "3.1.0-beta.34"
+    "vitest": "^4.0.15",
+    "@eggjs/mock": "7.0.0-beta.36",
+    "@eggjs/errors": "3.0.0-beta.36",
+    "@eggjs/supertest": "9.0.0-beta.36",
+    "@eggjs/tsconfig": "3.1.0-beta.36"
   },
   "engines": {
     "node": ">=22.18.0"
   },
   "scripts": {
-    "build": "tsdown && rimraf dist *.tsbuildinfo && tsc -p tsconfig.build.json",
     "lint": "oxlint",
-    "typecheck": "tsc --noEmit",
+    "typecheck": "tsgo --noEmit",
     "test": "vitest run"
   }
 }

package/dist/error/index.d.ts

@@ -1,2 +0,0 @@
-export * from './ClusterAgentWorkerError.ts';
-export * from './ClusterWorkerExceptionError.ts';

package/dist/error/index.js

@@ -1,3 +0,0 @@
-export * from "./ClusterAgentWorkerError.js";
-export * from "./ClusterWorkerExceptionError.js";
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZXJyb3IvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsY0FBYyw4QkFBOEIsQ0FBQztBQUM3QyxjQUFjLGtDQUFrQyxDQUFDIn0=

package/dist/utils/terminate.d.ts

@@ -1,6 +0,0 @@
-import { ChildProcess } from 'node:child_process';
-interface SubProcess extends ChildProcess {
-    process?: ChildProcess;
-}
-export declare function terminate(subProcess: SubProcess, timeout: number): Promise<void>;
-export {};