fix: fallback

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "icon": "./logo.png",
   "authors": [
     {

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.4.2",
+  "version": "4.4.3",
   "scripts": {
     "build:universal": "npm run build:webui && vite build --mode universal || exit 1",
     "build:framework": "npm run build:webui && vite build --mode framework || exit 1",

src/common/file.ts

@@ -181,28 +181,28 @@ export async function uriToLocalFile(dir: string, uri: string, filename: string
     const filePath = path.join(dir, filename);
 
     switch (UriType) {
-    case FileUriType.Local: {
+        case FileUriType.Local: {
-        const fileExt = path.extname(HandledUri);
+            const fileExt = path.extname(HandledUri);
-        const localFileName = path.basename(HandledUri, fileExt) + fileExt;
+            const localFileName = path.basename(HandledUri, fileExt) + fileExt;
-        const tempFilePath = path.join(dir, filename + fileExt);
+            const tempFilePath = path.join(dir, filename + fileExt);
-        fs.copyFileSync(HandledUri, tempFilePath);
+            fs.copyFileSync(HandledUri, tempFilePath);
-        return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
+            return { success: true, errMsg: '', fileName: localFileName, path: tempFilePath };
-    }
+        }
 
-    case FileUriType.Remote: {
+        case FileUriType.Remote: {
-        const buffer = await httpDownload({ url: HandledUri, headers: headers });
+            const buffer = await httpDownload({ url: HandledUri, headers: headers });
-        fs.writeFileSync(filePath, buffer, { flag: 'wx' });
+            fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        }
 
-    case FileUriType.Base64: {
+        case FileUriType.Base64: {
-        const base64 = HandledUri.replace(/^base64:\/\//, '');
+            const base64 = HandledUri.replace(/^base64:\/\//, '');
-        const base64Buffer = Buffer.from(base64, 'base64');
+            const base64Buffer = Buffer.from(base64, 'base64');
-        fs.writeFileSync(filePath, base64Buffer, { flag: 'wx' });
+            fs.writeFileSync(filePath, base64Buffer);
-        return { success: true, errMsg: '', fileName: filename, path: filePath };
+            return { success: true, errMsg: '', fileName: filename, path: filePath };
-    }
+        }
 
-    default:
+        default:
-        return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
+            return { success: false, errMsg: `识别URL失败, uri= ${uri}`, fileName: '', path: '' };
     }
 }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.4.2';
+export const napCatVersion = '4.4.3';

src/core/apis/file.ts

@@ -474,7 +474,7 @@ export class NTQQFileApi {
         if (rkeyData.online_rkey) {
             return IMAGE_HTTP_HOST_NT + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
         }
-        return IMAGE_HTTP_HOST + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
+        return IMAGE_HTTP_HOST + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}&spec=0`;
     }
 
     private getImageUrlFromMd5(fileMd5: string | undefined, md5HexStr: string | undefined): string {

src/core/external/appid.json

@@ -175,8 +175,16 @@
         "appid": 537266474,
         "qua": "V1_MAC_NQ_6.9.63_31245_GW_B"
     },
+    "3.2.15-31363": {
+        "appid": 537266535,
+        "qua": "V1_LNX_NQ_3.2.15_31363_GW_B"
+    },
+    "6.9.65-31363": {
+        "appid": 537266524,
+        "qua": "V1_MAC_NQ_6.9.65_31363_GW_B"
+    },
     "9.9.17-31363": {
         "appid": 537266500,
         "qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
     }
-}
+}

src/core/external/offset.json

@@ -230,5 +230,21 @@
     "9.9.17-31363-x64": {
         "send": "39C1910",
         "recv": "39C5d44"
+    },
+    "3.2.15-31363-x64": {
+        "send": "A554500",
+        "recv": "A557E00"
+    },
+    "3.2.15-31363-arm64": {
+        "send": "71BFD48",
+        "recv": "71C3580"
+    },
+    "6.9.65.31363-x64": {
+        "send": "4720E80",
+        "recv": "47236EC"
+    },
+    "6.9.65.31363-arm64": {
+        "send": "422CEF8",
+        "recv": "422F710"
     }
-}
+}