@struggler/cli 1.0.5 → 1.0.6

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,7 @@ const {
     toRemoteKey,
 } = require('../lib/deploy');
 const { printMessage } = require('../lib/output');
+const { computeFileMd5, readCache, writeCache, isCacheHit, updateCacheEntry } = require('../lib/cache');
 
 async function main(options, runtime = {}) {
     const qiniuConfig = getJsonData(getQiniuConfig(options))
@@ -25,20 +26,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 +67,7 @@ async function main(options, runtime = {}) {
             prefix,
             concurrency: normalizeConcurrency(options.concurrency),
             excludedPatterns,
+            skippedCount: 0,
         });
         return runtime.suppressOutput ? summary : finalizeOutput(summary, options, runtime.manifestExtra);
     }
@@ -108,6 +129,9 @@ async function main(options, runtime = {}) {
             if (!runtime.suppressOutput) {
                 printMessage(options, `[uploaded] ${plan.localFile} -> ${plan.target}`);
             }
+            if (useCache && plan.localMd5) {
+                updateCacheEntry(cache, plan.key, plan.localMd5, response.hash);
+            }
             return {
                 ok: true,
                 localFile: plan.localFile,
@@ -126,10 +150,25 @@ async function main(options, runtime = {}) {
         }
     });
 
-    const summary = createSummary('upload', false, results, startedAt, {
+    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/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/package.json

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