@eggjs/watcher 5.0.0-beta.17 → 5.0.0-beta.18

package/dist/lib/boot.js

@@ -1,16 +1,23 @@
 import { Watcher } from "./watcher.js";
+import { debuglog } from "node:util";
 
 //#region src/lib/boot.ts
+const debug = debuglog("egg/watcher/lib/boot");
 var Boot = class {
 	#app;
-	#watcher;
 	constructor(appOrAgent) {
 		this.#app = appOrAgent;
-		this.#watcher = this.#app.watcher = this.#app.cluster(Watcher, {}).delegate("watch", "subscribe").create(appOrAgent.config);
-		this.#watcher.on("info", (msg, ...args) => this.#app.coreLogger.info(msg, ...args)).on("warn", (msg, ...args) => this.#app.coreLogger.warn(msg, ...args)).on("error", (msg, ...args) => this.#app.coreLogger.error(msg, ...args));
+		if (this.#app.options.mode === "all-in-one-process") {
+			debug("init watcher in all-in-one-process mode");
+			this.#app.watcher = new Watcher(appOrAgent.config);
+		} else {
+			debug("init watcher in cluster mode");
+			this.#app.watcher = this.#app.clusterWrapper(Watcher, {}).delegate("watch", "subscribe").create(appOrAgent.config);
+		}
+		this.#app.watcher.on("info", (msg, ...args) => this.#app.coreLogger.info(msg, ...args)).on("warn", (msg, ...args) => this.#app.coreLogger.warn(msg, ...args)).on("error", (msg, ...args) => this.#app.coreLogger.error(msg, ...args));
 	}
 	async didLoad() {
-		await this.#watcher.ready();
+		await this.#app.watcher.ready();
 		this.#app.coreLogger.info("[@eggjs/watcher:%s] watcher start success", this.#app.type);
 	}
 };

package/dist/lib/watcher.js

@@ -6,7 +6,7 @@ import camelcase from "camelcase";
 import { importModule } from "@eggjs/utils";
 
 //#region src/lib/watcher.ts
-const debug = debuglog("egg-watcher/lib/watcher");
+const debug = debuglog("egg/watcher/lib/watcher");
 var Watcher = class extends Base {
 	#config;
 	#eventSource;
@@ -16,7 +16,11 @@ var Watcher = class extends Base {
 	}
 	async _init() {
 		const watcherType = this.#config.watcher?.type;
-		if (!watcherType) return;
+		debug("init with watcherType %o", watcherType);
+		if (!watcherType) {
+			debug("watcherType is not defined, skip initialization");
+			return;
+		}
 		let EventSource = this.#config.watcher?.eventSources[watcherType];
 		if (typeof EventSource === "string") EventSource = await importModule(EventSource, { importDefaultOnly: true });
 		const key = camelcase(["watcher", watcherType]);
@@ -26,6 +30,7 @@ var Watcher = class extends Base {
 		await this.#eventSource.ready();
 	}
 	watch(path, listener) {
+		debug("watch %o", path);
 		this.emit("info", "[@eggjs/watcher] Start watching: %j", path);
 		if (!path) return;
 		if (Array.isArray(path)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/watcher",
-  "version": "5.0.0-beta.17",
+  "version": "5.0.0-beta.18",
   "publishConfig": {
     "access": "public"
   },
@@ -26,18 +26,18 @@
   "dependencies": {
     "camelcase": "^8.0.0",
     "sdk-base": "^5.0.1",
-    "@eggjs/utils": "5.0.0-beta.17"
+    "@eggjs/utils": "5.0.0-beta.18"
   },
   "peerDependencies": {
-    "egg": "4.1.0-beta.17"
+    "egg": "4.1.0-beta.18"
   },
   "devDependencies": {
     "tsdown": "^0.15.4",
     "typescript": "5.9.2",
     "vitest": "4.0.0-beta.13",
-    "@eggjs/tsconfig": "3.1.0-beta.17",
-    "@eggjs/mock": "7.0.0-beta.17",
-    "@eggjs/utils": "5.0.0-beta.17"
+    "@eggjs/mock": "7.0.0-beta.18",
+    "@eggjs/tsconfig": "3.1.0-beta.18",
+    "@eggjs/utils": "5.0.0-beta.18"
   },
   "type": "module",
   "exports": {