@struggler/cli 1.0.5 → 1.0.7

package/command/upload.js

@@ -2,7 +2,7 @@ var qiniu = require("qiniu");
 
 var qiniuPrefix = require("../lib/prefix")
 
-let { getQiniuConfig, getDir } = require('../lib/config')
+let { getQiniuConfig, getDir, getCachePath } = require('../lib/config')
 let { getJsonData } = require('../lib/files')
 const { createIgnoreMatcher } = require('../lib/ignore');
 const {
@@ -16,6 +16,8 @@ const {
     toRemoteKey,
 } = 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))
@@ -25,20 +27,39 @@ async function main(options, runtime = {}) {
     const ignoreMatcher = createIgnoreMatcher(dir, options);
     const excludedPatterns = runtime.excludePatterns || ignoreMatcher.patterns;
     const files = runtime.files || await collectDeployFiles(dir, options);
-    const plans = files.map((localFile) => {
+
+    const useCache = !options.noCache;
+    const cachePath = getCachePath(options);
+    const cache = useCache ? readCache(cachePath) : {};
+
+    const plans = [];
+    const skippedPlans = [];
+
+    for (const localFile of files) {
         const key = toRemoteKey(prefix, dir, localFile);
-        return {
+        const plan = {
             localFile,
             key,
             target: `${qiniuConfig.domain || ''}${key}`,
         };
-    });
+
+        if (useCache && !options.dryRun) {
+            const md5 = computeFileMd5(localFile);
+            plan.localMd5 = md5;
+            if (isCacheHit(cache, key, md5)) {
+                skippedPlans.push(plan);
+                continue;
+            }
+        }
+
+        plans.push(plan);
+    }
 
     if (options.dryRun) {
         if (!runtime.suppressOutput) {
-            logPlan('upload', plans, options);
+            logPlan('upload', [...plans, ...skippedPlans], options);
         }
-        const summary = createSummary('upload', true, plans.map((plan) => ({
+        const summary = createSummary('upload', true, [...plans, ...skippedPlans].map((plan) => ({
             ok: true,
             localFile: plan.localFile,
             key: plan.key,
@@ -47,6 +68,7 @@ async function main(options, runtime = {}) {
             prefix,
             concurrency: normalizeConcurrency(options.concurrency),
             excludedPatterns,
+            skippedCount: 0,
         });
         return runtime.suppressOutput ? summary : finalizeOutput(summary, options, runtime.manifestExtra);
     }
@@ -102,11 +124,22 @@ 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);
             }
             return {
                 ok: true,
@@ -116,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,
@@ -126,10 +160,27 @@ async function main(options, runtime = {}) {
         }
     });
 
-    const summary = createSummary('upload', false, results, startedAt, {
+    bar.finish();
+
+    if (useCache) {
+        writeCache(cachePath, cache);
+    }
+
+    const skippedResults = skippedPlans.map((plan) => ({
+        ok: true,
+        skipped: true,
+        localFile: plan.localFile,
+        key: plan.key,
+        target: plan.target,
+    }));
+
+    const allResults = [...results, ...skippedResults];
+
+    const summary = createSummary('upload', false, allResults, startedAt, {
         prefix,
         concurrency: normalizeConcurrency(options.concurrency),
         excludedPatterns,
+        skippedCount: skippedPlans.length,
     });
     const finalSummary = runtime.suppressOutput ? summary : finalizeOutput(summary, options, runtime.manifestExtra);
     if (finalSummary.failedCount > 0) {

package/index.js

@@ -60,7 +60,7 @@ program.configureHelp({
 	},
 })
 
-program.name("struggler-cli").description(locale.appDescription).version(packageJson.version, "-v, --version", locale.options.version).helpOption("-h, --help", locale.options.help).option("-c, --config <path>", locale.options.config, "./command/qiniu.json").option("-d, --dir <path>", locale.options.dir, "./dist").option("--dry-run", locale.options.dryRun).option("--concurrency <number>", locale.options.concurrency, "5").option("--exclude <pattern>", locale.options.exclude).option("--ignore-file <path>", locale.options.ignoreFile, ".strugglerignore").option("--manifest <path>", locale.options.manifest).option("--json", locale.options.json).option("--skip-init", locale.options.skipInit).option("--skip-refresh", locale.options.skipRefresh).option("--lang <lang>", locale.options.lang, lang)
+program.name("struggler-cli").description(locale.appDescription).version(packageJson.version, "-v, --version", locale.options.version).helpOption("-h, --help", locale.options.help).option("-c, --config <path>", locale.options.config, "./command/qiniu.json").option("-d, --dir <path>", locale.options.dir, "./dist").option("--dry-run", locale.options.dryRun).option("--concurrency <number>", locale.options.concurrency, "5").option("--exclude <pattern>", locale.options.exclude).option("--ignore-file <path>", locale.options.ignoreFile, ".strugglerignore").option("--manifest <path>", locale.options.manifest).option("--json", locale.options.json).option("--skip-init", locale.options.skipInit).option("--skip-refresh", locale.options.skipRefresh).option("--no-cache", locale.options.noCache).option("--lang <lang>", locale.options.lang, lang)
 
 program
 	.command("init")

package/lib/cache.js

@@ -0,0 +1,37 @@
+const fs = require('fs');
+const crypto = require('crypto');
+const { getJsonData, setSyncJsonData } = require('./files');
+
+function computeFileMd5(filePath) {
+    const content = fs.readFileSync(filePath);
+    return crypto.createHash('md5').update(content).digest('hex');
+}
+
+function readCache(cachePath) {
+    return getJsonData(cachePath);
+}
+
+function writeCache(cachePath, cache) {
+    setSyncJsonData(cachePath, cache);
+}
+
+function isCacheHit(cache, relativeKey, localMd5) {
+    const entry = cache[relativeKey];
+    return entry && entry.localMd5 === localMd5;
+}
+
+function updateCacheEntry(cache, relativeKey, localMd5, qiniuHash) {
+    cache[relativeKey] = {
+        localMd5,
+        qiniuHash,
+        uploadedAt: new Date().toISOString(),
+    };
+}
+
+module.exports = {
+    computeFileMd5,
+    readCache,
+    writeCache,
+    isCacheHit,
+    updateCacheEntry,
+};

package/lib/config.js

@@ -2,6 +2,7 @@ let path = require('path')
 
 const DEFAULT_QINIU_CONFIG = './command/qiniu.json';
 const DEFAULT_CONFIG = './command/config.json';
+const DEFAULT_CACHE = './command/upload-cache.json';
 
 function resolveFromCwd(targetPath) {
     return path.resolve(process.cwd(), targetPath);
@@ -20,6 +21,15 @@ function getConfigPath(options = {}) {
     return path.join(path.dirname(qiniuConfigPath), 'config.json');
 }
 
+function getCachePath(options = {}) {
+    if (!options.config) {
+        return resolveFromCwd(DEFAULT_CACHE);
+    }
+
+    const qiniuConfigPath = getQiniuConfigPath(options);
+    return path.join(path.dirname(qiniuConfigPath), 'upload-cache.json');
+}
+
 module.exports = {
     getConfig: (options) => {
         return getConfigPath(options)
@@ -27,6 +37,9 @@ module.exports = {
     getQiniuConfig: (options) => {
         return getQiniuConfigPath(options)
     },
+    getCachePath: (options) => {
+        return getCachePath(options)
+    },
     getDir: (options) => {
         return resolveFromCwd(options.dir || './dist')
     },

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/i18n.js

@@ -13,6 +13,7 @@ const LANGUAGES = {
             json: '输出机器可读的 JSON 结果。',
             skipInit: '在 deploy 时跳过 init 步骤。',
             skipRefresh: '在 deploy 时跳过 refresh 步骤。',
+            noCache: '禁用上传缓存，强制重新上传所有文件。',
             lang: '切换菜单语言，可选 zh / en。',
             help: '显示帮助信息。',
         },
@@ -51,6 +52,7 @@ const LANGUAGES = {
             json: 'Print machine-readable JSON output.',
             skipInit: 'Skip init during deploy.',
             skipRefresh: 'Skip refresh during deploy.',
+            noCache: 'Disable upload cache and force re-upload all files.',
             lang: 'Switch menu language, supported values: zh / en.',
             help: 'Display help information.',
         },

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.5",
+	"version": "1.0.7",
 	"description": "CLI to Upload vite packaged files to Qiniu Cloud OSS.",
 	"main": "index.js",
 	"scripts": {