@struggler/cli 1.0.9 → 1.0.11

package/command/upload.js

@@ -19,6 +19,7 @@ const { printMessage } = require('../lib/output');
 const { computeFileMd5, readCache, writeCache, isCacheHit, updateCacheEntry } = require('../lib/cache');
 const { createProgressBar } = require('../lib/progress');
 const { getLocale } = require('../lib/i18n');
+const { resolveMimeType } = require('../lib/mime');
 
 async function main(options, runtime = {}) {
     const qiniuConfig = getJsonData(getQiniuConfig(options))
@@ -89,9 +90,10 @@ async function main(options, runtime = {}) {
     config.useCdnDomain = true;
 
     var formUploader = new qiniu.form_up.FormUploader(config);
-    var putExtra = new qiniu.form_up.PutExtra();
-
     function upload(plan, attempt = 1) {
+        var putExtra = new qiniu.form_up.PutExtra();
+        putExtra.mimeType = resolveMimeType(plan.localFile);
+
         var uploadOptions = {
             scope: `${qiniuConfig.Bucket}:${plan.key}`
         };

package/index.js

@@ -58,7 +58,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("--no-cache", locale.options.noCache).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("--config-dir <path>", locale.options.configDir).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/config.js

@@ -1,6 +1,8 @@
 let path = require('path')
+const { getJsonData } = require('./files');
 
 const DEFAULT_QINIU_CONFIG = './command/qiniu.json';
+const DEFAULT_META_DIR = './command';
 const DEFAULT_CONFIG = './command/config.json';
 const DEFAULT_CACHE = './command/upload-cache.json';
 
@@ -12,22 +14,31 @@ function getQiniuConfigPath(options = {}) {
     return resolveFromCwd(options.config || DEFAULT_QINIU_CONFIG);
 }
 
-function getConfigPath(options = {}) {
-    if (!options.config) {
-        return resolveFromCwd(DEFAULT_CONFIG);
+/** config.json / upload-cache.json 所在目录；优先级：CLI --config-dir > qiniu.json configDir > 与 qiniu 同目录 > ./command */
+function getMetaDir(options = {}) {
+    if (options.configDir) {
+        return resolveFromCwd(options.configDir);
     }
 
     const qiniuConfigPath = getQiniuConfigPath(options);
-    return path.join(path.dirname(qiniuConfigPath), 'config.json');
-}
+    const qiniuConfig = getJsonData(qiniuConfigPath);
+    if (qiniuConfig.configDir) {
+        return resolveFromCwd(qiniuConfig.configDir);
+    }
 
-function getCachePath(options = {}) {
     if (!options.config) {
-        return resolveFromCwd(DEFAULT_CACHE);
+        return resolveFromCwd(DEFAULT_META_DIR);
     }
 
-    const qiniuConfigPath = getQiniuConfigPath(options);
-    return path.join(path.dirname(qiniuConfigPath), 'upload-cache.json');
+    return path.dirname(qiniuConfigPath);
+}
+
+function getConfigPath(options = {}) {
+    return path.join(getMetaDir(options), 'config.json');
+}
+
+function getCachePath(options = {}) {
+    return path.join(getMetaDir(options), 'upload-cache.json');
 }
 
 module.exports = {
@@ -40,6 +51,9 @@ module.exports = {
     getCachePath: (options) => {
         return getCachePath(options)
     },
+    getMetaDir: (options) => {
+        return getMetaDir(options)
+    },
     getDir: (options) => {
         return resolveFromCwd(options.dir || './dist')
     },

package/lib/i18n.js

@@ -38,6 +38,7 @@ const LANGUAGES = {
         options: {
             version: '显示版本号。',
             config: '指定上传配置文件路径。',
+            configDir: '指定 config.json、upload-cache.json 所在目录（默认与 -c 同目录，未传 -c 时为 ./command）。',
             dir: '指定要上传的目录。',
             dryRun: '仅预览执行计划，不写文件也不调用七牛接口。',
             concurrency: '设置上传并发数。',
@@ -111,6 +112,7 @@ const LANGUAGES = {
         options: {
             version: 'Display the version number.',
             config: 'Specify the path to the upload configuration file.',
+            configDir: 'Directory for config.json and upload-cache.json (default: same dir as -c, or ./command).',
             dir: 'Specify the directory to upload.',
             dryRun: 'Preview actions without writing files or calling Qiniu APIs.',
             concurrency: 'Set upload concurrency.',

package/lib/mime.js

@@ -0,0 +1,55 @@
+const path = require('path');
+
+const MIME_TYPES = {
+    '.js': 'application/javascript',
+    '.mjs': 'application/javascript',
+    '.cjs': 'application/javascript',
+    '.css': 'text/css',
+    '.html': 'text/html',
+    '.htm': 'text/html',
+    '.json': 'application/json',
+    '.map': 'application/json',
+    '.txt': 'text/plain',
+    '.xml': 'application/xml',
+    '.svg': 'image/svg+xml',
+    '.png': 'image/png',
+    '.jpg': 'image/jpeg',
+    '.jpeg': 'image/jpeg',
+    '.gif': 'image/gif',
+    '.webp': 'image/webp',
+    '.ico': 'image/x-icon',
+    '.woff': 'font/woff',
+    '.woff2': 'font/woff2',
+    '.ttf': 'font/ttf',
+    '.otf': 'font/otf',
+    '.eot': 'application/vnd.ms-fontobject',
+    '.wasm': 'application/wasm',
+};
+
+function loadMimeResolver() {
+    try {
+        const qiniuDir = path.dirname(require.resolve('qiniu'));
+        const mimePath = require.resolve('mime', { paths: [qiniuDir] });
+        return require(mimePath);
+    } catch (error) {
+        return null;
+    }
+}
+
+const mimeResolver = loadMimeResolver();
+
+function resolveMimeType(filePath) {
+    if (mimeResolver && typeof mimeResolver.getType === 'function') {
+        const detected = mimeResolver.getType(filePath);
+        if (detected) {
+            return detected;
+        }
+    }
+
+    const extension = path.extname(filePath).toLowerCase();
+    return MIME_TYPES[extension] || null;
+}
+
+module.exports = {
+    resolveMimeType,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@struggler/cli",
-	"version": "1.0.9",
+	"version": "1.0.11",
 	"description": "CLI to Upload vite packaged files to Qiniu Cloud OSS.",
 	"main": "index.js",
 	"scripts": {
@@ -16,14 +16,16 @@
 	],
 	"author": "moqi(str@li.cm)",
 	"license": "ISC",
+	"engines": {
+		"node": ">=16"
+	},
 	"dependencies": {
 		"chalk": "^v4.1.2",
 		"clear": "^0.1.0",
 		"commander": "^11.0.0",
-		"figlet": "^1.6.0",
 		"qiniu": "^7.8.0"
 	},
 	"publicConfig": {
 		"registry": "http://registry.npmjs.org/"
 	}
-}
+}

package/test/config.test.js

@@ -24,6 +24,18 @@ test('config helpers resolve qiniu and derived config paths together', () => {
     );
 });
 
+test('config-dir overrides default meta directory', () => {
+    const options = {
+        config: './test/command/qiniu.json',
+        configDir: './test/meta',
+    };
+
+    assert.equal(
+        getConfig(options),
+        `${process.cwd()}/test/meta/config.json`
+    );
+});
+
 test('deploy helpers normalize concurrency and build remote keys', () => {
     assert.equal(normalizeConcurrency('0'), 5);
     assert.equal(normalizeConcurrency('3'), 3);

package/test/upload.test.js

@@ -3,8 +3,10 @@ const assert = require('node:assert/strict');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const qiniu = require('qiniu');
 const upload = require('../command/upload');
 const deploy = require('../command/deploy');
+const { resolveMimeType } = require('../lib/mime');
 
 function createWorkspace() {
     const workspace = fs.mkdtempSync(path.join(os.tmpdir(), 'struggler-cli-upload-'));
@@ -111,3 +113,71 @@ test('deploy dry-run supports skip-refresh and json-friendly summary data', asyn
         fs.rmSync(workspace, { recursive: true, force: true });
     }
 });
+
+test('upload sets explicit mimeType for web assets', async () => {
+    const previousCwd = process.cwd();
+    const workspace = createWorkspace();
+    const captured = [];
+
+    const originalMac = qiniu.auth.digest.Mac;
+    const originalPutPolicy = qiniu.rs.PutPolicy;
+    const originalFormUploader = qiniu.form_up.FormUploader;
+
+    try {
+        process.chdir(workspace);
+
+        fs.writeFileSync(path.join(workspace, 'command/qiniu.json'), JSON.stringify({
+            accessKey: 'ak',
+            secretKey: 'sk',
+            Bucket: 'demo-bucket',
+            zone: 'Zone_z0',
+            path: 'demo-app',
+            domain: 'https://cdn.example.com/',
+        }, null, 2));
+
+        qiniu.auth.digest.Mac = function MockMac() {};
+        qiniu.rs.PutPolicy = function MockPutPolicy() {
+            this.uploadToken = () => 'mock-token';
+        };
+        qiniu.form_up.FormUploader = function MockFormUploader() {
+            this.putFile = (uploadToken, key, localFile, putExtra, callback) => {
+                captured.push({
+                    uploadToken,
+                    key,
+                    localFile,
+                    mimeType: putExtra.mimeType,
+                });
+                callback(null, { hash: `${path.basename(localFile)}-hash` }, { statusCode: 200 });
+            };
+        };
+
+        const summary = await upload({
+            config: './command/qiniu.json',
+            dir: './dist',
+            concurrency: '1',
+        }, {
+            suppressOutput: true,
+        });
+
+        assert.equal(summary.failedCount, 0);
+        assert.deepEqual(
+            captured.map((item) => [path.basename(item.localFile), item.mimeType]).sort(),
+            [
+                ['app.js', 'application/javascript'],
+                ['index.html', 'text/html'],
+            ]
+        );
+    } finally {
+        qiniu.auth.digest.Mac = originalMac;
+        qiniu.rs.PutPolicy = originalPutPolicy;
+        qiniu.form_up.FormUploader = originalFormUploader;
+        process.chdir(previousCwd);
+        fs.rmSync(workspace, { recursive: true, force: true });
+    }
+});
+
+test('resolveMimeType covers common assets and keeps safe fallback', () => {
+    assert.equal(resolveMimeType('/tmp/app.js'), 'application/javascript');
+    assert.equal(resolveMimeType('/tmp/logo.svg'), 'image/svg+xml');
+    assert.equal(resolveMimeType('/tmp/data.unknown-ext'), null);
+});