@cloudbase/manager-node 5.4.0-beta.1 → 5.4.0-beta.2

package/lib/storage/index.js

@@ -16,6 +16,7 @@ const path_1 = __importDefault(require("path"));
 const make_dir_1 = __importDefault(require("make-dir"));
 const walkdir_1 = __importDefault(require("walkdir"));
 const micromatch_1 = __importDefault(require("micromatch"));
+const mime_types_1 = __importDefault(require("mime-types"));
 const cos_nodejs_sdk_v5_1 = __importDefault(require("cos-nodejs-sdk-v5"));
 const utils_1 = require("../utils");
 const error_1 = require("../error");
@@ -1314,11 +1315,18 @@ class StorageService {
                 code: 'FileSizeLimitExceeded'
             });
         }
-        // 组装 Headers
+        const finalContentType = this.resolveUploadContentType({
+            contentType,
+            localPath,
+            objectName,
+            body
+        });
         const headers = {
-            Authorization: `Bearer ${accessToken}`,
-            'Content-Type': contentType || 'application/octet-stream'
+            Authorization: `Bearer ${accessToken}`
         };
+        if (finalContentType) {
+            headers['Content-Type'] = finalContentType;
+        }
         if (fileSize !== undefined) {
             headers['Content-Length'] = String(fileSize);
         }
@@ -1994,9 +2002,16 @@ class StorageService {
         else if (Buffer.isBuffer(body) && fileSize === undefined) {
             fileSize = body.length;
         }
-        const headers = {
-            'Content-Type': contentType || 'application/octet-stream'
-        };
+        const finalContentType = this.resolveUploadContentType({
+            contentType,
+            localPath,
+            objectName,
+            body
+        });
+        const headers = {};
+        if (finalContentType) {
+            headers['Content-Type'] = finalContentType;
+        }
         if (fileSize !== undefined) {
             headers['Content-Length'] = String(fileSize);
         }
@@ -2636,6 +2651,87 @@ class StorageService {
         res.map(item => /Error/gi.test(Object.prototype.toString.call(item)) && resultErrorArr.push(item));
         return resultErrorArr;
     }
+    resolveUploadContentType(params) {
+        const { contentType, localPath, objectName, body } = params;
+        // 0. 用户显式指定优先
+        const trimmedContentType = contentType === null || contentType === void 0 ? void 0 : contentType.trim();
+        if (trimmedContentType) {
+            return this.assertValidContentType(trimmedContentType);
+        }
+        // 1. 扩展名推断（优先）
+        const byExt = this.inferMimeByExtension(localPath || objectName);
+        if (byExt)
+            return byExt;
+        // 2. magic bytes 二次识别
+        const byMagic = this.inferMimeByMagicBytes(localPath, body);
+        if (byMagic)
+            return byMagic;
+        return undefined;
+    }
+    inferMimeByExtension(filePathOrName) {
+        if (!filePathOrName)
+            return undefined;
+        const result = mime_types_1.default.lookup(filePathOrName);
+        return typeof result === 'string' ? result : undefined;
+    }
+    inferMimeByMagicBytes(localPath, body) {
+        let head;
+        try {
+            if (localPath) {
+                const fd = fs_1.default.openSync(path_1.default.resolve(localPath), 'r');
+                try {
+                    const buf = Buffer.alloc(512);
+                    const n = fs_1.default.readSync(fd, buf, 0, 512, 0);
+                    head = buf.slice(0, n);
+                }
+                finally {
+                    fs_1.default.closeSync(fd);
+                }
+            }
+            else if (Buffer.isBuffer(body)) {
+                head = body.slice(0, 512);
+            }
+        }
+        catch (_a) {
+            return undefined;
+        }
+        if (!head || head.length === 0)
+            return undefined;
+        const startsWith = (sig) => head.length >= sig.length && sig.every((b, i) => head[i] === b);
+        if (startsWith([0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]))
+            return 'image/png';
+        if (startsWith([0xFF, 0xD8, 0xFF]))
+            return 'image/jpeg';
+        if (head.slice(0, 6).toString('ascii') === 'GIF87a' || head.slice(0, 6).toString('ascii') === 'GIF89a')
+            return 'image/gif';
+        if (head.slice(0, 4).toString('ascii') === 'RIFF' && head.slice(8, 12).toString('ascii') === 'WEBP')
+            return 'image/webp';
+        if (head.slice(0, 4).toString('ascii') === '%PDF')
+            return 'application/pdf';
+        if (startsWith([0x50, 0x4B, 0x03, 0x04]))
+            return 'application/zip';
+        if (startsWith([0x1F, 0x8B]))
+            return 'application/gzip';
+        if (head.length >= 262 && head.slice(257, 262).toString('ascii') === 'ustar')
+            return 'application/x-tar';
+        return undefined;
+    }
+    assertValidContentType(input) {
+        const ct = input.trim();
+        if (!ct)
+            throw new error_1.CloudBaseError('contentType 不能为空');
+        // 防 header 注入 / 控制字符
+        if (/[\u0000-\u001F\u007F]/.test(ct)) {
+            throw new error_1.CloudBaseError('contentType 非法：包含控制字符');
+        }
+        // 只校验主类型（; 后参数放宽）
+        const base = ct.split(';', 1)[0].trim();
+        const typeSubtypeRe = /^[!#$%&'*+.^_`|~0-9A-Za-z-]+\/[!#$%&'*+.^_`|~0-9A-Za-z-]+$/;
+        if (!typeSubtypeRe.test(base)) {
+            throw new error_1.CloudBaseError('contentType 非法：主类型格式不正确');
+        }
+        return ct;
+    }
 }
 exports.StorageService = StorageService;
 __decorate([

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@cloudbase/manager-node",
-    "version": "5.4.0-beta.1",
+    "version": "5.4.0-beta.2",
     "description": "The node manage service api for cloudbase.",
     "main": "lib/index.js",
     "scripts": {
@@ -25,6 +25,7 @@
         "@lerna/create-symlink": "^6.4.1",
         "@types/fs-extra": "^11.0.4",
         "@types/jest": "^24.0.18",
+        "@types/mime-types": "^3.0.1",
         "@types/node": "^12.7.4",
         "@types/node-fetch": "^2.5.0",
         "@types/unzipper": "^0.10.11",
@@ -49,6 +50,7 @@
         "lodash": "^4.17.21",
         "make-dir": "^3.0.0",
         "micromatch": "^4.0.2",
+        "mime-types": "^3.0.2",
         "node-fetch": "^2.6.0",
         "query-string": "^6.8.3",
         "unzipper": "^0.12.3",

package/types/storage/index.d.ts

@@ -569,5 +569,9 @@ export declare class StorageService {
      * @returns
      */
     private determineDownLoadResultIsError;
+    private resolveUploadContentType;
+    private inferMimeByExtension;
+    private inferMimeByMagicBytes;
+    private assertValidContentType;
 }
 export {};