Add napiloader scripts and binaries, update Vite config

Introduces napiloader batch scripts and binaries (napiloader.dll, napimain.exe) for Windows integration. Updates vite.config.ts to include napiloader files in the Framework build output and refactors plugin target lists for improved distribution packaging.

.gitignore

@@ -15,3 +15,5 @@ devconfig/*
 checkVersion.sh
 bun.lockb
 tests/run/
+guild1.db-wal
+guild1.db-shm

manifest.json

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

napiloader/napiLoader-debug.bat

@@ -0,0 +1,30 @@
+@echo off
+chcp 65001
+set NAPCAT_INJECT_PATH=%cd%\napiloader.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\napimain.exe
+set NAPCAT_MAIN_PATH=%cd%\nativeLoader.cjs
+set NAPCAT_DEBUG_CONSOLE=1
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+     set "RetString=%%~b"
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+set "QQPath=%pathWithoutUninstall%QQ.exe"
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" "%NAPCAT_MAIN_PATH%"
+
+pause

napiloader/napiLoader.bat

@@ -0,0 +1,27 @@
+@echo off
+chcp 65001
+set NAPCAT_INJECT_PATH=%cd%\napiloader.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\napimain.exe
+set NAPCAT_MAIN_PATH=%cd%\nativeLoader.cjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+     set "RetString=%%~b"
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+set "QQPath=%pathWithoutUninstall%QQ.exe"
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+
+start "" "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" "%NAPCAT_MAIN_PATH%"

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.9.27",
+  "version": "4.9.32",
   "scripts": {
     "build:universal": "npm run build:webui && npm run dev:universal || exit 1",
     "build:framework": "npm run build:webui && npm run dev:framework || exit 1",

src/common/ffmpeg-addon-adapter.ts

@@ -68,11 +68,13 @@ export class FFmpegAddonAdapter implements IFFmpegAdapter {
     const addon = this.ensureAddon();
     const info = await addon.getVideoInfo(videoPath, 'bmp24');
 
+    let format = info.format.includes(',') ? info.format.split(',')[0] ?? info.format : info.format;
+    console.log('[FFmpegAddonAdapter] Detected format:', format);
     return {
       width: info.width,
       height: info.height,
       duration: info.duration,
-      format: info.format,
+      format: format,
       thumbnail: info.image,
     };
   }
@@ -88,7 +90,7 @@ export class FFmpegAddonAdapter implements IFFmpegAdapter {
   /**
      * 转换为 PCM
      */
-  async convertToPCM (filePath: string, pcmPath: string): Promise<{ result: boolean, sampleRate: number }> {
+  async convertToPCM (filePath: string, pcmPath: string): Promise<{ result: boolean, sampleRate: number; }> {
     const addon = this.ensureAddon();
     const result = await addon.decodeAudioToPCM(filePath, pcmPath, 24000);
 
@@ -100,13 +102,8 @@ export class FFmpegAddonAdapter implements IFFmpegAdapter {
      */
   async convertFile (inputFile: string, outputFile: string, format: string): Promise<void> {
     const addon = this.ensureAddon();
-
-    if (format === 'silk' || format === 'ntsilk') {
-      // 使用 Addon 的 NTSILK 转换
-      await addon.convertToNTSilkTct(inputFile, outputFile);
-    } else {
-      throw new Error(`Format '${format}' is not supported by FFmpeg Addon`);
-    }
+    console.log('[FFmpegAddonAdapter] Converting file:', inputFile, 'to', outputFile, 'as', format);
+    await addon.decodeAudioToFmt(inputFile, outputFile, format);
   }
 
   /**

src/common/ffmpeg-addon.ts

@@ -49,6 +49,7 @@ export interface AudioPCMResult {
  * FFmpeg interface providing all audio/video processing methods
  */
 export interface FFmpeg {
+  convertFile (inputFile: string, outputFile: string, format: string): Promise<{ success: boolean; }>;
   /**
      * Get video information including resolution, duration, format, codec and first frame thumbnail
      */
@@ -67,5 +68,6 @@ export interface FFmpeg {
   /**
      * Decode audio file to raw PCM data
      */
-  decodeAudioToPCM(filePath: string, pcmPath: string, sampleRate?: number): Promise<{ result: boolean, sampleRate: number }>;
+  decodeAudioToPCM (filePath: string, pcmPath: string, sampleRate?: number): Promise<{ result: boolean, sampleRate: number; }>;
+  decodeAudioToFmt (filePath: string, pcmPath: string, format: string): Promise<{ channels: number; sampleRate: number; format: string; }>;
 }

src/common/ffmpeg.ts

@@ -48,6 +48,14 @@ export class FFmpegService {
     this.initialized = true;
   }
 
+  public static getAdapterName (): string {
+    if (!this.adapter) {
+      throw new Error('FFmpeg service not initialized. Please call FFmpegService.init() first.');
+    }
+    return this.adapter.name;
+
+  }
+
   /**
      * 获取 FFmpeg 适配器
      */

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.9.27';
+export const napCatVersion = '4.9.32';

src/core/apis/friend.ts

@@ -17,8 +17,14 @@ export class NTQQFriendApi {
 
   async getBuddyV2SimpleInfoMap () {
     const buddyService = this.context.session.getBuddyService();
+    let uids: string[] = [];
+    if (this.core.context.basicInfoWrapper.requireMinNTQQBuild('41679')) {
+      const buddyListV2NT = await buddyService.getBuddyListV2('0', true, BuddyListReqType.KNOMAL);
+      uids = buddyListV2NT.data.flatMap(item => item.buddyUids);
+    } else {
       const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
-    const uids = buddyListV2.data.flatMap(item => item.buddyUids);
+      uids = buddyListV2.data.flatMap(item => item.buddyUids);
+    }
     return await this.core.eventWrapper.callNoListenerEvent(
       'NodeIKernelProfileService/getCoreAndBaseInfo',
       'nodeStore',
@@ -47,10 +53,15 @@ export class NTQQFriendApi {
 
   async getBuddyV2ExWithCate () {
     const buddyService = this.context.session.getBuddyService();
-    const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
-    const uids = buddyListV2.flatMap(item => {
-      return item.buddyUids;
-    });
+    let uids: string[] = [];
+    let buddyListV2: Awaited<ReturnType<typeof buddyService.getBuddyListV2>>['data'];
+    if (this.core.context.basicInfoWrapper.requireMinNTQQBuild('41679')) {
+      buddyListV2 = (await buddyService.getBuddyListV2('0', true, BuddyListReqType.KNOMAL)).data;
+      uids = buddyListV2.flatMap(item => item.buddyUids);
+    } else {
+      buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
+      uids = buddyListV2.flatMap(item => item.buddyUids);
+    }
     const data = await this.core.eventWrapper.callNoListenerEvent(
       'NodeIKernelProfileService/getCoreAndBaseInfo',
       'nodeStore',

src/core/services/NodeIKernelBuddyService.ts

@@ -10,9 +10,20 @@ export interface NodeIKernelBuddyService {
       categroyName: string,
       categroyMbCount: number,
       onlineCount: number,
-      buddyUids: Array<string>
-    }>
+      buddyUids: Array<string>;
     }>;
+  }>;
+  getBuddyListV2 (callFrom: string, isPullRefresh: boolean, reqType: BuddyListReqType): Promise<GeneralCallResult & {
+    data: Array<{
+      categoryId: number,
+      categorySortId: number,
+      categroyName: string,
+      categroyMbCount: number,
+      onlineCount: number,
+      buddyUids: Array<string>;
+    }>;
+  }>;
+
 
   getBuddyListFromCache (reqType: BuddyListReqType): Promise<Array<
     {
@@ -21,7 +32,7 @@ export interface NodeIKernelBuddyService {
       categroyName: string, // 分类名
       categroyMbCount: number, // 不懂
       onlineCount: number, // 在线数目
-          buddyUids: Array<string>// Uids
+      buddyUids: Array<string>;// Uids
     }>>;
 
   addKernelBuddyListener (listener: NodeIKernelBuddyListener): number;
@@ -36,7 +47,7 @@ export interface NodeIKernelBuddyService {
 
   getBuddyRemark (uid: number): string;
 
-  setBuddyRemark(param: { uid: string, remark: string, signInfo?: unknown }): void;
+  setBuddyRemark (param: { uid: string, remark: string, signInfo?: unknown; }): void;
 
   getAvatarUrl (uid: number): string;
 
@@ -118,7 +129,7 @@ export interface NodeIKernelBuddyService {
 
   reportDoubtBuddyReqUnread (): void;
 
-  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>;
+  getBuddyRecommendContactArkJson (uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string; }>;
 
   isNull (): boolean;
 }

src/onebot/action/file/GetRecord.ts

@@ -7,7 +7,7 @@ import { FFmpegService } from '@/common/ffmpeg';
 const out_format = ['mp3', 'amr', 'wma', 'm4a', 'spx', 'ogg', 'wav', 'flac'];
 
 type Payload = {
-  out_format: string
+  out_format: string;
 } & GetFilePayload;
 
 export default class GetRecord extends GetFileBase {
@@ -28,9 +28,13 @@ export default class GetRecord extends GetFileBase {
         try {
           await fs.access(outputFile);
         } catch {
+          if (FFmpegService.getAdapterName() === 'FFmpegAddon') {
+            await FFmpegService.convertFile(inputFile, outputFile, payload.out_format);
+          } else {
             await this.decodeFile(inputFile, pcmFile);
             await FFmpegService.convertFile(pcmFile, outputFile, payload.out_format);
           }
+        }
         const base64Data = await fs.readFile(outputFile, { encoding: 'base64' });
         res.file = outputFile;
         res.url = outputFile;

src/onebot/action/go-cqhttp/SendGroupNotice.ts

@@ -37,7 +37,7 @@ export class SendGroupNotice extends OneBotAction<Payload, null> {
       await checkFileExist(path, 5000);
       const ImageUploadResult = await this.core.apis.GroupApi.uploadGroupBulletinPic(payload.group_id.toString(), path);
       if (ImageUploadResult.errCode !== 0) {
-        throw new Error(`群公告${payload.image}设置失败,图片上传失败`);
+        throw new Error(`群公告${payload.image}设置失败,图片上传失败 ， 错误信息:${ImageUploadResult.errMsg}`);
       }
 
       unlink(path).catch(() => { });

src/onebot/action/stream/DownloadFileRecordStream.ts

@@ -47,8 +47,12 @@ export class DownloadFileRecordStream extends BaseDownloadStream<Payload, Downlo
           streamPath = outputFile;
         } catch {
           // 尝试解码 silk 到 pcm 再用 ffmpeg 转换
+          if (FFmpegService.getAdapterName() === 'FFmpegAddon') {
+            await FFmpegService.convertFile(downloadPath, outputFile, payload.out_format);
+          } else {
             await this.decodeFile(downloadPath, pcmFile);
             await FFmpegService.convertFile(pcmFile, outputFile, payload.out_format);
+          }
           streamPath = outputFile;
         }
       }

vite.config.ts

@@ -56,6 +56,7 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [
   // }),
   cp({
     targets: [
+      { src: './napiloader/', dest: 'dist', flatten: true },
       { src: './src/native/', dest: 'dist/native', flatten: false },
       { src: './manifest.json', dest: 'dist' },
       { src: './src/core/external/napcat.json', dest: 'dist/config/' },