feat: ffmpeg下载来源更换

launcher/qqnt.json

@@ -1,9 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.18-32869",
-  "verHash": "e735296c",
-  "linuxVersion": "3.2.16-32869",
-  "linuxVerHash": "4c192ba9",
+  "version": "9.9.19-34740",
+  "verHash": "f31348f2",
+  "linuxVersion": "3.2.17-34740",
+  "linuxVerHash": "5aa2d8d6",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -16,27 +16,10 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
-  "appid": {
-    "win32": "537258389",
-    "darwin": "537258412",
-    "linux": "537258424"
-  },
   "main": "./loadNapCat.js",
-  "peerDependenciesMeta": {
-    "*": {
-      "optional": true
-    }
-  },
-  "pnpm": {
-    "patchedDependencies": {
-      "@vue/runtime-dom@3.5.12": "patches/@vue__runtime-dom@3.5.12.patch",
-      "@swc/helpers@0.5.3": "patches/@swc__helpers@0.5.3.patch",
-      "vuex@4.1.0": "patches/vuex@4.1.0.patch"
-    }
-  },
-  "buildVersion": "32869",
+  "buildVersion": "34740",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.7.51",
+  "version": "4.7.57",
   "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/download-ffmpeg.ts

@@ -8,11 +8,12 @@ import { pipeline } from 'stream/promises';
 import { fileURLToPath } from 'url';
 import { LogWrapper } from './log';
 
-const downloadOri = "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2025-04-16-12-54/ffmpeg-n7.1.1-6-g48c0f071d4-win64-lgpl-7.1.zip"
+const downloadOri = "https://github.com/NapNeko/ffmpeg-build/releases/download/v1.0.0/ffmpeg-7.1.1-win64.zip"
 const urls = [
     "https://github.moeyy.xyz/" + downloadOri,
     "https://ghp.ci/" + downloadOri,
     "https://gh.api.99988866.xyz/" + downloadOri,
+    "https://gh.api.99988866.xyz/" + downloadOri,
     downloadOri
 ];
 
@@ -336,9 +337,16 @@ export async function downloadFFmpegIfNotExists(log: LogWrapper) {
     const ffprobe_exist = fs.existsSync(path.join(currentPath, 'ffmpeg', 'ffprobe.exe'));
 
     if (!ffmpeg_exist || !ffprobe_exist) {
-        await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
+        let url = await downloadFFmpeg(path.join(currentPath, 'ffmpeg'), path.join(currentPath, 'cache'), (percentage: number, message: string) => {
             log.log(`[FFmpeg] [Download] ${percentage}% - ${message}`);
         });
+        if (!url) {
+            log.log('[FFmpeg] [Error] 下载FFmpeg失败');
+            return {
+                path: null,
+                reset: false
+            };
+        }
         return {
             path: path.join(currentPath, 'ffmpeg'),
             reset: true

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.7.51';
+export const napCatVersion = '4.7.57';

src/core/external/appid.json

@@ -282,5 +282,9 @@
     "3.2.17-34740": {
         "appid": 537290727,
         "qua": "V1_LNX_NQ_3.2.17_34740_GW_B"
+    },
+    "9.9.19-34958": {
+        "appid": 537290742,
+        "qua": "V1_WIN_NQ_9.9.19_34958_GW_B"
     }
 }

src/core/external/offset.json

@@ -354,5 +354,17 @@
     "9.9.19-34740-x64": {
         "send": "3BDD8D0",
         "recv": "3BE20D0"
+    },
+    "3.2.17-34740-x64": {
+        "send": "ADDF0A0",
+        "recv": "ADE2AC0"
+    },
+    "3.2.17-34740-arm64": {
+        "send": "7753BB8",
+        "recv": "77574E8"
+    },
+    "9.9.19-34958-x64": {
+        "send": "3BDD8D0",
+        "recv": "3BE20D0"
     }
 }

src/core/listeners/NodeIKernelBuddyListener.ts

@@ -3,43 +3,43 @@ import { BuddyCategoryType, FriendRequestNotify } from '@/core/types';
 export type OnBuddyChangeParams = BuddyCategoryType[];
 
 export class NodeIKernelBuddyListener {
-    onBuddyListChangedV2(arg: unknown): any {
+    onBuddyListChangedV2(_arg: unknown): any {
     }
 
-    onAddBuddyNeedVerify(arg: unknown): any {
+    onAddBuddyNeedVerify(_arg: unknown): any {
     }
 
-    onAddMeSettingChanged(arg: unknown): any {
+    onAddMeSettingChanged(_arg: unknown): any {
     }
 
-    onAvatarUrlUpdated(arg: unknown): any {
+    onAvatarUrlUpdated(_arg: unknown): any {
     }
 
-    onBlockChanged(arg: unknown): any {
+    onBlockChanged(_arg: unknown): any {
     }
 
-    onBuddyDetailInfoChange(arg: unknown): any {
+    onBuddyDetailInfoChange(_arg: unknown): any {
     }
 
-    onBuddyInfoChange(arg: unknown): any {
+    onBuddyInfoChange(_arg: unknown): any {
     }
 
-    onBuddyListChange(arg: OnBuddyChangeParams): any {
+    onBuddyListChange(_arg: OnBuddyChangeParams): any {
     }
 
-    onBuddyRemarkUpdated(arg: unknown): any {
+    onBuddyRemarkUpdated(_arg: unknown): any {
     }
 
-    onBuddyReqChange(arg: FriendRequestNotify): any {
+    onBuddyReqChange(_arg: FriendRequestNotify): any {
     }
 
-    onBuddyReqUnreadCntChange(arg: unknown): any {
+    onBuddyReqUnreadCntChange(_arg: unknown): any {
     }
 
-    onCheckBuddySettingResult(arg: unknown): any {
+    onCheckBuddySettingResult(_arg: unknown): any {
     }
 
-    onDelBatchBuddyInfos(arg: unknown): any {
+    onDelBatchBuddyInfos(_arg: unknown): any {
         console.log('onDelBatchBuddyInfos not implemented', ...arguments);
     }
 
@@ -66,12 +66,12 @@ export class NodeIKernelBuddyListener {
     onDoubtBuddyReqUnreadNumChange(_num: number): void | Promise<void> {
     }
 
-    onNickUpdated(arg: unknown): any {
+    onNickUpdated(_arg: unknown): any {
     }
 
-    onSmartInfos(arg: unknown): any {
+    onSmartInfos(_arg: unknown): any {
     }
 
-    onSpacePermissionInfos(arg: unknown): any {
+    onSpacePermissionInfos(_arg: unknown): any {
     }
 }

src/core/services/NodeIKernelGroupService.ts

@@ -249,7 +249,7 @@ export interface NodeIKernelGroupService {
 
     reqToJoinGroup(groupCode: string, arg: unknown): void;
 
-    setGroupShutUp(groupCode: string, shutUp: boolean): void;
+    setGroupShutUp(groupCode: string, shutUp: boolean): Promise<GeneralCallResult>;
 
     getGroupShutUpMemberList(groupCode: string): Promise<GeneralCallResult>;
 

src/core/types/notify.ts

@@ -132,18 +132,26 @@ export enum BuddyReqType {
     KMEINITIATORWAITPEERCONFIRM = 13
 }
 
+// 其中 ? 代表新版本参数
 export interface FriendRequest {
-    isBuddy?: boolean;
     isInitiator?: boolean;
     isDecide: boolean;
     friendUid: string;
     reqType: BuddyReqType,
     reqTime: string;  // 时间戳 秒
+    flag?: number;  // 0
+    preGroupingId?: number;  // 0
+    commFriendNum?: number;  // 共同好友数
     extWords: string;  // 申请人填写的验证消息
     isUnread: boolean;
+    isDoubt?: boolean;  // 是否是可疑的好友请求
+    nameMore?: string;
     friendNick: string;
     sourceId: number;
-    groupCode: string
+    groupCode: string;
+    isBuddy?: boolean;
+    isAgreed?: boolean;
+    relation?: number;
 }
 
 export interface FriendRequestNotify {

src/onebot/action/group/SetGroupWholeBan.ts

@@ -15,7 +15,10 @@ export default class SetGroupWholeBan extends OneBotAction<Payload, null> {
 
     async _handle(payload: Payload): Promise<null> {
         const enable = payload.enable?.toString() !== 'false';
-        await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
+        let res = await this.core.apis.GroupApi.banGroup(payload.group_id.toString(), enable);
+        if (res.result !== 0) {
+            throw new Error(`SetGroupWholeBan failed: ${res.errMsg} ${res.result}`);
+        }
         return null;
     }
 }

src/onebot/index.ts

@@ -334,7 +334,7 @@ export class NapCatOneBot11Adapter {
             for (let i = 0; i < reqs.unreadNums; i++) {
                 const req = reqs.buddyReqs[i];
                 if (!req) continue;
-                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
+                if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM) || !req.isUnread) {
                     continue;
                 }
                 try {
@@ -352,7 +352,6 @@ export class NapCatOneBot11Adapter {
                 }
             }
         };
-
         this.context.session
             .getBuddyService()
             .addKernelBuddyListener(proxiedListenerOf(buddyListener, this.context.logger));

src/shell/pipe.ts

@@ -12,7 +12,6 @@ import { Writable } from 'stream';
 export function connectToNamedPipe(logger: LogWrapper, timeoutMs: number = 5000): Promise<{ disconnect: () => void }> {
     return new Promise((resolve, reject) => {
         if (process.platform !== 'win32') {
-            logger.log('只有Windows平台支持命名管道');
             // 非Windows平台不reject，而是返回一个空的disconnect函数
             return resolve({ disconnect: () => { } });
         }