@struggler/cli 1.0.6 → 1.0.7

package/command/upload.js

@@ -17,6 +17,7 @@ const {
 } = require('../lib/deploy');
 const { printMessage } = require('../lib/output');
 const { computeFileMd5, readCache, writeCache, isCacheHit, updateCacheEntry } = require('../lib/cache');
+const { createProgressBar } = require('../lib/progress');
 
 async function main(options, runtime = {}) {
     const qiniuConfig = getJsonData(getQiniuConfig(options))
@@ -123,12 +124,20 @@ async function main(options, runtime = {}) {
         });
     }
 
+    const totalFiles = plans.length + skippedPlans.length;
+    const bar = createProgressBar(totalFiles, {
+        json: options.json,
+        suppressOutput: runtime.suppressOutput,
+    });
+
+    for (const plan of skippedPlans) {
+        bar.tick({ filename: plan.localFile, skipped: true });
+    }
+
     const results = await runWithConcurrency(plans, normalizeConcurrency(options.concurrency), async (plan) => {
         try {
             const response = await upload(plan);
-            if (!runtime.suppressOutput) {
-                printMessage(options, `[uploaded] ${plan.localFile} -> ${plan.target}`);
-            }
+            bar.tick({ filename: plan.localFile });
             if (useCache && plan.localMd5) {
                 updateCacheEntry(cache, plan.key, plan.localMd5, response.hash);
             }
@@ -140,6 +149,7 @@ async function main(options, runtime = {}) {
                 hash: response.hash,
             };
         } catch (error) {
+            bar.tick({ filename: plan.localFile, failed: true });
             return {
                 ok: false,
                 localFile: plan.localFile,
@@ -150,6 +160,8 @@ async function main(options, runtime = {}) {
         }
     });
 
+    bar.finish();
+
     if (useCache) {
         writeCache(cachePath, cache);
     }

package/lib/deploy.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const chalk = require('chalk');
 const { listFiles } = require('./files');
 const { createIgnoreMatcher } = require('./ignore');
 const { printMessage, writeManifest, shouldUseJson, printJson } = require('./output');
@@ -70,13 +71,65 @@ function logPlan(action, items, options) {
     });
 }
 
+function formatDuration(ms) {
+    if (ms < 1000) return `${ms}ms`;
+    return `${(ms / 1000).toFixed(1)}s`;
+}
+
 function logSummary(summary, options) {
-    const mode = summary.dryRun ? 'dry-run' : 'live';
-    printMessage(options, `[summary] ${summary.action} mode=${mode} total=${summary.total} succeeded=${summary.succeededCount} failed=${summary.failedCount} duration=${summary.durationMs}ms`);
+    const allOk = summary.failedCount === 0;
+    const isDryRun = summary.dryRun;
+    const skipped = summary.skippedCount || 0;
+    const uploaded = summary.succeededCount - skipped;
+
+    const statusIcon = allOk ? chalk.green('✓') : chalk.red('✗');
+    const actionLabel = summary.action === 'upload' ? '上传' : summary.action === 'refresh' ? '刷新' : summary.action;
+    const modeTag = isDryRun ? chalk.yellow(' [dry-run]') : '';
+
+    printMessage(options, '');
+    printMessage(options, `  ${statusIcon}  ${chalk.bold(actionLabel + '完成')}${modeTag}  ${chalk.dim(formatDuration(summary.durationMs))}`);
+    printMessage(options, '');
+
+    const rows = [];
+    if (summary.action === 'upload') {
+        rows.push([chalk.dim('上传'), chalk.green(`${uploaded} 个文件`)]);
+        if (skipped > 0) {
+            rows.push([chalk.dim('跳过'), chalk.cyan(`${skipped} 个文件`) + chalk.dim('  (缓存命中，无变更)')]);
+        }
+        if (summary.failedCount > 0) {
+            rows.push([chalk.dim('失败'), chalk.red(`${summary.failedCount} 个文件`)]);
+        }
+        rows.push([chalk.dim('合计'), chalk.white(`${summary.total} 个文件`)]);
+    } else {
+        rows.push([chalk.dim('成功'), chalk.green(`${summary.succeededCount} 个`)]);
+        if (summary.failedCount > 0) {
+            rows.push([chalk.dim('失败'), chalk.red(`${summary.failedCount} 个`)]);
+        }
+        rows.push([chalk.dim('合计'), chalk.white(`${summary.total} 个`)]);
+    }
+
+    const labelWidth = 4;
+    rows.forEach(([label, value]) => {
+        printMessage(options, `     ${label.padEnd ? label : label}  ${value}`);
+    });
+    printMessage(options, '');
+
     if (summary.failedCount > 0) {
         summary.failed.forEach((item) => {
-            printMessage(options, `[failed] ${item.localFile}: ${item.error}`);
+            printMessage(options, `  ${chalk.red('✗')}  ${chalk.dim(item.localFile)}`);
+            printMessage(options, `     ${chalk.red(item.error)}`);
+        });
+        printMessage(options, '');
+    }
+
+    const uploadedItems = (summary.succeeded || []).filter((item) => !item.skipped && item.target);
+    if (uploadedItems.length > 0) {
+        printMessage(options, `  ${chalk.dim('─── 已上传文件链接 ───')}`);
+        printMessage(options, '');
+        uploadedItems.forEach((item) => {
+            printMessage(options, `  ${chalk.cyan(item.target)}`);
         });
+        printMessage(options, '');
     }
 }
 

package/lib/progress.js

@@ -0,0 +1,82 @@
+const chalk = require('chalk');
+
+const BAR_WIDTH = 30;
+
+function buildBar(completed, total) {
+    const ratio = total === 0 ? 1 : completed / total;
+    const filled = Math.round(BAR_WIDTH * ratio);
+    const empty = BAR_WIDTH - filled;
+    return chalk.green('█'.repeat(filled)) + chalk.gray('░'.repeat(empty));
+}
+
+function truncateFilename(filename, maxLen) {
+    if (!filename || filename.length <= maxLen) {
+        return (filename || '').padEnd(maxLen);
+    }
+    return '...' + filename.slice(-(maxLen - 3));
+}
+
+function createProgressBar(total, options = {}) {
+    if (options.json || options.suppressOutput || total === 0) {
+        return { tick: () => {}, finish: () => {} };
+    }
+
+    let completed = 0;
+    let failed = 0;
+    let skipped = 0;
+    let lastLine = '';
+
+    const isTTY = process.stdout.isTTY;
+
+    function render(currentFile, status) {
+        const bar = buildBar(completed, total);
+        const pct = total === 0 ? 100 : Math.round((completed / total) * 100);
+        const cols = (process.stdout.columns || 80) - BAR_WIDTH - 30;
+        const nameWidth = Math.max(10, Math.min(40, cols));
+        const name = truncateFilename(currentFile, nameWidth);
+
+        let statusIcon;
+        if (status === 'skipped') {
+            statusIcon = chalk.cyan('↩');
+        } else if (status === 'failed') {
+            statusIcon = chalk.red('✗');
+        } else {
+            statusIcon = chalk.green('✓');
+        }
+
+        const countStr = chalk.white(`${completed}/${total}`);
+        const pctStr = chalk.yellow(`${pct}%`);
+        const line = `  ${bar} ${countStr} ${pctStr}  ${statusIcon} ${chalk.dim(name)}`;
+
+        if (isTTY) {
+            process.stdout.write('\r' + line.padEnd(lastLine.length));
+        } else {
+            console.log(line);
+        }
+        lastLine = line;
+    }
+
+    function tick({ filename = '', skipped: isSkipped = false, failed: isFailed = false } = {}) {
+        completed += 1;
+        if (isSkipped) skipped += 1;
+        if (isFailed) failed += 1;
+        render(filename, isSkipped ? 'skipped' : isFailed ? 'failed' : 'uploaded');
+    }
+
+    function finish() {
+        if (!isTTY) return;
+        const bar = buildBar(total, total);
+        const parts = [
+            `  ${bar}`,
+            chalk.white(`${total}/${total}`),
+            chalk.green('100%'),
+        ];
+        if (skipped > 0) parts.push(chalk.cyan(`${skipped} skipped`));
+        if (failed > 0) parts.push(chalk.red(`${failed} failed`));
+        process.stdout.write('\r' + parts.join('  ').padEnd(lastLine.length) + '\n');
+    }
+
+    return { tick, finish };
+}
+
+module.exports = { createProgressBar };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@struggler/cli",
-	"version": "1.0.6",
+	"version": "1.0.7",
 	"description": "CLI to Upload vite packaged files to Qiniu Cloud OSS.",
 	"main": "index.js",
 	"scripts": {