0

src/api/common/commonController.js

@@ -18,19 +18,14 @@ const ALLOWED_IMAGE_TYPES = new Set([
     'jpg', 'jpeg', 'png', 'bmp', 'heic', 'heif', 'webp', 'gif'
 ]);
 
-// 不再允许音频类型
-// const ALLOWED_AUDIO_TYPES = new Set([
-//     'aac', 'mp3', 'mp4', 'm4a', 'flac', 'ogg', 'ape', 'amr', 
-//     'wma', 'wav', 'aiff', 'caf'
-// ]);
+const ALLOWED_AUDIO_TYPES = new Set([
+    'aac', 'mp3', 'mp4', 'm4a', 'flac', 'ogg', 'ape', 'amr',
+    'wma', 'wav', 'aiff', 'caf'
+]);
 
-// 阻止的文件类型，包括视频和其他不允许的类型
 const BLOCKED_TYPES = new Set([
-    'php', 'js', 'txt', 
-    // 视频格式
-    'mp4', 'avi', 'mov', 'wmv', 'flv', 'mkv', 'webm', '3gp', 'm4v',
-    // 音频格式
-    'aac', 'mp3', 'm4a', 'flac', 'ogg', 'ape', 'amr', 'wma', 'wav', 'aiff', 'caf'
+    'php', 'js', 'txt',
+    'avi', 'mov', 'wmv', 'flv', 'mkv', 'webm', '3gp', 'm4v'
 ]);
 
 // 文件上传配置
@@ -39,10 +34,10 @@ const fileFilter = (req, file, cb) => {
     
     if (BLOCKED_TYPES.has(extension)) {
         cb(new Error('不允许上传该类型的文件！'), false);
-    } else if (ALLOWED_IMAGE_TYPES.has(extension)) {
+    } else if (ALLOWED_IMAGE_TYPES.has(extension) || ALLOWED_AUDIO_TYPES.has(extension)) {
         cb(null, true);
     } else {
-        cb(new Error('只允许上传图片文件！'), false);
+        cb(new Error('只允许上传图片或音频文件！'), false);
     }
 };
 
@@ -70,8 +65,10 @@ export const UploadFile = async (ctx) => {
 
         if (ALLOWED_IMAGE_TYPES.has(extension)) {
             await checkImage(filename, filepath);
+        } else if (ALLOWED_AUDIO_TYPES.has(extension)) {
+            await uploadFile(filename, filepath);
         } else {
-            throw new Error('只允许上传图片文件！');
+            throw new Error('只允许上传图片或音频文件！');
         }
 
         ctx.body = {
@@ -134,7 +131,11 @@ async function checkImage(filename, filepath) {
                 if (size.width > maxSize || size.height > maxSize) {
                     imageMagick(filepath)
                         .resize(maxSize, maxSize)
-                        .write(filepath, async () => {
+                        .write(filepath, async (writeError) => {
+                            if (writeError) {
+                                reject(writeError);
+                                return;
+                            }
                             try {
                                 await uploadImage(filename, filepath);
                                 resolve();
@@ -152,54 +153,59 @@ async function checkImage(filename, filepath) {
     }
 }
 
-// 上传图片到腾讯云
-async function uploadImage(filename, filepath) {
+const TRANSIENT_UPLOAD_ERRORS = new Set([
+    'ECONNRESET', 'ETIMEDOUT', 'EPIPE', 'ECONNREFUSED'
+]);
+
+function shouldRetryUpload(error) {
+    return TRANSIENT_UPLOAD_ERRORS.has(error?.code)
+        || Number(error?.statusCode) >= 500;
+}
+
+async function uploadToCloud(filename, filepath) {
     const cos = new COS(config.QCloud);
-    
-    const params = {
-        Bucket: 'miaguo-1253256735',
-        Region: 'ap-guangzhou',
-        Key: filename,
-        Body: fs.createReadStream(filepath),
-        ContentLength: fs.statSync(filepath).size
-    };
+    const contentLength = fs.statSync(filepath).size;
+    let lastError;
 
-    return new Promise((resolve, reject) => {
-        cos.putObject(params, (err, data) => {
-            if (err) {
-                reject(err);
-            } else {
-                fsPromises.unlink(filepath)
-                    .then(() => resolve(data))
-                    .catch(reject);
+    for (let attempt = 0; attempt < 2; attempt++) {
+        try {
+            const data = await new Promise((resolve, reject) => {
+                cos.putObject({
+                    Bucket: 'miaguo-1253256735',
+                    Region: 'ap-guangzhou',
+                    Key: filename,
+                    Body: fs.createReadStream(filepath),
+                    ContentLength: contentLength
+                }, (error, result) => {
+                    if (error) reject(error);
+                    else resolve(result);
+                });
+            });
+
+            try {
+                await fsPromises.unlink(filepath);
+            } catch (cleanupError) {
+                console.warn('Failed to clean up uploaded temp file:', cleanupError.message);
             }
-        });
-    });
+            return data;
+        } catch (error) {
+            lastError = error;
+            if (attempt >= 1 || !shouldRetryUpload(error)) throw error;
+            await new Promise(resolve => setTimeout(resolve, 600));
+        }
+    }
+
+    throw lastError;
+}
+
+// 上传图片到腾讯云
+async function uploadImage(filename, filepath) {
+    return uploadToCloud(filename, filepath);
 }
 
 // 上传文件到腾讯云
 async function uploadFile(filename, filepath) {
-    const cos = new COS(config.QCloud);
-    
-    const params = {
-        Bucket: 'miaguo-1253256735',
-        Region: 'ap-guangzhou',
-        Key: filename,
-        Body: fs.createReadStream(filepath),
-        ContentLength: fs.statSync(filepath).size
-    };
-
-    return new Promise((resolve, reject) => {
-        cos.putObject(params, (err, data) => {
-            if (err) {
-                reject(err);
-            } else {
-                fsPromises.unlink(filepath)
-                    .then(() => resolve(data))
-                    .catch(reject);
-            }
-        });
-    });
+    return uploadToCloud(filename, filepath);
 }
 
 export async function GetBaiduToken (ctx) {