vite-plugin-deploy-oss 1.2.3 → 2.0.0

package/README.md

@@ -24,15 +24,30 @@ export default {
   plugins: [
     // 在最后一个插件中使用
     vitePluginDeployOss({
+      // 建议按环境变量开关上传，避免本地/CI误上传
+      open: process.env.DEPLOY_OSS === '1',
+      // 终端实时动效进度面板（默认 true）
+      fancy: true,
+
       accessKeyId: '***',
       accessKeySecret: '***',
       bucket: '***',
       region: '***',
       uploadDir: `H5/zz/test`,
       skip: ['**/index.html'],
+
+      // 默认 true：有上传失败时抛错并让构建失败
+      failOnError: true,
+
       // 修改打包后的资源路径
       configBase: `https://oss.eventnet.cn/H5/zz/test/`,
     }),
   ],
 }
 ```
+
+## 说明
+
+- `open` 默认 `true`，建议通过环境变量控制开关（例如 `DEPLOY_OSS=1` 时再上传）。
+- `fancy` 默认 `true`，TTY 终端下会显示实时动效进度（速度、预计剩余、并发、当前文件）。
+- `failOnError` 默认 `true`，上传有失败会抛错，适合 CI 场景保证发布质量。

package/dist/index.d.mts

@@ -14,9 +14,12 @@ interface vitePluginDeployOssOption extends Omit<oss.Options, 'accessKeyId' | 'a
     autoDelete?: boolean;
     skip?: string | string[];
     open?: boolean;
+    fancy?: boolean;
     noCache?: boolean;
+    failOnError?: boolean;
     concurrency?: number;
     retryTimes?: number;
+    multipartThreshold?: number;
 }
 declare function vitePluginDeployOss(option: vitePluginDeployOssOption): Plugin;
 

package/dist/index.d.ts

@@ -14,9 +14,12 @@ interface vitePluginDeployOssOption extends Omit<oss.Options, 'accessKeyId' | 'a
     autoDelete?: boolean;
     skip?: string | string[];
     open?: boolean;
+    fancy?: boolean;
     noCache?: boolean;
+    failOnError?: boolean;
     concurrency?: number;
     retryTimes?: number;
+    multipartThreshold?: number;
 }
 declare function vitePluginDeployOss(option: vitePluginDeployOssOption): Plugin;
 

package/dist/index.js

@@ -37,10 +37,50 @@ var import_ali_oss = __toESM(require("ali-oss"));
 var import_chalk = __toESM(require("chalk"));
 var import_delete_empty = __toESM(require("delete-empty"));
 var import_glob = require("glob");
-var import_node_fs = require("fs");
+var import_promises = require("fs/promises");
 var import_node_path = require("path");
 var import_ora = __toESM(require("ora"));
 var import_vite = require("vite");
+var normalizeObjectKey = (targetDir, relativeFilePath) => (0, import_vite.normalizePath)(`${targetDir}/${relativeFilePath}`).replace(/\/{2,}/g, "/").replace(/^\/+/, "");
+var formatBytes = (bytes) => {
+  if (!Number.isFinite(bytes) || bytes <= 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let value = bytes;
+  let unitIndex = 0;
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex++;
+  }
+  const digits = value >= 100 || unitIndex === 0 ? 0 : 1;
+  return `${value.toFixed(digits)} ${units[unitIndex]}`;
+};
+var formatDuration = (seconds) => {
+  if (!Number.isFinite(seconds) || seconds < 0) return "--";
+  const rounded = Math.round(seconds);
+  const mins = Math.floor(rounded / 60);
+  const secs = rounded % 60;
+  if (mins === 0) return `${secs}s`;
+  return `${mins}m${String(secs).padStart(2, "0")}s`;
+};
+var trimMiddle = (text, maxLength) => {
+  if (text.length <= maxLength) return text;
+  if (maxLength <= 10) return text.slice(0, maxLength);
+  const leftLength = Math.floor((maxLength - 3) / 2);
+  const rightLength = maxLength - 3 - leftLength;
+  return `${text.slice(0, leftLength)}...${text.slice(-rightLength)}`;
+};
+var buildCapsuleBar = (ratio, width = 30) => {
+  const safeRatio = Math.max(0, Math.min(1, ratio));
+  if (width <= 0) return "";
+  if (safeRatio >= 1) {
+    return import_chalk.default.green("\u2588".repeat(width));
+  }
+  const pointerIndex = Math.min(width - 1, Math.floor(width * safeRatio));
+  const done = pointerIndex > 0 ? import_chalk.default.green("\u2588".repeat(pointerIndex)) : "";
+  const pointer = import_chalk.default.cyanBright("\u25B8");
+  const pending = pointerIndex < width - 1 ? import_chalk.default.gray("\u2591".repeat(width - pointerIndex - 1)) : "";
+  return `${done}${pointer}${pending}`;
+};
 function vitePluginDeployOss(option) {
   const {
     accessKeyId,
@@ -55,17 +95,23 @@ function vitePluginDeployOss(option) {
     autoDelete = false,
     alias,
     open = true,
+    fancy = true,
     noCache = false,
+    failOnError = true,
     concurrency = 5,
     retryTimes = 3,
+    multipartThreshold = 10 * 1024 * 1024,
     ...props
   } = option || {};
   let buildFailed = false;
   let upload = false;
-  let outDir = "";
-  const maxListeners = Math.max(20, concurrency * 3);
-  process.stdout?.setMaxListeners?.(maxListeners);
-  process.stderr?.setMaxListeners?.(maxListeners);
+  let outDir = (0, import_vite.normalizePath)((0, import_node_path.resolve)("dist"));
+  let resolvedConfig = null;
+  const useInteractiveOutput = fancy && Boolean(process.stdout?.isTTY) && Boolean(process.stderr?.isTTY) && !process.env.CI;
+  const clearScreen = () => {
+    if (!useInteractiveOutput) return;
+    process.stdout.write("\x1B[2J\x1B[0f");
+  };
   const validateOptions = () => {
     const errors = [];
     if (!accessKeyId) errors.push("accessKeyId is required");
@@ -73,79 +119,185 @@ function vitePluginDeployOss(option) {
     if (!bucket) errors.push("bucket is required");
     if (!region) errors.push("region is required");
     if (!uploadDir) errors.push("uploadDir is required");
+    if (!Number.isInteger(retryTimes) || retryTimes < 1) errors.push("retryTimes must be >= 1");
+    if (!Number.isInteger(concurrency) || concurrency < 1) errors.push("concurrency must be >= 1");
+    if (!Number.isFinite(multipartThreshold) || multipartThreshold <= 0)
+      errors.push("multipartThreshold must be > 0");
     return errors;
   };
-  const uploadFileWithRetry = async (client, name, filePath, maxRetries = retryTimes) => {
+  const uploadFileWithRetry = async (client, task, silentLogs, maxRetries = retryTimes) => {
+    const shouldUseMultipart = task.size >= multipartThreshold;
+    const headers = {
+      "x-oss-storage-class": "Standard",
+      "x-oss-object-acl": "default",
+      "Cache-Control": noCache ? "no-cache" : "public, max-age=86400, immutable",
+      "x-oss-forbid-overwrite": overwrite ? "false" : "true"
+    };
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
-        const result = await client.put(name, filePath, {
+        const result = shouldUseMultipart ? await client.multipartUpload(task.name, task.filePath, {
           timeout: 6e5,
-          headers: {
-            "x-oss-storage-class": "Standard",
-            "x-oss-object-acl": "default",
-            "Cache-Control": noCache ? "no-cache" : "public, max-age=86400, immutable",
-            ...overwrite && {
-              "x-oss-forbid-overwrite": "false"
-            }
-          }
+          partSize: 1024 * 1024,
+          parallel: Math.max(1, Math.min(concurrency, 4)),
+          headers
+        }) : await client.put(task.name, task.filePath, {
+          timeout: 6e5,
+          headers
         });
         if (result.res.status === 200) {
-          const url = alias ? alias + name : result.url;
           if (autoDelete) {
             try {
-              (0, import_node_fs.unlinkSync)(filePath);
+              await (0, import_promises.unlink)(task.filePath);
             } catch (error) {
-              console.warn(`${import_chalk.default.yellow("\u26A0")} \u5220\u9664\u672C\u5730\u6587\u4EF6\u5931\u8D25: ${filePath}`);
+              console.warn(`${import_chalk.default.yellow("\u26A0")} \u5220\u9664\u672C\u5730\u6587\u4EF6\u5931\u8D25: ${task.filePath}`);
             }
           }
-          return { success: true, file: filePath };
+          return { success: true, file: task.filePath, name: task.name, size: task.size, retries: attempt - 1 };
         } else {
           throw new Error(`Upload failed with status: ${result.res.status}`);
         }
       } catch (error) {
         if (attempt === maxRetries) {
-          console.log(`${import_chalk.default.red("\u2717")} ${filePath} => ${error instanceof Error ? error.message : String(error)}`);
-          return { success: false, file: filePath, error };
+          if (!silentLogs) {
+            console.log(
+              `${import_chalk.default.red("\u2717")} ${task.filePath} => ${error instanceof Error ? error.message : String(error)}`
+            );
+          }
+          return {
+            success: false,
+            file: task.filePath,
+            name: task.name,
+            size: task.size,
+            retries: attempt - 1,
+            error
+          };
         } else {
-          console.log(`${import_chalk.default.yellow("\u26A0")} ${filePath} \u4E0A\u4F20\u5931\u8D25\uFF0C\u6B63\u5728\u91CD\u8BD5 (${attempt}/${maxRetries})...`);
+          if (!silentLogs) {
+            console.log(`${import_chalk.default.yellow("\u26A0")} ${task.filePath} \u4E0A\u4F20\u5931\u8D25\uFF0C\u6B63\u5728\u91CD\u8BD5 (${attempt}/${maxRetries})...`);
+          }
           await new Promise((resolve2) => setTimeout(resolve2, 1e3 * attempt));
         }
       }
     }
-    return { success: false, file: filePath, error: new Error("Max retries exceeded") };
+    return {
+      success: false,
+      file: task.filePath,
+      name: task.name,
+      size: task.size,
+      retries: maxRetries,
+      error: new Error("Max retries exceeded")
+    };
   };
-  const uploadFilesInBatches = async (client, files, batchSize = concurrency) => {
+  const uploadFilesInBatches = async (client, files, windowSize = concurrency) => {
     const results = [];
     const totalFiles = files.length;
+    const tasks = [];
     let completed = 0;
-    const spinner = (0, import_ora.default)("\u51C6\u5907\u4E0A\u4F20...").start();
-    const updateSpinner = (currentFile) => {
-      const percentage = Math.round(completed / totalFiles * 100);
-      const width2 = 30;
-      const filled = Math.round(width2 * completed / totalFiles);
-      const empty = width2 - filled;
-      const bar2 = import_chalk.default.green("\u2588".repeat(filled)) + import_chalk.default.gray("\u2591".repeat(empty));
-      spinner.text = `\u6B63\u5728\u4E0A\u4F20: ${import_chalk.default.cyan(currentFile)}
-${bar2} ${percentage}% (${completed}/${totalFiles})`;
+    let failed = 0;
+    let uploadedBytes = 0;
+    let retries = 0;
+    const taskCandidates = await Promise.all(
+      files.map(async (relativeFilePath) => {
+        const filePath = (0, import_vite.normalizePath)((0, import_node_path.resolve)(outDir, relativeFilePath));
+        const name = normalizeObjectKey(uploadDir, relativeFilePath);
+        try {
+          const fileStats = await (0, import_promises.stat)(filePath);
+          return { task: { filePath, name, size: fileStats.size } };
+        } catch (error) {
+          return { task: null, error, filePath, name };
+        }
+      })
+    );
+    for (const candidate of taskCandidates) {
+      if (candidate.task) {
+        tasks.push(candidate.task);
+      } else {
+        failed++;
+        completed++;
+        results.push({
+          success: false,
+          file: candidate.filePath,
+          name: candidate.name,
+          size: 0,
+          retries: 0,
+          error: candidate.error
+        });
+      }
+    }
+    const totalBytes = tasks.reduce((sum, task) => sum + task.size, 0);
+    const startAt = Date.now();
+    const activeFiles = /* @__PURE__ */ new Set();
+    const safeWindowSize = Math.max(1, Math.min(windowSize, tasks.length || 1));
+    const silentLogs = Boolean(useInteractiveOutput);
+    const spinner = useInteractiveOutput ? (0, import_ora.default)({ text: "\u51C6\u5907\u4E0A\u4F20...", spinner: "dots12" }).start() : null;
+    const reportEvery = Math.max(1, Math.ceil(totalFiles / 10));
+    let lastReportedCompleted = -1;
+    const updateProgress = () => {
+      const progressRatio = totalFiles > 0 ? completed / totalFiles : 1;
+      const percentage = Math.round(progressRatio * 100);
+      const elapsedSeconds = (Date.now() - startAt) / 1e3;
+      const speed = elapsedSeconds > 0 ? uploadedBytes / elapsedSeconds : 0;
+      const etaSeconds = speed > 0 ? Math.max(0, (totalBytes - uploadedBytes) / speed) : 0;
+      const activeList = Array.from(activeFiles);
+      const currentFile = activeList.length > 0 ? trimMiddle(activeList[activeList.length - 1], 86) : "-";
+      if (!spinner) {
+        if (completed === lastReportedCompleted) return;
+        if (completed === totalFiles || completed % reportEvery === 0) {
+          console.log(
+            `${import_chalk.default.gray("\u8FDB\u5EA6:")} ${completed}/${totalFiles} (${percentage}%) | ${import_chalk.default.gray("\u6570\u636E:")} ${formatBytes(uploadedBytes)}/${formatBytes(totalBytes)} | ${import_chalk.default.gray("\u901F\u5EA6:")} ${formatBytes(speed)}/s`
+          );
+          lastReportedCompleted = completed;
+        }
+        return;
+      }
+      const bar = buildCapsuleBar(progressRatio);
+      const warnLine = retries > 0 || failed > 0 ? `
+${import_chalk.default.yellow("\u91CD\u8BD5")}: ${retries}  ${import_chalk.default.yellow("\u5931\u8D25")}: ${failed}` : "";
+      spinner.text = [
+        `${import_chalk.default.cyan("\u6B63\u5728\u4E0A\u4F20:")} ${import_chalk.default.white(currentFile)}`,
+        `${bar} ${import_chalk.default.bold(`${percentage}%`)} ${import_chalk.default.gray(`(${completed}/${totalFiles})`)} ${import_chalk.default.gray("|")} ${import_chalk.default.blue(formatBytes(uploadedBytes))}/${import_chalk.default.blue(formatBytes(totalBytes))} ${import_chalk.default.gray("|")} ${import_chalk.default.magenta(`${formatBytes(speed)}/s`)} ${import_chalk.default.gray("|")} \u9884\u8BA1 ${import_chalk.default.yellow(formatDuration(etaSeconds))}`
+      ].join("\n");
+      spinner.text += warnLine;
     };
-    for (let i = 0; i < files.length; i += batchSize) {
-      const batch = files.slice(i, i + batchSize);
-      const batchPromises = batch.map(async (file) => {
-        const filePath = (0, import_vite.normalizePath)(file);
-        const name = filePath.replace(outDir, uploadDir).replace(/\/\//g, "/");
-        updateSpinner(name);
-        const result = await uploadFileWithRetry(client, name, filePath);
+    const refreshTimer = spinner ? setInterval(updateProgress, 120) : null;
+    let currentIndex = 0;
+    const worker = async () => {
+      while (true) {
+        const index = currentIndex++;
+        if (index >= tasks.length) return;
+        const task = tasks[index];
+        activeFiles.add(task.name);
+        updateProgress();
+        const result = await uploadFileWithRetry(client, task, silentLogs);
         completed++;
-        updateSpinner(name);
-        return result;
-      });
-      const batchResults = await Promise.all(batchPromises);
-      results.push(...batchResults);
+        retries += result.retries;
+        if (result.success) {
+          uploadedBytes += result.size;
+        } else {
+          failed++;
+        }
+        results.push(result);
+        activeFiles.delete(task.name);
+        updateProgress();
+      }
+    };
+    updateProgress();
+    try {
+      await Promise.all(Array.from({ length: safeWindowSize }, () => worker()));
+    } finally {
+      if (refreshTimer) clearInterval(refreshTimer);
+    }
+    if (spinner) {
+      const elapsedSeconds = (Date.now() - startAt) / 1e3;
+      const successCount = results.filter((item) => item.success).length;
+      const speed = elapsedSeconds > 0 ? uploadedBytes / elapsedSeconds : 0;
+      spinner.succeed(
+        `${import_chalk.default.green("\u4E0A\u4F20\u6210\u529F")} ${successCount} \u4E2A\u6587\u4EF6\u3002
+${buildCapsuleBar(1)} 100% (${totalFiles}/${totalFiles}) ${import_chalk.default.gray("|")} \u901F\u5EA6 ${import_chalk.default.magenta(`${formatBytes(speed)}/s`)} ${import_chalk.default.gray("|")} \u8017\u65F6 ${import_chalk.default.yellow(formatDuration(elapsedSeconds))}`
+      );
+    } else {
+      console.log(`${import_chalk.default.green("\u2714")} \u6240\u6709\u6587\u4EF6\u4E0A\u4F20\u5B8C\u6210 (${totalFiles}/${totalFiles})`);
     }
-    const width = 30;
-    const bar = import_chalk.default.green("\u2588".repeat(width));
-    spinner.succeed(`\u6240\u6709\u6587\u4EF6\u4E0A\u4F20\u5B8C\u6210!
-${bar} 100% (${totalFiles}/${totalFiles})`);
     return results;
   };
   return {
@@ -157,7 +309,7 @@ ${bar} 100% (${totalFiles}/${totalFiles})`);
     },
     config(config) {
       if (!open || buildFailed) return;
-      process.stdout.write("\x1B[2J\x1B[0f");
+      clearScreen();
       const validationErrors = validateOptions();
       if (validationErrors.length > 0) {
         console.log(`${import_chalk.default.red("\u2717 \u914D\u7F6E\u9519\u8BEF:")}
@@ -166,25 +318,29 @@ ${validationErrors.map((err) => `  - ${err}`).join("\n")}`);
       }
       upload = true;
       config.base = configBase || config.base;
-      outDir = config.build?.outDir || "dist";
       return config;
     },
+    configResolved(config) {
+      resolvedConfig = config;
+      outDir = (0, import_vite.normalizePath)((0, import_node_path.resolve)(config.root, config.build.outDir));
+    },
     closeBundle: {
       sequential: true,
       order: "post",
       async handler() {
-        if (!open || !upload || buildFailed) return;
+        if (!open || !upload || buildFailed || !resolvedConfig) return;
         const startTime = Date.now();
         const client = new import_ali_oss.default({ region, accessKeyId, accessKeySecret, secure, bucket, ...props });
-        const files = (0, import_glob.globSync)(outDir + "/**/*", {
+        const files = (0, import_glob.globSync)("**/*", {
+          cwd: outDir,
           nodir: true,
           ignore: Array.isArray(skip) ? skip : [skip]
-        });
+        }).map((file) => (0, import_vite.normalizePath)(file));
         if (files.length === 0) {
           console.log(`${import_chalk.default.yellow("\u26A0 \u6CA1\u6709\u627E\u5230\u9700\u8981\u4E0A\u4F20\u7684\u6587\u4EF6")}`);
           return;
         }
-        process.stdout.write("\x1B[2J\x1B[0f");
+        clearScreen();
         console.log(import_chalk.default.cyan(`
 \u{1F680} OSS \u90E8\u7F72\u5F00\u59CB
 `));
@@ -192,14 +348,19 @@ ${validationErrors.map((err) => `  - ${err}`).join("\n")}`);
         console.log(`${import_chalk.default.gray("Region:")}   ${import_chalk.default.green(region)}`);
         console.log(`${import_chalk.default.gray("Source:")}   ${import_chalk.default.yellow(outDir)}`);
         console.log(`${import_chalk.default.gray("Target:")}   ${import_chalk.default.yellow(uploadDir)}`);
+        if (alias) console.log(`${import_chalk.default.gray("Alias:")}    ${import_chalk.default.green(alias)}`);
         console.log(`${import_chalk.default.gray("Files:")}    ${import_chalk.default.blue(files.length)}
 `);
         try {
           const results = await uploadFilesInBatches(client, files, concurrency);
           const successCount = results.filter((r) => r.success).length;
           const failedCount = results.length - successCount;
-          const duration = ((Date.now() - startTime) / 1e3).toFixed(2);
-          process.stdout.write("\x1B[2J\x1B[0f");
+          const durationSeconds = (Date.now() - startTime) / 1e3;
+          const duration = durationSeconds.toFixed(2);
+          const uploadedBytes = results.reduce((sum, result) => result.success ? sum + result.size : sum, 0);
+          const retryCount = results.reduce((sum, result) => sum + result.retries, 0);
+          const avgSpeed = durationSeconds > 0 ? uploadedBytes / durationSeconds : 0;
+          clearScreen();
           console.log("\n" + import_chalk.default.gray("\u2500".repeat(40)) + "\n");
           if (failedCount === 0) {
             console.log(`${import_chalk.default.green("\u{1F389} \u90E8\u7F72\u6210\u529F!")}`);
@@ -212,17 +373,40 @@ ${import_chalk.default.gray("\u7EDF\u8BA1:")}`);
           if (failedCount > 0) {
             console.log(` ${import_chalk.default.red("\u2717")} \u5931\u8D25: ${import_chalk.default.bold(failedCount)}`);
           }
+          console.log(` ${import_chalk.default.cyan("\u21C4")} \u91CD\u8BD5: ${import_chalk.default.bold(retryCount)}`);
+          console.log(` ${import_chalk.default.blue("\u{1F4E6}")} \u6570\u636E: ${import_chalk.default.bold(formatBytes(uploadedBytes))}`);
+          console.log(` ${import_chalk.default.magenta("\u26A1")} \u5E73\u5747\u901F\u5EA6: ${import_chalk.default.bold(`${formatBytes(avgSpeed)}/s`)}`);
           console.log(` ${import_chalk.default.blue("\u23F1")} \u8017\u65F6: ${import_chalk.default.bold(duration)}s`);
           console.log("");
+          if (failedCount > 0) {
+            const failedItems = results.filter((result) => !result.success);
+            const previewCount = Math.min(5, failedItems.length);
+            console.log(import_chalk.default.red("\u5931\u8D25\u660E\u7EC6:"));
+            for (let i = 0; i < previewCount; i++) {
+              const item = failedItems[i];
+              const reason = item.error?.message || "unknown error";
+              console.log(` ${import_chalk.default.red("\u2022")} ${item.name} => ${reason}`);
+            }
+            if (failedItems.length > previewCount) {
+              console.log(import_chalk.default.gray(` ... \u8FD8\u6709 ${failedItems.length - previewCount} \u4E2A\u5931\u8D25\u6587\u4EF6`));
+            }
+            console.log("");
+          }
           try {
-            (0, import_delete_empty.default)((0, import_node_path.resolve)(outDir));
+            await (0, import_delete_empty.default)((0, import_node_path.resolve)(outDir));
           } catch (error) {
             console.warn(`${import_chalk.default.yellow("\u26A0 \u6E05\u7406\u7A7A\u76EE\u5F55\u5931\u8D25:")} ${error}`);
           }
+          if (failedCount > 0 && failOnError) {
+            throw new Error(`Failed to upload ${failedCount} of ${results.length} files`);
+          }
         } catch (error) {
           console.log(`
 ${import_chalk.default.red("\u274C \u4E0A\u4F20\u8FC7\u7A0B\u4E2D\u53D1\u751F\u9519\u8BEF:")} ${error}
 `);
+          if (failOnError) {
+            throw error instanceof Error ? error : new Error(String(error));
+          }
         }
       }
     }

package/dist/index.mjs

@@ -3,10 +3,50 @@ import oss from "ali-oss";
 import chalk from "chalk";
 import deleteEmpty from "delete-empty";
 import { globSync } from "glob";
-import { unlinkSync } from "fs";
+import { stat, unlink } from "fs/promises";
 import { resolve } from "path";
 import ora from "ora";
 import { normalizePath } from "vite";
+var normalizeObjectKey = (targetDir, relativeFilePath) => normalizePath(`${targetDir}/${relativeFilePath}`).replace(/\/{2,}/g, "/").replace(/^\/+/, "");
+var formatBytes = (bytes) => {
+  if (!Number.isFinite(bytes) || bytes <= 0) return "0 B";
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let value = bytes;
+  let unitIndex = 0;
+  while (value >= 1024 && unitIndex < units.length - 1) {
+    value /= 1024;
+    unitIndex++;
+  }
+  const digits = value >= 100 || unitIndex === 0 ? 0 : 1;
+  return `${value.toFixed(digits)} ${units[unitIndex]}`;
+};
+var formatDuration = (seconds) => {
+  if (!Number.isFinite(seconds) || seconds < 0) return "--";
+  const rounded = Math.round(seconds);
+  const mins = Math.floor(rounded / 60);
+  const secs = rounded % 60;
+  if (mins === 0) return `${secs}s`;
+  return `${mins}m${String(secs).padStart(2, "0")}s`;
+};
+var trimMiddle = (text, maxLength) => {
+  if (text.length <= maxLength) return text;
+  if (maxLength <= 10) return text.slice(0, maxLength);
+  const leftLength = Math.floor((maxLength - 3) / 2);
+  const rightLength = maxLength - 3 - leftLength;
+  return `${text.slice(0, leftLength)}...${text.slice(-rightLength)}`;
+};
+var buildCapsuleBar = (ratio, width = 30) => {
+  const safeRatio = Math.max(0, Math.min(1, ratio));
+  if (width <= 0) return "";
+  if (safeRatio >= 1) {
+    return chalk.green("\u2588".repeat(width));
+  }
+  const pointerIndex = Math.min(width - 1, Math.floor(width * safeRatio));
+  const done = pointerIndex > 0 ? chalk.green("\u2588".repeat(pointerIndex)) : "";
+  const pointer = chalk.cyanBright("\u25B8");
+  const pending = pointerIndex < width - 1 ? chalk.gray("\u2591".repeat(width - pointerIndex - 1)) : "";
+  return `${done}${pointer}${pending}`;
+};
 function vitePluginDeployOss(option) {
   const {
     accessKeyId,
@@ -21,17 +61,23 @@ function vitePluginDeployOss(option) {
     autoDelete = false,
     alias,
     open = true,
+    fancy = true,
     noCache = false,
+    failOnError = true,
     concurrency = 5,
     retryTimes = 3,
+    multipartThreshold = 10 * 1024 * 1024,
     ...props
   } = option || {};
   let buildFailed = false;
   let upload = false;
-  let outDir = "";
-  const maxListeners = Math.max(20, concurrency * 3);
-  process.stdout?.setMaxListeners?.(maxListeners);
-  process.stderr?.setMaxListeners?.(maxListeners);
+  let outDir = normalizePath(resolve("dist"));
+  let resolvedConfig = null;
+  const useInteractiveOutput = fancy && Boolean(process.stdout?.isTTY) && Boolean(process.stderr?.isTTY) && !process.env.CI;
+  const clearScreen = () => {
+    if (!useInteractiveOutput) return;
+    process.stdout.write("\x1B[2J\x1B[0f");
+  };
   const validateOptions = () => {
     const errors = [];
     if (!accessKeyId) errors.push("accessKeyId is required");
@@ -39,79 +85,185 @@ function vitePluginDeployOss(option) {
     if (!bucket) errors.push("bucket is required");
     if (!region) errors.push("region is required");
     if (!uploadDir) errors.push("uploadDir is required");
+    if (!Number.isInteger(retryTimes) || retryTimes < 1) errors.push("retryTimes must be >= 1");
+    if (!Number.isInteger(concurrency) || concurrency < 1) errors.push("concurrency must be >= 1");
+    if (!Number.isFinite(multipartThreshold) || multipartThreshold <= 0)
+      errors.push("multipartThreshold must be > 0");
     return errors;
   };
-  const uploadFileWithRetry = async (client, name, filePath, maxRetries = retryTimes) => {
+  const uploadFileWithRetry = async (client, task, silentLogs, maxRetries = retryTimes) => {
+    const shouldUseMultipart = task.size >= multipartThreshold;
+    const headers = {
+      "x-oss-storage-class": "Standard",
+      "x-oss-object-acl": "default",
+      "Cache-Control": noCache ? "no-cache" : "public, max-age=86400, immutable",
+      "x-oss-forbid-overwrite": overwrite ? "false" : "true"
+    };
     for (let attempt = 1; attempt <= maxRetries; attempt++) {
       try {
-        const result = await client.put(name, filePath, {
+        const result = shouldUseMultipart ? await client.multipartUpload(task.name, task.filePath, {
           timeout: 6e5,
-          headers: {
-            "x-oss-storage-class": "Standard",
-            "x-oss-object-acl": "default",
-            "Cache-Control": noCache ? "no-cache" : "public, max-age=86400, immutable",
-            ...overwrite && {
-              "x-oss-forbid-overwrite": "false"
-            }
-          }
+          partSize: 1024 * 1024,
+          parallel: Math.max(1, Math.min(concurrency, 4)),
+          headers
+        }) : await client.put(task.name, task.filePath, {
+          timeout: 6e5,
+          headers
         });
         if (result.res.status === 200) {
-          const url = alias ? alias + name : result.url;
           if (autoDelete) {
             try {
-              unlinkSync(filePath);
+              await unlink(task.filePath);
             } catch (error) {
-              console.warn(`${chalk.yellow("\u26A0")} \u5220\u9664\u672C\u5730\u6587\u4EF6\u5931\u8D25: ${filePath}`);
+              console.warn(`${chalk.yellow("\u26A0")} \u5220\u9664\u672C\u5730\u6587\u4EF6\u5931\u8D25: ${task.filePath}`);
             }
           }
-          return { success: true, file: filePath };
+          return { success: true, file: task.filePath, name: task.name, size: task.size, retries: attempt - 1 };
         } else {
           throw new Error(`Upload failed with status: ${result.res.status}`);
         }
       } catch (error) {
         if (attempt === maxRetries) {
-          console.log(`${chalk.red("\u2717")} ${filePath} => ${error instanceof Error ? error.message : String(error)}`);
-          return { success: false, file: filePath, error };
+          if (!silentLogs) {
+            console.log(
+              `${chalk.red("\u2717")} ${task.filePath} => ${error instanceof Error ? error.message : String(error)}`
+            );
+          }
+          return {
+            success: false,
+            file: task.filePath,
+            name: task.name,
+            size: task.size,
+            retries: attempt - 1,
+            error
+          };
         } else {
-          console.log(`${chalk.yellow("\u26A0")} ${filePath} \u4E0A\u4F20\u5931\u8D25\uFF0C\u6B63\u5728\u91CD\u8BD5 (${attempt}/${maxRetries})...`);
+          if (!silentLogs) {
+            console.log(`${chalk.yellow("\u26A0")} ${task.filePath} \u4E0A\u4F20\u5931\u8D25\uFF0C\u6B63\u5728\u91CD\u8BD5 (${attempt}/${maxRetries})...`);
+          }
           await new Promise((resolve2) => setTimeout(resolve2, 1e3 * attempt));
         }
       }
     }
-    return { success: false, file: filePath, error: new Error("Max retries exceeded") };
+    return {
+      success: false,
+      file: task.filePath,
+      name: task.name,
+      size: task.size,
+      retries: maxRetries,
+      error: new Error("Max retries exceeded")
+    };
   };
-  const uploadFilesInBatches = async (client, files, batchSize = concurrency) => {
+  const uploadFilesInBatches = async (client, files, windowSize = concurrency) => {
     const results = [];
     const totalFiles = files.length;
+    const tasks = [];
     let completed = 0;
-    const spinner = ora("\u51C6\u5907\u4E0A\u4F20...").start();
-    const updateSpinner = (currentFile) => {
-      const percentage = Math.round(completed / totalFiles * 100);
-      const width2 = 30;
-      const filled = Math.round(width2 * completed / totalFiles);
-      const empty = width2 - filled;
-      const bar2 = chalk.green("\u2588".repeat(filled)) + chalk.gray("\u2591".repeat(empty));
-      spinner.text = `\u6B63\u5728\u4E0A\u4F20: ${chalk.cyan(currentFile)}
-${bar2} ${percentage}% (${completed}/${totalFiles})`;
+    let failed = 0;
+    let uploadedBytes = 0;
+    let retries = 0;
+    const taskCandidates = await Promise.all(
+      files.map(async (relativeFilePath) => {
+        const filePath = normalizePath(resolve(outDir, relativeFilePath));
+        const name = normalizeObjectKey(uploadDir, relativeFilePath);
+        try {
+          const fileStats = await stat(filePath);
+          return { task: { filePath, name, size: fileStats.size } };
+        } catch (error) {
+          return { task: null, error, filePath, name };
+        }
+      })
+    );
+    for (const candidate of taskCandidates) {
+      if (candidate.task) {
+        tasks.push(candidate.task);
+      } else {
+        failed++;
+        completed++;
+        results.push({
+          success: false,
+          file: candidate.filePath,
+          name: candidate.name,
+          size: 0,
+          retries: 0,
+          error: candidate.error
+        });
+      }
+    }
+    const totalBytes = tasks.reduce((sum, task) => sum + task.size, 0);
+    const startAt = Date.now();
+    const activeFiles = /* @__PURE__ */ new Set();
+    const safeWindowSize = Math.max(1, Math.min(windowSize, tasks.length || 1));
+    const silentLogs = Boolean(useInteractiveOutput);
+    const spinner = useInteractiveOutput ? ora({ text: "\u51C6\u5907\u4E0A\u4F20...", spinner: "dots12" }).start() : null;
+    const reportEvery = Math.max(1, Math.ceil(totalFiles / 10));
+    let lastReportedCompleted = -1;
+    const updateProgress = () => {
+      const progressRatio = totalFiles > 0 ? completed / totalFiles : 1;
+      const percentage = Math.round(progressRatio * 100);
+      const elapsedSeconds = (Date.now() - startAt) / 1e3;
+      const speed = elapsedSeconds > 0 ? uploadedBytes / elapsedSeconds : 0;
+      const etaSeconds = speed > 0 ? Math.max(0, (totalBytes - uploadedBytes) / speed) : 0;
+      const activeList = Array.from(activeFiles);
+      const currentFile = activeList.length > 0 ? trimMiddle(activeList[activeList.length - 1], 86) : "-";
+      if (!spinner) {
+        if (completed === lastReportedCompleted) return;
+        if (completed === totalFiles || completed % reportEvery === 0) {
+          console.log(
+            `${chalk.gray("\u8FDB\u5EA6:")} ${completed}/${totalFiles} (${percentage}%) | ${chalk.gray("\u6570\u636E:")} ${formatBytes(uploadedBytes)}/${formatBytes(totalBytes)} | ${chalk.gray("\u901F\u5EA6:")} ${formatBytes(speed)}/s`
+          );
+          lastReportedCompleted = completed;
+        }
+        return;
+      }
+      const bar = buildCapsuleBar(progressRatio);
+      const warnLine = retries > 0 || failed > 0 ? `
+${chalk.yellow("\u91CD\u8BD5")}: ${retries}  ${chalk.yellow("\u5931\u8D25")}: ${failed}` : "";
+      spinner.text = [
+        `${chalk.cyan("\u6B63\u5728\u4E0A\u4F20:")} ${chalk.white(currentFile)}`,
+        `${bar} ${chalk.bold(`${percentage}%`)} ${chalk.gray(`(${completed}/${totalFiles})`)} ${chalk.gray("|")} ${chalk.blue(formatBytes(uploadedBytes))}/${chalk.blue(formatBytes(totalBytes))} ${chalk.gray("|")} ${chalk.magenta(`${formatBytes(speed)}/s`)} ${chalk.gray("|")} \u9884\u8BA1 ${chalk.yellow(formatDuration(etaSeconds))}`
+      ].join("\n");
+      spinner.text += warnLine;
     };
-    for (let i = 0; i < files.length; i += batchSize) {
-      const batch = files.slice(i, i + batchSize);
-      const batchPromises = batch.map(async (file) => {
-        const filePath = normalizePath(file);
-        const name = filePath.replace(outDir, uploadDir).replace(/\/\//g, "/");
-        updateSpinner(name);
-        const result = await uploadFileWithRetry(client, name, filePath);
+    const refreshTimer = spinner ? setInterval(updateProgress, 120) : null;
+    let currentIndex = 0;
+    const worker = async () => {
+      while (true) {
+        const index = currentIndex++;
+        if (index >= tasks.length) return;
+        const task = tasks[index];
+        activeFiles.add(task.name);
+        updateProgress();
+        const result = await uploadFileWithRetry(client, task, silentLogs);
         completed++;
-        updateSpinner(name);
-        return result;
-      });
-      const batchResults = await Promise.all(batchPromises);
-      results.push(...batchResults);
+        retries += result.retries;
+        if (result.success) {
+          uploadedBytes += result.size;
+        } else {
+          failed++;
+        }
+        results.push(result);
+        activeFiles.delete(task.name);
+        updateProgress();
+      }
+    };
+    updateProgress();
+    try {
+      await Promise.all(Array.from({ length: safeWindowSize }, () => worker()));
+    } finally {
+      if (refreshTimer) clearInterval(refreshTimer);
+    }
+    if (spinner) {
+      const elapsedSeconds = (Date.now() - startAt) / 1e3;
+      const successCount = results.filter((item) => item.success).length;
+      const speed = elapsedSeconds > 0 ? uploadedBytes / elapsedSeconds : 0;
+      spinner.succeed(
+        `${chalk.green("\u4E0A\u4F20\u6210\u529F")} ${successCount} \u4E2A\u6587\u4EF6\u3002
+${buildCapsuleBar(1)} 100% (${totalFiles}/${totalFiles}) ${chalk.gray("|")} \u901F\u5EA6 ${chalk.magenta(`${formatBytes(speed)}/s`)} ${chalk.gray("|")} \u8017\u65F6 ${chalk.yellow(formatDuration(elapsedSeconds))}`
+      );
+    } else {
+      console.log(`${chalk.green("\u2714")} \u6240\u6709\u6587\u4EF6\u4E0A\u4F20\u5B8C\u6210 (${totalFiles}/${totalFiles})`);
     }
-    const width = 30;
-    const bar = chalk.green("\u2588".repeat(width));
-    spinner.succeed(`\u6240\u6709\u6587\u4EF6\u4E0A\u4F20\u5B8C\u6210!
-${bar} 100% (${totalFiles}/${totalFiles})`);
     return results;
   };
   return {
@@ -123,7 +275,7 @@ ${bar} 100% (${totalFiles}/${totalFiles})`);
     },
     config(config) {
       if (!open || buildFailed) return;
-      process.stdout.write("\x1B[2J\x1B[0f");
+      clearScreen();
       const validationErrors = validateOptions();
       if (validationErrors.length > 0) {
         console.log(`${chalk.red("\u2717 \u914D\u7F6E\u9519\u8BEF:")}
@@ -132,25 +284,29 @@ ${validationErrors.map((err) => `  - ${err}`).join("\n")}`);
       }
       upload = true;
       config.base = configBase || config.base;
-      outDir = config.build?.outDir || "dist";
       return config;
     },
+    configResolved(config) {
+      resolvedConfig = config;
+      outDir = normalizePath(resolve(config.root, config.build.outDir));
+    },
     closeBundle: {
       sequential: true,
       order: "post",
       async handler() {
-        if (!open || !upload || buildFailed) return;
+        if (!open || !upload || buildFailed || !resolvedConfig) return;
         const startTime = Date.now();
         const client = new oss({ region, accessKeyId, accessKeySecret, secure, bucket, ...props });
-        const files = globSync(outDir + "/**/*", {
+        const files = globSync("**/*", {
+          cwd: outDir,
           nodir: true,
           ignore: Array.isArray(skip) ? skip : [skip]
-        });
+        }).map((file) => normalizePath(file));
         if (files.length === 0) {
           console.log(`${chalk.yellow("\u26A0 \u6CA1\u6709\u627E\u5230\u9700\u8981\u4E0A\u4F20\u7684\u6587\u4EF6")}`);
           return;
         }
-        process.stdout.write("\x1B[2J\x1B[0f");
+        clearScreen();
         console.log(chalk.cyan(`
 \u{1F680} OSS \u90E8\u7F72\u5F00\u59CB
 `));
@@ -158,14 +314,19 @@ ${validationErrors.map((err) => `  - ${err}`).join("\n")}`);
         console.log(`${chalk.gray("Region:")}   ${chalk.green(region)}`);
         console.log(`${chalk.gray("Source:")}   ${chalk.yellow(outDir)}`);
         console.log(`${chalk.gray("Target:")}   ${chalk.yellow(uploadDir)}`);
+        if (alias) console.log(`${chalk.gray("Alias:")}    ${chalk.green(alias)}`);
         console.log(`${chalk.gray("Files:")}    ${chalk.blue(files.length)}
 `);
         try {
           const results = await uploadFilesInBatches(client, files, concurrency);
           const successCount = results.filter((r) => r.success).length;
           const failedCount = results.length - successCount;
-          const duration = ((Date.now() - startTime) / 1e3).toFixed(2);
-          process.stdout.write("\x1B[2J\x1B[0f");
+          const durationSeconds = (Date.now() - startTime) / 1e3;
+          const duration = durationSeconds.toFixed(2);
+          const uploadedBytes = results.reduce((sum, result) => result.success ? sum + result.size : sum, 0);
+          const retryCount = results.reduce((sum, result) => sum + result.retries, 0);
+          const avgSpeed = durationSeconds > 0 ? uploadedBytes / durationSeconds : 0;
+          clearScreen();
           console.log("\n" + chalk.gray("\u2500".repeat(40)) + "\n");
           if (failedCount === 0) {
             console.log(`${chalk.green("\u{1F389} \u90E8\u7F72\u6210\u529F!")}`);
@@ -178,17 +339,40 @@ ${chalk.gray("\u7EDF\u8BA1:")}`);
           if (failedCount > 0) {
             console.log(` ${chalk.red("\u2717")} \u5931\u8D25: ${chalk.bold(failedCount)}`);
           }
+          console.log(` ${chalk.cyan("\u21C4")} \u91CD\u8BD5: ${chalk.bold(retryCount)}`);
+          console.log(` ${chalk.blue("\u{1F4E6}")} \u6570\u636E: ${chalk.bold(formatBytes(uploadedBytes))}`);
+          console.log(` ${chalk.magenta("\u26A1")} \u5E73\u5747\u901F\u5EA6: ${chalk.bold(`${formatBytes(avgSpeed)}/s`)}`);
           console.log(` ${chalk.blue("\u23F1")} \u8017\u65F6: ${chalk.bold(duration)}s`);
           console.log("");
+          if (failedCount > 0) {
+            const failedItems = results.filter((result) => !result.success);
+            const previewCount = Math.min(5, failedItems.length);
+            console.log(chalk.red("\u5931\u8D25\u660E\u7EC6:"));
+            for (let i = 0; i < previewCount; i++) {
+              const item = failedItems[i];
+              const reason = item.error?.message || "unknown error";
+              console.log(` ${chalk.red("\u2022")} ${item.name} => ${reason}`);
+            }
+            if (failedItems.length > previewCount) {
+              console.log(chalk.gray(` ... \u8FD8\u6709 ${failedItems.length - previewCount} \u4E2A\u5931\u8D25\u6587\u4EF6`));
+            }
+            console.log("");
+          }
           try {
-            deleteEmpty(resolve(outDir));
+            await deleteEmpty(resolve(outDir));
           } catch (error) {
             console.warn(`${chalk.yellow("\u26A0 \u6E05\u7406\u7A7A\u76EE\u5F55\u5931\u8D25:")} ${error}`);
           }
+          if (failedCount > 0 && failOnError) {
+            throw new Error(`Failed to upload ${failedCount} of ${results.length} files`);
+          }
         } catch (error) {
           console.log(`
 ${chalk.red("\u274C \u4E0A\u4F20\u8FC7\u7A0B\u4E2D\u53D1\u751F\u9519\u8BEF:")} ${error}
 `);
+          if (failOnError) {
+            throw error instanceof Error ? error : new Error(String(error));
+          }
         }
       }
     }

package/package.json

@@ -1,21 +1,28 @@
 {
   "name": "vite-plugin-deploy-oss",
-  "version": "1.2.3",
+  "version": "2.0.0",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
+  "type": "commonjs",
   "homepage": "https://github.com/yulin96/vite-plugin-deploy-oss",
   "repository": {
     "type": "git",
-    "url": "https://github.com/yulin96/vite-plugin-deploy-oss"
+    "url": "git+https://github.com/yulin96/vite-plugin-deploy-oss.git"
   },
   "bugs": {
     "url": "https://github.com/yulin96/vite-plugin-deploy-oss/issues"
   },
   "exports": {
     ".": {
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js"
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
     }
   },
   "keywords": [
@@ -31,25 +38,27 @@
   "license": "MIT",
   "description": "将dist目录下的文件上传到阿里云oss",
   "devDependencies": {
-    "@types/node": "^22.15.32",
-    "tsup": "^8.5.0",
-    "typescript": "^5.8.3"
+    "@types/ali-oss": "^6.23.3",
+    "@types/delete-empty": "^3.0.5",
+    "@types/node": "^22.19.11",
+    "tsup": "^8.5.1",
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "vite": "^6.0.3 || ^7"
   },
   "dependencies": {
-    "@types/ali-oss": "^6.16.11",
-    "@types/delete-empty": "^3.0.5",
     "ali-oss": "^6.23.0",
-    "chalk": "^5.4.1",
+    "chalk": "^5.6.2",
     "delete-empty": "^3.0.0",
-    "glob": "^13.0.1",
-    "ora": "^9.0.0"
+    "glob": "^13.0.6",
+    "ora": "^9.3.0"
   },
   "scripts": {
     "build": "tsup",
+    "typecheck": "tsc -p tsconfig.json",
     "pack": "pnpm run build && pnpm pack",
-    "build:test": "cd playground && vite build"
+    "build:test": "cd playground && vite build",
+    "build:test:deploy": "cd playground && vite build --mode deploy"
   }
 }