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

package/dist/config/config.default.d.ts

@@ -1,6 +1,16 @@
-import { WatcherConfig } from "../lib/types.js";
-
 //#region src/config/config.default.d.ts
+interface WatcherConfig {
+  /**
+   * event source type, default is `default`
+   * can be `default` or `development`
+   */
+  type: string;
+  /**
+   * event sources
+   * key is event source type, value is event source module path
+   */
+  eventSources: Record<string, string>;
+}
 declare const _default: {
   /**
    * watcher options
@@ -10,4 +20,4 @@ declare const _default: {
   watcher: WatcherConfig;
 };
 //#endregion
-export { _default as default };
+export { WatcherConfig, _default as default };

package/dist/config/config.default.js

@@ -1,12 +1,11 @@
-import { getSourceDirname } from "../lib/utils.js";
 import path from "node:path";
 
 //#region src/config/config.default.ts
 var config_default_default = { watcher: {
 	type: "default",
 	eventSources: {
-		default: path.join(getSourceDirname(), "lib", "event-sources", "default"),
-		development: path.join(getSourceDirname(), "lib", "event-sources", "development")
+		default: path.join(import.meta.dirname, "../lib/event-sources/default"),
+		development: path.join(import.meta.dirname, "../lib/event-sources/development")
 	}
 } };
 

package/dist/config/config.local.d.ts

@@ -1,8 +1,6 @@
-import { WatcherConfig } from "../lib/types.js";
+import { PartialEggConfig } from "egg";
 
 //#region src/config/config.local.d.ts
-declare const _default: {
-  watcher: WatcherConfig;
-};
+declare const _default: PartialEggConfig;
 //#endregion
 export { _default as default };

package/dist/config/config.unittest.d.ts

@@ -1,8 +1,6 @@
-import { WatcherConfig } from "../lib/types.js";
+import { PartialEggConfig } from "egg";
 
 //#region src/config/config.unittest.d.ts
-declare const _default: {
-  watcher: WatcherConfig;
-};
+declare const _default: PartialEggConfig;
 //#endregion
 export { _default as default };

package/dist/index.d.ts

@@ -1,6 +1,5 @@
-import { WatchListener, Watcher } from "./lib/watcher.js";
-import { ChangeInfo, WatcherConfig } from "./lib/types.js";
+import { ChangeInfo, WatchListener, Watcher } from "./lib/watcher.js";
 import { BaseEventSource } from "./lib/event-sources/base.js";
 import DefaultEventSource from "./lib/event-sources/default.js";
 import DevelopmentEventSource from "./lib/event-sources/development.js";
-export { BaseEventSource, ChangeInfo, DefaultEventSource, DevelopmentEventSource, WatchListener, Watcher, WatcherConfig };
+export { BaseEventSource, ChangeInfo, DefaultEventSource, DevelopmentEventSource, WatchListener, Watcher };

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/utils.d.ts

@@ -1,5 +1,4 @@
 //#region src/lib/utils.d.ts
 declare function isEqualOrParentPath(parent: string, child: string): boolean;
-declare function getSourceDirname(): string;
 //#endregion
-export { getSourceDirname, isEqualOrParentPath };
+export { isEqualOrParentPath };

package/dist/lib/utils.js

@@ -1,15 +1,9 @@
 import path from "node:path";
-import { fileURLToPath } from "node:url";
 
 //#region src/lib/utils.ts
 function isEqualOrParentPath(parent, child) {
 	return !path.relative(parent, child).startsWith("..");
 }
-function getSourceDirname() {
-	if (typeof __dirname === "string") return path.dirname(__dirname);
-	const __filename = fileURLToPath(import.meta.url);
-	return path.dirname(path.dirname(__filename));
-}
 
 //#endregion
-export { getSourceDirname, isEqualOrParentPath };
+export { isEqualOrParentPath };

package/dist/lib/watcher.d.ts

@@ -1,8 +1,17 @@
-import { ChangeInfo } from "./types.js";
 import { Base } from "sdk-base";
+import { Stats, WatchEventType } from "node:fs";
 import { EggAppConfig } from "egg";
 
 //#region src/lib/watcher.d.ts
+interface ChangeInfo extends Record<string, any> {
+  event: WatchEventType;
+  /**
+   * file stat if path exists
+   */
+  stat?: Stats;
+  path: string;
+  isDirectory?: boolean;
+}
 type WatchListener = (info: ChangeInfo) => void;
 declare class Watcher extends Base {
   #private;
@@ -11,4 +20,4 @@ declare class Watcher extends Base {
   watch(path: string | string[], listener: WatchListener): void;
 }
 //#endregion
-export { WatchListener, Watcher };
+export { ChangeInfo, WatchListener, Watcher };

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/dist/types.d.ts

@@ -0,0 +1,12 @@
+import { WatcherConfig } from "./config/config.default.js";
+import { Watcher } from "./lib/watcher.js";
+
+//#region src/types.d.ts
+declare module 'egg' {
+  interface EggApplicationCore {
+    watcher: Watcher;
+  }
+  interface EggAppConfig {
+    watcher?: WatcherConfig;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eggjs/watcher",
-  "version": "5.0.0-beta.15",
+  "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.15"
+    "@eggjs/utils": "5.0.0-beta.18"
   },
   "peerDependencies": {
-    "egg": "4.1.0-beta.15"
+    "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.15",
-    "@eggjs/mock": "7.0.0-beta.15",
-    "@eggjs/utils": "5.0.0-beta.15"
+    "@eggjs/mock": "7.0.0-beta.18",
+    "@eggjs/tsconfig": "3.1.0-beta.18",
+    "@eggjs/utils": "5.0.0-beta.18"
   },
   "type": "module",
   "exports": {
@@ -52,9 +52,9 @@
     "./lib/event-sources/base": "./dist/lib/event-sources/base.js",
     "./lib/event-sources/default": "./dist/lib/event-sources/default.js",
     "./lib/event-sources/development": "./dist/lib/event-sources/development.js",
-    "./lib/types": "./dist/lib/types.js",
     "./lib/utils": "./dist/lib/utils.js",
     "./lib/watcher": "./dist/lib/watcher.js",
+    "./types": "./dist/types.js",
     "./package.json": "./package.json"
   },
   "files": [

package/dist/lib/types.d.ts

@@ -1,35 +0,0 @@
-import { Watcher } from "./watcher.js";
-import { Stats, WatchEventType } from "node:fs";
-
-//#region src/lib/types.d.ts
-interface WatcherConfig {
-  /**
-   * event source type, default is `default`
-   * can be `default` or `development`
-   */
-  type: string;
-  /**
-   * event sources
-   * key is event source type, value is event source module path
-   */
-  eventSources: Record<string, string>;
-}
-interface ChangeInfo extends Record<string, any> {
-  event: WatchEventType;
-  /**
-   * file stat if path exists
-   */
-  stat?: Stats;
-  path: string;
-  isDirectory?: boolean;
-}
-declare module 'egg' {
-  interface EggApplicationCore {
-    watcher: Watcher;
-  }
-  interface EggAppConfig {
-    watcher?: WatcherConfig;
-  }
-}
-//#endregion
-export { ChangeInfo, WatcherConfig };