@struggler/cli 1.0.7 → 1.0.8

package/command/deploy.js

@@ -1,10 +1,12 @@
 const init = require('./init');
 const upload = require('./upload');
 const refresh = require('./refresh');
+const chalk = require('chalk');
 const { collectDeployFiles, createSummary, finalizeOutput } = require('../lib/deploy');
 const { getDir } = require('../lib/config');
 const { createIgnoreMatcher } = require('../lib/ignore');
 const { printMessage } = require('../lib/output');
+const { getLocale } = require('../lib/i18n');
 
 async function main(options) {
     const startedAt = Date.now();
@@ -47,7 +49,8 @@ async function main(options) {
             suppressOutput: true,
         });
     } else {
-        printMessage(options, '[deploy] refresh step skipped');
+        const { messages } = getLocale(options && options.lang);
+        printMessage(options, `  ${chalk.dim(`↩  ${messages.deploySkipRefresh}`)}`);
     }
 
     const deploySummary = finalizeOutput(createSummary('deploy', Boolean(options.dryRun), [
@@ -68,7 +71,18 @@ async function main(options) {
         excludedPatterns: ignoreMatcher.patterns,
     }), options, manifestExtra);
 
-    printMessage(options, `[deploy] upload=${uploadSummary.succeededCount}/${uploadSummary.total} refresh=${refreshSummary.succeededCount}/${refreshSummary.total}`);
+    const { messages } = getLocale(options && options.lang);
+    const uploadOk = uploadSummary.failedCount === 0;
+    const refreshOk = options.skipRefresh || refreshSummary.failedCount === 0;
+    const allOk = uploadOk && refreshOk;
+    printMessage(options, '');
+    printMessage(options, `  ${allOk ? chalk.green('✓') : chalk.red('✗')}  ${chalk.bold(messages.deployDone)}`);
+    printMessage(options, '');
+    printMessage(options, `     ${chalk.dim(messages.deployUploadLabel)}  ${chalk.green(uploadSummary.succeededCount)} / ${uploadSummary.total} ${messages.deployFileUnit}`);
+    if (!options.skipRefresh) {
+        printMessage(options, `     ${chalk.dim(messages.deployRefreshLabel)}  ${chalk.green(refreshSummary.succeededCount)} / ${refreshSummary.total} ${messages.deployUnit}`);
+    }
+    printMessage(options, '');
     return deploySummary;
 }
 

package/command/init.js

@@ -4,21 +4,23 @@ let { getJsonData, setJsonData, setSyncJsonData, directoryExists } = require('..
 let path = require('path')
 const { formatDate } = require('../lib/date');
 const { printMessage } = require('../lib/output');
+const { getLocale } = require('../lib/i18n');
 
 function init(qiniuConfigPath, options){
+    const { messages } = getLocale(options && options.lang);
     if (!directoryExists(qiniuConfigPath)){
-        printMessage(options, chalk.red("七牛配置不存在 正在生成模版 请稍后在下面的文件里填写必要的信息!"))
-        printMessage(options, chalk.blue(qiniuConfigPath))
+        printMessage(options, chalk.yellow(`  ⚠  ${messages.initTemplateCreated}`));
+        printMessage(options, `     ${chalk.dim(qiniuConfigPath)}`);
         if (options.dryRun) {
-            printMessage(options, `[dry-run] init would create template ${qiniuConfigPath}`)
+            printMessage(options, chalk.dim(messages.initDryRunCreate(qiniuConfigPath)));
             return
         }
         setSyncJsonData(qiniuConfigPath, getJsonData(path.resolve(__dirname, '../def/qiniu.json')))
     }
-
 }
 
 function main(options){
+    const { messages } = getLocale(options && options.lang);
     let configPath = getConfig(options)
     let qiniuConfigPath = getQiniuConfig(options)
     init(qiniuConfigPath, options)
@@ -29,11 +31,12 @@ function main(options){
     config.publicPath = `${qiniuConfig.path || ''}/${versionPrefix}/`
     config.base = `${domain || ''}${qiniuConfig.path || ''}/${versionPrefix}/`
     if (options.dryRun) {
-        printMessage(options, `[dry-run] init would write ${configPath}`)
-        printMessage(options, JSON.stringify(config, null, 2))
+        printMessage(options, chalk.dim(messages.initDryRunWrite(configPath)));
+        printMessage(options, chalk.dim(JSON.stringify(config, null, 2)));
         return config
     }
-    printMessage(options, JSON.stringify(config, null, 2))
+    printMessage(options, `  ${chalk.green('✓')}  ${messages.initConfigUpdated}`);
+    printMessage(options, `     ${chalk.dim(configPath)}`);
     setJsonData(configPath, config)
     return config
 }

package/command/refresh.js

@@ -14,6 +14,8 @@ const {
     toRemoteKey,
 } = require('../lib/deploy');
 const { printMessage } = require('../lib/output');
+const { createProgressBar } = require('../lib/progress');
+const { getLocale } = require('../lib/i18n');
 
 async function main(options, runtime = {}) {
     const qiniuConfig = getJsonData(getQiniuConfig(options))
@@ -50,7 +52,8 @@ async function main(options, runtime = {}) {
 
     ensureRequiredConfig(
         { ...qiniuConfig, 'publicPath(config.json)': prefix },
-        ['accessKey', 'secretKey', 'domain', 'publicPath(config.json)']
+        ['accessKey', 'secretKey', 'domain', 'publicPath(config.json)'],
+        options
     );
 
     var accessKey = qiniuConfig.accessKey
@@ -72,13 +75,16 @@ async function main(options, runtime = {}) {
         });
     }
 
+    const bar = createProgressBar(plans.length, {
+        json: options.json,
+        suppressOutput: runtime.suppressOutput,
+    });
+
     const results = [];
     for (const plan of plans) {
         try {
             await refresh(plan);
-            if (!runtime.suppressOutput) {
-                printMessage(options, `[refreshed] ${plan.target}`);
-            }
+            bar.tick({ filename: plan.target });
             results.push({
                 ok: true,
                 localFile: plan.localFile,
@@ -86,6 +92,7 @@ async function main(options, runtime = {}) {
                 target: plan.target,
             });
         } catch (error) {
+            bar.tick({ filename: plan.target, failed: true });
             results.push({
                 ok: false,
                 localFile: plan.localFile,
@@ -96,13 +103,16 @@ async function main(options, runtime = {}) {
         }
     }
 
+    bar.finish();
+
     const summary = createSummary('refresh', false, results, startedAt, {
         prefix,
         excludedPatterns,
     });
     const finalSummary = runtime.suppressOutput ? summary : finalizeOutput(summary, options, runtime.manifestExtra);
     if (finalSummary.failedCount > 0) {
-        throw new Error(`Refresh finished with ${summary.failedCount} failures`);
+        const { messages } = getLocale(options && options.lang);
+        throw new Error(messages.refreshFailed(summary.failedCount));
     }
 
     return finalSummary;

package/command/upload.js

@@ -18,6 +18,7 @@ const {
 const { printMessage } = require('../lib/output');
 const { computeFileMd5, readCache, writeCache, isCacheHit, updateCacheEntry } = require('../lib/cache');
 const { createProgressBar } = require('../lib/progress');
+const { getLocale } = require('../lib/i18n');
 
 async function main(options, runtime = {}) {
     const qiniuConfig = getJsonData(getQiniuConfig(options))
@@ -75,7 +76,8 @@ async function main(options, runtime = {}) {
 
     ensureRequiredConfig(
         { ...qiniuConfig, 'publicPath(config.json)': prefix },
-        ['accessKey', 'secretKey', 'Bucket', 'zone', 'domain', 'publicPath(config.json)']
+        ['accessKey', 'secretKey', 'Bucket', 'zone', 'domain', 'publicPath(config.json)'],
+        options
     );
 
     var accessKey = qiniuConfig.accessKey
@@ -100,7 +102,8 @@ async function main(options, runtime = {}) {
             formUploader.putFile(uploadToken, plan.key, plan.localFile, putExtra, async function (respErr, respBody, respInfo) {
                 if (respErr || respInfo.statusCode !== 200) {
                     if (attempt < 3) {
-                        console.log(`${plan.localFile} 上传失败，正在进行第 ${attempt + 1} 次重试`);
+                        const { messages } = getLocale(options && options.lang);
+                        printMessage(options, messages.uploadRetrying(plan.localFile, attempt + 1));
                         try {
                             const retryResult = await upload(plan, attempt + 1);
                             resolve(retryResult);
@@ -184,7 +187,8 @@ async function main(options, runtime = {}) {
     });
     const finalSummary = runtime.suppressOutput ? summary : finalizeOutput(summary, options, runtime.manifestExtra);
     if (finalSummary.failedCount > 0) {
-        throw new Error(`Upload finished with ${summary.failedCount} failures`);
+        const { messages } = getLocale(options && options.lang);
+        throw new Error(messages.uploadFailed(summary.failedCount));
     }
 
     return finalSummary;

package/index.js

@@ -19,7 +19,7 @@ if (!shouldUseJson({ json: isJsonMode })) {
 
 // 输出Logo
 if (!isJsonMode) {
-	console.log(magentaBright(figlet.textSync("struggler-cli", { horizontalLayout: "full" })), "\n\n")
+	console.log(magentaBright(figlet.textSync("struggler-cli", { font: "Small" })), "\n")
 }
 
 function formatItems(items, getLeft, getRight) {
@@ -97,6 +97,13 @@ program.parseAsync().catch(error => {
 		printJson({ ok: false, error: error.message || String(error) })
 		return
 	}
-	printError({}, error.message || error)
+	const { redBright, dim } = require('chalk')
+	const { messages } = getLocale(lang)
+	const msg = error.message || String(error)
+	console.error('')
+	console.error(redBright(`  ✗  ${messages.errorTitle}`))
+	console.error('')
+	msg.split('\n').forEach(line => console.error(`  ${dim(line)}`))
+	console.error('')
 	process.exitCode = 1
 })

package/lib/deploy.js

@@ -3,6 +3,7 @@ const chalk = require('chalk');
 const { listFiles } = require('./files');
 const { createIgnoreMatcher } = require('./ignore');
 const { printMessage, writeManifest, shouldUseJson, printJson } = require('./output');
+const { getLocale } = require('./i18n');
 
 const DEFAULT_CONCURRENCY = 5;
 
@@ -65,9 +66,10 @@ function createSummary(action, dryRun, results, startedAt, extra = {}) {
 }
 
 function logPlan(action, items, options) {
-    printMessage(options, `[dry-run] ${action} plan (${items.length} files)`);
+    const { messages } = getLocale(options && options.lang);
+    printMessage(options, messages.dryRunPlan(action, items.length));
     items.forEach((item) => {
-        printMessage(options, `- ${item.localFile} -> ${item.target}`);
+        printMessage(options, `  ${item.localFile} -> ${item.target}`);
     });
 }
 
@@ -77,40 +79,44 @@ function formatDuration(ms) {
 }
 
 function logSummary(summary, options) {
+    const { messages } = getLocale(options && options.lang);
     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]') : '';
+    const actionDoneLabel = summary.action === 'upload'
+        ? messages.uploadDone
+        : summary.action === 'refresh'
+            ? messages.refreshDone
+            : messages.deployDone;
+    const modeTag = isDryRun ? chalk.yellow(` [${messages.dryRunLabel}]`) : '';
 
     printMessage(options, '');
-    printMessage(options, `  ${statusIcon}  ${chalk.bold(actionLabel + '完成')}${modeTag}  ${chalk.dim(formatDuration(summary.durationMs))}`);
+    printMessage(options, `  ${statusIcon}  ${chalk.bold(actionDoneLabel)}${modeTag}  ${chalk.dim(formatDuration(summary.durationMs))}`);
     printMessage(options, '');
 
     const rows = [];
     if (summary.action === 'upload') {
-        rows.push([chalk.dim('上传'), chalk.green(`${uploaded} 个文件`)]);
+        rows.push([chalk.dim(messages.uploadLabel), chalk.green(`${uploaded} ${messages.uploadFileUnit}`)]);
         if (skipped > 0) {
-            rows.push([chalk.dim('跳过'), chalk.cyan(`${skipped} 个文件`) + chalk.dim('  (缓存命中，无变更)')]);
+            rows.push([chalk.dim(messages.uploadSkippedLabel), chalk.cyan(`${skipped} ${messages.uploadFileUnit}`) + chalk.dim(`  (${messages.uploadCacheHint})`)]);
         }
         if (summary.failedCount > 0) {
-            rows.push([chalk.dim('失败'), chalk.red(`${summary.failedCount} 个文件`)]);
+            rows.push([chalk.dim(messages.uploadFailedLabel), chalk.red(`${summary.failedCount} ${messages.uploadFileUnit}`)]);
         }
-        rows.push([chalk.dim('合计'), chalk.white(`${summary.total} 个文件`)]);
+        rows.push([chalk.dim(messages.uploadTotalLabel), chalk.white(`${summary.total} ${messages.uploadFileUnit}`)]);
     } else {
-        rows.push([chalk.dim('成功'), chalk.green(`${summary.succeededCount} 个`)]);
+        rows.push([chalk.dim(messages.refreshSucceededLabel), chalk.green(`${summary.succeededCount} ${messages.refreshUnit}`)]);
         if (summary.failedCount > 0) {
-            rows.push([chalk.dim('失败'), chalk.red(`${summary.failedCount} 个`)]);
+            rows.push([chalk.dim(messages.refreshFailedLabel), chalk.red(`${summary.failedCount} ${messages.refreshUnit}`)]);
         }
-        rows.push([chalk.dim('合计'), chalk.white(`${summary.total} 个`)]);
+        rows.push([chalk.dim(messages.refreshTotalLabel), chalk.white(`${summary.total} ${messages.refreshUnit}`)]);
     }
 
-    const labelWidth = 4;
     rows.forEach(([label, value]) => {
-        printMessage(options, `     ${label.padEnd ? label : label}  ${value}`);
+        printMessage(options, `     ${label}  ${value}`);
     });
     printMessage(options, '');
 
@@ -124,7 +130,7 @@ function logSummary(summary, options) {
 
     const uploadedItems = (summary.succeeded || []).filter((item) => !item.skipped && item.target);
     if (uploadedItems.length > 0) {
-        printMessage(options, `  ${chalk.dim('─── 已上传文件链接 ───')}`);
+        printMessage(options, `  ${chalk.dim(`─── ${messages.uploadLinksTitle} ───`)}`);
         printMessage(options, '');
         uploadedItems.forEach((item) => {
             printMessage(options, `  ${chalk.cyan(item.target)}`);
@@ -156,17 +162,25 @@ function finalizeOutput(summary, options, extra = {}) {
     } else {
         logSummary(finalSummary, options);
         if (finalSummary.manifestPath) {
-            printMessage(options, `[manifest] ${finalSummary.manifestPath}`);
+            const { messages } = getLocale(options && options.lang);
+            printMessage(options, `  ${chalk.dim(messages.manifestWritten)} ${finalSummary.manifestPath}`);
         }
     }
 
     return finalSummary;
 }
 
-function ensureRequiredConfig(config, requiredFields) {
+function ensureRequiredConfig(config, requiredFields, options) {
     const missingFields = requiredFields.filter((field) => !config[field]);
     if (missingFields.length > 0) {
-        throw new Error(`Missing required config: ${missingFields.join(', ')}`);
+        const { messages } = getLocale(options && options.lang);
+        const lines = [
+            messages.errorMissingConfig,
+            ...missingFields.map((f) => `  · ${f}`),
+            '',
+            messages.errorMissingConfigHint,
+        ];
+        throw new Error(lines.join('\n'));
     }
 }
 

package/lib/i18n.js

@@ -1,6 +1,40 @@
 const LANGUAGES = {
     zh: {
         appDescription: '用于将前端打包产物上传到七牛云 OSS 的命令行工具。',
+        messages: {
+            initTemplateCreated: '七牛配置不存在，已生成模版，请填写必要信息：',
+            initConfigUpdated: '配置已更新：',
+            initDryRunCreate: (p) => `[预览] 将创建配置模版：${p}`,
+            initDryRunWrite: (p) => `[预览] 将写入配置：${p}`,
+            uploadRetrying: (file, attempt) => `${file} 上传失败，正在进行第 ${attempt} 次重试`,
+            uploadDone: '上传完成',
+            uploadLabel: '上传',
+            uploadSkippedLabel: '跳过',
+            uploadFailedLabel: '失败',
+            uploadTotalLabel: '合计',
+            uploadCacheHint: '缓存命中，无变更',
+            uploadLinksTitle: '已上传文件链接',
+            uploadFileUnit: '个文件',
+            uploadFailed: (n) => `上传完成，${n} 个失败`,
+            refreshDone: '刷新完成',
+            refreshSucceededLabel: '成功',
+            refreshFailedLabel: '失败',
+            refreshTotalLabel: '合计',
+            refreshUnit: '个',
+            refreshFailed: (n) => `刷新完成，${n} 个失败`,
+            deployDone: '部署完成',
+            deploySkipRefresh: '刷新步骤已跳过 (--skip-refresh)',
+            deployUploadLabel: '上传',
+            deployRefreshLabel: '刷新',
+            deployFileUnit: '个文件',
+            deployUnit: '个',
+            errorTitle: '出错了',
+            errorMissingConfig: '配置不完整，以下字段缺失或为空：',
+            errorMissingConfigHint: '请检查 command/qiniu.json 和 command/config.json，或运行 struggler-cli init 初始化配置。',
+            dryRunLabel: '预览',
+            dryRunPlan: (action, n) => `[预览] ${action} 计划 (${n} 个文件)`,
+            manifestWritten: '清单已写入：',
+        },
         options: {
             version: '显示版本号。',
             config: '指定上传配置文件路径。',
@@ -40,6 +74,40 @@ const LANGUAGES = {
     },
     en: {
         appDescription: 'CLI to upload front-end build files to Qiniu Cloud OSS.',
+        messages: {
+            initTemplateCreated: 'Qiniu config not found, template created. Please fill in the required fields:',
+            initConfigUpdated: 'Config updated:',
+            initDryRunCreate: (p) => `[dry-run] would create template: ${p}`,
+            initDryRunWrite: (p) => `[dry-run] would write config: ${p}`,
+            uploadRetrying: (file, attempt) => `${file} upload failed, retrying (attempt ${attempt})`,
+            uploadDone: 'Upload complete',
+            uploadLabel: 'Uploaded',
+            uploadSkippedLabel: 'Skipped',
+            uploadFailedLabel: 'Failed',
+            uploadTotalLabel: 'Total',
+            uploadCacheHint: 'cached, no changes',
+            uploadLinksTitle: 'Uploaded file links',
+            uploadFileUnit: 'files',
+            uploadFailed: (n) => `Upload finished with ${n} failures`,
+            refreshDone: 'Refresh complete',
+            refreshSucceededLabel: 'Succeeded',
+            refreshFailedLabel: 'Failed',
+            refreshTotalLabel: 'Total',
+            refreshUnit: '',
+            refreshFailed: (n) => `Refresh finished with ${n} failures`,
+            deployDone: 'Deploy complete',
+            deploySkipRefresh: 'Refresh step skipped (--skip-refresh)',
+            deployUploadLabel: 'Upload',
+            deployRefreshLabel: 'Refresh',
+            deployFileUnit: 'files',
+            deployUnit: '',
+            errorTitle: 'Error',
+            errorMissingConfig: 'Incomplete config, the following fields are missing or empty:',
+            errorMissingConfigHint: 'Check command/qiniu.json and command/config.json, or run struggler-cli init.',
+            dryRunLabel: 'dry-run',
+            dryRunPlan: (action, n) => `[dry-run] ${action} plan (${n} files)`,
+            manifestWritten: 'Manifest written:',
+        },
         options: {
             version: 'Display the version number.',
             config: 'Specify the path to the upload configuration file.',

package/package.json

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