@haluo/util 2.0.20 → 2.0.21

package/dist/modules/upload/aliOss.js

@@ -1,4 +1,3 @@
-"use strict";
 /**
  * @file 阿里云OSS上传统一工具类
  * @description 整合所有项目的aliOss业务逻辑，通过传参形式支持不同业务场景
@@ -50,87 +49,35 @@
  * })
  * ```
  */
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAliOssUploader = exports.SuffixEnum = exports.BusinessType = void 0;
-var ali_oss_1 = __importDefault(require("ali-oss"));
-var lrz_1 = __importDefault(require("lrz"));
+import OSS from 'ali-oss';
+import lrz from 'lrz';
 // ==================== 常量定义 ====================
 /** 支持的图片格式 */
-var SUPPORTED_IMAGE_TYPES = ['image/png', 'image/gif', 'image/jpg', 'image/jpeg'];
+const SUPPORTED_IMAGE_TYPES = ['image/png', 'image/gif', 'image/jpg', 'image/jpeg'];
 /** 小图片阈值（KB） */
-var SMALL_IMAGE_THRESHOLD = 100;
+const SMALL_IMAGE_THRESHOLD = 100;
 /** 长图宽高比阈值 */
-var LONG_IMAGE_RATIO = 2;
+const LONG_IMAGE_RATIO = 2;
 /** 默认文件大小限制（MB） */
-var DEFAULT_FILE_SIZE_LIMIT = 10;
+const DEFAULT_FILE_SIZE_LIMIT = 10;
 /** 默认压缩质量 */
-var DEFAULT_QUALITY = 0.7;
+const DEFAULT_QUALITY = 0.7;
 /** 默认图片类型 */
-var DEFAULT_IMAGE_TYPE = 'official';
+const DEFAULT_IMAGE_TYPE = 'official';
 /** OSS默认区域 */
-var DEFAULT_OSS_REGION = 'oss-cn-beijing';
+const DEFAULT_OSS_REGION = 'oss-cn-beijing';
 /** 预签名URL过期时间（毫秒） */
-var PRESIGNED_URL_EXPIRE_TIME = 60000;
+const PRESIGNED_URL_EXPIRE_TIME = 60000;
 /** 随机字符串字符集 */
-var RANDOM_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz';
+const RANDOM_CHARS = '0123456789abcdefghijklmnopqrstuvwxyz';
 /** OSS元数据 */
-var OSS_META_PEOPLE = 'x-oss-meta-motor';
+const OSS_META_PEOPLE = 'x-oss-meta-motor';
 // ==================== 枚举定义 ====================
 /**
  * 业务类型枚举
  * 不同的businessType对应不同的OSS bucket和水印策略
  */
-var BusinessType;
+export var BusinessType;
 (function (BusinessType) {
     BusinessType[BusinessType["NO_WATER"] = 0] = "NO_WATER";
     BusinessType[BusinessType["AVATAR"] = 1] = "AVATAR";
@@ -141,11 +88,11 @@ var BusinessType;
     BusinessType[BusinessType["PRIVATE"] = 1199] = "PRIVATE";
     BusinessType[BusinessType["ENCRYPTED"] = 1299] = "ENCRYPTED";
     BusinessType[BusinessType["DEFAULT"] = 1500] = "DEFAULT"; // 默认
-})(BusinessType = exports.BusinessType || (exports.BusinessType = {}));
+})(BusinessType || (BusinessType = {}));
 /**
  * 图片类型后缀枚举
  */
-exports.SuffixEnum = {
+export const SuffixEnum = {
     nowater: '!nowater',
     official: '!official',
     panoram: '!panoram',
@@ -155,7 +102,7 @@ exports.SuffixEnum = {
     carport: '!carport' // 车库、经销商水印
 };
 /** 不打水印的图片类型 */
-var NO_WATER_IMAGE_TYPES = ['nowater', 'forum'];
+const NO_WATER_IMAGE_TYPES = ['nowater', 'forum'];
 // ==================== 工具函数 ====================
 /**
  * 生成随机字符串
@@ -163,9 +110,9 @@ var NO_WATER_IMAGE_TYPES = ['nowater', 'forum'];
  * @returns 随机字符串
  */
 function randomString(length) {
-    var result = '';
-    for (var i = 0; i < length; i++) {
-        var randomIndex = Math.floor(Math.random() * RANDOM_CHARS.length);
+    let result = '';
+    for (let i = 0; i < length; i++) {
+        const randomIndex = Math.floor(Math.random() * RANDOM_CHARS.length);
         result += RANDOM_CHARS[randomIndex];
     }
     return result;
@@ -176,8 +123,8 @@ function randomString(length) {
  * @returns 过滤后的对象
  */
 function filterUndefined(obj) {
-    var result = {};
-    Object.keys(obj).forEach(function (key) {
+    const result = {};
+    Object.keys(obj).forEach(key => {
         if (obj[key] !== undefined) {
             result[key] = obj[key];
         }
@@ -216,61 +163,66 @@ function getFileSizeInKB(size) {
 function getFileSizeInMB(size) {
     return size / (1024 * 1024);
 }
-// ==================== 主函数 ====================
+// ==================== 主类 ====================
 /**
- * 创建阿里云OSS上传器
- * @param apiConfig API配置对象，包含业务相关的API函数
- * @returns OSS上传器实例
+ * 阿里云OSS上传类
+ * 整合所有项目的aliOss业务逻辑，通过依赖注入实现业务API解耦
  */
-function createAliOssUploader(apiConfig) {
-    // 缓存OSS客户端实例（可选）
-    var clientCache = new Map();
+export class AliOssClass {
+    apiConfig;
+    clientCache;
+    constructor(apiConfig) {
+        this.apiConfig = apiConfig;
+        this.clientCache = new Map();
+    }
     /**
      * 创建OSS客户端
      * @param businessType 业务类型
      * @param imggeCarType 车辆图片类型（可选，用于特定业务）
      * @returns OSS客户端实例
      */
-    function createOssClient(businessType, imggeCarType) {
-        return __awaiter(this, void 0, void 0, function () {
-            var cacheKey, res, clientParams, filteredParams, client;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0:
-                        cacheKey = "".concat(businessType, "_").concat(imggeCarType || 'default');
-                        return [4 /*yield*/, apiConfig.getAliyunSts({ businessType: businessType, imggeCarType: imggeCarType })];
-                    case 1:
-                        res = _a.sent();
-                        if (res.data.code !== 0) {
-                            throw new Error('获取OSS配置失败');
-                        }
-                        clientParams = res.data.data || {};
-                        clientParams.suffix = clientParams.style || '';
-                        filteredParams = filterUndefined(clientParams);
-                        client = new ali_oss_1.default(__assign({ region: DEFAULT_OSS_REGION }, filteredParams));
-                        // 保存客户端选项供后续使用
-                        client.options = __assign(__assign({}, client.options), { realmName: clientParams.realmName, suffix: clientParams.suffix });
-                        clientCache.set(cacheKey, client);
-                        return [2 /*return*/, client];
-                }
-            });
+    async createOssClient(businessType, imggeCarType) {
+        const cacheKey = `${businessType}_${imggeCarType || 'default'}`;
+        // 注释：某些项目使用缓存，某些不使用。这里提供可选的缓存机制
+        // if (this.clientCache.has(cacheKey)) {
+        //   return this.clientCache.get(cacheKey)
+        // }
+        const res = await this.apiConfig.getAliyunSts({ businessType, imggeCarType });
+        if (res.data.code !== 0) {
+            throw new Error('获取OSS配置失败');
+        }
+        const clientParams = res.data.data || {};
+        clientParams.suffix = clientParams.style || '';
+        // 过滤掉undefined值的属性，并确保必需字段存在
+        const filteredParams = filterUndefined(clientParams);
+        const client = new OSS({
+            region: DEFAULT_OSS_REGION,
+            ...filteredParams
         });
+        // 保存客户端选项供后续使用
+        client.options = {
+            ...client.options,
+            realmName: clientParams.realmName,
+            suffix: clientParams.suffix
+        };
+        this.clientCache.set(cacheKey, client);
+        return client;
     }
     /**
      * 预加载图片获取尺寸
      * @param file 文件对象
      * @returns 图片对象
      */
-    function imgUpload(file) {
-        return new Promise(function (resolve, reject) {
-            var URL = window.URL || window.webkitURL;
-            var image = new Image();
-            var objectUrl = URL.createObjectURL(file);
-            image.onload = function () {
+    imgUpload(file) {
+        return new Promise((resolve, reject) => {
+            const URL = window.URL || window.webkitURL;
+            const image = new Image();
+            const objectUrl = URL.createObjectURL(file);
+            image.onload = () => {
                 URL.revokeObjectURL(objectUrl); // 释放内存
                 resolve(image);
             };
-            image.onerror = function () {
+            image.onerror = () => {
                 URL.revokeObjectURL(objectUrl); // 释放内存
                 reject(new Error('图片加载失败'));
             };
@@ -283,14 +235,14 @@ function createAliOssUploader(apiConfig) {
      * @param extension 文件扩展名
      * @returns 文件名信息
      */
-    function generateFileName(imageType, extension) {
-        var now = new Date();
-        var year = apiConfig.dateFormat(now, 'YYYY');
-        var date = apiConfig.dateFormat(now, 'YYYYMMDD');
-        var dateTime = apiConfig.dateFormat(now, 'YYYYMMDDHHmmss');
-        var randomStr = randomString(4);
-        var fileName = "".concat(imageType, "/").concat(date, "/").concat(dateTime, "_").concat(randomStr).concat(extension);
-        return { year: year, fileName: fileName };
+    generateFileName(imageType, extension) {
+        const now = new Date();
+        const year = this.apiConfig.dateFormat(now, 'YYYY');
+        const date = this.apiConfig.dateFormat(now, 'YYYYMMDD');
+        const dateTime = this.apiConfig.dateFormat(now, 'YYYYMMDDHHmmss');
+        const randomStr = randomString(4);
+        const fileName = `${imageType}/${date}/${dateTime}_${randomStr}${extension}`;
+        return { year, fileName };
     }
     /**
      * 检查图片是否为长图
@@ -298,9 +250,9 @@ function createAliOssUploader(apiConfig) {
      * @param height 图片高度
      * @returns 是否为长图
      */
-    function isLongImage(width, height) {
-        var maxDimension = Math.max(width, height);
-        var minDimension = Math.min(width, height);
+    isLongImage(width, height) {
+        const maxDimension = Math.max(width, height);
+        const minDimension = Math.min(width, height);
         return maxDimension / minDimension > LONG_IMAGE_RATIO;
     }
     /**
@@ -313,20 +265,13 @@ function createAliOssUploader(apiConfig) {
      * @param onProgress 进度回调
      * @returns 上传结果
      */
-    function performOssUpload(client, fileName, file, year, mimeType, onProgress) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, client.multipartUpload(fileName, file, {
-                            progress: function (p) {
-                                onProgress === null || onProgress === void 0 ? void 0 : onProgress({ percent: Math.floor(p * 100) });
-                            },
-                            meta: { year: year, people: OSS_META_PEOPLE },
-                            mime: mimeType
-                        })];
-                    case 1: return [2 /*return*/, _a.sent()];
-                }
-            });
+    async performOssUpload(client, fileName, file, year, mimeType, onProgress) {
+        return await client.multipartUpload(fileName, file, {
+            progress: (p) => {
+                onProgress?.({ percent: Math.floor(p * 100) });
+            },
+            meta: { year, people: OSS_META_PEOPLE },
+            mime: mimeType
         });
     }
     /**
@@ -335,12 +280,12 @@ function createAliOssUploader(apiConfig) {
      * @param isGif 是否为GIF
      * @returns 业务类型
      */
-    function determineBusinessType(option, isGif) {
+    determineBusinessType(option, isGif) {
         // 如果已指定businessType，直接使用
         if (option.businessType !== undefined) {
             return option.businessType;
         }
-        var imageType = option.imageType || DEFAULT_IMAGE_TYPE;
+        const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
         // 注释：GIF图片使用businessType=4
         if (isGif) {
             return BusinessType.GIF;
@@ -359,29 +304,27 @@ function createAliOssUploader(apiConfig) {
      * 用于标准的图片上传场景
      * @param params 加载参数
      */
-    function loadImage(params) {
-        var url = params.url, val = params.val, suffix = params.suffix, file = params.file, option = params.option, resolve = params.resolve, reject = params.reject, isGif = params.isGif;
-        var img = new Image();
+    loadImage(params) {
+        const { url, val, suffix, file, option, resolve, reject, isGif } = params;
+        let img = new Image();
         img.src = url;
         img.onload = function () {
-            var _a;
             if (!img)
                 return;
-            val.imgOrgUrl = "".concat(url, "?_").concat(img.width, "_").concat(img.height);
+            val.imgOrgUrl = `${url}?_${img.width}_${img.height}`;
             // 注释：全景图和GIF图片缩略图后缀不带300，其他需要
             val.imgUrl =
                 suffix === '!panoram' || isGif
-                    ? "".concat(url, "?_").concat(img.width, "_").concat(img.height)
-                    : "".concat(url, "300?_").concat(img.width, "_").concat(img.height);
+                    ? `${url}?_${img.width}_${img.height}`
+                    : `${url}300?_${img.width}_${img.height}`;
             val.name = file.name;
             val.fileName = file.name;
-            (_a = option.onSuccess) === null || _a === void 0 ? void 0 : _a.call(option, val);
+            option.onSuccess?.(val);
             resolve(val);
             img = null;
         };
         img.onerror = function () {
-            var _a;
-            (_a = option.onError) === null || _a === void 0 ? void 0 : _a.call(option, '图片加载失败');
+            option.onError?.('图片加载失败');
             reject('图片加载失败');
             img = null;
         };
@@ -391,23 +334,21 @@ function createAliOssUploader(apiConfig) {
      * 用于avatar、idCard等特殊场景，返回格式不同
      * @param params 加载参数
      */
-    function loadImageNew(params) {
-        var url = params.url, val = params.val, file = params.file, option = params.option, resolve = params.resolve, reject = params.reject;
-        var img = new Image();
+    loadImageNew(params) {
+        const { url, val, file, option, resolve, reject } = params;
+        let img = new Image();
         img.src = url;
         img.onload = function () {
-            var _a;
             val.imgOrgUrl = url;
             val.imgUrl = val.name;
             val.name = file.name;
             val.fileName = file.name;
-            (_a = option.onSuccess) === null || _a === void 0 ? void 0 : _a.call(option, val);
+            option.onSuccess?.(val);
             resolve(val);
             img = null;
         };
         img.onerror = function () {
-            var _a;
-            (_a = option.onError) === null || _a === void 0 ? void 0 : _a.call(option, '图片加载失败');
+            option.onError?.('图片加载失败');
             reject('图片加载失败');
             img = null;
         };
@@ -418,447 +359,368 @@ function createAliOssUploader(apiConfig) {
      * @param option 上传选项
      * @returns Promise
      */
-    function ossUploadImage(option) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var file, callbacks;
-            var _this = this;
-            return __generator(this, function (_b) {
-                file = option.file;
-                callbacks = {
-                    onError: option.onError || (function () { }),
-                    onSuccess: option.onSuccess || (function () { }),
-                    onProgress: option.onProgress || (function () { })
-                };
-                option.onError = callbacks.onError;
-                option.onSuccess = callbacks.onSuccess;
-                option.onProgress = callbacks.onProgress;
-                // 文件类型验证
-                if (!isSupportedImageType(file.type)) {
-                    callbacks.onError('');
-                    (_a = apiConfig.messageWarning) === null || _a === void 0 ? void 0 : _a.call(apiConfig, '上传失败，请上传后缀为png、gif、jpg的文件');
-                    return [2 /*return*/, Promise.reject('文件类型不支持')];
+    ossUploadImage = async (option) => {
+        const file = option.file;
+        // 初始化回调函数
+        const callbacks = {
+            onError: option.onError || (() => { }),
+            onSuccess: option.onSuccess || (() => { }),
+            onProgress: option.onProgress || (() => { })
+        };
+        option.onError = callbacks.onError;
+        option.onSuccess = callbacks.onSuccess;
+        option.onProgress = callbacks.onProgress;
+        // 文件类型验证
+        if (!isSupportedImageType(file.type)) {
+            callbacks.onError('');
+            this.apiConfig.messageWarning?.('上传失败，请上传后缀为png、gif、jpg的文件');
+            return Promise.reject('文件类型不支持');
+        }
+        return new Promise(async (resolve, reject) => {
+            try {
+                const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
+                const suffix = SuffixEnum[imageType] || SuffixEnum.official;
+                // 生成文件名
+                const extensionName = `.${file.name.split('.').pop()}`;
+                const { year, fileName } = this.generateFileName(imageType, extensionName);
+                // 注释：小图片（≤100KB）不压缩，quality设为1 (MAIN-2481)
+                const isSmallImage = getFileSizeInKB(file.size) <= SMALL_IMAGE_THRESHOLD;
+                let quality = isSmallImage ? 1 : (option.quality || DEFAULT_QUALITY);
+                const isGif = file.type === 'image/gif';
+                const idCard = option.idCard || false;
+                // 确定业务类型
+                const businessType = this.determineBusinessType(option, isGif);
+                // 注释：特殊业务类型1299（加密）直接返回bucket路径，不加载图片
+                if (businessType === BusinessType.ENCRYPTED) {
+                    const client = await this.createOssClient(businessType, option.imggeCarType);
+                    const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
+                    if (result.res.statusCode === 200) {
+                        const val = {
+                            ...result,
+                            imgUrl: `${result.bucket}://${result.name}`,
+                            imgOrgUrl: `${result.bucket}://${result.name}`,
+                            fileName: file.name
+                        };
+                        callbacks.onSuccess(val);
+                        resolve(val);
+                    }
+                    else {
+                        callbacks.onError('上传失败');
+                        reject('上传失败');
+                    }
+                    return;
+                }
+                // 注释：batchTransfer选项 - 批量转换水印（用于某些特殊业务场景）
+                if (option.batchTransfer && this.apiConfig.multiTransferImage) {
+                    const res = await this.apiConfig.multiTransferImage({ file });
+                    if (res.data.code === 0) {
+                        this.loadImage({
+                            url: res.data.data,
+                            val: res.data,
+                            suffix,
+                            option,
+                            file,
+                            resolve,
+                            reject
+                        });
+                    }
+                    else {
+                        callbacks.onError('上传失败');
+                        reject('上传失败');
+                    }
+                    return;
+                }
+                // 注释：carport类型需要打暗水印
+                if (option.imageType === 'carport' && this.apiConfig.darkWaterUploadImage) {
+                    const res = await this.apiConfig.darkWaterUploadImage({ file });
+                    if (res.data.code === 0) {
+                        this.loadImage({
+                            url: res.data.data,
+                            val: res.data,
+                            suffix,
+                            option,
+                            file,
+                            resolve,
+                            reject
+                        });
+                    }
+                    else {
+                        callbacks.onError('上传失败');
+                        reject('上传失败');
+                    }
+                    return;
+                }
+                // 预加载图片获取尺寸
+                const image = await this.imgUpload(file);
+                // 图片压缩
+                const rst = await lrz(file, { quality });
+                // 注释：长图压缩有问题，长宽比>2:1的图片不压缩
+                const isLong = this.isLongImage(image.width, image.height);
+                // 确定最终上传的文件
+                let postFile;
+                if (option.notCompress || isGif || isLong) {
+                    // 注释：GIF、notCompress选项或长图不压缩
+                    postFile = file;
+                }
+                else {
+                    postFile = rst.file;
                 }
-                return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var imageType, suffix, extensionName, _a, year, fileName, isSmallImage, quality, isGif, idCard, businessType, client_1, result_1, val, res, res, image, rst, isLong, postFile, imgSize, maxSizeMB, errorMsg, client, result, res, res, clientParams, url, error_1, errorMsg;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    _b.trys.push([0, 16, , 17]);
-                                    imageType = option.imageType || DEFAULT_IMAGE_TYPE;
-                                    suffix = exports.SuffixEnum[imageType] || exports.SuffixEnum.official;
-                                    extensionName = ".".concat(file.name.split('.').pop());
-                                    _a = generateFileName(imageType, extensionName), year = _a.year, fileName = _a.fileName;
-                                    isSmallImage = getFileSizeInKB(file.size) <= SMALL_IMAGE_THRESHOLD;
-                                    quality = isSmallImage ? 1 : (option.quality || DEFAULT_QUALITY);
-                                    isGif = file.type === 'image/gif';
-                                    idCard = option.idCard || false;
-                                    businessType = determineBusinessType(option, isGif);
-                                    if (!(businessType === BusinessType.ENCRYPTED)) return [3 /*break*/, 3];
-                                    return [4 /*yield*/, createOssClient(businessType, option.imggeCarType)];
-                                case 1:
-                                    client_1 = _b.sent();
-                                    return [4 /*yield*/, performOssUpload(client_1, fileName, file, year, file.type, callbacks.onProgress)];
-                                case 2:
-                                    result_1 = _b.sent();
-                                    if (result_1.res.statusCode === 200) {
-                                        val = __assign(__assign({}, result_1), { imgUrl: "".concat(result_1.bucket, "://").concat(result_1.name), imgOrgUrl: "".concat(result_1.bucket, "://").concat(result_1.name), fileName: file.name });
-                                        callbacks.onSuccess(val);
-                                        resolve(val);
-                                    }
-                                    else {
-                                        callbacks.onError('上传失败');
-                                        reject('上传失败');
-                                    }
-                                    return [2 /*return*/];
-                                case 3:
-                                    if (!(option.batchTransfer && apiConfig.multiTransferImage)) return [3 /*break*/, 5];
-                                    return [4 /*yield*/, apiConfig.multiTransferImage({ file: file })];
-                                case 4:
-                                    res = _b.sent();
-                                    if (res.data.code === 0) {
-                                        loadImage({
-                                            url: res.data.data,
-                                            val: res.data,
-                                            suffix: suffix,
-                                            option: option,
-                                            file: file,
-                                            resolve: resolve,
-                                            reject: reject
-                                        });
-                                    }
-                                    else {
-                                        callbacks.onError('上传失败');
-                                        reject('上传失败');
-                                    }
-                                    return [2 /*return*/];
-                                case 5:
-                                    if (!(option.imageType === 'carport' && apiConfig.darkWaterUploadImage)) return [3 /*break*/, 7];
-                                    return [4 /*yield*/, apiConfig.darkWaterUploadImage({ file: file })];
-                                case 6:
-                                    res = _b.sent();
-                                    if (res.data.code === 0) {
-                                        loadImage({
-                                            url: res.data.data,
-                                            val: res.data,
-                                            suffix: suffix,
-                                            option: option,
-                                            file: file,
-                                            resolve: resolve,
-                                            reject: reject
-                                        });
-                                    }
-                                    else {
-                                        callbacks.onError('上传失败');
-                                        reject('上传失败');
-                                    }
-                                    return [2 /*return*/];
-                                case 7: return [4 /*yield*/, imgUpload(file)
-                                    // 图片压缩
-                                ];
-                                case 8:
-                                    image = _b.sent();
-                                    return [4 /*yield*/, (0, lrz_1.default)(file, { quality: quality })
-                                        // 注释：长图压缩有问题，长宽比>2:1的图片不压缩
-                                    ];
-                                case 9:
-                                    rst = _b.sent();
-                                    isLong = isLongImage(image.width, image.height);
-                                    postFile = void 0;
-                                    if (option.notCompress || isGif || isLong) {
-                                        // 注释：GIF、notCompress选项或长图不压缩
-                                        postFile = file;
-                                    }
-                                    else {
-                                        postFile = rst.file;
-                                    }
-                                    imgSize = postFile.size;
-                                    maxSizeMB = DEFAULT_FILE_SIZE_LIMIT;
-                                    if (getFileSizeInMB(imgSize) > maxSizeMB) {
-                                        errorMsg = "\u56FE\u7247\u4E0D\u80FD\u8D85\u8FC7".concat(maxSizeMB, "M");
-                                        callbacks.onError(errorMsg);
-                                        reject(errorMsg);
-                                        return [2 /*return*/];
-                                    }
-                                    // 设置文件名（确保压缩后的文件有名称）
-                                    if (!postFile.name) {
-                                        Object.defineProperty(postFile, 'name', {
-                                            value: file.name,
-                                            writable: false
-                                        });
-                                    }
-                                    return [4 /*yield*/, createOssClient(businessType, option.imggeCarType)
-                                        // 执行上传
-                                    ];
-                                case 10:
-                                    client = _b.sent();
-                                    return [4 /*yield*/, performOssUpload(client, fileName, postFile, year, postFile.type, callbacks.onProgress)];
-                                case 11:
-                                    result = _b.sent();
-                                    if (result.res.statusCode !== 200) {
-                                        callbacks.onError('上传失败');
-                                        reject('上传失败');
-                                        return [2 /*return*/];
-                                    }
-                                    if (!(idCard && apiConfig.generatePrePresignedUrl)) return [3 /*break*/, 13];
-                                    return [4 /*yield*/, apiConfig.generatePrePresignedUrl({
-                                            objectId: result.name,
-                                            expireMils: PRESIGNED_URL_EXPIRE_TIME
-                                        })];
-                                case 12:
-                                    res = _b.sent();
-                                    if (res.data.code === 0) {
-                                        loadImageNew({
-                                            url: res.data.data,
-                                            val: result,
-                                            file: postFile,
-                                            option: option,
-                                            resolve: resolve,
-                                            reject: reject
-                                        });
-                                    }
-                                    else {
-                                        callbacks.onError('生成预签名URL失败');
-                                        reject('生成预签名URL失败');
-                                    }
-                                    return [2 /*return*/];
-                                case 13:
-                                    if (!(imageType === 'avatar' && apiConfig.aliyunPersist)) return [3 /*break*/, 15];
-                                    return [4 /*yield*/, apiConfig.aliyunPersist({
-                                            object: "".concat(result.bucket, "://").concat(result.name),
-                                            businessType: BusinessType.AVATAR
-                                        })];
-                                case 14:
-                                    res = _b.sent();
-                                    if (res.data.code === 0) {
-                                        loadImageNew({
-                                            url: res.data.data,
-                                            val: result,
-                                            file: postFile,
-                                            option: option,
-                                            resolve: resolve,
-                                            reject: reject
-                                        });
-                                    }
-                                    else {
-                                        callbacks.onError('头像处理失败');
-                                        reject('头像处理失败');
-                                    }
-                                    return [2 /*return*/];
-                                case 15:
-                                    clientParams = client.options;
-                                    url = "".concat(clientParams.realmName).concat(result.name).concat(clientParams.suffix || '');
-                                    loadImage({
-                                        url: url,
-                                        val: result,
-                                        suffix: suffix,
-                                        file: postFile,
-                                        option: option,
-                                        resolve: resolve,
-                                        reject: reject,
-                                        isGif: isGif
-                                    });
-                                    return [3 /*break*/, 17];
-                                case 16:
-                                    error_1 = _b.sent();
-                                    errorMsg = error_1.message || '上传异常';
-                                    callbacks.onError(errorMsg);
-                                    reject(errorMsg);
-                                    return [3 /*break*/, 17];
-                                case 17: return [2 /*return*/];
-                            }
+                // 文件大小验证
+                const imgSize = postFile.size;
+                const maxSizeMB = DEFAULT_FILE_SIZE_LIMIT;
+                if (getFileSizeInMB(imgSize) > maxSizeMB) {
+                    const errorMsg = `图片不能超过${maxSizeMB}M`;
+                    callbacks.onError(errorMsg);
+                    reject(errorMsg);
+                    return;
+                }
+                // 设置文件名（确保压缩后的文件有名称）
+                if (!postFile.name) {
+                    Object.defineProperty(postFile, 'name', {
+                        value: file.name,
+                        writable: false
+                    });
+                }
+                // 注释：根据不同场景选择不同的OSS客户端
+                // GIF -> UnProtect(8), idCard -> Private(1199), nowater/forum -> NoWater(0), 其他 -> 默认
+                const client = await this.createOssClient(businessType, option.imggeCarType);
+                // 执行上传
+                const result = await this.performOssUpload(client, fileName, postFile, year, postFile.type, callbacks.onProgress);
+                if (result.res.statusCode !== 200) {
+                    callbacks.onError('上传失败');
+                    reject('上传失败');
+                    return;
+                }
+                // 注释：idCard场景 - 生成预签名URL
+                if (idCard && this.apiConfig.generatePrePresignedUrl) {
+                    const res = await this.apiConfig.generatePrePresignedUrl({
+                        objectId: result.name,
+                        expireMils: PRESIGNED_URL_EXPIRE_TIME
+                    });
+                    if (res.data.code === 0) {
+                        this.loadImageNew({
+                            url: res.data.data,
+                            val: result,
+                            file: postFile,
+                            option,
+                            resolve,
+                            reject
+                        });
+                    }
+                    else {
+                        callbacks.onError('生成预签名URL失败');
+                        reject('生成预签名URL失败');
+                    }
+                    return;
+                }
+                // 注释：avatar场景 - 调用aliyunPersist处理
+                if (imageType === 'avatar' && this.apiConfig.aliyunPersist) {
+                    const res = await this.apiConfig.aliyunPersist({
+                        object: `${result.bucket}://${result.name}`,
+                        businessType: BusinessType.AVATAR
+                    });
+                    if (res.data.code === 0) {
+                        this.loadImageNew({
+                            url: res.data.data,
+                            val: result,
+                            file: postFile,
+                            option,
+                            resolve,
+                            reject
                         });
-                    }); })];
-            });
+                    }
+                    else {
+                        callbacks.onError('头像处理失败');
+                        reject('头像处理失败');
+                    }
+                    return;
+                }
+                // 注释：标准场景 - 使用client.options中的realmName和suffix
+                const clientParams = client.options;
+                const url = `${clientParams.realmName}${result.name}${clientParams.suffix || ''}`;
+                this.loadImage({
+                    url,
+                    val: result,
+                    suffix,
+                    file: postFile,
+                    option,
+                    resolve,
+                    reject,
+                    isGif
+                });
+            }
+            catch (error) {
+                const errorMsg = error.message || '上传异常';
+                callbacks.onError(errorMsg);
+                reject(errorMsg);
+            }
         });
-    }
+    };
     /**
      * 文件上传方法
      * 支持视频、文档、APK等文件类型
      * @param option 上传选项
      * @returns Promise
      */
-    function ossUploadFile(option) {
-        return __awaiter(this, void 0, void 0, function () {
-            var file, callbacks;
-            var _this = this;
-            return __generator(this, function (_a) {
-                file = option.file;
-                callbacks = {
-                    onError: option.onError || (function () { }),
-                    onSuccess: option.onSuccess || (function () { }),
-                    onProgress: option.onProgress || (function () { })
-                };
-                option.onError = callbacks.onError;
-                option.onSuccess = callbacks.onSuccess;
-                option.onProgress = callbacks.onProgress;
-                return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var extensionName, fileType, _a, year, fileName, isVideo, isDocument, isUnProtect, businessType, client, result, clientParams, url, uploadResult, error_2, errorMsg;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    _b.trys.push([0, 5, , 6]);
-                                    extensionName = ".".concat(file.name.split('.').pop());
-                                    fileType = extensionName === '.apk' ? 'apk' : 'file';
-                                    _a = generateFileName(fileType, extensionName), year = _a.year, fileName = _a.fileName;
-                                    isVideo = !!option.isVideo;
-                                    isDocument = !!option.isDocument;
-                                    isUnProtect = !!option.isUnProtect;
-                                    businessType = option.businessType;
-                                    if (!businessType) {
-                                        if (isUnProtect) {
-                                            businessType = BusinessType.UNPROTECT;
-                                        }
-                                        else if (isVideo || isDocument) {
-                                            businessType = BusinessType.VIDEO; // 视频和文档都使用6
-                                        }
-                                        else {
-                                            businessType = BusinessType.DEFAULT;
-                                        }
-                                    }
-                                    if (!(isDocument && apiConfig.uploadConf)) return [3 /*break*/, 2];
-                                    return [4 /*yield*/, apiConfig.uploadConf(businessType)];
-                                case 1:
-                                    _b.sent();
-                                    _b.label = 2;
-                                case 2: return [4 /*yield*/, createOssClient(businessType, option.imggeCarType)
-                                    // 执行上传
-                                ];
-                                case 3:
-                                    client = _b.sent();
-                                    return [4 /*yield*/, performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress)];
-                                case 4:
-                                    result = _b.sent();
-                                    if (result.res.statusCode === 200) {
-                                        clientParams = client.options;
-                                        url = "".concat(clientParams.realmName).concat(result.name).concat(clientParams.suffix || '');
-                                        uploadResult = __assign(__assign({}, result), { url: url, fileName: file.name });
-                                        callbacks.onSuccess(uploadResult);
-                                        resolve(uploadResult);
-                                    }
-                                    else {
-                                        callbacks.onError('上传失败');
-                                        reject('上传失败');
-                                    }
-                                    return [3 /*break*/, 6];
-                                case 5:
-                                    error_2 = _b.sent();
-                                    errorMsg = error_2.message || '上传异常';
-                                    callbacks.onError(errorMsg);
-                                    reject(errorMsg);
-                                    return [3 /*break*/, 6];
-                                case 6: return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            });
+    ossUploadFile = async (option) => {
+        const file = option.file;
+        // 初始化回调函数
+        const callbacks = {
+            onError: option.onError || (() => { }),
+            onSuccess: option.onSuccess || (() => { }),
+            onProgress: option.onProgress || (() => { })
+        };
+        option.onError = callbacks.onError;
+        option.onSuccess = callbacks.onSuccess;
+        option.onProgress = callbacks.onProgress;
+        return new Promise(async (resolve, reject) => {
+            try {
+                // 生成文件名
+                const extensionName = `.${file.name.split('.').pop()}`;
+                const fileType = extensionName === '.apk' ? 'apk' : 'file';
+                const { year, fileName } = this.generateFileName(fileType, extensionName);
+                const isVideo = !!option.isVideo;
+                const isDocument = !!option.isDocument;
+                const isUnProtect = !!option.isUnProtect;
+                // 注释：根据不同场景选择businessType
+                // isUnProtect -> 8, isVideo -> 6, isDocument -> 6, 其他 -> 1500
+                let businessType = option.businessType;
+                if (!businessType) {
+                    if (isUnProtect) {
+                        businessType = BusinessType.UNPROTECT;
+                    }
+                    else if (isVideo || isDocument) {
+                        businessType = BusinessType.VIDEO; // 视频和文档都使用6
+                    }
+                    else {
+                        businessType = BusinessType.DEFAULT;
+                    }
+                }
+                // 注释：文档上传可能需要先调用uploadConf获取配置
+                if (isDocument && this.apiConfig.uploadConf) {
+                    await this.apiConfig.uploadConf(businessType);
+                }
+                const client = await this.createOssClient(businessType, option.imggeCarType);
+                // 执行上传
+                const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
+                if (result.res.statusCode === 200) {
+                    const clientParams = client.options;
+                    const url = `${clientParams.realmName}${result.name}${clientParams.suffix || ''}`;
+                    const uploadResult = {
+                        ...result,
+                        url,
+                        fileName: file.name
+                    };
+                    callbacks.onSuccess(uploadResult);
+                    resolve(uploadResult);
+                }
+                else {
+                    callbacks.onError('上传失败');
+                    reject('上传失败');
+                }
+            }
+            catch (error) {
+                const errorMsg = error.message || '上传异常';
+                callbacks.onError(errorMsg);
+                reject(errorMsg);
+            }
         });
-    }
+    };
     /**
      * 商品详情图片上传
      * 注释：此方法用于商品详情页的图片上传，不压缩，使用NoWater客户端
      * @param option 上传选项
      * @returns Promise
      */
-    function shopDetailUpdate(option) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var file, callbacks;
-            var _this = this;
-            return __generator(this, function (_b) {
-                file = option.file;
-                callbacks = {
-                    onError: option.onError || (function () { }),
-                    onSuccess: option.onSuccess || (function () { }),
-                    onProgress: option.onProgress || (function () { })
-                };
-                option.onError = callbacks.onError;
-                option.onSuccess = callbacks.onSuccess;
-                option.onProgress = callbacks.onProgress;
-                // 文件类型验证
-                if (!isSupportedImageType(file.type)) {
-                    callbacks.onError('');
-                    (_a = apiConfig.messageWarning) === null || _a === void 0 ? void 0 : _a.call(apiConfig, '上传失败，请上传后缀为png、gif、jpg的文件');
-                    return [2 /*return*/, Promise.reject('文件类型不支持')];
+    shopDetailUpdate = async (option) => {
+        const file = option.file;
+        // 初始化回调函数
+        const callbacks = {
+            onError: option.onError || (() => { }),
+            onSuccess: option.onSuccess || (() => { }),
+            onProgress: option.onProgress || (() => { })
+        };
+        option.onError = callbacks.onError;
+        option.onSuccess = callbacks.onSuccess;
+        option.onProgress = callbacks.onProgress;
+        // 文件类型验证
+        if (!isSupportedImageType(file.type)) {
+            callbacks.onError('');
+            this.apiConfig.messageWarning?.('上传失败，请上传后缀为png、gif、jpg的文件');
+            return Promise.reject('文件类型不支持');
+        }
+        return new Promise(async (resolve, reject) => {
+            try {
+                // 文件大小验证
+                if (getFileSizeInMB(file.size) > DEFAULT_FILE_SIZE_LIMIT) {
+                    const errorMsg = `图片不能超过${DEFAULT_FILE_SIZE_LIMIT}M`;
+                    callbacks.onError(errorMsg);
+                    reject(errorMsg);
+                    return;
                 }
-                return [2 /*return*/, new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
-                        var errorMsg, imageType, suffix, extensionName, _a, year, fileName, client, result, clientParams, url, error_3, errorMsg;
-                        return __generator(this, function (_b) {
-                            switch (_b.label) {
-                                case 0:
-                                    _b.trys.push([0, 4, , 5]);
-                                    // 文件大小验证
-                                    if (getFileSizeInMB(file.size) > DEFAULT_FILE_SIZE_LIMIT) {
-                                        errorMsg = "\u56FE\u7247\u4E0D\u80FD\u8D85\u8FC7".concat(DEFAULT_FILE_SIZE_LIMIT, "M");
-                                        callbacks.onError(errorMsg);
-                                        reject(errorMsg);
-                                        return [2 /*return*/];
-                                    }
-                                    // 预加载图片（虽然不需要尺寸，但保持原有逻辑）
-                                    return [4 /*yield*/, imgUpload(file)];
-                                case 1:
-                                    // 预加载图片（虽然不需要尺寸，但保持原有逻辑）
-                                    _b.sent();
-                                    imageType = option.imageType || DEFAULT_IMAGE_TYPE;
-                                    suffix = exports.SuffixEnum[imageType] || exports.SuffixEnum.official;
-                                    extensionName = ".".concat(file.name.split('.').pop());
-                                    _a = generateFileName(imageType, extensionName), year = _a.year, fileName = _a.fileName;
-                                    return [4 /*yield*/, createOssClient(BusinessType.NO_WATER, option.imggeCarType)
-                                        // 执行上传
-                                    ];
-                                case 2:
-                                    client = _b.sent();
-                                    return [4 /*yield*/, performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress)];
-                                case 3:
-                                    result = _b.sent();
-                                    if (result.res.statusCode === 200) {
-                                        clientParams = client.options;
-                                        url = "".concat(clientParams.realmName).concat(result.name).concat(clientParams.suffix || '');
-                                        loadImage({
-                                            url: url,
-                                            val: result,
-                                            suffix: suffix,
-                                            file: file,
-                                            option: option,
-                                            resolve: resolve,
-                                            reject: reject
-                                        });
-                                    }
-                                    else {
-                                        callbacks.onError('上传失败');
-                                        reject('上传失败');
-                                    }
-                                    return [3 /*break*/, 5];
-                                case 4:
-                                    error_3 = _b.sent();
-                                    errorMsg = error_3.message || '上传异常';
-                                    callbacks.onError(errorMsg);
-                                    reject(errorMsg);
-                                    return [3 /*break*/, 5];
-                                case 5: return [2 /*return*/];
-                            }
-                        });
-                    }); })];
-            });
+                // 预加载图片（虽然不需要尺寸，但保持原有逻辑）
+                await this.imgUpload(file);
+                const imageType = option.imageType || DEFAULT_IMAGE_TYPE;
+                const suffix = SuffixEnum[imageType] || SuffixEnum.official;
+                // 生成文件名
+                const extensionName = `.${file.name.split('.').pop()}`;
+                const { year, fileName } = this.generateFileName(imageType, extensionName);
+                // 使用NoWater客户端
+                const client = await this.createOssClient(BusinessType.NO_WATER, option.imggeCarType);
+                // 执行上传
+                const result = await this.performOssUpload(client, fileName, file, year, file.type, callbacks.onProgress);
+                if (result.res.statusCode === 200) {
+                    const clientParams = client.options;
+                    const url = `${clientParams.realmName}${result.name}${clientParams.suffix || ''}`;
+                    this.loadImage({
+                        url,
+                        val: result,
+                        suffix,
+                        file,
+                        option,
+                        resolve,
+                        reject
+                    });
+                }
+                else {
+                    callbacks.onError('上传失败');
+                    reject('上传失败');
+                }
+            }
+            catch (error) {
+                const errorMsg = error.message || '上传异常';
+                callbacks.onError(errorMsg);
+                reject(errorMsg);
+            }
         });
-    }
-    // 返回上传器实例
-    return {
-        /**
-         * 图片上传
-         * @param option 上传选项
-         */
-        ossUploadImage: ossUploadImage,
-        /**
-         * 文件上传（视频、文档、APK等）
-         * @param option 上传选项
-         */
-        ossUploadFile: ossUploadFile,
-        /**
-         * 商品详情图片上传
-         * @param option 上传选项
-         */
-        shopDetailUpdate: shopDetailUpdate,
-        /**
-         * 后缀枚举
-         */
-        suffixEnum: exports.SuffixEnum,
-        /**
-         * 业务类型枚举
-         */
-        businessType: BusinessType,
-        /**
-         * 生成随机字符串
-         * @param num 字符串长度
-         */
-        randomString: randomString,
-        /**
-         * 创建OSS客户端（高级用法）
-         * @param businessType 业务类型
-         * @param imggeCarType 车辆图片类型
-         */
-        createOssClient: createOssClient,
-        /**
-         * 预加载图片
-         * @param file 文件对象
-         */
-        imgUpload: imgUpload,
-        /**
-         * 加载图片并返回结果
-         */
-        loadImage: loadImage,
-        /**
-         * 加载图片并返回结果（新版）
-         */
-        loadImageNew: loadImageNew
     };
+    /**
+     * 生成随机字符串
+     * @param num 字符串长度
+     */
+    randomString = randomString;
+    /**
+     * 后缀枚举
+     */
+    suffixEnum = SuffixEnum;
+    /**
+     * 业务类型枚举
+     */
+    businessType = BusinessType;
+}
+/**
+ * 创建阿里云OSS上传器（工厂函数）
+ * @param apiConfig API配置对象，包含业务相关的API函数
+ * @returns OSS上传器实例
+ */
+export function createAliOssUploader(apiConfig) {
+    return new AliOssClass(apiConfig);
 }
-exports.createAliOssUploader = createAliOssUploader;
 /**
  * 默认导出
  */
-exports.default = {
-    createAliOssUploader: createAliOssUploader,
-    BusinessType: BusinessType,
-    SuffixEnum: exports.SuffixEnum
+export default {
+    createAliOssUploader,
+    BusinessType,
+    SuffixEnum
 };