weapp-vite 7.4.0 → 7.6.0

package/dist/{upload-D0RcEWrq.mjs → upload-DozK8UdN.mjs}

@@ -1,12 +1,225 @@
-import { m as resolveMiniPlatform } from "./platform-DTWs5QRi.mjs";
-import { r as logger_default } from "./logger-mt4mSTqV.mjs";
+import { m as resolveMiniPlatform } from "./platform-CnkySBKz.mjs";
+import { r as logger_default } from "./logger-DGn5iEVN.mjs";
 import { createRequire } from "node:module";
+import process from "node:process";
 import { pathToFileURL } from "node:url";
 import path from "node:path";
-import process from "node:process";
 import { mkdir, readFile, stat } from "node:fs/promises";
 import { getPackageInfo } from "local-pkg";
-import { execFile } from "node:child_process";
+import { Buffer } from "node:buffer";
+import { performance } from "node:perf_hooks";
+import { execFile, execFileSync } from "node:child_process";
+//#region src/cli/upload/processTreeDiagnostics.ts
+const diagnostics = /* @__PURE__ */ new WeakMap();
+const MARKER_PREFIX = "[weapp-vite:upload-process-tree:v1]";
+const MARKER_RE = /^\[weapp-vite:upload-process-tree:v1\] (script-enter|parent-query-start|parent-query-end|children-query-start|children-query-end) (\d{1,9}) (\d{1,16})$/;
+const ERROR_CODES = /* @__PURE__ */ new Set([
+	"ETIMEDOUT",
+	"ENOENT",
+	"EACCES",
+	"EPERM",
+	"ENOBUFS",
+	"EIO",
+	"UNKNOWN"
+]);
+const SIGNALS = /* @__PURE__ */ new Set([
+	"SIGTERM",
+	"SIGKILL",
+	"SIGINT",
+	"SIGABRT"
+]);
+/** 标记只写入诊断管道，不进入供清理使用的 PID 输出。 */
+const WINDOWS_PROCESS_TREE_DIAGNOSTIC_SETUP = `\$wvTreeClock = [Diagnostics.Stopwatch]::StartNew(); function Write-WvTreeStage([string]\$stage) { [Console]::Error.WriteLine('${MARKER_PREFIX} ' + $stage + ' ' + $wvTreeClock.ElapsedMilliseconds + ' ' + [DateTimeOffset]::UtcNow.ToUnixTimeMilliseconds()) }; `;
+function processTreeStageCommand(stage) {
+	return `Write-WvTreeStage '${stage}'; `;
+}
+function readMarkers(stderr, elapsedMs) {
+	const text = Buffer.isBuffer(stderr) ? stderr.subarray(0, 8192).toString("utf8") : typeof stderr === "string" ? Buffer.from(stderr.slice(0, 8192)).subarray(0, 8192).toString("utf8") : "";
+	const markers = [];
+	for (const line of text.split(/\r?\n/)) {
+		const match = MARKER_RE.exec(line);
+		if (!match) continue;
+		const elapsed = Number(match[2]);
+		const utc = Number(match[3]);
+		if (!Number.isSafeInteger(elapsed) || elapsed > elapsedMs || !Number.isSafeInteger(utc) || markers.length >= 8) return [];
+		markers.push({
+			stage: match[1],
+			elapsedMs: elapsed,
+			utcMs: utc
+		});
+	}
+	const expected = markers[1]?.stage === "parent-query-start" ? [
+		"script-enter",
+		"parent-query-start",
+		"parent-query-end",
+		"children-query-start",
+		"children-query-end"
+	] : [
+		"script-enter",
+		"children-query-start",
+		"children-query-end"
+	];
+	return markers.every((marker, index) => marker.stage === expected[index] && marker.elapsedMs >= (markers[index - 1]?.elapsedMs ?? 0)) ? markers : [];
+}
+function describeQuery(error, elapsedMs, utcStart, utcEnd) {
+	const failure = error;
+	const markers = readMarkers(failure.stderr, elapsedMs);
+	const first = markers[0];
+	const last = markers.at(-1);
+	const result = {
+		elapsedMs,
+		stage: last?.stage ?? "before-script-entry-or-unobserved"
+	};
+	if (typeof failure.code === "string" && ERROR_CODES.has(failure.code)) result.code = failure.code;
+	if (typeof failure.signal === "string" && SIGNALS.has(failure.signal)) result.signal = failure.signal;
+	if (typeof failure.status === "number" && Number.isSafeInteger(failure.status)) result.status = failure.status;
+	const startupMs = first && first.utcMs - utcStart;
+	if (first && startupMs !== void 0 && startupMs >= 0 && startupMs <= elapsedMs && Math.abs(utcEnd - utcStart - elapsedMs) <= 5 && markers.every((marker) => Math.abs(marker.utcMs - first.utcMs - (marker.elapsedMs - first.elapsedMs)) <= 5)) {
+		result.startupMs = startupMs;
+		if (last?.stage === "parent-query-start" || last?.stage === "children-query-start") result.activeQueryMs = Math.max(0, elapsedMs - startupMs - (last.elapsedMs - first.elapsedMs));
+	}
+	for (const [name, key] of [["parent", "parentQueryMs"], ["children", "childrenQueryMs"]]) {
+		const start = markers.find((marker) => marker.stage === `${name}-query-start`);
+		const end = markers.find((marker) => marker.stage === `${name}-query-end`);
+		if (start && end) result[key] = end.elapsedMs - start.elapsedMs;
+	}
+	return result;
+}
+/** 只附带标量诊断，保持清理失败的原始异常身份与控制流。 */
+function observeWindowsProcessTreeQuery(run) {
+	const startedAt = performance.now();
+	const utcStart = Date.now();
+	try {
+		return run();
+	} catch (error) {
+		if (error && typeof error === "object") {
+			const elapsedMs = Math.max(0, Math.round(performance.now() - startedAt));
+			diagnostics.set(error, {
+				elapsedMs,
+				stage: "before-script-entry-or-unobserved"
+			});
+			try {
+				diagnostics.set(error, describeQuery(error, elapsedMs, utcStart, Date.now()));
+			} catch {}
+		}
+		throw error;
+	}
+}
+/** Windows 查询只展示白名单诊断，不能回显异常中携带的命令或原始 stderr。 */
+function describeUploadProcessTreeError(error) {
+	const diagnostic = error && typeof error === "object" ? diagnostics.get(error) : void 0;
+	return diagnostic ? `PowerShell 进程归属查询失败 ${JSON.stringify(diagnostic)}` : String(error);
+}
+//#endregion
+//#region src/cli/upload/processTree.ts
+function childPids(pid, lifetime) {
+	if (process.platform === "win32") {
+		const since = lifetime ? `[DateTimeOffset]::FromUnixTimeMilliseconds(${lifetime.start}).UtcDateTime` : `(Get-CimInstance Win32_Process -Filter 'ProcessId = ${pid}').CreationDate.ToUniversalTime()`;
+		const until = lifetime ? `[DateTimeOffset]::FromUnixTimeMilliseconds(${lifetime.end}).UtcDateTime` : "[DateTime]::UtcNow";
+		return observeWindowsProcessTreeQuery(() => execFileSync("powershell.exe", [
+			"-NoProfile",
+			"-NonInteractive",
+			"-Command",
+			`$ErrorActionPreference = 'Stop'; ${WINDOWS_PROCESS_TREE_DIAGNOSTIC_SETUP}${processTreeStageCommand("script-enter")}${lifetime ? "" : processTreeStageCommand("parent-query-start")}$since = ${since}; ${lifetime ? "" : processTreeStageCommand("parent-query-end")}$until = ${until}; ${processTreeStageCommand("children-query-start")}Get-CimInstance Win32_Process -Filter 'ParentProcessId = ${pid}' | Where-Object { $_.CreationDate.ToUniversalTime() -ge $since -and $_.CreationDate.ToUniversalTime() -le $until } | Select-Object -ExpandProperty ProcessId; ${processTreeStageCommand("children-query-end")}`
+		], {
+			encoding: "utf8",
+			windowsHide: true,
+			timeout: 3e4,
+			stdio: [
+				"ignore",
+				"pipe",
+				"pipe"
+			]
+		})).split(/\s+/).map(Number).filter((value) => Number.isSafeInteger(value) && value > 0);
+	}
+	const output = execFileSync("ps", [
+		"-A",
+		"-o",
+		"pid=,ppid="
+	], {
+		encoding: "utf8",
+		timeout: 5e3,
+		stdio: [
+			"ignore",
+			"pipe",
+			"ignore"
+		]
+	});
+	const children = /* @__PURE__ */ new Map();
+	for (const line of output.trim().split(/\r?\n/)) {
+		const [child, parent] = line.trim().split(/\s+/).map(Number);
+		if (child && parent) {
+			const siblings = children.get(parent) ?? [];
+			siblings.push(child);
+			children.set(parent, siblings);
+		}
+	}
+	const descendants = [];
+	const visit = (parent) => {
+		for (const child of children.get(parent) ?? []) {
+			visit(child);
+			descendants.push(child);
+		}
+	};
+	visit(pid);
+	return descendants;
+}
+function killPid(pid) {
+	try {
+		process.kill(pid, "SIGKILL");
+	} catch (error) {
+		if (error.code !== "ESRCH") throw error;
+	}
+}
+/** POSIX 使用独立进程组；已退出的根进程不再授权向其正 PID 发信号。 */
+function terminateUploadProcess(pid, options) {
+	if (process.platform === "win32") {
+		if (options?.exited) {
+			if (!options.lifetime) throw new Error("缺少已退出进程的生命周期，无法确认子进程归属。");
+			for (const child of childPids(pid, options.lifetime)) terminateUploadProcess(child);
+			return;
+		}
+		try {
+			execFileSync("taskkill", [
+				"/PID",
+				String(pid),
+				"/T",
+				"/F"
+			], {
+				windowsHide: true,
+				timeout: 5e3,
+				stdio: "ignore"
+			});
+		} catch (error) {
+			try {
+				process.kill(pid, 0);
+			} catch (probeError) {
+				if (probeError.code === "ESRCH") {
+					if (!options?.lifetime) throw new Error("根进程已消失，无法确认子进程归属。");
+					for (const child of childPids(pid, options.lifetime)) terminateUploadProcess(child);
+					return;
+				}
+			}
+			throw error;
+		}
+		return;
+	}
+	if (options?.processGroup) {
+		try {
+			process.kill(-pid, "SIGKILL");
+		} catch (error) {
+			if (error.code !== "ESRCH") throw error;
+			if (!options.exited) killPid(pid);
+		}
+		return;
+	}
+	if (!options?.exited) killPid(pid);
+}
+/** 只终止当前 worker 所属的本地子进程，不推断远端任务状态。 */
+function terminateUploadDescendants(pid) {
+	for (const child of childPids(pid)) terminateUploadProcess(child);
+}
+//#endregion
 //#region src/cli/upload/tools.ts
 function requireUploadEnv(context, name) {
 	const value = context.env[name]?.trim();
@@ -56,7 +269,14 @@ async function runUploadCli(context, packageName, binName, args, secrets, captur
 			resolve(stdout);
 		});
 		function cancel() {
-			child.kill("SIGKILL");
+			if (child.pid) try {
+				if (process.platform !== "win32") terminateUploadDescendants(child.pid);
+				terminateUploadProcess(child.pid);
+			} catch {
+				child.kill("SIGKILL");
+				process.stderr.write("无法确认上传 CLI 子进程已全部终止。\n");
+				process.exitCode = 1;
+			}
 		}
 		process.once("exit", cancel);
 		child.once("close", () => process.off("exit", cancel));
@@ -97,7 +317,7 @@ async function prepareAlipayUpload(context, action = "upload") {
 	if (!alipay || typeof alipay !== "object" || !("authentication" in alipay) || !alipay.authentication) throw new Error("支付宝身份密钥文件缺少 alipay.authentication。请从开放平台重新获取身份密钥。");
 	return {
 		secrets,
-		async run() {
+		async run(onProgress) {
 			const sdk = await loadUploadPackage("minidev", context.cwd);
 			if (action === "preview") {
 				const result = await sdk.minidev.preview({
@@ -118,7 +338,20 @@ async function prepareAlipayUpload(context, action = "upload") {
 				version: context.version,
 				versionDescription: context.desc,
 				experience: false
-			});
+			}, onProgress ? {
+				onLog: (message) => onProgress({
+					type: "log",
+					message: redactUploadSecrets(message, secrets)
+				}),
+				onTaskCreated: (taskId) => onProgress({
+					type: "task-created",
+					message: redactUploadSecrets(taskId, secrets)
+				}),
+				onVersionCreated: (version) => onProgress({
+					type: "version-created",
+					message: redactUploadSecrets(version, secrets)
+				})
+			} : void 0);
 		}
 	};
 }
@@ -264,7 +497,13 @@ async function prepareSwanUpload(context, action = "upload") {
 				if (typeof previewUrl !== "string" || !previewUrl.trim()) throw new Error("百度预览未返回有效的预览链接。");
 				return { previewUrl: previewUrl.trim() };
 			}
-			return runUploadCli(context, "swan-toolkit", "swan", [
+			const output = await runUploadCli({
+				...context,
+				env: {
+					...context.env,
+					IS_NODE_JS: "true"
+				}
+			}, "swan-toolkit", "swan", [
 				"upload",
 				"--project-path",
 				context.projectPath,
@@ -277,7 +516,14 @@ async function prepareSwanUpload(context, action = "upload") {
 				"--desc",
 				context.desc,
 				"--json"
-			], secrets);
+			], secrets, true);
+			try {
+				const marker = /^NODE_JS_ENV_RESULT:/m.exec(output);
+				if (!marker) throw new Error("缺少官方 JSON 结果标记。");
+				return JSON.parse(output.slice(marker.index + marker[0].length));
+			} catch {
+				throw new Error("百度上传未返回有效的 JSON 结果。");
+			}
 		}
 	};
 }
@@ -301,9 +547,10 @@ async function prepareWechatUpload(context, action = "upload") {
 		throw new Error("无法读取 WEAPP_CI_PRIVATE_KEY_PATH 指定的私钥文件；相对路径以项目根目录为基准。");
 	}
 	if (!privateKey.trim()) throw new Error("WEAPP_CI_PRIVATE_KEY_PATH 指定的私钥文件不能为空。");
+	const secrets = [privateKey, privateKey.trim()];
 	return {
-		secrets: [privateKey, privateKey.trim()],
-		async run() {
+		secrets,
+		async run(onProgress) {
 			const ci = await loadUploadPackage("miniprogram-ci", context.cwd);
 			const project = new ci.Project({
 				appid,
@@ -333,7 +580,13 @@ async function prepareWechatUpload(context, action = "upload") {
 				version: context.version,
 				desc: context.desc,
 				robot,
-				setting: { useProjectConfig: true }
+				setting: { useProjectConfig: true },
+				onProgressUpdate: onProgress ? (task) => {
+					onProgress({
+						type: "progress",
+						message: redactUploadSecrets(typeof task === "string" ? task : `${task.status}: ${task.message}`, secrets)
+					});
+				} : void 0
 			});
 		}
 	};
@@ -348,7 +601,7 @@ async function prepareXhsUpload(context, action = "upload") {
 	if (JSON.parse(await readFile(path.join(context.projectPath, "project.config.json"), "utf8"))?.appid !== appid) throw new Error("小红书 project.config.json 的 appid 必须与 XHS_APP_ID 或项目配置的 AppID 一致，禁止向其他小程序上传。");
 	return {
 		secrets: [token],
-		async run() {
+		async run(onProgress) {
 			const { CI } = await loadUploadPackage("xhs-mp-cli/dist/ci.js", context.cwd);
 			const sdk = new CI();
 			sdk.core.login = async () => {
@@ -370,7 +623,17 @@ async function prepareXhsUpload(context, action = "upload") {
 				project: { projectPath: context.projectPath },
 				version: context.version,
 				desc: context.desc,
-				verbose: false
+				verbose: false,
+				progressCallback: onProgress ? (progress) => {
+					if (progress === -1) onProgress({
+						type: "log",
+						message: "小红书 SDK 报告上传失败。"
+					});
+					else if (Number.isFinite(progress) && progress >= 0 && progress <= 100) onProgress({
+						type: "progress",
+						percent: progress
+					});
+				} : void 0
 			});
 		}
 	};
@@ -400,4 +663,4 @@ function prepareUpload(platform, context, action = "upload") {
 	return providers[platform](context, action);
 }
 //#endregion
-export { resolveUploadPlatforms as n, redactUploadSecrets as r, prepareUpload as t };
+export { terminateUploadProcess as a, terminateUploadDescendants as i, resolveUploadPlatforms as n, describeUploadProcessTreeError as o, redactUploadSecrets as r, prepareUpload as t };

package/dist/upload-worker.mjs

@@ -1,20 +1,153 @@
-import { t as prepareUpload } from "./upload-D0RcEWrq.mjs";
+import { i as terminateUploadDescendants, r as redactUploadSecrets, t as prepareUpload } from "./upload-DozK8UdN.mjs";
 import process from "node:process";
+//#region src/cli/upload/uploadResult.ts
+function record(value) {
+	return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function text(value, secrets) {
+	if (typeof value !== "string" || !value.trim() || value.includes("\0")) return;
+	return redactUploadSecrets(value.trim(), secrets);
+}
+function bytes(value) {
+	return typeof value === "number" && Number.isSafeInteger(value) && value >= 0 ? value : void 0;
+}
+function link(value, secrets, scheme = false) {
+	if (typeof value !== "string" || !value.trim() || /[\s\p{Cc}]/u.test(value.trim())) return;
+	try {
+		const url = new URL(value);
+		if (!(scheme ? [
+			"http:",
+			"https:",
+			"baiduboxapp:",
+			"swan:"
+		] : ["http:", "https:"]).includes(url.protocol) || url.username || url.password) return;
+		return text(value, secrets);
+	} catch {
+		return;
+	}
+}
+function base64(value, secrets) {
+	if (typeof value !== "string") return;
+	const source = value.trim();
+	const content = source.replace(/^data:image\/(?:png|jpe?g|gif|webp);base64,/i, "");
+	if (!content || !/^(?:[a-z\d+/]{4})*(?:[a-z\d+/]{2}==|[a-z\d+/]{3}=)?$/i.test(content)) return;
+	return text(source, secrets);
+}
+/** 按官方上传结果选择字段；可选信息无效时丢弃，不把已完成上传改判失败。 */
+function normalizeUploadResult(platform, value, secrets) {
+	const input = record(value);
+	const result = {};
+	if (!input) return result;
+	if (platform === "weapp") {
+		if (Array.isArray(input.subPackageInfo)) result.subPackages = input.subPackageInfo.flatMap((value) => {
+			const item = record(value);
+			const name = text(item?.name, secrets);
+			const size = bytes(item?.size);
+			return name !== void 0 && size !== void 0 ? [{
+				name,
+				size
+			}] : [];
+		});
+		if (Array.isArray(input.pluginInfo)) result.plugins = input.pluginInfo.flatMap((value) => {
+			const item = record(value);
+			const appid = text(item?.pluginProviderAppid, secrets);
+			const version = text(item?.version, secrets);
+			const size = bytes(item?.size);
+			return appid !== void 0 && version !== void 0 && size !== void 0 ? [{
+				appid,
+				version,
+				size
+			}] : [];
+		});
+	} else if (platform === "alipay") {
+		const sdkVersion = text(input.version, secrets);
+		const qrCodeUrl = link(input.experienceQrCodeUrl, secrets);
+		if (sdkVersion !== void 0) result.sdkVersion = sdkVersion;
+		if (qrCodeUrl !== void 0) result.qrCodeUrl = qrCodeUrl;
+	} else if (platform === "tt") {
+		const previewUrl = link(input.shortUrl, secrets);
+		const qrCodeFile = text(input.qrcodeFilePath, secrets);
+		if (previewUrl !== void 0) result.previewUrl = previewUrl;
+		if (qrCodeFile !== void 0) result.qrCodeFile = qrCodeFile;
+	} else if (platform === "jd") {
+		const qrCodeUrl = link(input.imgUrl, secrets);
+		const qrCodeBase64 = base64(input.base64Data, secrets);
+		if (qrCodeUrl !== void 0) result.qrCodeUrl = qrCodeUrl;
+		if (qrCodeBase64 !== void 0) result.qrCodeBase64 = qrCodeBase64;
+	} else if (platform === "swan") {
+		const previewUrl = link(input.schemeUrlOpti, secrets, true) ?? link(input.schemeUrl, secrets, true);
+		const fileSize = bytes(input.fileSize);
+		if (previewUrl !== void 0) result.previewUrl = previewUrl;
+		if (fileSize !== void 0) result.fileSize = fileSize;
+		if (Array.isArray(input.warningList)) result.warnings = input.warningList.flatMap((value) => {
+			const warning = text(value, secrets);
+			return warning === void 0 ? [] : [warning];
+		});
+	}
+	return result;
+}
+//#endregion
 //#region src/cli/upload/worker.ts
 process.once("disconnect", () => process.exit(1));
 process.once("SIGINT", () => process.exit(1));
 process.once("SIGTERM", () => process.exit(1));
+process.once("exit", () => {
+	try {
+		terminateUploadDescendants(process.pid);
+	} catch {
+		process.stderr.write("无法确认本地 SDK 子进程已全部终止。\n");
+		process.exitCode = 1;
+	}
+});
 try {
 	let input = "";
 	for await (const chunk of process.stdin) input += String(chunk);
 	const { platform, context, action } = JSON.parse(input);
 	if (action !== "upload" && action !== "preview") throw new Error("不支持的上传或预览操作。");
-	const result = await (await prepareUpload(platform, context, action)).run();
+	const upload = await prepareUpload(platform, context, action);
+	await new Promise((resolve, reject) => {
+		const onMessage = (message) => {
+			if (message && typeof message === "object" && "type" in message && message.type === "run" && "action" in message && message.action === action) {
+				process.off("message", onMessage);
+				resolve();
+			}
+		};
+		if (!process.send) {
+			reject(/* @__PURE__ */ new Error("上传 worker 缺少父进程 IPC 通道。"));
+			return;
+		}
+		process.on("message", onMessage);
+		process.send({
+			type: "started",
+			action
+		}, (error) => {
+			if (error) {
+				process.off("message", onMessage);
+				reject(error);
+			}
+		});
+	});
+	const onProgress = (event) => {
+		const safeEvent = {
+			type: event.type,
+			...typeof event.message === "string" ? { message: redactUploadSecrets(event.message, upload.secrets) } : {},
+			...typeof event.percent === "number" && Number.isFinite(event.percent) ? { percent: event.percent } : {}
+		};
+		process.send?.({
+			type: "progress",
+			action,
+			event: safeEvent
+		}, (error) => {
+			if (error) process.exit(1);
+		});
+	};
+	const rawResult = await upload.run(onProgress);
+	const result = action === "upload" ? normalizeUploadResult(platform, rawResult, upload.secrets) : rawResult;
 	const finish = () => process.stderr.write("", () => process.stdout.write("", () => process.exit(0)));
 	if (process.send) process.send({
 		type: "completed",
 		action,
-		result: action === "preview" ? result : void 0
+		result
 	}, (error) => {
 		if (error) process.exit(1);
 		finish();