feat: 32793

chore(deps-dev): bump globals from 15.15.0 to 16.0.0

.vscode/launch.json

@@ -0,0 +1,115 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:shell",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:shell"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "build:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "build:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:universal",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:universal"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:framework",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:framework"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:webui",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:webui"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "lint",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "lint"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "depend"
+            ]
+        },
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "dev:depend",
+            "runtimeExecutable": "npm",
+            "runtimeArgs": [
+                "run",
+                "dev:depend"
+            ]
+        }
+    ]
+}

launcher/qqnt.json

@@ -1,10 +1,9 @@
 {
   "name": "qq-chat",
-  "version": "9.9.17-30899",
-  "verHash": "ececf273",
-  "linuxVersion": "3.2.15-30899",
-  "linuxVerHash": "63c751e8",
-  "type": "module",
+  "version": "9.9.18-32793",
+  "verHash": "d43f097e",
+  "linuxVersion": "3.2.16-32793",
+  "linuxVerHash": "ee4bd910",
   "private": true,
   "description": "QQ",
   "productName": "QQ",
@@ -17,10 +16,27 @@
   "bin": {
     "qd": "externals/devtools/cli/index.js"
   },
+  "appid": {
+    "win32": "537258389",
+    "darwin": "537258412",
+    "linux": "537258424"
+  },
   "main": "./loadNapCat.js",
-  "buildVersion": "30899",
+  "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": "32793",
   "isPureShell": true,
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.5.22",
+  "version": "4.6.4",
   "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",
@@ -50,7 +50,7 @@
     "express-rate-limit": "^7.5.0",
     "fast-xml-parser": "^4.3.6",
     "file-type": "^20.0.0",
-    "globals": "^15.12.0",
+    "globals": "^16.0.0",
     "image-size": "^1.1.1",
     "json5": "^2.2.3",
     "multer": "^1.4.5-lts.1",
@@ -59,13 +59,13 @@
     "vite": "^6.0.1",
     "vite-plugin-cp": "^4.0.8",
     "vite-tsconfig-paths": "^5.1.0",
-    "winston": "^3.17.0"
+    "napcat.protobuf": "^1.1.3",
+    "winston": "^3.17.0",
+    "compressing": "^1.10.1"
   },
   "dependencies": {
     "@ffmpeg.wasm/core-mt": "^0.13.2",
-    "compressing": "^1.10.1",
     "express": "^5.0.0",
-    "piscina": "^4.7.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }

src/common/audio-worker.ts

@@ -1,9 +1,20 @@
 import { encode } from 'silk-wasm';
+import { parentPort } from 'worker_threads';
 
 export interface EncodeArgs {
     input: ArrayBufferView | ArrayBuffer
     sampleRate: number
 }
-export default async ({ input, sampleRate }: EncodeArgs) => {
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
+recvTask<EncodeArgs>(async ({ input, sampleRate }) => {
     return await encode(input, sampleRate);
-};
+});

src/common/audio.ts

@@ -1,4 +1,3 @@
-import Piscina from 'piscina';
 import fsPromise from 'fs/promises';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
@@ -6,16 +5,16 @@ import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-w
 import { LogWrapper } from '@/common/log';
 import { EncodeArgs } from '@/common/audio-worker';
 import { FFmpegService } from '@/common/ffmpeg';
+import { runTask } from './worker';
+import { fileURLToPath } from 'node:url';
 
 const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
 
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+function getWorkerPath() {
+    //return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), 'audio-worker.mjs');
 }
 
-const piscina = new Piscina<EncodeArgs, EncodeResult>({
-    filename: await getWorkerPath(),
-});
 
 async function guessDuration(pttPath: string, logger: LogWrapper) {
     const pttFileInfo = await fsPromise.stat(pttPath);
@@ -46,7 +45,7 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
             const { input, sampleRate } = isWav(file)
                 ? await handleWavFile(file, filePath, pcmPath)
                 : { input: await FFmpegService.convert(filePath, pcmPath), sampleRate: 24000 };
-            const silk = await piscina.run({ input: input, sampleRate: sampleRate });
+            const silk = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { input: input, sampleRate: sampleRate });
             fsPromise.unlink(pcmPath).catch((e) => logger.logError('删除临时文件失败', pcmPath, e));
             await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
             logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);

src/common/ffmpeg-worker.ts

@@ -5,6 +5,17 @@ import { readFileSync, statSync, writeFileSync } from 'fs';
 import type { VideoInfo } from './video';
 import { fileTypeFromFile } from 'file-type';
 import imageSize from 'image-size';
+import { parentPort } from 'worker_threads';
+export function recvTask<T>(cb: (taskData: T) => Promise<unknown>) {
+    parentPort?.on('message', async (taskData: T) => {
+        try {
+            let ret = await cb(taskData);
+            parentPort?.postMessage(ret);
+        } catch (error: unknown) {
+            parentPort?.postMessage({ error: (error as Error).message });
+        }
+    });
+}
 class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
         const ffmpegInstance = await FFmpeg.create({ core: '@ffmpeg.wasm/core-mt' });
@@ -137,15 +148,18 @@ interface FFmpegTask {
 }
 export default async function handleFFmpegTask({ method, args }: FFmpegTask): Promise<any> {
     switch (method) {
-    case 'extractThumbnail':
-        return await FFmpegService.extractThumbnail(...args as [string, string]);
-    case 'convertFile':
-        return await FFmpegService.convertFile(...args as [string, string, string]);
-    case 'convert':
-        return await FFmpegService.convert(...args as [string, string]);
-    case 'getVideoInfo':
-        return await FFmpegService.getVideoInfo(...args as [string, string]);
-    default:
-        throw new Error(`Unknown method: ${method}`);
+        case 'extractThumbnail':
+            return await FFmpegService.extractThumbnail(...args as [string, string]);
+        case 'convertFile':
+            return await FFmpegService.convertFile(...args as [string, string, string]);
+        case 'convert':
+            return await FFmpegService.convert(...args as [string, string]);
+        case 'getVideoInfo':
+            return await FFmpegService.getVideoInfo(...args as [string, string]);
+        default:
+            throw new Error(`Unknown method: ${method}`);
     }
-}
+}
+recvTask<FFmpegTask>(async ({ method, args }: FFmpegTask) => {
+    return await handleFFmpegTask({ method, args });
+});

src/common/ffmpeg.ts

@@ -1,6 +1,8 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import Piscina from 'piscina';
 import { VideoInfo } from './video';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { runTask } from './worker';
 
 type EncodeArgs = {
     method: 'extractThumbnail' | 'convertFile' | 'convert' | 'getVideoInfo';
@@ -9,42 +11,26 @@ type EncodeArgs = {
 
 type EncodeResult = any;
 
-async function getWorkerPath() {
-    return new URL(/* @vite-ignore */ './ffmpeg-worker.mjs', import.meta.url).href;
+function getWorkerPath() {
+    return path.join(path.dirname(fileURLToPath(import.meta.url)), './ffmpeg-worker.mjs');
 }
 
 export class FFmpegService {
     public static async extractThumbnail(videoPath: string, thumbnailPath: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'extractThumbnail', args: [videoPath, thumbnailPath] });
     }
 
     public static async convertFile(inputFile: string, outputFile: string, format: string): Promise<void> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        await piscina.run({ method: 'convertFile', args: [inputFile, outputFile, format] });
-        await piscina.destroy();
+        await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convertFile', args: [inputFile, outputFile, format] });
     }
 
     public static async convert(filePath: string, pcmPath: string): Promise<Buffer> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'convert', args: [filePath, pcmPath] });
-        await piscina.destroy();
+        const result = await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'convert', args: [filePath, pcmPath] });
         return result;
     }
 
     public static async getVideoInfo(videoPath: string, thumbnailPath: string): Promise<VideoInfo> {
-        const piscina = new Piscina<EncodeArgs, EncodeResult>({
-            filename: await getWorkerPath(),
-        });
-        const result = await piscina.run({ method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
-        await piscina.destroy();
+        const result = await await runTask<EncodeArgs, EncodeResult>(getWorkerPath(), { method: 'getVideoInfo', args: [videoPath, thumbnailPath] });
         return result;
     }
 }

src/common/log.ts

@@ -232,7 +232,7 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
             tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
         }
         if (msg.senderUin !== '0') {
-            tokens.push(`[${msg.sendMemberName ?? msg.sendRemarkName ?? msg.sendNickName}(${msg.senderUin})]`);
+            tokens.push(`[${msg.sendMemberName || msg.sendRemarkName || msg.sendNickName}(${msg.senderUin})]`);
         }
     } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
         tokens.push('移动设备');

src/common/store.ts

@@ -163,7 +163,7 @@ class Store {
         const current = this.get<StoreValueType>(key);
 
         if (current === null) {
-            this.set(key, 1);
+            this.set(key, 1, 60);
             return 1;
         }
 
@@ -180,7 +180,7 @@ class Store {
         }
 
         const newValue = numericValue + 1;
-        this.set(key, newValue);
+        this.set(key, newValue, 60);
         return newValue;
     }
 }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.5.22';
+export const napCatVersion = '4.6.4';

src/common/worker.ts

@@ -0,0 +1,29 @@
+import { Worker } from 'worker_threads';
+
+export async function runTask<T, R>(workerScript: string, taskData: T): Promise<R> {
+    let worker = new Worker(workerScript);
+    try {
+        return await new Promise<R>((resolve, reject) => {
+            worker.on('message', (result: R) => {
+                resolve(result);
+            });
+
+            worker.on('error', (error) => {
+                reject(new Error(`Worker error: ${error.message}`));
+            });
+
+            worker.on('exit', (code) => {
+                if (code !== 0) {
+                    reject(new Error(`Worker stopped with exit code ${code}`));
+                }
+            });
+            worker.postMessage(taskData);
+        });
+    } catch (error: unknown) {
+        throw new Error(`Failed to run task: ${(error as Error).message}`);
+    } finally {
+        // Ensure the worker is terminated after the promise is settled
+        worker.terminate();
+    }
+}
+

src/core/apis/file.ts

@@ -41,7 +41,8 @@ export class NTQQFileApi {
         this.context = context;
         this.core = core;
         this.rkeyManager = new RkeyManager([
-            'https://rkey.napneko.icu/rkeys'
+            'https://ss.xingzhige.com/music_card/rkey', // 国内
+            'https://secret-service.bietiaop.com/rkeys',//国内
         ],
         this.context.logger
         );

src/core/apis/group.ts

@@ -165,7 +165,13 @@ export class NTQQGroupApi {
 
         return this.groupMemberCache.get(groupCode);
     }
-
+    async refreshGroupMemberCachePartial(groupCode: string, uid: string) {
+        const member = await this.getGroupMemberEx(groupCode, uid, true);
+        if (member) {
+            this.groupMemberCache.get(groupCode)?.set(uid, member);
+        }
+        return member;
+    }
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
         const groupCodeStr = groupCode.toString();
         const memberUinOrUidStr = memberUinOrUid.toString();

src/core/apis/msg.ts

@@ -136,6 +136,20 @@ export class NTQQMsgApi {
         });
     }
 
+    async queryFirstMsgBySender(peer: Peer, SendersUid: string[]) {
+        console.log(peer, SendersUid);
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', '0', {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: true,
+            isIncludeCurrent: true,
+            pageLimit: 20000,
+        });
+    }
+
     async setMsgRead(peer: Peer) {
         return this.context.session.getMsgService().setMsgRead(peer);
     }

src/core/external/appid.json

@@ -186,5 +186,29 @@
     "9.9.17-31363": {
         "appid": 537266500,
         "qua": "V1_WIN_NQ_9.9.17_31363_GW_B"
+    },
+    "3.2.16-32690": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32690_GW_B"
+    },
+    "9.9.18-32690": {
+        "appid": 537271194,
+        "qua": "V1_WIN_NQ_9.9.18_32690_GW_B"
+    },
+    "6.9.66-32690": {
+        "appid": 537271218,
+        "qua": "V1_MAC_NQ_6.9.66_32690_GW_B"
+    },
+    "3.2.16-32721": {
+        "appid": 537271229,
+        "qua": "V1_LNX_NQ_3.2.16_32721_GW_B"
+    },
+    "9.9.18-32793": {
+        "appid": 537271244,
+        "qua": "V1_WIN_NQ_9.9.18_32793_GW_B"
+    },
+    "3.2.16-32793": {
+        "appid": 537271279,
+        "qua": "V1_LNX_NQ_3.2.16_32793_GW_B"
     }
-}
+}

src/core/external/napcat.json

@@ -4,5 +4,6 @@
     "fileLogLevel": "debug",
     "consoleLogLevel": "info",
     "packetBackend": "auto",
-    "packetServer": ""
-}
+    "packetServer": "",
+    "o3HookMode": 1
+  }

src/core/external/offset.json

@@ -246,5 +246,37 @@
     "6.9.65-31363-arm64": {
         "send": "422CEF8",
         "recv": "422F710"
+    },
+    "9.9.18-32690-x64": {
+        "send": "39F9630",
+        "recv": "39FDE30"
+    },
+    "3.2.16-32690-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32690-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "3.2.16-32721-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32721-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
+    },
+    "9.9.18-32793-x64": {
+        "send": "3D3051B",
+        "recv": "3D3F48C"
+    },
+    "3.2.16-32793-x64": {
+        "send": "A5E24C0",
+        "recv": "A5E5EE0"
+    },
+    "3.2.16-32793-arm64": {
+        "send": "7226630",
+        "recv": "7229F60"
     }
-}
+}

src/core/helper/config.ts

@@ -10,6 +10,7 @@ export const NapcatConfigSchema = Type.Object({
     consoleLogLevel: Type.String({ default: 'info' }),
     packetBackend: Type.String({ default: 'auto' }),
     packetServer: Type.String({ default: '' }),
+    o3HookMode: Type.Number({ default: 0 }),
 });
 
 export type NapcatConfig = Static<typeof NapcatConfigSchema>;

src/core/listeners/NodeIKernelSearchListener.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core';
+import { ChatType, RawMessage } from '@/core';
 export interface SearchGroupInfo {
     groupCode: string;
     ownerUid: string;
@@ -56,7 +56,7 @@ export interface GroupSearchResult {
     nextPos: number;
 }
 export interface NodeIKernelSearchListener {
-    
+
     onSearchGroupResult(params: GroupSearchResult): any;
 
     onSearchFileKeywordsResult(params: {
@@ -94,4 +94,27 @@ export interface NodeIKernelSearchListener {
             }[]
         }[]
     }): any;
+
+    onSearchMsgKeywordsResult(params: {
+        searchId: string,
+        hasMore: boolean,
+        resultItems: Array<{
+            msgId: string,
+            msgSeq: string,
+            msgTime: string,
+            senderUid: string,
+            senderUin: string,
+            senderNick: string,
+            senderNickHits: unknown[],
+            senderRemark: string,
+            senderRemarkHits: unknown[],
+            senderCard: string,
+            senderCardHits: unknown[],
+            fieldType: number,
+            fieldText: string,
+            msgRecord: RawMessage;
+            hitsInfo: Array<unknown>,
+            msgAbstract: unknown,
+        }>
+    }): void | Promise<void>;
 }

src/core/packet/client/nativeClient.ts

@@ -11,7 +11,7 @@ import { PacketLogger } from '@/core/packet/context/loggerContext';
 
 // 0 send 1 recv
 export interface NativePacketExportType {
-    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void) => boolean;
+    InitHook?: (send: string, recv: string, callback: (type: number, uin: string, cmd: string, seq: number, hex_data: string) => void, o3_hook: boolean) => boolean;
     SendPacket?: (cmd: string, data: string, trace_id: string) => void;
 }
 
@@ -42,6 +42,7 @@ export class NativePacketClient extends IPacketClient {
         const platform = process.platform + '.' + process.arch;
         const moehoo_path = path.join(dirname(fileURLToPath(import.meta.url)), './moehoo/MoeHoo.' + platform + '.node');
         process.dlopen(this.MoeHooExport, moehoo_path, constants.dlopen.RTLD_LAZY);
+        
         this.MoeHooExport.exports.InitHook?.(send, recv, (type: number, uin: string, cmd: string, seq: number, hex_data: string) => {
             const trace_id = createHash('md5').update(Buffer.from(hex_data, 'hex')).digest('hex');
             if (type === 0 && this.cb.get(trace_id + 'recv')) {
@@ -55,7 +56,7 @@ export class NativePacketClient extends IPacketClient {
                 // console.log('callback:', callback, trace_id);
                 callback?.({ seq, cmd, hex_data });
             }
-        });
+        }, this.napcore.config.o3HookMode == 1);
         this.available = true;
     }
 

src/core/packet/highway/highwayContext.ts

@@ -144,7 +144,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupImageReq get upload ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -181,7 +181,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CImageReq get upload ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -219,7 +219,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupVideoReq get upload video ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
@@ -244,16 +244,16 @@ export class PacketHighwayContext {
             this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
         }
         const subFile = preRespData.upload.subFileInfos[0];
-        if (subFile.uKey && subFile.uKey != '') {
-            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+        if (subFile!.uKey && subFile!.uKey != '') {
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
-                uKey: subFile.uKey,
+                uKey: subFile!.uKey,
                 network: {
-                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
                 },
                 msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
                 blockSize: BlockSize,
@@ -269,7 +269,7 @@ export class PacketHighwayContext {
                 extend
             );
         } else {
-            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+            this.logger.debug(`[Highway] uploadGroupVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
         }
         video.msgInfo = preRespData.upload.msgInfo;
     }
@@ -284,7 +284,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CVideoReq get upload video ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
@@ -309,16 +309,16 @@ export class PacketHighwayContext {
             this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid ukey ${ukey}, don't need upload!`);
         }
         const subFile = preRespData.upload.subFileInfos[0];
-        if (subFile.uKey && subFile.uKey != '') {
-            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile.uKey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[1].index;
+        if (subFile!.uKey && subFile!.uKey != '') {
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload video thumb ukey: ${subFile!.uKey}, need upload!`);
+            const index = preRespData.upload.msgInfo.msgInfoBody[1]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
                 fileUuid: index.fileUuid,
-                uKey: subFile.uKey,
+                uKey: subFile!.uKey,
                 network: {
-                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile.ipv4S)
+                    ipv4S: oidbIpv4s2HighwayIpv4s(subFile!.ipv4S)
                 },
                 msgInfoBody: preRespData.upload.msgInfo.msgInfoBody,
                 blockSize: BlockSize,
@@ -334,7 +334,7 @@ export class PacketHighwayContext {
                 extend
             );
         } else {
-            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile.uKey}, don't need upload!`);
+            this.logger.debug(`[Highway] uploadC2CVideoReq get upload invalid thumb ukey ${subFile!.uKey}, don't need upload!`);
         }
         video.msgInfo = preRespData.upload.msgInfo;
     }
@@ -347,7 +347,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadGroupPttReq get upload ptt ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({
@@ -383,7 +383,7 @@ export class PacketHighwayContext {
         const ukey = preRespData.upload.uKey;
         if (ukey && ukey != '') {
             this.logger.debug(`[Highway] uploadC2CPttReq get upload ptt ukey: ${ukey}, need upload!`);
-            const index = preRespData.upload.msgInfo.msgInfoBody[0].index;
+            const index = preRespData.upload.msgInfo.msgInfoBody[0]!.index;
             const md5 = Buffer.from(index.info.fileHash, 'hex');
             const sha1 = Buffer.from(index.info.fileSha1, 'hex');
             const extend = new NapProtoMsg(proto.NTV2RichMediaHighwayExt).encode({

src/core/services/NodeIKernelSearchService.ts

@@ -1,4 +1,4 @@
-import { ChatType } from '@/core/types';
+import { ChatType, Peer } from '@/core/types';
 import { GeneralCallResult } from './common';
 
 export interface NodeIKernelSearchService {
@@ -54,7 +54,7 @@ export interface NodeIKernelSearchService {
 
     cancelSearchChatMsgs(...args: unknown[]): unknown;// needs 3 arguments
 
-    searchMsgWithKeywords(...args: unknown[]): unknown;// needs 2 arguments
+    searchMsgWithKeywords(keyWords: string[], param: Peer & { searchFields: number, pageLimit: number }): Promise<GeneralCallResult>;
 
     searchMoreMsgWithKeywords(...args: unknown[]): unknown;// needs 1 arguments
 

src/onebot/action/extends/GetUnidirectionalFriendList.ts

@@ -0,0 +1,56 @@
+import { PacketHexStr } from '@/core/packet/transformer/base';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
+import { ActionName } from '@/onebot/action/router';
+import { ProtoBuf, ProtoBufBase, PBUint32, PBString } from 'napcat.protobuf';
+
+interface Friend {
+    uin: number;
+    uid: string;
+    nick_name: string;
+    age: number;
+    source: string;
+}
+
+interface Block {
+    str_uid: string;
+    bytes_source: string;
+    uint32_sex: number;
+    uint32_age: number;
+    bytes_nick: string;
+    uint64_uin: number;
+}
+
+export class GetUnidirectionalFriendList extends OneBotAction<void, Friend[]> {
+    override actionName = ActionName.GetUnidirectionalFriendList;
+
+    async pack_data(data: string): Promise<Uint8Array> {
+        return ProtoBuf(class extends ProtoBufBase {
+            type = PBUint32(2, false, 0);
+            data = PBString(3, false, data);
+        }).encode();
+    }
+
+    async _handle(): Promise<Friend[]> {
+        const self_id = this.core.selfInfo.uin;
+        const req_json = {
+            uint64_uin: self_id,
+            uint64_top: 0,
+            uint32_req_num: 99,
+            bytes_cookies: ""
+        };
+        const packed_data = await this.pack_data(JSON.stringify(req_json));
+        const data = Buffer.from(packed_data).toString('hex');
+        const rsq = { cmd: 'MQUpdateSvc_com_qq_ti.web.OidbSvc.0xe17_0', data: data as PacketHexStr };
+        const rsp_data = await this.core.apis.PacketApi.pkt.operation.sendPacket(rsq, true);
+        const block_json = ProtoBuf(class extends ProtoBufBase { data = PBString(4); }).decode(rsp_data);
+        const block_list: Block[] = JSON.parse(block_json.data).rpt_block_list;
+
+        return block_list.map((block) => ({
+            uin: block.uint64_uin,
+            uid: block.str_uid,
+            nick_name: Buffer.from(block.bytes_nick, 'base64').toString(),
+            age: block.uint32_age,
+            source: Buffer.from(block.bytes_source, 'base64').toString()
+        }));
+    }
+}

src/onebot/action/extends/SetSpecialTittle.ts

@@ -5,7 +5,7 @@ import { Static, Type } from '@sinclair/typebox';
 const SchemaData = Type.Object({
     group_id: Type.Union([Type.Number(), Type.String()]),
     user_id: Type.Union([Type.Number(), Type.String()]),
-    special_title: Type.String(),
+    special_title: Type.String({ default: '' }),
 });
 
 type Payload = Static<typeof SchemaData>;
@@ -16,7 +16,7 @@ export class SetSpecialTittle extends GetPacketStatusDepends<Payload, void> {
 
     async _handle(payload: Payload) {
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
-        if(!uid) throw new Error('User not found');
+        if (!uid) throw new Error('User not found');
         await this.core.apis.PacketApi.pkt.operation.SetGroupSpecialTitle(+payload.group_id, uid, payload.special_title);
     }
 }

src/onebot/action/group/SetGroupBan.ts

@@ -16,6 +16,8 @@ export default class SetGroupBan extends OneBotAction<Payload, null> {
     async _handle(payload: Payload): Promise<null> {
         const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw new Error('uid error');
+        let member_role = (await this.core.apis.GroupApi.getGroupMemberEx(payload.group_id.toString(), uid, true))?.role;
+        if (member_role === 4) throw new Error('cannot ban owner');
         // 例如无管理员权限时 result为 120101005 errMsg为 'ERR_NOT_GROUP_ADMIN'
         let ret = await this.core.apis.GroupApi.banMember(payload.group_id.toString(),
             [{ uid: uid, timeStamp: +payload.duration }]);

src/onebot/action/index.ts

@@ -107,6 +107,7 @@ import { SetDiyOnlineStatus } from './extends/SetDiyOnlineStatus';
 import { BotExit } from './extends/BotExit';
 import { ClickInlineKeyboardButton } from './extends/ClickInlineKeyboardButton';
 import { GetPrivateFileUrl } from './file/GetPrivateFileUrl';
+import { GetUnidirectionalFriendList } from './extends/GetUnidirectionalFriendList';
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore) {
 
@@ -226,7 +227,8 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GetGroupSystemMsg(obContext, core),
         new BotExit(obContext, core),
         new ClickInlineKeyboardButton(obContext, core),
-        new GetPrivateFileUrl(obContext,core)
+        new GetPrivateFileUrl(obContext,core),
+        new GetUnidirectionalFriendList(obContext,core),
     ];
 
     type HandlerUnion = typeof actionHandlers[number];

src/onebot/api/group.ts

@@ -49,6 +49,7 @@ export class OneBotGroupApi {
                 duration = -1;
             }
         }
+        await this.core.apis.GroupApi.refreshGroupMemberCachePartial(GroupCode, memberUid);
         const adminUin = (await this.core.apis.GroupApi.getGroupMember(GroupCode, adminUid))?.uin;
         if (memberUin && adminUin) {
             return new OB11GroupBanEvent(
@@ -113,12 +114,16 @@ export class OneBotGroupApi {
     async parseCardChangedEvent(msg: RawMessage) {
         if (msg.senderUin && msg.senderUin !== '0') {
             const member = await this.core.apis.GroupApi.getGroupMember(msg.peerUid, msg.senderUin);
+            await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
             if (member && member.cardName !== msg.sendMemberName) {
                 const newCardName = msg.sendMemberName ?? '';
                 const event = new OB11GroupCardEvent(this.core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
                 member.cardName = newCardName;
                 return event;
             }
+            if (member && member.nick !== msg.sendNickName) {
+                await this.core.apis.GroupApi.refreshGroupMemberCachePartial(msg.peerUid, msg.senderUid);
+            }
         }
         return undefined;
     }

src/onebot/api/msg.ts

@@ -355,6 +355,7 @@ export class OneBotMsgApi {
                 data: {
                     file: fileCode,
                     file_size: element.fileSize,
+                    path: element.filePath,
                 },
             };
         },
@@ -654,6 +655,19 @@ export class OneBotMsgApi {
         [OB11MessageDataType.node]: async () => undefined,
 
         [OB11MessageDataType.forward]: async ({ data }, context) => {
+            // let id = data.id.toString();
+            // let peer: Peer | undefined = context.peer;
+            // if (isNumeric(id)) {
+            //     let msgid = '';
+            //     if (BigInt(data.id) > 2147483647n) {
+            //         peer = MessageUnique.getPeerByMsgId(id)?.Peer;
+            //         msgid = id;
+            //     } else {
+            //         let data = MessageUnique.getMsgIdAndPeerByShortId(parseInt(id));
+            //         msgid = data?.MsgId ?? '';
+            //         peer = data?.Peer;
+            //     }
+            // }
             const jsonData = ForwardMsgBuilder.fromResId(data.id);
             return this.ob11ToRawConverters.json({
                 data: { data: JSON.stringify(jsonData) },

src/onebot/event/notice/OB11GroupAdminNoticeEvent.ts

@@ -3,7 +3,7 @@ import { NapCatCore } from '@/core';
 
 export class OB11GroupAdminNoticeEvent extends OB11GroupNoticeEvent {
     notice_type = 'group_admin';
-    sub_type: 'set' | 'unset'; 
+    sub_type: 'set' | 'unset';
 
     constructor(core: NapCatCore, group_id: number, user_id: number, sub_type: 'set' | 'unset') {
         super(core, group_id, user_id);

vite.config.ts

@@ -8,8 +8,7 @@ const external = [
     'silk-wasm',
     'ws',
     'express',
-    '@ffmpeg.wasm/core-mt',
-    'piscina'
+    '@ffmpeg.wasm/core-mt'
 ];
 const nodeModules = [...builtinModules, builtinModules.map((m) => `node:${m}`)].flat();