Merge pull request #286 from shadowhenry/main

bugfix: Compatible with different browsers for uploading zip mimetype

internal/servants/web/utils.go

@@ -163,7 +163,7 @@ func getFileExt(s string) (string, mir.Error) {
 		return ".mp4", nil
 	case "video/quicktime":
 		return ".mov", nil
-	case "application/zip":
+	case "application/zip", "application/x-zip", "application/octet-stream", "application/x-zip-compressed":
 		return ".zip", nil
 	default:
 		return "", _errFileInvalidExt.WithDetails("仅允许 png/jpg/gif/mp4/mov/zip 类型")

web/src/components/compose.vue

@@ -278,6 +278,7 @@ import {
 } from '@vicons/ionicons5';
 import { createPost } from '@/api/post';
 import { parsePostTag } from '@/utils/content';
+import { isZipFile } from '@/utils/isZipFile';
 import type { MentionOption, UploadFileInfo, UploadInst } from 'naive-ui';
 import { VisibilityEnum, PostItemTypeEnum } from '@/utils/IEnum';
 
@@ -432,11 +433,9 @@ const beforeUpload = async (data: any) => {
         window.$message.warning('视频大小不能超过100MB');
         return false;
     }
-
     // 附件类型校验
     if (
-        uploadType.value === 'attachment' &&
+        uploadType.value === 'attachment' && !(await isZipFile(data.file.file))
-        !['application/zip'].includes(data.file.file?.type)
     ) {
         window.$message.warning('附件仅允许 zip 格式');
         return false;

web/src/utils/isZipFile.ts

@@ -0,0 +1,47 @@
+
+export const isZipFile = (file: File): Promise<unknown> => {
+    const fileReader = new FileReader();
+
+    const isValidZipFileType = (fileType: string): boolean => {
+        const zipFileTypes = ['application/zip', 'application/x-zip', 'application/octet-stream', 'application/x-zip-compressed'];
+        return zipFileTypes.includes(fileType);
+    };
+
+    const checkFileType = (): boolean => {
+        const arr = new Uint8Array(fileReader.result as ArrayBuffer).subarray(0, 4);
+        let header = '';
+        for (let i = 0; i < arr.length; i++) {
+            header += arr[i].toString(16);
+        }
+
+        switch (header) {
+            case '504b0304':
+            case '504b0506':
+            case '504b0708':
+                return isValidZipFileType('application/zip');
+            case '504b030414':
+                return isValidZipFileType('application/x-zip-compressed');
+            case '504b0508':
+                return isValidZipFileType('application/x-zip');
+            case '504b5370':
+                return isValidZipFileType('application/octet-stream');
+            default:
+                return false;
+        }
+    };
+
+    return new Promise((resolve, reject) => {
+        fileReader.onloadend = () => {
+            const fileType = file.type;
+            if (fileType === '' || fileType === 'application/octet-stream') {
+                // 如果浏览器不能识别文件类型，则进行手动检查
+                resolve(checkFileType());
+            } else {
+                // 如果浏览器可以识别文件类型，则根据文件类型进行检查
+                resolve(isValidZipFileType(fileType));
+            }
+        };
+
+        fileReader.readAsArrayBuffer(file.slice(0, 4));
+    });
+}