@pubinfo/vite 2.0.13 → 2.0.15

package/dist/index.d.ts

@@ -20,11 +20,6 @@ interface ChromeDevtoolsOptions {
   /** DevTools 面板访问路径 */
   panelPath?: string;
 }
-/**
- * 创建 Chrome DevTools 插件
- * @param options 插件配置选项
- * @returns Vite 插件
- */
 //#endregion
 //#region src/plugins/built-in/inject-auto.d.ts
 interface InjectAutoOptions {

package/dist/index.js

@@ -1,16 +1,19 @@
 import { createRequire } from "node:module";
 import { defineConfig, loadEnv, mergeConfig, normalizePath } from "rolldown-vite";
-import { cwd } from "node:process";
+import process, { cwd } from "node:process";
 import chalk from "chalk";
 import consola from "consola";
-import { dirname, join, posix, relative, resolve } from "node:path";
+import path, { dirname, join, posix, relative, resolve } from "node:path";
 import vue from "@vitejs/plugin-vue";
 import vueJsx from "@vitejs/plugin-vue-jsx";
+import fs from "fs-extra";
 import boxen from "boxen";
 import MagicString from "magic-string";
 import fg from "fast-glob";
 import { merge } from "lodash-es";
 import picomatch from "picomatch";
+import "micromatch";
+import { execSync } from "node:child_process";
 import dayjs from "dayjs";
 import { readPackageJSON } from "pkg-types";
 import { existsSync, readFileSync, readdirSync, statSync, writeFileSync } from "node:fs";
@@ -40,7 +43,7 @@ export * from "vite-plugin-fake-server/client"
 //#region src/helper/alias.ts
 function alias(root) {
 	const resolvePath = (name) => join(root, name);
-	const resolveDeps = (name, path) => join(createRequire(import.meta.url).resolve(name), path);
+	const resolveDeps = (name, path$1) => join(createRequire(import.meta.url).resolve(name), path$1);
 	return {
 		"@": resolvePath("src"),
 		"#": resolvePath("types"),
@@ -66,7 +69,7 @@ function getServerProxy(env, isProxy) {
 		else serverProxy[pk] = {
 			target: url,
 			changeOrigin: true,
-			rewrite: (path) => path.replace(pk, ""),
+			rewrite: (path$1) => path$1.replace(pk, ""),
 			secure: false
 		};
 	}
@@ -75,79 +78,171 @@ function getServerProxy(env, isProxy) {
 
 //#endregion
 //#region src/plugins/built-in/chrome-devtools.ts
+const GLOBAL_STATE_KEY = "__pubinfoChromeDevtoolsState__";
+const DEFAULT_VITE_PORT = 5173;
+const DEFAULT_HOST = "localhost";
+const RANDOM_PORT_RANGE = {
+	min: 56e3,
+	max: 64e3
+};
+function getGlobalState() {
+	const globalRef = globalThis;
+	if (!globalRef[GLOBAL_STATE_KEY]) globalRef[GLOBAL_STATE_KEY] = {};
+	return globalRef[GLOBAL_STATE_KEY];
+}
 /**
-* Chii 服务管理器
+* 管理 chii (Chrome DevTools 后端) 的生命周期与日志。
 */
 var ChiiServiceManager = class {
 	port;
 	isStarted = false;
+	loggingPatched = false;
+	globalState;
+	constructor() {
+		this.globalState = getGlobalState();
+	}
 	/**
-	* 启动 Chii 服务
-	* @param customPort 自定义端口
-	* @param vitePort Vite 开发服务器端口
-	* @param viteHost Vite 开发服务器主机
-	* @param panelPath DevTools 面板路径
-	* @returns 服务端口号
+	* 启动 chii 服务，自动处理端口复用、冲突检测与启动失败兜底。
 	*/
 	async start(customPort, vitePort, viteHost, panelPath) {
 		if (this.isStarted && this.port) return this.port;
+		const reusedPort = await this.tryReuseExistingService(customPort, vitePort);
+		if (reusedPort) {
+			this.registerPort(reusedPort);
+			return reusedPort;
+		}
 		try {
 			const { start } = await this.importChii();
-			const port = customPort || this.generatePort(vitePort);
+			const portCandidate = customPort || this.generatePort(vitePort);
+			const port = await this.findAvailablePort(portCandidate, customPort === void 0);
+			if (port == null) {
+				console.warn("[pubinfo][chrome-devtools] 未找到可用的 DevTools 端口，跳过启动");
+				return;
+			}
 			start({ port });
-			this.port = port;
-			this.isStarted = true;
+			this.registerPort(port);
 			return port;
 		} catch (error) {
 			console.warn("[pubinfo][chrome-devtools] 启动 Chii 失败:", error);
 			return;
 		}
 	}
-	/**
-	* 获取服务端口
-	*/
 	getPort() {
 		return this.port;
 	}
-	/**
-	* 检查服务是否已启动
-	*/
 	isServiceStarted() {
 		return this.isStarted && !!this.port;
 	}
-	/**
-	* 生成可用端口
-	* @param vitePort Vite 端口
-	* @returns 生成的端口号
-	*/
+	registerPort(port) {
+		this.port = port;
+		this.isStarted = true;
+		this.globalState.port = port;
+	}
+	async tryReuseExistingService(customPort, vitePort) {
+		if (this.globalState.port != null) {
+			if (await this.isChiiRunning(this.globalState.port)) return this.globalState.port;
+			this.globalState.port = void 0;
+		}
+		if (customPort != null) {
+			if (await this.isChiiRunning(customPort)) return customPort;
+			return;
+		}
+		if (vitePort) {
+			const generatedPort = this.generatePort(vitePort);
+			if (await this.isChiiRunning(generatedPort)) return generatedPort;
+		}
+	}
 	generatePort(vitePort) {
-		if (vitePort) return vitePort + 1e3;
-		return 9229 + Math.floor(Math.random() * 100);
+		if (vitePort) {
+			const prefixedCandidate = Number(`6${vitePort}`);
+			if (Number.isFinite(prefixedCandidate) && prefixedCandidate <= 65535) return prefixedCandidate;
+			const highRangeCandidate = 6e4 + vitePort % 1e3;
+			if (highRangeCandidate <= 65535) return highRangeCandidate;
+		}
+		const { min, max } = RANDOM_PORT_RANGE;
+		return min + Math.floor(Math.random() * (max - min + 1));
 	}
-	/**
-	* 输出启动信息
-	* @param host 主机地址
-	* @param vitePort Vite 端口
-	* @param panelPath 面板路径
-	*/
-	logStartupInfo(host, vitePort, panelPath) {
-		if (!this.port) return;
-		const panelUrl = `${`http://${host}:${vitePort}`}${panelPath}`;
-		const colorUrl = (url) => chalk.cyan(url.replace(/:(\d+)\//, (_, port) => `:${chalk.bold(port)}/`));
-		console.log(`  ${chalk.green("➜")}  ${chalk.bold("Chrome DevTools")}: ${chalk.green(`Open ${colorUrl(panelUrl)} as a separate window`)}`);
+	async findAvailablePort(startPort, allowIncrement) {
+		let port = startPort;
+		for (let attempt = 0; attempt < 20; attempt += 1) {
+			if (await this.isPortAvailable(port)) return port;
+			if (!allowIncrement) return;
+			port += 1;
+		}
+	}
+	async isPortAvailable(port) {
+		const net = await this.importNet();
+		return await new Promise((resolve$1) => {
+			const tester = net.createServer();
+			tester.once("error", () => {
+				try {
+					tester.close();
+				} catch {}
+				resolve$1(false);
+			});
+			tester.once("listening", () => {
+				tester.close(() => resolve$1(true));
+			});
+			tester.listen(port);
+		});
+	}
+	async isChiiRunning(port) {
+		try {
+			const controller = new AbortController();
+			const timeout = setTimeout(() => controller.abort(), 300);
+			try {
+				const response = await fetch(`http://127.0.0.1:${port}/targets`, { signal: controller.signal });
+				if (!response.ok) return false;
+				const data = await response.json();
+				return Array.isArray(data?.targets);
+			} finally {
+				clearTimeout(timeout);
+			}
+		} catch {
+			return false;
+		}
 	}
-	/**
-	* 动态导入 chii
-	*/
 	async importChii() {
+		await this.patchChiiLogger();
 		return await import(
 			/* @vite-ignore */
 			"chii"
 );
 	}
+	async importNet() {
+		return await import("node:net");
+	}
+	async patchChiiLogger() {
+		if (this.loggingPatched) return;
+		try {
+			const utilModule = createRequire(import.meta.url)("chii/server/lib/util.js");
+			const utilTarget = typeof utilModule.log === "function" ? utilModule : utilModule.default;
+			if (!utilTarget || typeof utilTarget.log !== "function") {
+				console.warn("[pubinfo][chrome-devtools] 未检测到 chii util.log，跳过日志定制");
+				this.loggingPatched = true;
+				return;
+			}
+			const descriptor = Object.getOwnPropertyDescriptor(utilTarget, "log");
+			if (descriptor && descriptor.writable === false) Object.defineProperty(utilTarget, "log", {
+				...descriptor,
+				writable: true,
+				configurable: true
+			});
+			const patchedLog = () => {};
+			const targetExports = utilTarget;
+			const moduleExports = utilModule;
+			const defaultExports = utilModule.default;
+			targetExports.log = patchedLog;
+			if (moduleExports !== targetExports) moduleExports.log = patchedLog;
+			if (defaultExports && defaultExports !== targetExports) defaultExports.log = patchedLog;
+			this.loggingPatched = true;
+		} catch (error) {
+			console.warn("[pubinfo][chrome-devtools] 自定义 DevTools 日志失败:", error);
+		}
+	}
 };
 /**
-* DevTools 面板处理器
+* 处理 /__chrome_devtools 面板访问跳转：实时查询 chii targets，生成前端面板地址。
 */
 var DevToolsPanelHandler = class {
 	panelPath;
@@ -156,9 +251,6 @@ var DevToolsPanelHandler = class {
 		this.panelPath = panelPath;
 		this.serviceManager = serviceManager;
 	}
-	/**
-	* 创建面板访问中间件
-	*/
 	createMiddleware(server) {
 		server.middlewares.use(async (req, res, next) => {
 			if (!this.isTargetPath(req.url)) return next();
@@ -176,16 +268,10 @@ var DevToolsPanelHandler = class {
 			}
 		});
 	}
-	/**
-	* 检查是否为目标路径
-	*/
 	isTargetPath(url) {
 		if (!url) return false;
 		return url === this.panelPath || url === `${this.panelPath}/`;
 	}
-	/**
-	* 获取 DevTools URL
-	*/
 	async getDevToolsUrl(port) {
 		const firstTarget = (await (await fetch(`http://127.0.0.1:${port}/targets`)).json())?.targets?.[0];
 		if (firstTarget) {
@@ -194,16 +280,10 @@ var DevToolsPanelHandler = class {
 		}
 		return `http://127.0.0.1:${port}/`;
 	}
-	/**
-	* 发送错误响应
-	*/
 	sendErrorResponse(res, message) {
 		res.statusCode = 503;
 		res.end(message);
 	}
-	/**
-	* 发送重定向响应
-	*/
 	sendRedirectResponse(res, location) {
 		res.statusCode = 302;
 		res.setHeader("Location", location);
@@ -211,16 +291,13 @@ var DevToolsPanelHandler = class {
 	}
 };
 /**
-* HTML 注入器
+* 负责把 target.js 注入到 HTML 中，使页面成为可调试目标。
 */
 var HtmlInjector = class {
 	serviceManager;
 	constructor(serviceManager) {
 		this.serviceManager = serviceManager;
 	}
-	/**
-	* 注入调试脚本到 HTML
-	*/
 	injectScript(html) {
 		const port = this.serviceManager.getPort();
 		if (!port) return html;
@@ -229,53 +306,142 @@ var HtmlInjector = class {
 		const scriptTag = this.createScriptTag(port, injectedMarker);
 		return this.insertScriptTag(html, scriptTag);
 	}
-	/**
-	* 创建脚本标签
-	*/
 	createScriptTag(port, marker) {
 		return `<script>${marker}<\/script>\n<script src="http://127.0.0.1:${port}/target.js" data-pubinfo-devtools="chrome"><\/script>`;
 	}
-	/**
-	* 插入脚本标签到 HTML
-	*/
 	insertScriptTag(html, scriptTag) {
 		if (/<head[\s\S]*?>/i.test(html)) return html.replace(/<head([\s\S]*?)>/i, (match) => `${match}\n${scriptTag}`);
 		return html.replace(/<body(.*?)>/i, (match) => `${match}\n${scriptTag}`);
 	}
 };
 /**
-* 创建 Chrome DevTools 插件
-* @param options 插件配置选项
-* @returns Vite 插件
+* 管理 Vite Dev Server 与 chii 服务之间的协作：监听端口、控制打印、确保服务可用。
 */
+var DevServerOrchestrator = class {
+	server;
+	lastResolvedServerInfo;
+	constructor(serviceManager, panelHandler, panelPath, customPort) {
+		this.serviceManager = serviceManager;
+		this.panelHandler = panelHandler;
+		this.panelPath = panelPath;
+		this.customPort = customPort;
+	}
+	attach(server) {
+		this.server = server;
+		this.lastResolvedServerInfo = this.resolveServerInfo();
+		this.panelHandler.createMiddleware(server);
+		this.bindStartupHooks(server);
+	}
+	async ensureReady() {
+		const info = this.resolveServerInfo();
+		await this.serviceManager.start(this.customPort, info.port, info.host, this.panelPath);
+	}
+	async ensureReadyIfNeeded() {
+		if (!this.serviceManager.isServiceStarted()) await this.ensureReady();
+	}
+	bindStartupHooks(server) {
+		const scheduleStart = () => {
+			(async () => {
+				await this.ensureReady();
+			})();
+		};
+		if (server.httpServer?.listening) scheduleStart();
+		else server.httpServer?.once("listening", () => {
+			this.lastResolvedServerInfo = void 0;
+			scheduleStart();
+		});
+		const originalPrintUrls = server.printUrls;
+		server.printUrls = () => {
+			originalPrintUrls();
+			(async () => {
+				await this.ensureReady();
+			})();
+		};
+	}
+	resolveServerInfo() {
+		const info = this.computeServerInfo();
+		this.lastResolvedServerInfo = info;
+		return info;
+	}
+	computeServerInfo() {
+		const server = this.server;
+		if (!server) return {
+			host: DEFAULT_HOST,
+			port: DEFAULT_VITE_PORT
+		};
+		const localUrl = server.resolvedUrls?.local?.[0];
+		if (localUrl) try {
+			const url = new URL(localUrl);
+			if (url.hostname && url.port) return {
+				host: this.normalizeHost(url.hostname),
+				port: Number(url.port) || DEFAULT_VITE_PORT
+			};
+		} catch {}
+		const configuredHost = typeof server.config.server.host === "string" ? server.config.server.host : DEFAULT_HOST;
+		const address = server.httpServer?.address();
+		if (address && typeof address === "object" && "port" in address && typeof address.port === "number") return {
+			host: this.normalizeHost(configuredHost),
+			port: address.port
+		};
+		return {
+			host: this.normalizeHost(configuredHost),
+			port: server.config.server.port || DEFAULT_VITE_PORT
+		};
+	}
+	normalizeHost(host) {
+		if (!host || host === "0.0.0.0" || host === "::") return DEFAULT_HOST;
+		return host;
+	}
+};
 function createChromeDevtools(options = {}) {
 	const { enabled = true, port, autoInject = true, panelPath = "/__chrome_devtools" } = options;
 	if (!enabled) return null;
 	const serviceManager = new ChiiServiceManager();
 	const panelHandler = new DevToolsPanelHandler(panelPath, serviceManager);
 	const htmlInjector = new HtmlInjector(serviceManager);
+	const orchestrator = new DevServerOrchestrator(serviceManager, panelHandler, panelPath, port);
 	return {
 		name: "pubinfo:chrome-devtools",
 		apply: "serve",
 		enforce: "post",
 		async configureServer(server) {
-			const vitePort = server.config.server.port || 5173;
-			const viteHost = typeof server.config.server.host === "string" ? server.config.server.host : "localhost";
-			await serviceManager.start(port, vitePort, viteHost, panelPath);
-			panelHandler.createMiddleware(server);
-			const _printUrls = server.printUrls;
-			server.printUrls = () => {
-				_printUrls();
-				serviceManager.logStartupInfo(viteHost, vitePort, panelPath);
-			};
+			orchestrator.attach(server);
 		},
-		transformIndexHtml(html) {
+		async transformIndexHtml(html) {
 			if (!autoInject) return html;
+			await orchestrator.ensureReadyIfNeeded();
 			return htmlInjector.injectScript(html);
 		}
 	};
 }
 
+//#endregion
+//#region src/plugins/built-in/clean-build.ts
+function createCleanBuild() {
+	let config;
+	return {
+		name: "vite-plugin-clean-build",
+		apply: "build",
+		enforce: "post",
+		configResolved(resolvedConfig) {
+			config = resolvedConfig;
+		},
+		buildStart() {
+			const outDir = config.build.outDir;
+			const root = config.root;
+			const outputPath = path.resolve(root, outDir);
+			if (fs.existsSync(outputPath)) try {
+				fs.rmSync(outputPath, {
+					recursive: true,
+					force: true
+				});
+			} catch (error) {
+				consola.error(`[vite-plugin-clean-build] Failed to clean build directory: ${error}`);
+			}
+		}
+	};
+}
+
 //#endregion
 //#region src/plugins/built-in/info.ts
 var Ctx$1 = class {
@@ -369,8 +535,8 @@ function getPatternBase(pattern) {
 	}
 	return baseParts.join("/");
 }
-function normalizePath$1(path) {
-	return posix.normalize(path.replace(/\\/g, "/"));
+function normalizePath$1(path$1) {
+	return posix.normalize(path$1.replace(/\\/g, "/"));
 }
 function libResolverPlugin(options) {
 	const virtualModuleId = "virtual:pubinfo-resolver";
@@ -468,6 +634,34 @@ function createLibResolver(options) {
 
 //#endregion
 //#region src/plugins/built-in/system-info.ts
+function getGitInfo() {
+	try {
+		const commit = execSync("git rev-parse HEAD", { encoding: "utf-8" }).trim();
+		const commitShort = execSync("git rev-parse --short HEAD", { encoding: "utf-8" }).trim();
+		let branch = process.env.GITHUB_REF_NAME || process.env.CI_COMMIT_REF_NAME || process.env.GIT_BRANCH || process.env.BRANCH_NAME;
+		if (!branch) {
+			branch = execSync("git rev-parse --abbrev-ref HEAD", { encoding: "utf-8" }).trim();
+			if (branch === "HEAD") try {
+				const branches = execSync(`git show-ref --heads | grep ${commit}`, { encoding: "utf-8" }).trim();
+				if (branches) {
+					const match = branches.split("\n")[0].match(/refs\/heads\/(.+)$/);
+					if (match) branch = match[1];
+				}
+			} catch {}
+		}
+		return {
+			commit,
+			commitShort,
+			branch
+		};
+	} catch {
+		return {
+			commit: "",
+			commitShort: "",
+			branch: ""
+		};
+	}
+}
 function createSystemInfo(options = {}) {
 	const defineKey = options.defineKey || "__SYSTEM_INFO__";
 	return {
@@ -476,7 +670,8 @@ function createSystemInfo(options = {}) {
 			const pkg = await readPackageJSON();
 			const systemInfo = {
 				buildTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-				pkg
+				pkg,
+				git: getGitInfo()
 			};
 			return { define: { [defineKey]: JSON.stringify(systemInfo) } };
 		}
@@ -749,7 +944,7 @@ function createVitePlugins(viteEnv, isBuild = false, config, type) {
 			createDTS(),
 			createInjectCSS(),
 			createInjectAuto({ id: config.moduleId })
-		] : null,
+		] : [createCleanBuild()],
 		isBuild ? createCompression(viteEnv) : null
 	].filter(Boolean);
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pubinfo/vite",
   "type": "module",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -21,7 +21,7 @@
     "vue": "^3.5.17"
   },
   "dependencies": {
-    "@pubinfo/unplugin-openapi": "^0.9.0",
+    "@pubinfo/unplugin-openapi": "^0.9.1",
     "@vitejs/plugin-legacy": "^7.2.1",
     "@vitejs/plugin-vue": "^6.0.0",
     "@vitejs/plugin-vue-jsx": "^5.0.1",
@@ -36,6 +36,7 @@
     "jszip": "^3.10.1",
     "lodash-es": "^4.17.21",
     "magic-string": "^0.30.19",
+    "micromatch": "^4.0.8",
     "picomatch": "^4.0.3",
     "pkg-types": "^2.3.0",
     "rolldown-vite": "^7.1.2",
@@ -54,9 +55,11 @@
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
     "@types/lodash-es": "^4.17.12",
+    "@types/micromatch": "^4.0.9",
     "@types/node": "^24.0.10",
     "@types/picomatch": "^4.0.2",
-    "vue": "^3.5.17"
+    "vue": "^3.5.17",
+    "@pubinfo/shared": "2.0.15"
   },
   "scripts": {
     "dev": "tsdown --watch",