release: 2.2.29

fix: 群成员信息

.eslintrc.cjs

@@ -4,7 +4,7 @@ module.exports = {
         'es2021': true,
         'node': true
     },
-    'ignorePatterns': ['src/proto/'],
+    'ignorePatterns': ['src/core/proto/'],
     'extends': [
         'eslint:recommended',
         'plugin:@typescript-eslint/recommended'

.github/workflows/build.yml

@@ -1,15 +1,11 @@
 name: "Build Action"
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
 
 permissions: write-all
 
 jobs:
   Build-LiteLoader:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
     - name: Clone Main Repository
@@ -37,7 +33,6 @@ jobs:
         name: NapCat.Framework
         path: dist
   Build-Shell:
-    if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
     steps:
         - name: Clone Main Repository
@@ -63,4 +58,4 @@ jobs:
           uses: actions/upload-artifact@v4
           with:
               name: NapCat.Shell
-              path: dist
+              path: dist

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.2.18",
+  "version": "2.2.29",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -27,8 +27,8 @@
     "@types/node": "^22.0.1",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/ws": "^8.5.12",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
     "eslint": "^8.57.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",

src/common/event-v2.ts

@@ -1,4 +1,4 @@
-import type { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper/wrapper';
+import type { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
 import EventEmitter from 'node:events';
 
 export type ListenerClassBase = Record<string, string>;

src/common/event.ts

@@ -1,4 +1,4 @@
-import { NodeIQQNTWrapperSession } from '@/core/wrapper/wrapper';
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
 import { randomUUID } from 'crypto';
 import { ListenerNamingMapping, ServiceNamingMapping } from '@/core';
 

src/common/helper.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'fs';
 import os from 'node:os';
-import { QQLevel } from '@/core';
+import { Peer, QQLevel } from '@/core';
 
 export async function solveProblem<T extends (...arg: any[]) => any>(func: T, ...args: Parameters<T>): Promise<ReturnType<T> | undefined> {
     return new Promise<ReturnType<T> | undefined>((resolve) => {
@@ -24,25 +24,49 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
     });
 }
 
-//下面这个类是用于将uid+msgid合并的类
-export class UUIDConverter {
-    static encode(highStr: string, lowStr: string): string {
-        const high = BigInt(highStr);
-        const low = BigInt(lowStr);
-        const highHex = high.toString(16).padStart(16, '0');
-        const lowHex = low.toString(16).padStart(16, '0');
-        const combinedHex = highHex + lowHex;
-        return `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
-            12,
-            16,
-        )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
+export class FileNapCatOneBotUUID {
+    static encodeModelId(peer: Peer, modelId: string): string {
+        return `NapCatOneBot-ModelIdFile-${peer.chatType}-${peer.peerUid}-${modelId}`;
     }
 
-    static decode(uuid: string): { high: string; low: string } {
-        const hex = uuid.replace(/-/g, '');
-        const high = BigInt('0x' + hex.substring(0, 16));
-        const low = BigInt('0x' + hex.substring(16));
-        return { high: high.toString(), low: low.toString() };
+    static decodeModelId(uuid: string): undefined | {
+        peer: Peer,
+        modelId: string
+    } {
+        if (!uuid.startsWith('NapCatOneBot-ModelIdFile-')) return undefined;
+        const data = uuid.split('-');
+        if (data.length !== 5) return undefined;
+        const [, , chatType, peerUid, modelId] = data;
+        return {
+            peer: {
+                chatType: chatType as any,
+                peerUid: peerUid,
+            },
+            modelId,
+        };
+    }
+
+    static encode(peer: Peer, msgId: string, elementId: string): string {
+        return `NapCatOneBot-MsgFile-${peer.chatType}-${peer.peerUid}-${msgId}-${elementId}`;
+    }
+
+    static decode(uuid: string): undefined | {
+        peer: Peer,
+        msgId: string,
+        elementId: string
+    } {
+        if (!uuid.startsWith('NapCatOneBot-MsgFile-')) return undefined;
+        const data = uuid.split('-');
+        if (data.length !== 6) return undefined;
+        const [, , chatType, peerUid, msgId, elementId] = data;
+        return {
+            peer: {
+                chatType: chatType as any,
+                peerUid: peerUid,
+            },
+            msgId,
+            elementId,
+        };
     }
 }
 

src/common/message-unique.ts

@@ -91,7 +91,7 @@ class MessageUniqueWrapper {
         return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
     }
 
-    createMsg(peer: Peer, msgId: string) {
+    createUniqueMsgId(peer: Peer, msgId: string) {
         const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
         const hash = crypto.createHash('md5').update(key).digest();
         //设置第一个bit为0 保证shortId为正数

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.2.18';
+export const napCatVersion = '2.2.29';

src/core/apis/file.ts

@@ -17,7 +17,7 @@ import {
 import path from 'path';
 import fs from 'fs';
 import fsPromises from 'fs/promises';
-import { InstanceContext, NapCatCore } from '@/core';
+import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
@@ -302,7 +302,18 @@ export class NTQQFileApi {
     async downloadMediaByUuid() {
         //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
     }
-
+    async downloadFileForModelId(peer: Peer, modelId: string, unknown: string, timeout = 1000 * 60 * 2) {
+        const [, fileTransNotifyInfo] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelRichMediaService/downloadFileForModelId',
+            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
+            [peer, [modelId], unknown],
+            () => true,
+            (arg) => arg?.commonFileInfo?.fileModelId === modelId,
+            1,
+            timeout,
+        );
+        return fileTransNotifyInfo.filePath;
+    }
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
         //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
         // 用于下载收到的消息中的图片等
@@ -342,20 +353,15 @@ export class NTQQFileApi {
             chatType: chatType,
             peerUid: peerUid,
         }, [msgId]);
-        if (msg.msgList.length === 0) {
-            return fileTransNotifyInfo.filePath;
+        const mixElement = msg.msgList.find((msg) => msg.msgId === msgId)?.elements.find((e) => e.elementId === elementId);
+        const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement;
+        let realPath = mixElementInner?.filePath;
+        if (!realPath) {
+            const picThumbPath: Map<number, string> = (mixElementInner as any)?.picThumbPath;
+            const picThumbPathList = Array.from(picThumbPath.values());
+            if (picThumbPathList.length > 0) realPath = picThumbPathList[0];
         }
-        //获取原始消息
-        const FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId);
-        if (!FileElements) {
-            //失败则就乱来 Todo
-            return fileTransNotifyInfo.filePath;
-        }
-        //从原始消息获取文件路径
-        return FileElements?.fileElement?.filePath ??
-            FileElements?.pttElement?.filePath ??
-            FileElements?.videoElement?.filePath ??
-            FileElements?.picElement?.sourcePath;
+        return realPath;
     }
 
     async getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined> {
@@ -429,17 +435,44 @@ export class NTQQFileApi {
         });
     }
 
-    async searchfile(keys: string[]) {
-        const Event = this.core.eventWrapper.createEventFunction('NodeIKernelSearchService/searchFileWithKeywords');
-        const id = await Event!(keys, 12);
-        const Listener = this.core.eventWrapper.registerListen(
-            'NodeIKernelSearchListener/onSearchFileKeywordsResult',
-            1,
-            20000,
-            (params) => id !== '' && params.searchId == id,
+    async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
+        const randomResultId = 100000 + Math.floor(Math.random() * 10000);
+        let searchId = 0;
+        const [, searchResult] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/searchFile',
+            'NodeIKernelFileAssistantListener/onFileSearch',
+            [
+                keys,
+                {
+                    resultType: 2,
+                    pageLimit: 1,
+                },
+                randomResultId
+            ],
+            (ret) => {
+                searchId = ret;
+                return true;
+            },
+            result => result.searchId === searchId && result.resultId === randomResultId,
         );
-        const [ret] = (await Listener);
-        return ret;
+        return searchResult.resultItems[0];
+    }
+
+    async downloadFileById(
+        fileId: string,
+        fileSize: number = 1024576,
+        estimatedTime: number = (fileSize * 1000 / 1024576) + 5000,
+    ) {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelFileAssistantService/downloadFile',
+            'NodeIKernelFileAssistantListener/onFileStatusChanged',
+            [[fileId]],
+            ret => ret.result === 0,
+            status => status.fileStatus === 2 && status.fileProgress === '0',
+            1,
+            estimatedTime, // estimate 1MB/s
+        );
+        return ret.filePath!;
     }
 
     async getImageUrl(element: PicElement) {

src/core/apis/group.ts

@@ -11,6 +11,7 @@ import {
     NapCatCore,
 } from '@/core';
 import { isNumeric, runAllWithTimeout } from '@/common/helper';
+import { LimitedHashTable } from '@/common/message-unique';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -18,6 +19,7 @@ export class NTQQGroupApi {
     groupCache: Map<string, Group> = new Map<string, Group>();
     groupMemberCache: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
     groups: Group[] = [];
+    essenceLRU = new LimitedHashTable<number, string>(1000);
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
@@ -32,7 +34,17 @@ export class NTQQGroupApi {
         }
         this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
     }
-
+    async fetchGroupEssenceList(groupCode: string) {
+        const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!;
+        return this.context.session.getGroupService().fetchGroupEssenceList({
+            groupCode: groupCode,
+            pageStart: 0,
+            pageLimit: 300
+        }, pskey);
+    }
+    async clearGroupNotifiesUnreadCount(unk: boolean) {
+        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(unk);
+    }
     async setGroupAvatar(gc: string, filePath: string) {
         return this.context.session.getGroupService().setHeader(gc, filePath);
     }
@@ -270,7 +282,15 @@ export class NTQQGroupApi {
         //应该是直接返回不需要Listener的 未经测试 需测试再发布
         return this.context.session.getGroupService().quitGroupV2(param);
     }
-
+    async removeGroupEssenceBySeq(GroupCode: string, msgRandom: string, msgSeq: string) {
+        const param = {
+            groupCode: GroupCode,
+            msgRandom: parseInt(msgRandom),
+            msgSeq: parseInt(msgSeq),
+        };
+        // GetMsgByShoretID(ShoretID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
+        return this.context.session.getGroupService().removeGroupEssence(param);
+    }
     async removeGroupEssence(GroupCode: string, msgId: string) {
         // 代码没测过
         // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
@@ -288,12 +308,12 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().removeGroupEssence(param);
     }
 
-    async getSingleScreenNotifies(num: number) {
+    async getSingleScreenNotifies(doubt: boolean, num: number) {
         const [, , , notifies] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelGroupService/getSingleScreenNotifies',
             'NodeIKernelGroupListener/onGroupSingleScreenNotifies',
             [
-                false,
+                doubt,
                 '',
                 num,
             ],
@@ -340,7 +360,7 @@ export class NTQQGroupApi {
             ]);
             if (membersFromFunc.status === 'fulfilled' && membersFromListener.status === 'fulfilled') {
                 return new Map([
-                    ...membersFromFunc.value.result.infos, 
+                    ...membersFromFunc.value.result.infos,
                     ...membersFromListener.value[0].infos
                 ]);
             }
@@ -355,7 +375,7 @@ export class NTQQGroupApi {
             groupService.destroyMemberListScene(sceneId);
         }
     }
-    
+
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
         const groupService = this.context.session.getGroupService();
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
@@ -381,7 +401,7 @@ export class NTQQGroupApi {
 
     }
 
-    async GetGroupFileCount(Gids: Array<string>) {
+    async getGroupFileCount(Gids: Array<string>) {
         return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids);
     }
 

src/core/apis/msg.ts

@@ -200,7 +200,7 @@ export class NTQQMsgApi {
                 msgElements,
                 new Map(),
             ],
-            () => true,
+            (ret) => ret.result === 0,
             msgRecords => {
                 for (const msgRecord of msgRecords) {
                     if (msgRecord.guildId === msgId && msgRecord.sendStatus === SendStatusType.KSEND_STATUS_SUCCESS) {

src/core/apis/webapi.ts

@@ -27,27 +27,40 @@ export class NTQQWebApi {
             msg_random: msgRandom,
             target_group_code: targetGroupCode,
         }).toString()
-        }`;
+            }`;
         try {
             return RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
         } catch (e) {
             return undefined;
         }
     }
+    async getGroupEssenceMsgAll(GroupCode: string) {
+        let ret: GroupEssenceMsgRet[] = [];
+        for (let i = 0; i < 4; i++) {
+            let data = await this.getGroupEssenceMsg(GroupCode, i, 50);
+            if (!data) break;
+            if (data.data.is_end) {
+                ret.push(data);
+                break;
+            }
+            ret.push(data);
 
-    async getGroupEssenceMsg(GroupCode: string, page_start: string) {
+        }
+        return ret;
+    }
+    async getGroupEssenceMsg(GroupCode: string, page_start: number = 0, page_limit: number = 50) {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?${new URLSearchParams({
             bkn: this.getBknFromCookie(cookieObject),
+            page_start: page_start.toString(),
+            page_limit: page_limit.toString(),
             group_code: GroupCode,
-            page_start,
-            page_limit: '20',
         }).toString()
-        }`;
+            }`;
         let ret;
         try {
             ret = await RequestUtil.HttpGetJson<GroupEssenceMsgRet>
-            (url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+                (url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
         } catch {
             return undefined;
         }
@@ -63,14 +76,14 @@ export class NTQQWebApi {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
         const retList: Promise<WebApiGroupMemberRet>[] = [];
         const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-        (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
-            st: '0',
-            end: '40',
-            sort: '1',
-            gc: GroupCode,
-            bkn: this.getBknFromCookie(cookieObject),
-        }).toString()
-        }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+            (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
+                st: '0',
+                end: '40',
+                sort: '1',
+                gc: GroupCode,
+                bkn: this.getBknFromCookie(cookieObject),
+            }).toString()
+                }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
         if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
             return [];
         } else {
@@ -83,14 +96,14 @@ export class NTQQWebApi {
         //遍历批量请求
         for (let i = 2; i <= PageNum; i++) {
             const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>
-            (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
-                st: ((i - 1) * 40).toString(),
-                end: (i * 40).toString(),
-                sort: '1',
-                gc: GroupCode,
-                bkn: this.getBknFromCookie(cookieObject),
-            }).toString()
-            }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
+                (`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${new URLSearchParams({
+                    st: ((i - 1) * 40).toString(),
+                    end: (i * 40).toString(),
+                    sort: '1',
+                    gc: GroupCode,
+                    bkn: this.getBknFromCookie(cookieObject),
+                }).toString()
+                    }`, 'POST', '', { 'Cookie': this.cookieToString(cookieObject) });
             retList.push(ret);
         }
         //批量等待
@@ -123,15 +136,15 @@ export class NTQQWebApi {
         let ret: any = undefined;
         try {
             ret = await RequestUtil.HttpGetJson<any>
-            (`https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${new URLSearchParams({
-                bkn: this.getBknFromCookie(cookieObject),
-                qid: GroupCode,
-                text: Content,
-                pinned: '0',
-                type: '1',
-                settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
-            }).toString()
-            }`, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
+                (`https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${new URLSearchParams({
+                    bkn: this.getBknFromCookie(cookieObject),
+                    qid: GroupCode,
+                    text: Content,
+                    pinned: '0',
+                    type: '1',
+                    settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
+                }).toString()
+                    }`, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });
             return ret;
         } catch (e) {
             return undefined;
@@ -162,7 +175,7 @@ export class NTQQWebApi {
                 gc: Internal_groupCode,
                 type: Internal_type.toString(),
             }).toString()
-            }`;
+                }`;
             let resJson;
             try {
                 const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': this.cookieToString(cookieObject) });

src/core/core.ts

@@ -1,205 +0,0 @@
-import { NodeQQNTWrapperUtil, StableNTApiWrapper, WrapperNodeApi } from '@/core/wrapper';
-import path from 'node:path';
-import fs from 'node:fs';
-import { InstanceContext } from './wrapper';
-import { proxiedListenerOf } from '@/common/proxy-handler';
-import { NodeIKernelGroupListener, NodeIKernelMsgListener, NodeIKernelProfileListener } from './listeners';
-import { DataSource, GroupMember, SelfInfo } from './entities';
-import { NTEventWrapper } from '@/common/event';
-import { NTQQFileApi, NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from './apis';
-import os from 'node:os';
-import { NTQQCollectionApi } from './apis/collection';
-import { NapCatConfigLoader } from './helper/config';
-import { LogLevel } from '@/common/log';
-
-export enum NapCatCoreWorkingEnv {
-    Unknown = 0,
-    Shell = 1,
-    Framework = 2,
-}
-
-export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
-    let wrapperNodePath = path.resolve(path.dirname(process.execPath), './resources/app/wrapper.node');
-    if (!fs.existsSync(wrapperNodePath)) {
-        wrapperNodePath = path.join(path.dirname(process.execPath), `resources/app/versions/${QQVersion}/wrapper.node`);
-    }
-    const nativemodule: any = { exports: {} };
-    process.dlopen(nativemodule, wrapperNodePath);
-    return nativemodule.exports;
-}
-
-export class NapCatCore {
-    readonly context: InstanceContext;
-    readonly apis: StableNTApiWrapper;
-    readonly eventWrapper: NTEventWrapper;
-    // readonly eventChannel: NTEventChannel;
-    NapCatDataPath: string;
-    NapCatTempPath: string;
-    // runtime info, not readonly
-    selfInfo: SelfInfo;
-    util: NodeQQNTWrapperUtil;
-    configLoader: NapCatConfigLoader;
-
-    // 通过构造器递过去的 runtime info 应该尽量少
-    constructor(context: InstanceContext, selfInfo: SelfInfo) {
-        this.selfInfo = selfInfo;
-        this.context = context;
-        this.util = this.context.wrapper.NodeQQNTWrapperUtil;
-        this.eventWrapper = new NTEventWrapper(context.session);
-        this.apis = {
-            FileApi: new NTQQFileApi(this.context, this),
-            SystemApi: new NTQQSystemApi(this.context, this),
-            CollectionApi: new NTQQCollectionApi(this.context, this),
-            WebApi: new NTQQWebApi(this.context, this),
-            FriendApi: new NTQQFriendApi(this.context, this),
-            MsgApi: new NTQQMsgApi(this.context, this),
-            UserApi: new NTQQUserApi(this.context, this),
-            GroupApi: new NTQQGroupApi(this.context, this),
-        };
-        this.configLoader = new NapCatConfigLoader(this, this.context.pathWrapper.configPath);
-        this.NapCatDataPath = path.join(this.dataPath, 'NapCat');
-        fs.mkdirSync(this.NapCatDataPath, { recursive: true });
-        this.NapCatTempPath = path.join(this.NapCatDataPath, 'temp');
-        // 创建临时目录
-        if (!fs.existsSync(this.NapCatTempPath)) {
-            fs.mkdirSync(this.NapCatTempPath, { recursive: true });
-        }
-        this.initNapCatCoreListeners().then().catch(this.context.logger.logError);
-
-        this.context.logger.setFileLogEnabled(
-            this.configLoader.configData.fileLog,
-        );
-        this.context.logger.setConsoleLogEnabled(
-            this.configLoader.configData.consoleLog,
-        );
-        this.context.logger.setFileAndConsoleLogLevel(
-            this.configLoader.configData.fileLogLevel as LogLevel,
-            this.configLoader.configData.consoleLogLevel as LogLevel,
-        );
-    }
-
-    get dataPath(): string {
-        let result = this.context.wrapper.NodeQQNTWrapperUtil.getNTUserDataInfoConfig();
-        if (!result) {
-            result = path.resolve(os.homedir(), './.config/QQ');
-            fs.mkdirSync(result, { recursive: true });
-        }
-        return result;
-    }
-
-    // Renamed from 'InitDataListener'
-    async initNapCatCoreListeners() {
-        const msgListener = new NodeIKernelMsgListener();
-        msgListener.onRecvMsg = (msgs) => {
-            msgs.forEach(msg => this.context.logger.logMessage(msg, this.selfInfo));
-        };
-        msgListener.onAddSendMsg = (msg) => {
-            this.context.logger.logMessage(msg, this.selfInfo);
-        };
-        //await sleep(2500);
-        this.context.session.getMsgService().addKernelMsgListener(
-            proxiedListenerOf(msgListener, this.context.logger) as any,
-        );
-
-        const profileListener = new NodeIKernelProfileListener();
-        profileListener.onProfileDetailInfoChanged = (profile) => {
-            if (profile.uid === this.selfInfo.uid) {
-                Object.assign(this.selfInfo, profile);
-            }
-        };
-        profileListener.onSelfStatusChanged = (/* Info: SelfStatusInfo */) => {
-            // if (Info.status == 20) {
-            //   log("账号状态变更为离线")
-            // }
-        };
-        this.context.session.getProfileService().addKernelProfileListener(
-            proxiedListenerOf(profileListener, this.context.logger),
-        );
-
-        // 群相关
-        const groupListener = new NodeIKernelGroupListener();
-        groupListener.onGroupListUpdate = (updateType, groupList) => {
-            // console.log("onGroupListUpdate", updateType, groupList)
-            groupList.map(g => {
-                const existGroup = this.apis.GroupApi.groupCache.get(g.groupCode);
-                //群成员数量变化 应该刷新缓存
-                if (existGroup && g.memberCount === existGroup.memberCount) {
-                    Object.assign(existGroup, g);
-                } else {
-                    this.apis.GroupApi.groupCache.set(g.groupCode, g);
-                    // 获取群成员
-                }
-                const sceneId = this.context.session.getGroupService().createMemberListScene(g.groupCode, 'groupMemberList_MainWindow');
-                this.context.session.getGroupService().getNextMemberList(sceneId, undefined, 3000).then( /* r => {
-                    // console.log(`get group ${g.groupCode} members`, r);
-                    // r.result.infos.forEach(member => {
-                    // });
-                    // groupMembers.set(g.groupCode, r.result.infos);
-                } */);
-                this.context.session.getGroupService().destroyMemberListScene(sceneId);
-            });
-        };
-        groupListener.onMemberListChange = (arg) => {
-            // todo: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
-            const groupCode = arg.sceneId.split('_')[0];
-            if (this.apis.GroupApi.groupMemberCache.has(groupCode)) {
-                const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!;
-                arg.infos.forEach((member, uid) => {
-                    //console.log('onMemberListChange', member);
-                    const existMember = existMembers.get(uid);
-                    if (existMember) {
-                        Object.assign(existMember, member);
-                    } else {
-                        existMembers!.set(uid, member);
-                    }
-                    //移除成员
-                    if (member.isDelete) {
-                        existMembers.delete(uid);
-                    }
-                });
-            } else {
-                this.apis.GroupApi.groupMemberCache.set(groupCode, arg.infos);
-            }
-        };
-        groupListener.onMemberInfoChange = (groupCode, dataSource, members) => {
-            if (dataSource === DataSource.LOCAL && members.get(this.selfInfo.uid)?.isDelete) {
-                // 自身退群或者被踢退群 5s用于Api操作 之后不再出现
-                setTimeout(() => {
-                    this.apis.GroupApi.groupCache.delete(groupCode);
-                }, 5000);
-
-            }
-            const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode);
-            if (existMembers) {
-                members.forEach((member, uid) => {
-                    const existMember = existMembers.get(uid);
-                    if (existMember) {
-                        // 检查管理变动
-                        member.isChangeRole = this.checkAdminEvent(groupCode, member, existMember);
-                        // 更新成员信息
-                        Object.assign(existMember, member);
-                    } else {
-                        existMembers.set(uid, member);
-                    }
-                    //移除成员
-                    if (member.isDelete) {
-                        existMembers.delete(uid);
-                    }
-                });
-            } else {
-                this.apis.GroupApi.groupMemberCache.set(groupCode, members);
-            }
-        };
-        this.context.session.getGroupService().addKernelGroupListener(
-            proxiedListenerOf(groupListener, this.context.logger) as any,
-        );
-    }
-
-    checkAdminEvent(groupCode: string, memberNew: GroupMember, memberOld: GroupMember | undefined): boolean {
-        if (memberNew.role !== memberOld?.role) {
-            this.context.logger.logDebug(`群 ${groupCode} ${memberNew.nick} 角色变更为 ${memberNew.role === 3 ? '管理员' : '群员'}`);
-            return true;
-        }
-        return false;
-    }
-}

src/core/entities/msg.ts

@@ -22,6 +22,7 @@ export interface GetFileListParam {
     startIndex: number;
     sortOrder: number;
     showOnlinedocFolder: number;
+    folderId?: string;
 }
 
 export enum ElementType {
@@ -593,6 +594,7 @@ export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn';
 
 export interface PicElement {
     md5HexStr?: string;
+    filePath?: string;
     fileSize: number | string;//number
     picWidth: number;
     picHeight: number;

src/core/index.ts

@@ -1,5 +1,299 @@
-export * from './core';
+import {
+    NTQQFileApi,
+    NTQQFriendApi,
+    NTQQGroupApi,
+    NTQQMsgApi,
+    NTQQSystemApi,
+    NTQQUserApi,
+    NTQQWebApi,
+} from '@/core/apis';
+import { NTQQCollectionApi } from '@/core/apis/collection';
+import {
+    NodeIQQNTWrapperSession,
+    NodeQQNTWrapperUtil,
+    PlatformType,
+    VendorType,
+    WrapperNodeApi,
+    WrapperSessionInitConfig,
+} from '@/core/wrapper';
+import { LogLevel, LogWrapper } from '@/common/log';
+import { NodeIKernelLoginService } from '@/core/services';
+import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
+import { NapCatPathWrapper } from '@/common/path';
+import path from 'node:path';
+import fs from 'node:fs';
+import { getMachineId, hostname, systemName, systemVersion } from '@/common/system';
+import { NTEventWrapper } from '@/common/event';
+import { DataSource, GroupMember, SelfInfo } from '@/core/entities';
+import { NapCatConfigLoader } from '@/core/helper/config';
+import os from 'node:os';
+import { NodeIKernelGroupListener, NodeIKernelMsgListener, NodeIKernelProfileListener } from '@/core/listeners';
+import { proxiedListenerOf } from '@/common/proxy-handler';
+
 export * from './wrapper';
 export * from './entities';
 export * from './services';
 export * from './listeners';
+
+export enum NapCatCoreWorkingEnv {
+    Unknown = 0,
+    Shell = 1,
+    Framework = 2,
+}
+
+export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
+    let wrapperNodePath = path.resolve(path.dirname(process.execPath), './resources/app/wrapper.node');
+    if (!fs.existsSync(wrapperNodePath)) {
+        wrapperNodePath = path.join(path.dirname(process.execPath), `resources/app/versions/${QQVersion}/wrapper.node`);
+    }
+    const nativemodule: any = { exports: {} };
+    process.dlopen(nativemodule, wrapperNodePath);
+    return nativemodule.exports;
+}
+
+export class NapCatCore {
+    readonly context: InstanceContext;
+    readonly apis: StableNTApiWrapper;
+    readonly eventWrapper: NTEventWrapper;
+    // readonly eventChannel: NTEventChannel;
+    NapCatDataPath: string;
+    NapCatTempPath: string;
+    // runtime info, not readonly
+    selfInfo: SelfInfo;
+    util: NodeQQNTWrapperUtil;
+    configLoader: NapCatConfigLoader;
+
+    // 通过构造器递过去的 runtime info 应该尽量少
+    constructor(context: InstanceContext, selfInfo: SelfInfo) {
+        this.selfInfo = selfInfo;
+        this.context = context;
+        this.util = this.context.wrapper.NodeQQNTWrapperUtil;
+        this.eventWrapper = new NTEventWrapper(context.session);
+        this.apis = {
+            FileApi: new NTQQFileApi(this.context, this),
+            SystemApi: new NTQQSystemApi(this.context, this),
+            CollectionApi: new NTQQCollectionApi(this.context, this),
+            WebApi: new NTQQWebApi(this.context, this),
+            FriendApi: new NTQQFriendApi(this.context, this),
+            MsgApi: new NTQQMsgApi(this.context, this),
+            UserApi: new NTQQUserApi(this.context, this),
+            GroupApi: new NTQQGroupApi(this.context, this),
+        };
+        this.configLoader = new NapCatConfigLoader(this, this.context.pathWrapper.configPath);
+        this.NapCatDataPath = path.join(this.dataPath, 'NapCat');
+        fs.mkdirSync(this.NapCatDataPath, { recursive: true });
+        this.NapCatTempPath = path.join(this.NapCatDataPath, 'temp');
+        // 创建临时目录
+        if (!fs.existsSync(this.NapCatTempPath)) {
+            fs.mkdirSync(this.NapCatTempPath, { recursive: true });
+        }
+        this.initNapCatCoreListeners().then().catch(this.context.logger.logError);
+
+        this.context.logger.setFileLogEnabled(
+            this.configLoader.configData.fileLog,
+        );
+        this.context.logger.setConsoleLogEnabled(
+            this.configLoader.configData.consoleLog,
+        );
+        this.context.logger.setFileAndConsoleLogLevel(
+            this.configLoader.configData.fileLogLevel as LogLevel,
+            this.configLoader.configData.consoleLogLevel as LogLevel,
+        );
+    }
+
+    get dataPath(): string {
+        let result = this.context.wrapper.NodeQQNTWrapperUtil.getNTUserDataInfoConfig();
+        if (!result) {
+            result = path.resolve(os.homedir(), './.config/QQ');
+            fs.mkdirSync(result, { recursive: true });
+        }
+        return result;
+    }
+
+    // Renamed from 'InitDataListener'
+    async initNapCatCoreListeners() {
+        const msgListener = new NodeIKernelMsgListener();
+        msgListener.onRecvMsg = (msgs) => {
+            msgs.forEach(msg => this.context.logger.logMessage(msg, this.selfInfo));
+        };
+        msgListener.onAddSendMsg = (msg) => {
+            this.context.logger.logMessage(msg, this.selfInfo);
+        };
+        //await sleep(2500);
+        this.context.session.getMsgService().addKernelMsgListener(
+            proxiedListenerOf(msgListener, this.context.logger) as any,
+        );
+
+        const profileListener = new NodeIKernelProfileListener();
+        profileListener.onProfileDetailInfoChanged = (profile) => {
+            if (profile.uid === this.selfInfo.uid) {
+                Object.assign(this.selfInfo, profile);
+            }
+        };
+        profileListener.onSelfStatusChanged = (/* Info: SelfStatusInfo */) => {
+            // if (Info.status == 20) {
+            //   log("账号状态变更为离线")
+            // }
+        };
+        this.context.session.getProfileService().addKernelProfileListener(
+            proxiedListenerOf(profileListener, this.context.logger),
+        );
+
+        // 群相关
+        const groupListener = new NodeIKernelGroupListener();
+        groupListener.onGroupListUpdate = (updateType, groupList) => {
+            // console.log("onGroupListUpdate", updateType, groupList)
+            groupList.map(g => {
+                const existGroup = this.apis.GroupApi.groupCache.get(g.groupCode);
+                //群成员数量变化 应该刷新缓存
+                if (existGroup && g.memberCount === existGroup.memberCount) {
+                    Object.assign(existGroup, g);
+                } else {
+                    this.apis.GroupApi.groupCache.set(g.groupCode, g);
+                    // 获取群成员
+                }
+                const sceneId = this.context.session.getGroupService().createMemberListScene(g.groupCode, 'groupMemberList_MainWindow');
+                this.context.session.getGroupService().getNextMemberList(sceneId, undefined, 3000).then( /* r => {
+                    // console.log(`get group ${g.groupCode} members`, r);
+                    // r.result.infos.forEach(member => {
+                    // });
+                    // groupMembers.set(g.groupCode, r.result.infos);
+                } */);
+                this.context.session.getGroupService().destroyMemberListScene(sceneId);
+            });
+        };
+        groupListener.onMemberListChange = (arg) => {
+            // todo: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
+            const groupCode = arg.sceneId.split('_')[0];
+            if (this.apis.GroupApi.groupMemberCache.has(groupCode)) {
+                const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!;
+                arg.infos.forEach((member, uid) => {
+                    //console.log('onMemberListChange', member);
+                    const existMember = existMembers.get(uid);
+                    if (existMember) {
+                        Object.assign(existMember, member);
+                    } else {
+                        existMembers!.set(uid, member);
+                    }
+                    //移除成员
+                    if (member.isDelete) {
+                        existMembers.delete(uid);
+                    }
+                });
+            } else {
+                this.apis.GroupApi.groupMemberCache.set(groupCode, arg.infos);
+            }
+        };
+        groupListener.onMemberInfoChange = (groupCode, dataSource, members) => {
+            if (dataSource === DataSource.LOCAL && members.get(this.selfInfo.uid)?.isDelete) {
+                // 自身退群或者被踢退群 5s用于Api操作 之后不再出现
+                setTimeout(() => {
+                    this.apis.GroupApi.groupCache.delete(groupCode);
+                }, 5000);
+
+            }
+            const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode);
+            if (existMembers) {
+                members.forEach((member, uid) => {
+                    const existMember = existMembers.get(uid);
+                    if (existMember) {
+                        // 检查管理变动
+                        member.isChangeRole = this.checkAdminEvent(groupCode, member, existMember);
+                        // 更新成员信息
+                        Object.assign(existMember, member);
+                    } else {
+                        existMembers.set(uid, member);
+                    }
+                    //移除成员
+                    if (member.isDelete) {
+                        existMembers.delete(uid);
+                    }
+                });
+            } else {
+                this.apis.GroupApi.groupMemberCache.set(groupCode, members);
+            }
+        };
+        this.context.session.getGroupService().addKernelGroupListener(
+            proxiedListenerOf(groupListener, this.context.logger) as any,
+        );
+    }
+
+    checkAdminEvent(groupCode: string, memberNew: GroupMember, memberOld: GroupMember | undefined): boolean {
+        if (memberNew.role !== memberOld?.role) {
+            this.context.logger.logDebug(`群 ${groupCode} ${memberNew.nick} 角色变更为 ${memberNew.role === 3 ? '管理员' : '群员'}`);
+            return true;
+        }
+        return false;
+    }
+}
+
+export async function genSessionConfig(QQVersionAppid: string, QQVersion: string, selfUin: string, selfUid: string, account_path: string): Promise<WrapperSessionInitConfig> {
+    const downloadPath = path.join(account_path, 'NapCat', 'temp');
+    fs.mkdirSync(downloadPath, { recursive: true });
+    const guid: string = await getMachineId();//26702 支持JS获取guid值 在LoginService中获取 TODO mlikiow a
+    return {
+        selfUin,
+        selfUid,
+        desktopPathConfig: {
+            account_path, // 可以通过NodeQQNTWrapperUtil().getNTUserDataInfoConfig()获取
+        },
+        clientVer: QQVersion,  // 9.9.8-22355
+        a2: '',
+        d2: '',
+        d2Key: '',
+        machineId: '',
+        platform: PlatformType.KWINDOWS,  // 3是Windows?
+        platVer: systemVersion,  // 系统版本号, 应该可以固定
+        appid: QQVersionAppid,
+        rdeliveryConfig: {
+            appKey: '',
+            systemId: 0,
+            appId: '',
+            logicEnvironment: '',
+            platform: PlatformType.KWINDOWS,
+            language: '',
+            sdkVersion: '',
+            userId: '',
+            appVersion: '',
+            osVersion: '',
+            bundleId: '',
+            serverUrl: '',
+            fixedAfterHitKeys: [''],
+        },
+        defaultFileDownloadPath: downloadPath,
+        deviceInfo: {
+            guid,
+            buildVer: QQVersion,
+            localId: 2052,
+            devName: hostname,
+            devType: systemName,
+            vendorName: '',
+            osVer: systemVersion,
+            vendorOsName: systemName,
+            setMute: false,
+            vendorType: VendorType.KNOSETONIOS,
+        },
+        deviceConfig: '{"appearance":{"isSplitViewMode":true},"msg":{}}',
+    };
+}
+
+export interface InstanceContext {
+    readonly workingEnv: NapCatCoreWorkingEnv;
+    readonly wrapper: WrapperNodeApi;
+    readonly session: NodeIQQNTWrapperSession;
+    readonly logger: LogWrapper;
+    readonly loginService: NodeIKernelLoginService;
+    readonly basicInfoWrapper: QQBasicInfoWrapper;
+    readonly pathWrapper: NapCatPathWrapper;
+}
+
+export interface StableNTApiWrapper {
+    FileApi: NTQQFileApi,
+    SystemApi: NTQQSystemApi,
+    CollectionApi: NTQQCollectionApi,
+    WebApi: NTQQWebApi,
+    FriendApi: NTQQFriendApi,
+    MsgApi: NTQQMsgApi,
+    UserApi: NTQQUserApi,
+    GroupApi: NTQQGroupApi
+}

src/core/listeners/NodeIKernelFileAssistantListener.ts

@@ -1,5 +1,13 @@
 export class NodeIKernelFileAssistantListener {
-    onFileStatusChanged(...args: unknown[]) {
+    onFileStatusChanged(fileStatus: {
+        id: string,
+        fileStatus: number,
+        fileProgress: `${number}`,
+        fileSize: `${number}`,
+        fileSpeed: number,
+        thumbPath: string | null,
+        filePath: string | null,
+    }) {
     }
 
     onSessionListChanged(...args: unknown[]) {
@@ -11,6 +19,42 @@ export class NodeIKernelFileAssistantListener {
     onFileListChanged(...args: unknown[]) {
     }
 
-    onFileSearch(...args: unknown[]) {
+    onFileSearch(searchResult: SearchResultWrapper) {
     }
 }
+
+export type SearchResultWrapper = {
+    searchId: number,
+    resultId: number,
+    hasMore: boolean,
+    resultItems: SearchResultItem[],
+};
+
+export type SearchResultItem = {
+    id: string,
+    fileName: string,
+    fileNameHits: string[],
+    fileStatus: number,
+    fileSize: string,
+    isSend: boolean,
+    source: number,
+    fileTime: string,
+    expTime: string,
+    session: {
+        context: null,
+        uid: string,
+        nick: string,
+        remark: string,
+        memberCard: string,
+        groupCode: string,
+        groupName: string,
+        groupRemark: string,
+        count: number,
+    },
+    thumbPath: string,
+    filePath: string,
+    msgId: string,
+    chatType: number,
+    peerUid: string,
+    fileType: number,
+};

src/core/listeners/NodeIKernelMsgListener.ts

@@ -1,4 +1,5 @@
 import { ChatType, RawMessage } from '@/core/entities';
+import { CommonFileInfo } from '@/core';
 
 export interface OnRichMediaDownloadCompleteParams {
     fileModelId: string,
@@ -15,7 +16,7 @@ export interface OnRichMediaDownloadCompleteParams {
     totalSize: string,
     trasferStatus: number,
     step: number,
-    commonFileInfo: unknown | null,
+    commonFileInfo?: CommonFileInfo,
     fileSrvErrCode: string,
     clientMsg: string,
     businessId: number,
@@ -28,7 +29,47 @@ export interface GroupFileInfoUpdateParamType {
     retMsg: string;
     clientWording: string;
     isEnd: boolean;
-    item: Array<any>;
+    item: Array<{
+        peerId: string;
+        type: number;
+        folderInfo?: {
+            folderId: string;
+            parentFolderId: string;
+            folderName: string;
+            createTime: number;
+            modifyTime: number;
+            createUin: string;
+            creatorName: string;
+            totalFileCount: number;
+            modifyUin: string;
+            modifyName: string;
+            usedSpace: string;
+        },
+        fileInfo?: {
+            fileModelId: string;
+            fileId: string;
+            fileName: string;
+            fileSize: string;
+            busId: number;
+            uploadedSize: string;
+            uploadTime: number;
+            deadTime: number;
+            modifyTime: number;
+            downloadTimes: number;
+            sha: string;
+            sha3: string;
+            md5: string;
+            uploaderLocalPath: string;
+            uploaderName: string;
+            uploaderUin: string;
+            parentFolderId: string;
+            localPath: string;
+            transStatus: number;
+            transType: number;
+            elementId: string;
+            isFolder: boolean;
+        },
+    }>;
     allFileCount: string;
     nextIndex: string;
     reqId: string;

src/core/proto/EmojiLikeToOthers.proto

@@ -0,0 +1,31 @@
+syntax = 'proto3';
+package SysMessage;
+
+message EmojiLikeToOthersWrapper1 {
+  EmojiLikeToOthersWrapper2 wrapper = 1;
+}
+
+message EmojiLikeToOthersWrapper2 {
+  EmojiLikeToOthersWrapper3 body = 1;
+}
+
+message EmojiLikeToOthersWrapper3 {
+  EmojiLikeToOthersMsgSpec msgSpec = 2;
+  EmojiLikeToOthersAttributes attributes = 3;
+}
+
+message EmojiLikeToOthersMsgSpec {
+  uint32 msgSeq = 1;
+}
+
+message EmojiLikeToOthersAttributes {
+  enum Operation {
+    FALLBACK = 0;
+    LIKE = 1;
+    UNLIKE = 2;
+  }
+
+  string emojiId = 1;
+  string senderUid = 4;
+  Operation operation = 5;
+}

src/core/proto/EmojiLikeToOthers.ts

@@ -0,0 +1,341 @@
+// @generated by protobuf-ts 2.9.4
+// @generated from protobuf file "EmojiLikeToOthers.proto" (package "SysMessage", syntax proto3)
+// tslint:disable
+import type {
+    BinaryReadOptions,
+    BinaryWriteOptions,
+    IBinaryReader,
+    IBinaryWriter,
+    PartialMessage,
+} from '@protobuf-ts/runtime';
+import { MessageType, reflectionMergePartial, UnknownFieldHandler, WireType } from '@protobuf-ts/runtime';
+
+/**
+ * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper1
+ */
+export interface EmojiLikeToOthersWrapper1 {
+    /**
+     * @generated from protobuf field: SysMessage.EmojiLikeToOthersWrapper2 wrapper = 1;
+     */
+    wrapper?: EmojiLikeToOthersWrapper2;
+}
+/**
+ * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper2
+ */
+export interface EmojiLikeToOthersWrapper2 {
+    /**
+     * @generated from protobuf field: SysMessage.EmojiLikeToOthersWrapper3 body = 1;
+     */
+    body?: EmojiLikeToOthersWrapper3;
+}
+/**
+ * @generated from protobuf message SysMessage.EmojiLikeToOthersWrapper3
+ */
+export interface EmojiLikeToOthersWrapper3 {
+    /**
+     * @generated from protobuf field: SysMessage.EmojiLikeToOthersMsgSpec msgSpec = 2;
+     */
+    msgSpec?: EmojiLikeToOthersMsgSpec;
+    /**
+     * @generated from protobuf field: SysMessage.EmojiLikeToOthersAttributes attributes = 3;
+     */
+    attributes?: EmojiLikeToOthersAttributes;
+}
+/**
+ * @generated from protobuf message SysMessage.EmojiLikeToOthersMsgSpec
+ */
+export interface EmojiLikeToOthersMsgSpec {
+    /**
+     * @generated from protobuf field: uint32 msgSeq = 1;
+     */
+    msgSeq: number;
+}
+/**
+ * @generated from protobuf message SysMessage.EmojiLikeToOthersAttributes
+ */
+export interface EmojiLikeToOthersAttributes {
+    /**
+     * @generated from protobuf field: string emojiId = 1;
+     */
+    emojiId: string;
+    /**
+     * @generated from protobuf field: string senderUid = 4;
+     */
+    senderUid: string;
+    /**
+     * @generated from protobuf field: SysMessage.EmojiLikeToOthersAttributes.Operation operation = 5;
+     */
+    operation: EmojiLikeToOthersAttributes_Operation;
+}
+/**
+ * @generated from protobuf enum SysMessage.EmojiLikeToOthersAttributes.Operation
+ */
+export enum EmojiLikeToOthersAttributes_Operation {
+    /**
+     * @generated from protobuf enum value: FALLBACK = 0;
+     */
+    FALLBACK = 0,
+    /**
+     * @generated from protobuf enum value: LIKE = 1;
+     */
+    LIKE = 1,
+    /**
+     * @generated from protobuf enum value: UNLIKE = 2;
+     */
+    UNLIKE = 2
+}
+// @generated message type with reflection information, may provide speed optimized methods
+class EmojiLikeToOthersWrapper1$Type extends MessageType<EmojiLikeToOthersWrapper1> {
+    constructor() {
+        super("SysMessage.EmojiLikeToOthersWrapper1", [
+            { no: 1, name: "wrapper", kind: "message", T: () => EmojiLikeToOthersWrapper2 }
+        ]);
+    }
+    create(value?: PartialMessage<EmojiLikeToOthersWrapper1>): EmojiLikeToOthersWrapper1 {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        if (value !== undefined)
+            reflectionMergePartial<EmojiLikeToOthersWrapper1>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper1): EmojiLikeToOthersWrapper1 {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* SysMessage.EmojiLikeToOthersWrapper2 wrapper */ 1:
+                    message.wrapper = EmojiLikeToOthersWrapper2.internalBinaryRead(reader, reader.uint32(), options, message.wrapper);
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: EmojiLikeToOthersWrapper1, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* SysMessage.EmojiLikeToOthersWrapper2 wrapper = 1; */
+        if (message.wrapper)
+            EmojiLikeToOthersWrapper2.internalBinaryWrite(message.wrapper, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper1
+ */
+export const EmojiLikeToOthersWrapper1 = new EmojiLikeToOthersWrapper1$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class EmojiLikeToOthersWrapper2$Type extends MessageType<EmojiLikeToOthersWrapper2> {
+    constructor() {
+        super("SysMessage.EmojiLikeToOthersWrapper2", [
+            { no: 1, name: "body", kind: "message", T: () => EmojiLikeToOthersWrapper3 }
+        ]);
+    }
+    create(value?: PartialMessage<EmojiLikeToOthersWrapper2>): EmojiLikeToOthersWrapper2 {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        if (value !== undefined)
+            reflectionMergePartial<EmojiLikeToOthersWrapper2>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper2): EmojiLikeToOthersWrapper2 {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* SysMessage.EmojiLikeToOthersWrapper3 body */ 1:
+                    message.body = EmojiLikeToOthersWrapper3.internalBinaryRead(reader, reader.uint32(), options, message.body);
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: EmojiLikeToOthersWrapper2, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* SysMessage.EmojiLikeToOthersWrapper3 body = 1; */
+        if (message.body)
+            EmojiLikeToOthersWrapper3.internalBinaryWrite(message.body, writer.tag(1, WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper2
+ */
+export const EmojiLikeToOthersWrapper2 = new EmojiLikeToOthersWrapper2$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class EmojiLikeToOthersWrapper3$Type extends MessageType<EmojiLikeToOthersWrapper3> {
+    constructor() {
+        super("SysMessage.EmojiLikeToOthersWrapper3", [
+            { no: 2, name: "msgSpec", kind: "message", T: () => EmojiLikeToOthersMsgSpec },
+            { no: 3, name: "attributes", kind: "message", T: () => EmojiLikeToOthersAttributes }
+        ]);
+    }
+    create(value?: PartialMessage<EmojiLikeToOthersWrapper3>): EmojiLikeToOthersWrapper3 {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        if (value !== undefined)
+            reflectionMergePartial<EmojiLikeToOthersWrapper3>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersWrapper3): EmojiLikeToOthersWrapper3 {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* SysMessage.EmojiLikeToOthersMsgSpec msgSpec */ 2:
+                    message.msgSpec = EmojiLikeToOthersMsgSpec.internalBinaryRead(reader, reader.uint32(), options, message.msgSpec);
+                    break;
+                case /* SysMessage.EmojiLikeToOthersAttributes attributes */ 3:
+                    message.attributes = EmojiLikeToOthersAttributes.internalBinaryRead(reader, reader.uint32(), options, message.attributes);
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: EmojiLikeToOthersWrapper3, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* SysMessage.EmojiLikeToOthersMsgSpec msgSpec = 2; */
+        if (message.msgSpec)
+            EmojiLikeToOthersMsgSpec.internalBinaryWrite(message.msgSpec, writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* SysMessage.EmojiLikeToOthersAttributes attributes = 3; */
+        if (message.attributes)
+            EmojiLikeToOthersAttributes.internalBinaryWrite(message.attributes, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersWrapper3
+ */
+export const EmojiLikeToOthersWrapper3 = new EmojiLikeToOthersWrapper3$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class EmojiLikeToOthersMsgSpec$Type extends MessageType<EmojiLikeToOthersMsgSpec> {
+    constructor() {
+        super("SysMessage.EmojiLikeToOthersMsgSpec", [
+            { no: 1, name: "msgSeq", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
+        ]);
+    }
+    create(value?: PartialMessage<EmojiLikeToOthersMsgSpec>): EmojiLikeToOthersMsgSpec {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.msgSeq = 0;
+        if (value !== undefined)
+            reflectionMergePartial<EmojiLikeToOthersMsgSpec>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersMsgSpec): EmojiLikeToOthersMsgSpec {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* uint32 msgSeq */ 1:
+                    message.msgSeq = reader.uint32();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: EmojiLikeToOthersMsgSpec, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* uint32 msgSeq = 1; */
+        if (message.msgSeq !== 0)
+            writer.tag(1, WireType.Varint).uint32(message.msgSeq);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersMsgSpec
+ */
+export const EmojiLikeToOthersMsgSpec = new EmojiLikeToOthersMsgSpec$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class EmojiLikeToOthersAttributes$Type extends MessageType<EmojiLikeToOthersAttributes> {
+    constructor() {
+        super("SysMessage.EmojiLikeToOthersAttributes", [
+            { no: 1, name: "emojiId", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 4, name: "senderUid", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 5, name: "operation", kind: "enum", T: () => ["SysMessage.EmojiLikeToOthersAttributes.Operation", EmojiLikeToOthersAttributes_Operation] }
+        ]);
+    }
+    create(value?: PartialMessage<EmojiLikeToOthersAttributes>): EmojiLikeToOthersAttributes {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.emojiId = "";
+        message.senderUid = "";
+        message.operation = 0;
+        if (value !== undefined)
+            reflectionMergePartial<EmojiLikeToOthersAttributes>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: EmojiLikeToOthersAttributes): EmojiLikeToOthersAttributes {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* string emojiId */ 1:
+                    message.emojiId = reader.string();
+                    break;
+                case /* string senderUid */ 4:
+                    message.senderUid = reader.string();
+                    break;
+                case /* SysMessage.EmojiLikeToOthersAttributes.Operation operation */ 5:
+                    message.operation = reader.int32();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: EmojiLikeToOthersAttributes, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* string emojiId = 1; */
+        if (message.emojiId !== "")
+            writer.tag(1, WireType.LengthDelimited).string(message.emojiId);
+        /* string senderUid = 4; */
+        if (message.senderUid !== "")
+            writer.tag(4, WireType.LengthDelimited).string(message.senderUid);
+        /* SysMessage.EmojiLikeToOthersAttributes.Operation operation = 5; */
+        if (message.operation !== 0)
+            writer.tag(5, WireType.Varint).int32(message.operation);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.EmojiLikeToOthersAttributes
+ */
+export const EmojiLikeToOthersAttributes = new EmojiLikeToOthersAttributes$Type();

src/core/proto/GreyTipWrapper.proto

@@ -0,0 +1,9 @@
+syntax = 'proto3';
+package SysMessage;
+
+message GreyTipWrapper {
+  uint32 subTypeId = 1;
+  uint32 groupCode = 4;
+  uint32 subTypeIdMinusOne = 13;
+  bytes rest = 44;
+}

src/core/proto/GreyTipWrapper.ts

@@ -0,0 +1,104 @@
+// @generated by protobuf-ts 2.9.4
+// @generated from protobuf file "GreyTipWrapper.proto" (package "SysMessage", syntax proto3)
+// tslint:disable
+import type {
+    BinaryReadOptions,
+    BinaryWriteOptions,
+    IBinaryReader,
+    IBinaryWriter,
+    PartialMessage,
+} from '@protobuf-ts/runtime';
+import { MessageType, reflectionMergePartial, UnknownFieldHandler, WireType } from '@protobuf-ts/runtime';
+
+/**
+ * @generated from protobuf message SysMessage.GreyTipWrapper
+ */
+export interface GreyTipWrapper {
+    /**
+     * @generated from protobuf field: uint32 subTypeId = 1;
+     */
+    subTypeId: number;
+    /**
+     * @generated from protobuf field: uint32 groupCode = 4;
+     */
+    groupCode: number;
+    /**
+     * @generated from protobuf field: uint32 subTypeIdMinusOne = 13;
+     */
+    subTypeIdMinusOne: number;
+    /**
+     * @generated from protobuf field: bytes rest = 44;
+     */
+    rest: Uint8Array;
+}
+// @generated message type with reflection information, may provide speed optimized methods
+class GreyTipWrapper$Type extends MessageType<GreyTipWrapper> {
+    constructor() {
+        super("SysMessage.GreyTipWrapper", [
+            { no: 1, name: "subTypeId", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 4, name: "groupCode", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 13, name: "subTypeIdMinusOne", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 44, name: "rest", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
+        ]);
+    }
+    create(value?: PartialMessage<GreyTipWrapper>): GreyTipWrapper {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.subTypeId = 0;
+        message.groupCode = 0;
+        message.subTypeIdMinusOne = 0;
+        message.rest = new Uint8Array(0);
+        if (value !== undefined)
+            reflectionMergePartial<GreyTipWrapper>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: GreyTipWrapper): GreyTipWrapper {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* uint32 subTypeId */ 1:
+                    message.subTypeId = reader.uint32();
+                    break;
+                case /* uint32 groupCode */ 4:
+                    message.groupCode = reader.uint32();
+                    break;
+                case /* uint32 subTypeIdMinusOne */ 13:
+                    message.subTypeIdMinusOne = reader.uint32();
+                    break;
+                case /* bytes rest */ 44:
+                    message.rest = reader.bytes();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: GreyTipWrapper, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* uint32 subTypeId = 1; */
+        if (message.subTypeId !== 0)
+            writer.tag(1, WireType.Varint).uint32(message.subTypeId);
+        /* uint32 groupCode = 4; */
+        if (message.groupCode !== 0)
+            writer.tag(4, WireType.Varint).uint32(message.groupCode);
+        /* uint32 subTypeIdMinusOne = 13; */
+        if (message.subTypeIdMinusOne !== 0)
+            writer.tag(13, WireType.Varint).uint32(message.subTypeIdMinusOne);
+        /* bytes rest = 44; */
+        if (message.rest.length)
+            writer.tag(44, WireType.LengthDelimited).bytes(message.rest);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.GreyTipWrapper
+ */
+export const GreyTipWrapper = new GreyTipWrapper$Type();

src/core/proto/SysMessage.proto

@@ -0,0 +1,36 @@
+syntax = 'proto3';
+package SysMessage;
+
+message SysMessage {
+  repeated SysMessageHeader header = 1;
+  repeated SysMessageMsgSpec msgSpec = 2;
+  SysMessageBodyWrapper bodyWrapper = 3;
+}
+
+message SysMessageHeader {
+  uint32 PeerNumber = 1;
+  string PeerString = 2;
+  uint32 Uin = 5;
+  optional string Uid = 6;
+}
+
+message SysMessageMsgSpec {
+  uint32 msgType = 1;
+  uint32 subType = 2;
+  uint32 subSubType = 3;
+  uint32 msgSeq = 5;
+  uint32 time = 6;
+  uint64 msgId = 12;
+  uint32 other = 13;
+}
+
+message SysMessageBodyWrapper {
+  bytes wrappedBody = 2;
+  // Find the first [08], or ignore the first 7 bytes?
+  // And it becomes another ProtoBuf message.
+}
+
+message KeyValuePair {
+  string key = 1;
+  string value = 2;
+}

src/core/proto/SysMessage.ts

@@ -0,0 +1,435 @@
+// @generated by protobuf-ts 2.9.4
+// @generated from protobuf file "SysMessage.proto" (package "SysMessage", syntax proto3)
+// tslint:disable
+import type {
+    BinaryReadOptions,
+    BinaryWriteOptions,
+    IBinaryReader,
+    IBinaryWriter,
+    PartialMessage,
+} from '@protobuf-ts/runtime';
+import { MessageType, reflectionMergePartial, UnknownFieldHandler, WireType } from '@protobuf-ts/runtime';
+
+/**
+ * @generated from protobuf message SysMessage.SysMessage
+ */
+export interface SysMessage {
+    /**
+     * @generated from protobuf field: repeated SysMessage.SysMessageHeader header = 1;
+     */
+    header: SysMessageHeader[];
+    /**
+     * @generated from protobuf field: repeated SysMessage.SysMessageMsgSpec msgSpec = 2;
+     */
+    msgSpec: SysMessageMsgSpec[];
+    /**
+     * @generated from protobuf field: SysMessage.SysMessageBodyWrapper bodyWrapper = 3;
+     */
+    bodyWrapper?: SysMessageBodyWrapper;
+}
+/**
+ * @generated from protobuf message SysMessage.SysMessageHeader
+ */
+export interface SysMessageHeader {
+    /**
+     * @generated from protobuf field: uint32 PeerNumber = 1 [json_name = "PeerNumber"];
+     */
+    peerNumber: number;
+    /**
+     * @generated from protobuf field: string PeerString = 2 [json_name = "PeerString"];
+     */
+    peerString: string;
+    /**
+     * @generated from protobuf field: uint32 Uin = 5 [json_name = "Uin"];
+     */
+    uin: number;
+    /**
+     * @generated from protobuf field: optional string Uid = 6 [json_name = "Uid"];
+     */
+    uid?: string;
+}
+/**
+ * @generated from protobuf message SysMessage.SysMessageMsgSpec
+ */
+export interface SysMessageMsgSpec {
+    /**
+     * @generated from protobuf field: uint32 msgType = 1;
+     */
+    msgType: number;
+    /**
+     * @generated from protobuf field: uint32 subType = 2;
+     */
+    subType: number;
+    /**
+     * @generated from protobuf field: uint32 subSubType = 3;
+     */
+    subSubType: number;
+    /**
+     * @generated from protobuf field: uint32 msgSeq = 5;
+     */
+    msgSeq: number;
+    /**
+     * @generated from protobuf field: uint32 time = 6;
+     */
+    time: number;
+    /**
+     * @generated from protobuf field: uint64 msgId = 12;
+     */
+    msgId: bigint;
+    /**
+     * @generated from protobuf field: uint32 other = 13;
+     */
+    other: number;
+}
+/**
+ * @generated from protobuf message SysMessage.SysMessageBodyWrapper
+ */
+export interface SysMessageBodyWrapper {
+    /**
+     * @generated from protobuf field: bytes wrappedBody = 2;
+     */
+    wrappedBody: Uint8Array; // Find the first [08], or ignore the first 7 bytes?
+    // And it becomes another ProtoBuf message.
+}
+/**
+ * @generated from protobuf message SysMessage.KeyValuePair
+ */
+export interface KeyValuePair {
+    /**
+     * @generated from protobuf field: string key = 1;
+     */
+    key: string;
+    /**
+     * @generated from protobuf field: string value = 2;
+     */
+    value: string;
+}
+// @generated message type with reflection information, may provide speed optimized methods
+class SysMessage$Type extends MessageType<SysMessage> {
+    constructor() {
+        super("SysMessage.SysMessage", [
+            { no: 1, name: "header", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => SysMessageHeader },
+            { no: 2, name: "msgSpec", kind: "message", repeat: 1 /*RepeatType.PACKED*/, T: () => SysMessageMsgSpec },
+            { no: 3, name: "bodyWrapper", kind: "message", T: () => SysMessageBodyWrapper }
+        ]);
+    }
+    create(value?: PartialMessage<SysMessage>): SysMessage {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.header = [];
+        message.msgSpec = [];
+        if (value !== undefined)
+            reflectionMergePartial<SysMessage>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessage): SysMessage {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* repeated SysMessage.SysMessageHeader header */ 1:
+                    message.header.push(SysMessageHeader.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
+                case /* repeated SysMessage.SysMessageMsgSpec msgSpec */ 2:
+                    message.msgSpec.push(SysMessageMsgSpec.internalBinaryRead(reader, reader.uint32(), options));
+                    break;
+                case /* SysMessage.SysMessageBodyWrapper bodyWrapper */ 3:
+                    message.bodyWrapper = SysMessageBodyWrapper.internalBinaryRead(reader, reader.uint32(), options, message.bodyWrapper);
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: SysMessage, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* repeated SysMessage.SysMessageHeader header = 1; */
+        for (let i = 0; i < message.header.length; i++)
+            SysMessageHeader.internalBinaryWrite(message.header[i], writer.tag(1, WireType.LengthDelimited).fork(), options).join();
+        /* repeated SysMessage.SysMessageMsgSpec msgSpec = 2; */
+        for (let i = 0; i < message.msgSpec.length; i++)
+            SysMessageMsgSpec.internalBinaryWrite(message.msgSpec[i], writer.tag(2, WireType.LengthDelimited).fork(), options).join();
+        /* SysMessage.SysMessageBodyWrapper bodyWrapper = 3; */
+        if (message.bodyWrapper)
+            SysMessageBodyWrapper.internalBinaryWrite(message.bodyWrapper, writer.tag(3, WireType.LengthDelimited).fork(), options).join();
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.SysMessage
+ */
+export const SysMessage = new SysMessage$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class SysMessageHeader$Type extends MessageType<SysMessageHeader> {
+    constructor() {
+        super("SysMessage.SysMessageHeader", [
+            { no: 1, name: "PeerNumber", kind: "scalar", jsonName: "PeerNumber", T: 13 /*ScalarType.UINT32*/ },
+            { no: 2, name: "PeerString", kind: "scalar", jsonName: "PeerString", T: 9 /*ScalarType.STRING*/ },
+            { no: 5, name: "Uin", kind: "scalar", jsonName: "Uin", T: 13 /*ScalarType.UINT32*/ },
+            { no: 6, name: "Uid", kind: "scalar", jsonName: "Uid", opt: true, T: 9 /*ScalarType.STRING*/ }
+        ]);
+    }
+    create(value?: PartialMessage<SysMessageHeader>): SysMessageHeader {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.peerNumber = 0;
+        message.peerString = "";
+        message.uin = 0;
+        if (value !== undefined)
+            reflectionMergePartial<SysMessageHeader>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageHeader): SysMessageHeader {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* uint32 PeerNumber = 1 [json_name = "PeerNumber"];*/ 1:
+                    message.peerNumber = reader.uint32();
+                    break;
+                case /* string PeerString = 2 [json_name = "PeerString"];*/ 2:
+                    message.peerString = reader.string();
+                    break;
+                case /* uint32 Uin = 5 [json_name = "Uin"];*/ 5:
+                    message.uin = reader.uint32();
+                    break;
+                case /* optional string Uid = 6 [json_name = "Uid"];*/ 6:
+                    message.uid = reader.string();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: SysMessageHeader, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* uint32 PeerNumber = 1 [json_name = "PeerNumber"]; */
+        if (message.peerNumber !== 0)
+            writer.tag(1, WireType.Varint).uint32(message.peerNumber);
+        /* string PeerString = 2 [json_name = "PeerString"]; */
+        if (message.peerString !== "")
+            writer.tag(2, WireType.LengthDelimited).string(message.peerString);
+        /* uint32 Uin = 5 [json_name = "Uin"]; */
+        if (message.uin !== 0)
+            writer.tag(5, WireType.Varint).uint32(message.uin);
+        /* optional string Uid = 6 [json_name = "Uid"]; */
+        if (message.uid !== undefined)
+            writer.tag(6, WireType.LengthDelimited).string(message.uid);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.SysMessageHeader
+ */
+export const SysMessageHeader = new SysMessageHeader$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class SysMessageMsgSpec$Type extends MessageType<SysMessageMsgSpec> {
+    constructor() {
+        super("SysMessage.SysMessageMsgSpec", [
+            { no: 1, name: "msgType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 2, name: "subType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 3, name: "subSubType", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 5, name: "msgSeq", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 6, name: "time", kind: "scalar", T: 13 /*ScalarType.UINT32*/ },
+            { no: 12, name: "msgId", kind: "scalar", T: 4 /*ScalarType.UINT64*/, L: 0 /*LongType.BIGINT*/ },
+            { no: 13, name: "other", kind: "scalar", T: 13 /*ScalarType.UINT32*/ }
+        ]);
+    }
+    create(value?: PartialMessage<SysMessageMsgSpec>): SysMessageMsgSpec {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.msgType = 0;
+        message.subType = 0;
+        message.subSubType = 0;
+        message.msgSeq = 0;
+        message.time = 0;
+        message.msgId = 0n;
+        message.other = 0;
+        if (value !== undefined)
+            reflectionMergePartial<SysMessageMsgSpec>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageMsgSpec): SysMessageMsgSpec {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* uint32 msgType */ 1:
+                    message.msgType = reader.uint32();
+                    break;
+                case /* uint32 subType */ 2:
+                    message.subType = reader.uint32();
+                    break;
+                case /* uint32 subSubType */ 3:
+                    message.subSubType = reader.uint32();
+                    break;
+                case /* uint32 msgSeq */ 5:
+                    message.msgSeq = reader.uint32();
+                    break;
+                case /* uint32 time */ 6:
+                    message.time = reader.uint32();
+                    break;
+                case /* uint64 msgId */ 12:
+                    message.msgId = reader.uint64().toBigInt();
+                    break;
+                case /* uint32 other */ 13:
+                    message.other = reader.uint32();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: SysMessageMsgSpec, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* uint32 msgType = 1; */
+        if (message.msgType !== 0)
+            writer.tag(1, WireType.Varint).uint32(message.msgType);
+        /* uint32 subType = 2; */
+        if (message.subType !== 0)
+            writer.tag(2, WireType.Varint).uint32(message.subType);
+        /* uint32 subSubType = 3; */
+        if (message.subSubType !== 0)
+            writer.tag(3, WireType.Varint).uint32(message.subSubType);
+        /* uint32 msgSeq = 5; */
+        if (message.msgSeq !== 0)
+            writer.tag(5, WireType.Varint).uint32(message.msgSeq);
+        /* uint32 time = 6; */
+        if (message.time !== 0)
+            writer.tag(6, WireType.Varint).uint32(message.time);
+        /* uint64 msgId = 12; */
+        if (message.msgId !== 0n)
+            writer.tag(12, WireType.Varint).uint64(message.msgId);
+        /* uint32 other = 13; */
+        if (message.other !== 0)
+            writer.tag(13, WireType.Varint).uint32(message.other);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.SysMessageMsgSpec
+ */
+export const SysMessageMsgSpec = new SysMessageMsgSpec$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class SysMessageBodyWrapper$Type extends MessageType<SysMessageBodyWrapper> {
+    constructor() {
+        super("SysMessage.SysMessageBodyWrapper", [
+            { no: 2, name: "wrappedBody", kind: "scalar", T: 12 /*ScalarType.BYTES*/ }
+        ]);
+    }
+    create(value?: PartialMessage<SysMessageBodyWrapper>): SysMessageBodyWrapper {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.wrappedBody = new Uint8Array(0);
+        if (value !== undefined)
+            reflectionMergePartial<SysMessageBodyWrapper>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: SysMessageBodyWrapper): SysMessageBodyWrapper {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* bytes wrappedBody */ 2:
+                    message.wrappedBody = reader.bytes();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: SysMessageBodyWrapper, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* bytes wrappedBody = 2; */
+        if (message.wrappedBody.length)
+            writer.tag(2, WireType.LengthDelimited).bytes(message.wrappedBody);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.SysMessageBodyWrapper
+ */
+export const SysMessageBodyWrapper = new SysMessageBodyWrapper$Type();
+// @generated message type with reflection information, may provide speed optimized methods
+class KeyValuePair$Type extends MessageType<KeyValuePair> {
+    constructor() {
+        super("SysMessage.KeyValuePair", [
+            { no: 1, name: "key", kind: "scalar", T: 9 /*ScalarType.STRING*/ },
+            { no: 2, name: "value", kind: "scalar", T: 9 /*ScalarType.STRING*/ }
+        ]);
+    }
+    create(value?: PartialMessage<KeyValuePair>): KeyValuePair {
+        const message = globalThis.Object.create((this.messagePrototype!));
+        message.key = "";
+        message.value = "";
+        if (value !== undefined)
+            reflectionMergePartial<KeyValuePair>(this, message, value);
+        return message;
+    }
+    internalBinaryRead(reader: IBinaryReader, length: number, options: BinaryReadOptions, target?: KeyValuePair): KeyValuePair {
+        let message = target ?? this.create(), end = reader.pos + length;
+        while (reader.pos < end) {
+            let [fieldNo, wireType] = reader.tag();
+            switch (fieldNo) {
+                case /* string key */ 1:
+                    message.key = reader.string();
+                    break;
+                case /* string value */ 2:
+                    message.value = reader.string();
+                    break;
+                default:
+                    let u = options.readUnknownField;
+                    if (u === "throw")
+                        throw new globalThis.Error(`Unknown field ${fieldNo} (wire type ${wireType}) for ${this.typeName}`);
+                    let d = reader.skip(wireType);
+                    if (u !== false)
+                        (u === true ? UnknownFieldHandler.onRead : u)(this.typeName, message, fieldNo, wireType, d);
+            }
+        }
+        return message;
+    }
+    internalBinaryWrite(message: KeyValuePair, writer: IBinaryWriter, options: BinaryWriteOptions): IBinaryWriter {
+        /* string key = 1; */
+        if (message.key !== "")
+            writer.tag(1, WireType.LengthDelimited).string(message.key);
+        /* string value = 2; */
+        if (message.value !== "")
+            writer.tag(2, WireType.LengthDelimited).string(message.value);
+        let u = options.writeUnknownFields;
+        if (u !== false)
+            (u == true ? UnknownFieldHandler.onWrite : u)(this.typeName, message, writer);
+        return writer;
+    }
+}
+/**
+ * @generated MessageType for protobuf message SysMessage.KeyValuePair
+ */
+export const KeyValuePair = new KeyValuePair$Type();

src/core/services/NodeIKernelFileAssistantService.ts

@@ -1,5 +1,7 @@
+import { NodeIKernelFileAssistantListener } from '@/core';
+
 export interface NodeIKernelFileAssistantService {
-    addKernelFileAssistantListener(arg1: unknown[]): unknown;
+    addKernelFileAssistantListener(listener: NodeIKernelFileAssistantListener): unknown;
 
     removeKernelFileAssistantListener(arg1: unknown[]): unknown;
 
@@ -9,7 +11,7 @@ export interface NodeIKernelFileAssistantService {
 
     getFileSessionList(): unknown;
 
-    searchFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
+    searchFile(keywords: string[], params: { resultType: number, pageLimit: number }, resultId: number): number;
 
     resetSearchFileSortType(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
 
@@ -17,7 +19,7 @@ export interface NodeIKernelFileAssistantService {
 
     cancelSearchFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
 
-    downloadFile(arg1: unknown[]): unknown;
+    downloadFile(fileIds: string[]): { result: number, errMsg: string };
 
     forwardFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
 
@@ -32,4 +34,4 @@ export interface NodeIKernelFileAssistantService {
     saveAsWithRename(arg1: unknown, arg2: unknown, arg3: unknown): unknown;
 
     isNull(): boolean;
-}
+}

src/core/services/NodeIKernelGroupService.ts

@@ -2,6 +2,7 @@ import { NodeIKernelGroupListener } from '@/core/listeners/NodeIKernelGroupListe
 import {
     GroupExt0xEF0InfoFilter,
     GroupExtParam,
+    GroupInfoSource,
     GroupMember,
     GroupMemberRole,
     GroupNotifyMsgType,
@@ -13,9 +14,9 @@ import { GeneralCallResult } from '@/core/services/common';
 //高版本的接口不应该随意使用 使用应该严格进行pr审核 同时部分ipc中未出现的接口不要过于依赖 应该做好数据兜底
 
 export interface NodeIKernelGroupService {
-    //getGroupExt0xEF0Info(this.$enableGroupCodes, this.$bannedGroupCodes, this.$filter, this.$forceFetch
     getGroupExt0xEF0Info(enableGroupCodes: string[], bannedGroupCodes: string[], filter: GroupExt0xEF0InfoFilter, forceFetch: boolean):
-        Promise<GeneralCallResult & { result: { groupExtInfos: Map<string, any> }}>;
+        Promise<GeneralCallResult & { result: { groupExtInfos: Map<string, any> } }>;
+
     kickMemberV2(param: KickMemberV2Req): Promise<GeneralCallResult>;
 
     quitGroupV2(param: { groupCode: string; needDeleteLocalMsg: boolean; }): Promise<GeneralCallResult>;
@@ -39,11 +40,11 @@ export interface NodeIKernelGroupService {
         realSpecialTitleFlag: number
     }): Promise<unknown>;
 
-    //26702
     getGroupMemberLevelInfo(groupCode: string): Promise<unknown>;
 
-    //26702
-    getGroupHonorList(groupCodes: Array<string>): unknown;
+    getGroupInfoForJoinGroup(groupCode: string, needPrivilegeFlag: boolean, serviceType: number): Promise<unknown>;
+
+    getGroupHonorList(req: { groupCodes: Array<string> }): Promise<unknown>;
 
     getUinByUids(uins: string[]): Promise<{
         errCode: number,
@@ -57,13 +58,10 @@ export interface NodeIKernelGroupService {
         uids: Map<string, string>
     }>;
 
-    //26702(其实更早 但是我不知道)
     checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>;
 
-    //26702(其实更早 但是我不知道)
     getGroupLatestEssenceList(groupCode: string): Promise<unknown>;
 
-    //26702(其实更早 但是我不知道)
     shareDigest(Req: {
         appId: string,
         appType: number,
@@ -83,20 +81,17 @@ export interface NodeIKernelGroupService {
         }
     }): Promise<unknown>;
 
-    //26702(其实更早 但是我不知道)
+
     isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
 
-    //26702(其实更早 但是我不知道)
     queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>;
 
-    //26702(其实更早 但是我不知道)
     fetchGroupEssenceList(Req: {
         groupCode: string,
         pageStart: number,
         pageLimit: number
     }, Arg: unknown): Promise<unknown>;
 
-    //26702
     getAllMemberList(groupCode: string, forceFetch: boolean): Promise<{
         errCode: number,
         errMsg: string,
@@ -135,8 +130,6 @@ export interface NodeIKernelGroupService {
 
     getMemberInfo(group_id: string, uids: string[], forceFetch: boolean): Promise<GeneralCallResult>;
 
-    //getMemberInfo  [ '56729xxxx', [ 'u_4Nj08cwW5Hxxxxx' ], true ]
-
     kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise<void>;
 
     modifyMemberRole(groupCode: string, uid: string, role: GroupMemberRole): void;
@@ -151,7 +144,7 @@ export interface NodeIKernelGroupService {
 
     getGroupExtList(force: boolean): Promise<GeneralCallResult>;
 
-    getGroupDetailInfo(groupCode: string): unknown;
+    getGroupDetailInfo(groupCode: string, groupInfoSource: GroupInfoSource): Promise<unknown>;
 
     getMemberExtInfo(param: GroupExtParam): Promise<unknown>;//req
 
@@ -189,14 +182,13 @@ export interface NodeIKernelGroupService {
 
     destroyGroup(groupCode: string): void;
 
-    //获取单屏群通知列表
-    getSingleScreenNotifies(force: boolean, start_seq: string, num: number): Promise<GeneralCallResult>;
+    getSingleScreenNotifies(doubted: boolean, start_seq: string, num: number): Promise<GeneralCallResult>;
 
     clearGroupNotifies(groupCode: string): void;
 
     getGroupNotifiesUnreadCount(unknown: boolean): Promise<GeneralCallResult>;
 
-    clearGroupNotifiesUnreadCount(groupCode: string): void;
+    clearGroupNotifiesUnreadCount(unknown: boolean): void;
 
     operateSysNotify(
         doubt: boolean,

src/core/services/NodeIKernelRichMediaService.ts

@@ -155,7 +155,7 @@ export interface NodeIKernelRichMediaService {
     }): unknown;
 
     //arg3为“”
-    downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown;
+    downloadFileForModelId(peer: Peer, ModelId: string[], unknown: string): Promise<unknown>;
 
     //第三个参数 Array<Type>
     // this.fileId = "";

src/core/wrapper.ts

@@ -1,4 +1,4 @@
-import { NodeIDependsAdapter, NodeIDispatcherAdapter, NodeIGlobalAdapter } from '../adapters';
+import { NodeIDependsAdapter, NodeIDispatcherAdapter, NodeIGlobalAdapter } from './adapters';
 import {
     NodeIKernelAvatarService,
     NodeIKernelBuddyService,
@@ -13,19 +13,19 @@ import {
     NodeIKernelStorageCleanService,
     NodeIKernelTicketService,
     NodeIKernelTipOffService,
-} from '@/core';
-import { NodeIKernelNodeMiscService } from '../services/NodeIKernelNodeMiscService';
-import { NodeIKernelUixConvertService } from '../services/NodeIKernelUixConvertService';
-import { NodeIKernelMsgBackupService } from '../services/NodeIKernelMsgBackupService';
-import { NodeIKernelAlbumService } from '../services/NodeIKernelAlbumService';
-import { NodeIKernelTianShuService } from '../services/NodeIKernelTianShuService';
-import { NodeIKernelUnitedConfigService } from '../services/NodeIKernelUnitedConfigService';
-import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
-import { NodeIKernelCollectionService } from '../services/NodeIKernelCollectionService';
-import { NodeIKernelRecentContactService } from '../services/NodeIKernelRecentContactService';
-import { NodeIKernelMSFService } from '../services/NodeIKernelMSFService';
-import { NodeIkernelTestPerformanceService } from '../services/NodeIkernelTestPerformanceService';
-import { NodeIKernelECDHService } from '../services/NodeIKernelECDHService';
+} from '@/core/index';
+import { NodeIKernelNodeMiscService } from './services/NodeIKernelNodeMiscService';
+import { NodeIKernelUixConvertService } from './services/NodeIKernelUixConvertService';
+import { NodeIKernelMsgBackupService } from './services/NodeIKernelMsgBackupService';
+import { NodeIKernelAlbumService } from './services/NodeIKernelAlbumService';
+import { NodeIKernelTianShuService } from './services/NodeIKernelTianShuService';
+import { NodeIKernelUnitedConfigService } from './services/NodeIKernelUnitedConfigService';
+import { NodeIKernelSearchService } from './services/NodeIKernelSearchService';
+import { NodeIKernelCollectionService } from './services/NodeIKernelCollectionService';
+import { NodeIKernelRecentContactService } from './services/NodeIKernelRecentContactService';
+import { NodeIKernelMSFService } from './services/NodeIKernelMSFService';
+import { NodeIkernelTestPerformanceService } from './services/NodeIkernelTestPerformanceService';
+import { NodeIKernelECDHService } from './services/NodeIKernelECDHService';
 
 export interface NodeQQNTWrapperUtil {
     get(): unknown;

src/core/wrapper/context.ts

@@ -1,27 +0,0 @@
-import { LogWrapper } from '@/common/log';
-import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
-import { NapCatCoreWorkingEnv, NodeIKernelLoginService, NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core';
-import { NTQQFileApi, NTQQFriendApi, NTQQGroupApi, NTQQMsgApi, NTQQSystemApi, NTQQUserApi, NTQQWebApi } from '../apis';
-import { NTQQCollectionApi } from '../apis/collection';
-import { NapCatPathWrapper } from '@/common/path';
-
-export interface InstanceContext {
-    readonly workingEnv: NapCatCoreWorkingEnv;
-    readonly wrapper: WrapperNodeApi;
-    readonly session: NodeIQQNTWrapperSession;
-    readonly logger: LogWrapper;
-    readonly loginService: NodeIKernelLoginService;
-    readonly basicInfoWrapper: QQBasicInfoWrapper;
-    readonly pathWrapper: NapCatPathWrapper;
-}
-
-export interface StableNTApiWrapper {
-    FileApi: NTQQFileApi,
-    SystemApi: NTQQSystemApi,
-    CollectionApi: NTQQCollectionApi,
-    WebApi: NTQQWebApi,
-    FriendApi: NTQQFriendApi,
-    MsgApi: NTQQMsgApi,
-    UserApi: NTQQUserApi,
-    GroupApi: NTQQGroupApi
-}

src/core/wrapper/helper.ts

@@ -1,55 +0,0 @@
-import path from 'node:path';
-import fs from 'node:fs';
-import { PlatformType, VendorType, WrapperSessionInitConfig } from './wrapper';
-import { getMachineId, hostname, systemName, systemVersion } from '@/common/system';
-
-export async function genSessionConfig(QQVersionAppid: string, QQVersion: string, selfUin: string, selfUid: string, account_path: string): Promise<WrapperSessionInitConfig> {
-    const downloadPath = path.join(account_path, 'NapCat', 'temp');
-    fs.mkdirSync(downloadPath, { recursive: true });
-    const guid: string = await getMachineId();//26702 支持JS获取guid值 在LoginService中获取 TODO mlikiow a
-    const config: WrapperSessionInitConfig = {
-        selfUin,
-        selfUid,
-        desktopPathConfig: {
-            account_path, // 可以通过NodeQQNTWrapperUtil().getNTUserDataInfoConfig()获取
-        },
-        clientVer: QQVersion,  // 9.9.8-22355
-        a2: '',
-        d2: '',
-        d2Key: '',
-        machineId: '',
-        platform: PlatformType.KWINDOWS,  // 3是Windows?
-        platVer: systemVersion,  // 系统版本号, 应该可以固定
-        appid: QQVersionAppid,
-        rdeliveryConfig: {
-            appKey: '',
-            systemId: 0,
-            appId: '',
-            logicEnvironment: '',
-            platform: PlatformType.KWINDOWS,
-            language: '',
-            sdkVersion: '',
-            userId: '',
-            appVersion: '',
-            osVersion: '',
-            bundleId: '',
-            serverUrl: '',
-            fixedAfterHitKeys: [''],
-        },
-        defaultFileDownloadPath: downloadPath,
-        deviceInfo: {
-            guid,
-            buildVer: QQVersion,
-            localId: 2052,
-            devName: hostname,
-            devType: systemName,
-            vendorName: '',
-            osVer: systemVersion,
-            vendorOsName: systemName,
-            setMute: false,
-            vendorType: VendorType.KNOSETONIOS,
-        },
-        deviceConfig: '{"appearance":{"isSplitViewMode":true},"msg":{}}',
-    };
-    return config;
-}

src/core/wrapper/index.ts

@@ -1,3 +0,0 @@
-export * from './wrapper';
-export * from './helper';
-export * from './context';

src/framework/napcat.ts

@@ -2,12 +2,11 @@ import { NapCatPathWrapper } from '@/common/path';
 import { LogWrapper } from '@/common/log';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
-import { loadQQWrapper, NapCatCore, NapCatCoreWorkingEnv } from '@/core/core';
-import { InstanceContext } from '@/core';
+import { InstanceContext, loadQQWrapper, NapCatCore, NapCatCoreWorkingEnv } from '@/core';
 import { SelfInfo } from '@/core/entities';
 import { NodeIKernelLoginListener } from '@/core/listeners';
 import { NodeIKernelLoginService } from '@/core/services';
-import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper/wrapper';
+import { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
 import { InitWebUi, WebUiConfig } from '@/webui';
 import { NapCatOneBot11Adapter } from '@/onebot';
 

src/nekodoge/network/socket.ts

@@ -1,4 +1,5 @@
 import { createServer } from 'node:net';
+
 export class NewAdapterNetwork {
     constructor(public host: number, public port: number) { }
     async open() {
@@ -11,8 +12,8 @@ export class NewAdapterNetwork {
             });
             socket.on('connect', () => {
 
-            })
+            });
         });
         server.listen(this.port, this.host);
     }
-}
+}

src/onebot/action/extends/GetFriendWithCategory.ts

@@ -1,4 +1,4 @@
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 

src/onebot/action/extends/GetGroupInfoEx.ts

@@ -0,0 +1,24 @@
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['number', 'string'] },
+    },
+    required: ['group_id'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupInfoEx extends BaseAction<Payload, any> {
+    actionName = ActionName.GetGroupInfoEx;
+    payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        const groupInfoEx = (await NTQQGroupApi.getGroupExtFE0Info([payload.group_id.toString()])).result.groupExtInfos.get(payload.group_id.toString());
+        return groupInfoEx;
+    }
+}

src/onebot/action/extends/SetOnlineStatus.ts

@@ -7,10 +7,10 @@ const SchemaData = {
     type: 'object',
     properties: {
         status: { type: ['number', 'string'] },
-        extStatus: { type: ['number', 'string'] },
-        batteryStatus: { type: ['number', 'string'] },
+        ext_status: { type: ['number', 'string'] },
+        battery_status: { type: ['number', 'string'] },
     },
-    required: ['status', 'extStatus', 'batteryStatus'],
+    required: ['status', 'ext_status', 'battery_status'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
@@ -23,8 +23,8 @@ export class SetOnlineStatus extends BaseAction<Payload, null> {
         const NTQQUserApi = this.core.apis.UserApi;
         const ret = await NTQQUserApi.setSelfOnlineStatus(
             parseInt(payload.status.toString()),
-            parseInt(payload.extStatus.toString()),
-            parseInt(payload.batteryStatus.toString()),
+            parseInt(payload.ext_status.toString()),
+            parseInt(payload.battery_status.toString()),
         );
         if (ret.result !== 0) {
             throw new Error('设置在线状态失败');

src/onebot/action/file/GetFile.ts

@@ -1,8 +1,7 @@
 import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
-import { UUIDConverter } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/helper';
 import { ActionName } from '../types';
-import { ChatType, ElementType, Peer, RawMessage } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 export interface GetFilePayload {
@@ -29,100 +28,80 @@ export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
     payloadSchema: any = GetFileBase_PayloadSchema;
 
     async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-        const NTQQFriendApi = this.core.apis.FriendApi;
-        const NTQQUserApi = this.core.apis.UserApi;
         const NTQQMsgApi = this.core.apis.MsgApi;
-        const NTQQGroupApi = this.core.apis.GroupApi;
         const NTQQFileApi = this.core.apis.FileApi;
-        try {
-            const uuidData = UUIDConverter.decode(payload.file);
-            const peerUin = uuidData.high;
-            const msgId = uuidData.low;
-            const isGroup: boolean = !!(await NTQQGroupApi.getGroups(false)).find(e => e.groupCode == peerUin);
-            let peer: Peer | undefined;
-            //识别Peer
-            if (isGroup) {
-                peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: peerUin };
-            }
-            const PeerUid = await NTQQUserApi.getUidByUinV2(peerUin);
-            if (PeerUid) {
-                const isBuddy = await NTQQFriendApi.isBuddy(PeerUid);
-                if (isBuddy) {
-                    peer = { chatType: ChatType.KCHATTYPEC2C, peerUid: PeerUid };
-                } else {
-                    peer = { chatType: ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: PeerUid };
-                }
-            }
-            if (!peer) {
-                throw new Error('chattype not support');
-            }
-            const msgList = await NTQQMsgApi.getMsgsByMsgId(peer, [msgId]);
-            if (msgList.msgList.length == 0) {
-                throw new Error('msg not found');
-            }
-            const msg = msgList.msgList[0];
-            const findEle = msg.elements.find(e => e.elementType == ElementType.VIDEO || e.elementType == ElementType.FILE || e.elementType == ElementType.PTT);
-            if (!findEle) {
-                throw new Error('element not found');
-            }
-            const downloadPath = await NTQQFileApi.downloadMedia(msgId, msg.chatType, msg.peerUid, findEle.elementId, '', '');
-            const fileSize = findEle?.videoElement?.fileSize || findEle?.fileElement?.fileSize || findEle?.pttElement?.fileSize || '0';
-            const fileName = findEle?.videoElement?.fileName || findEle?.fileElement?.fileName || findEle?.pttElement?.fileName || '';
+
+        //接收消息标记模式
+        const contextMsgFile = FileNapCatOneBotUUID.decode(payload.file);
+        if (contextMsgFile) {
+            const { peer, msgId, elementId } = contextMsgFile;
+            const downloadPath = await NTQQFileApi.downloadMedia(msgId, peer.chatType, peer.peerUid, elementId, '', '');
+            const mixElement = (await NTQQMsgApi.getMsgsByMsgId(peer, [msgId]))?.msgList
+                .find(msg => msg.msgId === msgId)?.elements.find(e => e.elementId === elementId);
+            const mixElementInner = mixElement?.videoElement ?? mixElement?.fileElement ?? mixElement?.pttElement ?? mixElement?.picElement;
+            if (!mixElementInner) throw new Error('element not found');
+            const fileSize = mixElementInner.fileSize?.toString() ?? '';
+            const fileName = mixElementInner.fileName ?? '';
+
             const res: GetFileResponse = {
                 file: downloadPath,
                 url: downloadPath,
                 file_size: fileSize,
                 file_name: fileName,
             };
-            if (/* enableLocalFile2Url && */ downloadPath) {
+
+            if (this.obContext.configLoader.configData.enableLocalFile2Url && downloadPath) {
                 try {
                     res.base64 = await fs.readFile(downloadPath, 'base64');
                 } catch (e) {
                     throw new Error('文件下载失败. ' + e);
                 }
             }
-            //不手动删除？文件持久化了
             return res;
-        } catch {
-            this.core.context.logger.logDebug('GetFileBase Mode - 1 Error');
         }
 
-        const NTSearchNameResult = (await NTQQFileApi.searchfile([payload.file])).resultItems;
-        if (NTSearchNameResult.length !== 0) {
-            const MsgId = NTSearchNameResult[0].msgId;
-            let peer: Peer | undefined = undefined;
-            if (NTSearchNameResult[0].chatType == ChatType.KCHATTYPEGROUP) {
-                peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: NTSearchNameResult[0].groupChatInfo[0].groupCode };
-            }
-            if (!peer) {
-                throw new Error('chattype not support');
-            }
-            const msgList: RawMessage[] = (await NTQQMsgApi.getMsgsByMsgId(peer, [MsgId]))?.msgList;
-            if (!msgList || msgList.length == 0) {
-                throw new Error('msg not found');
-            }
-            const msg = msgList[0];
-            const file = msg.elements.filter(e => e.elementType == NTSearchNameResult[0].elemType);
-            if (file.length == 0) {
-                throw new Error('file not found');
-            }
-            const downloadPath = await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid, file[0].elementId, '', '');
+        //群文件模式
+        const contextModelIdFile = FileNapCatOneBotUUID.decodeModelId(payload.file);
+        if (contextModelIdFile) {
+            const { peer, modelId } = contextModelIdFile;
+            const downloadPath = await NTQQFileApi.downloadFileForModelId(peer, modelId, '');
             const res: GetFileResponse = {
                 file: downloadPath,
                 url: downloadPath,
-                file_size: NTSearchNameResult[0].fileSize.toString(),
-                file_name: NTSearchNameResult[0].fileName,
+                file_size: '',
+                file_name: '',
             };
-            if (/* enableLocalFile2Url && */ downloadPath) {
+
+            if (this.obContext.configLoader.configData.enableLocalFile2Url && downloadPath) {
                 try {
                     res.base64 = await fs.readFile(downloadPath, 'base64');
                 } catch (e) {
                     throw new Error('文件下载失败. ' + e);
                 }
             }
-            //不手动删除？文件持久化了
             return res;
         }
+
+        //搜索名字模式
+        const searchResult = (await NTQQFileApi.searchForFile([payload.file]));
+        if (searchResult) {
+            const downloadPath = await NTQQFileApi.downloadFileById(searchResult.id, parseInt(searchResult.fileSize));
+            const res: GetFileResponse = {
+                file: downloadPath,
+                url: downloadPath,
+                file_size: searchResult.fileSize.toString(),
+                file_name: searchResult.fileName,
+            };
+            if (this.obContext.configLoader.configData.enableLocalFile2Url && downloadPath) {
+                try {
+                    res.base64 = await fs.readFile(downloadPath, 'base64');
+                } catch (e) {
+                    throw new Error('文件下载失败. ' + e);
+                }
+            }
+            return res;
+        }
+
         throw new Error('file not found');
     }
 }

src/onebot/action/file/GetGroupFileCount.ts

@@ -17,8 +17,7 @@ export class GetGroupFileCount extends BaseAction<Payload, { count: number }> {
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        const NTQQGroupApi = this.core.apis.GroupApi;
-        const ret = await NTQQGroupApi.GetGroupFileCount([payload.group_id?.toString()]);
+        const ret = await this.core.apis.GroupApi.getGroupFileCount([payload.group_id?.toString()]);
         return { count: ret.groupFileCounts[0] };
     }
 }

src/onebot/action/file/GetGroupFileList.ts

@@ -1,13 +1,15 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
+import { FileNapCatOneBotUUID } from '@/common/helper';
 
 const SchemaData = {
     type: 'object',
     properties: {
         group_id: { type: ['string', 'number'] },
-        start_index: { type: 'number' },
-        file_count: { type: 'number' },
+        start_index: { type: ['string', 'number'] },
+        file_count: { type: ['string', 'number'] },
+        folder_id: { type: ['string', 'number'] },
     },
     required: ['group_id', 'start_index', 'file_count'],
 } as const satisfies JSONSchema;
@@ -20,15 +22,30 @@ export class GetGroupFileList extends BaseAction<Payload, { FileList: Array<any>
 
     async _handle(payload: Payload) {
         const NTQQMsgApi = this.core.apis.MsgApi;
+        let param = {};
+        if (payload.folder_id) {
+            param = {
+                folderId: payload.folder_id.toString(),
+            };
+        }
         const ret = await NTQQMsgApi.getGroupFileList(payload.group_id.toString(), {
             sortType: 1,
-            fileCount: payload.file_count,
-            startIndex: payload.start_index,
+            fileCount: +payload.file_count,
+            startIndex: +payload.start_index,
             sortOrder: 2,
             showOnlinedocFolder: 0,
-        }).catch((e) => {
+            ...param
+        }).catch(() => {
             return [];
         });
+        ret.forEach((e) => {
+            const fileModelId = e?.fileInfo?.fileModelId;
+            if (fileModelId)
+                e.fileInfo!.fileId = FileNapCatOneBotUUID.encodeModelId({
+                    chatType: 2,
+                    peerUid: payload.group_id.toString()
+                }, fileModelId);
+        });
         return { FileList: ret };
     }
 }

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

@@ -0,0 +1,32 @@
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NapCatOneBot11Adapter } from '@/onebot';
+import { NapCatCore } from '@/core';
+import { SetGroupFileFolder } from '@/onebot/action/file/SetGroupFileFolder';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['string', 'number'] },
+        folder_name: { type: 'string' },
+    },
+    required: ['group_id', 'folder_name'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class CreateGroupFileFolder extends BaseAction<Payload, null> {
+    actionName = ActionName.GoCQHTTP_CreateGroupFileFolder;
+    payloadSchema = SchemaData;
+
+    constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore,
+                private ncSetGroupFileFolderImpl: SetGroupFileFolder) {
+        super(obContext, core);
+    }
+
+    async _handle(payload: Payload) {
+        await this.ncSetGroupFileFolderImpl._handle(payload);
+        return null;
+    }
+}

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

@@ -0,0 +1,32 @@
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NapCatCore } from '@/core';
+import { NapCatOneBot11Adapter } from '@/onebot';
+import { DelGroupFile } from '@/onebot/action/file/DelGroupFile';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['string', 'number'] },
+        file_id: { type: 'string' },
+    },
+    required: ['group_id', 'file_id'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class DeleteGroupFile extends BaseAction<Payload, null> {
+    actionName = ActionName.GOCQHTTP_DeleteGroupFile;
+    payloadSchema = SchemaData;
+
+    constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore,
+                private ncDelGroupFileImpl: DelGroupFile) {
+        super(obContext, core);
+    }
+
+    async _handle(payload: Payload) {
+        await this.ncDelGroupFileImpl._handle(payload);
+        return null;
+    }
+}

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

@@ -0,0 +1,32 @@
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NapCatCore } from '@/core';
+import { NapCatOneBot11Adapter } from '@/onebot';
+import { DelGroupFileFolder } from '@/onebot/action/file/DelGroupFileFolder';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['string', 'number'] },
+        folder_id: { type: 'string' },
+    },
+    required: ['group_id', 'folder_id'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class DeleteGroupFileFolder extends BaseAction<Payload, null> {
+    actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;
+    payloadSchema = SchemaData;
+
+    constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore,
+                private ncDelGroupFileFolderImpl: DelGroupFileFolder) {
+        super(obContext, core);
+    }
+
+    async _handle(payload: Payload) {
+        await this.ncDelGroupFileFolderImpl._handle(payload);
+        return null;
+    }
+}

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

@@ -38,7 +38,7 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
             const resMsg = await this.obContext.apis.MsgApi
                 .parseMessage(msg);
             if (!resMsg) return;
-            resMsg.message_id = MessageUnique.createMsg({
+            resMsg.message_id = MessageUnique.createUniqueMsgId({
                 guildId: '',
                 chatType: msg.chatType,
                 peerUid: msg.peerUid,

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

@@ -47,7 +47,7 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
         if (isReverseOrder) msgList.reverse();
         //转换序号
         await Promise.all(msgList.map(async msg => {
-            msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
+            msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(

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

@@ -0,0 +1,35 @@
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['string', 'number'] },
+    },
+    required: ['group_id'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupFileSystemInfo extends BaseAction<Payload, {
+    file_count: number,
+    limit_count: number, // unimplemented
+    used_space: number, // todo: unimplemented, but can be implemented later
+    total_space: number, // unimplemented, 10 GB by default
+}> {
+    actionName = ActionName.GoCQHTTP_GetGroupFileSystemInfo;
+    payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return {
+            file_count:
+                (await this.core.apis.GroupApi
+                    .getGroupFileCount([payload.group_id.toString()]))
+                    .groupFileCounts[0],
+            limit_count: 10000,
+            used_space: 0,
+            total_space: 10 * 1024 * 1024 * 1024,
+        };
+    }
+}

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

@@ -0,0 +1,52 @@
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NapCatOneBot11Adapter, OB11GroupFile } from '@/onebot';
+import { NapCatCore } from '@/core';
+import { GetGroupRootFiles } from '@/onebot/action/go-cqhttp/GetGroupRootFiles';
+import { OB11Entities } from '@/onebot/entities';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['string', 'number'] },
+        folder_id: { type: 'string' },
+    },
+    required: ['group_id', 'folder_id'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupFilesByFolder extends BaseAction<Payload, {
+    files: OB11GroupFile[],
+    folders: [] // QQ does not allow nested folders
+}> {
+    actionName = ActionName.GoCQHTTP_GetGroupFilesByFolder;
+    payloadSchema = SchemaData;
+
+    constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore,
+                private getGroupRootFilesImpl: GetGroupRootFiles) {
+        super(obContext, core);
+    }
+
+    async _handle(payload: Payload) {
+        const folder = (await this.getGroupRootFilesImpl._handle({ group_id: payload.group_id }))
+            .folders.find(folder => folder.folder_id === payload.folder_id);
+        if (!folder) {
+            throw new Error('Folder not found');
+        }
+        const ret = await this.core.apis.MsgApi.getGroupFileList(payload.group_id.toString(), {
+            sortType: 1,
+            fileCount: folder.total_file_count,
+            startIndex: 0,
+            sortOrder: 2,
+            showOnlinedocFolder: 0,
+            folderId: payload.folder_id,
+        }).catch(() => []);
+        return {
+            files: ret.filter(item => item.fileInfo)
+                .map(item => OB11Entities.file(item.peerId, item.fileInfo!)),
+            folders: [] as [],
+        };
+    }
+}

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

@@ -42,7 +42,7 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
         if (isReverseOrder) msgList.reverse();
         //转换序号
         await Promise.all(msgList.map(async msg => {
-            msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
+            msg.id = MessageUnique.createUniqueMsgId({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
         //烘焙消息
         const ob11MsgList = (await Promise.all(

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

@@ -0,0 +1,47 @@
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { NapCatOneBot11Adapter, OB11GroupFile, OB11GroupFileFolder } from '@/onebot';
+import { NapCatCore } from '@/core';
+import { GetGroupFileCount } from '@/onebot/action/file/GetGroupFileCount';
+import { OB11Entities } from '@/onebot/entities';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['string', 'number'] },
+    },
+    required: ['group_id'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupRootFiles extends BaseAction<Payload, {
+    files: OB11GroupFile[],
+    folders: OB11GroupFileFolder[],
+}> {
+    actionName = ActionName.GoCQHTTP_GetGroupRootFiles;
+    payloadSchema = SchemaData;
+
+    constructor(obContext: NapCatOneBot11Adapter, core: NapCatCore,
+                private ncGetGroupFileCountImpl: GetGroupFileCount) {
+        super(obContext, core);
+    }
+
+    async _handle(payload: Payload) {
+        const ret = await this.core.apis.MsgApi.getGroupFileList(payload.group_id.toString(), {
+            sortType: 1,
+            fileCount: (await this.ncGetGroupFileCountImpl._handle({ group_id: payload.group_id.toString() })).count,
+            startIndex: 0,
+            sortOrder: 2,
+            showOnlinedocFolder: 0,
+        }).catch(() => []);
+
+        return {
+            files: ret.filter(item => item.fileInfo)
+                .map(item => OB11Entities.file(item.peerId, item.fileInfo!)),
+            folders: ret.filter(item => item.folderInfo)
+                .map(item => OB11Entities.folder(item.peerId, item.folderInfo!)),
+        };
+    }
+}

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

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import { OB11User, OB11UserSex } from '@/onebot';
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { calcQQLevel } from '@/common/helper';

src/onebot/action/group/DelEssenceMsg.ts

@@ -20,7 +20,13 @@ export default class DelEssenceMsg extends BaseAction<Payload, any> {
     async _handle(payload: Payload): Promise<any> {
         const NTQQGroupApi = this.core.apis.GroupApi;
         const msg = MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id);
-        if (!msg) throw new Error('msg not found');
+        const NTQQWebApi = this.core.apis.WebApi;
+        if (!msg) {
+            const data = NTQQGroupApi.essenceLRU.getValue(+payload.message_id);
+            if(!data) throw new Error('消息不存在');
+            const { msg_seq, msg_random, group_id } = JSON.parse(data) as { msg_seq: string, msg_random: string, group_id: string };
+            return await NTQQGroupApi.removeGroupEssenceBySeq(group_id, msg_seq, msg_random);
+        }
         return await NTQQGroupApi.removeGroupEssence(
             msg.Peer.peerUid,
             msg.MsgId,

src/onebot/action/group/GetGroupEssence.ts

@@ -1,29 +1,99 @@
-import { GroupEssenceMsgRet } from '@/core';
+import { ChatType, Peer } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { MessageUnique } from '@/common/message-unique';
+import crypto from 'crypto';
 
 const SchemaData = {
     type: 'object',
     properties: {
-        group_id: { type: ['number', 'string'] },
-        pages: { type: ['number', 'string'] },
+        group_id: { type: ['number', 'string'] }
     },
     required: ['group_id'],
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupEssence extends BaseAction<Payload, GroupEssenceMsgRet> {
+export class GetGroupEssence extends BaseAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_GetEssenceMsg;
     payloadSchema = SchemaData;
 
+    private async msgSeqToMsgId(peer: Peer, msgSeq: string, msgRandom: string) {
+        const replyMsgList = (await this.core.apis.MsgApi.getMsgsBySeqAndCount(peer, msgSeq, 1, true, true)).msgList.find((msg) => msg.msgSeq === msgSeq && msg.msgRandom === msgRandom);
+        if (!replyMsgList) {
+            return undefined;
+        }
+        return {
+            id: MessageUnique.createUniqueMsgId(peer, replyMsgList.msgId),
+            msg: replyMsgList
+        };
+    }
+
     async _handle(payload: Payload) {
         const NTQQWebApi = this.core.apis.WebApi;
-        const ret = await NTQQWebApi.getGroupEssenceMsg(payload.group_id.toString(), (+(payload.pages ?? 0)).toString());
-        if (!ret) {
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        const msglist = (await NTQQWebApi.getGroupEssenceMsgAll(payload.group_id.toString())).flatMap((e) => e.data.msg_list);
+        if (!msglist) {
             throw new Error('获取失败');
         }
-        return ret;
+        return await Promise.all(msglist.map(async (msg) => {
+            const msgOriginData = await this.msgSeqToMsgId({
+                chatType: ChatType.KCHATTYPEGROUP,
+                peerUid: payload.group_id.toString(),
+            }, msg.msg_seq.toString(), msg.msg_random.toString());
+            if (msgOriginData) {
+                const { id: message_id, msg: rawMessage } = msgOriginData;
+                return {
+                    msg_seq: msg.msg_seq,
+                    msg_random: msg.msg_random,
+                    sender_id: +msg.sender_uin,
+                    sender_nick: msg.sender_nick,
+                    operator_id: +msg.add_digest_uin,
+                    operator_nick: msg.add_digest_nick,
+                    message_id: message_id,
+                    operator_time: msg.add_digest_time,
+                    content: (await this.obContext.apis.MsgApi.parseMessage(rawMessage, 'array'))?.message
+                };
+            }
+            const msgTempData = JSON.stringify({
+                msg_seq: msg.msg_seq.toString(),
+                msg_random: msg.msg_random.toString(),
+                group_id: payload.group_id.toString(),
+            });
+            const hash = crypto.createHash('md5').update(msgTempData).digest();
+            //设置第一个bit为0 保证shortId为正数
+            hash[0] &= 0x7f;
+            const shortId = hash.readInt32BE(0);
+            NTQQGroupApi.essenceLRU.set(shortId, msgTempData);
+            return {
+                msg_seq: msg.msg_seq,
+                msg_random: msg.msg_random,
+                sender_id: +msg.sender_uin,
+                sender_nick: msg.sender_nick,
+                operator_id: +msg.add_digest_uin,
+                operator_nick: msg.add_digest_nick,
+                message_id: shortId,
+                operator_time: msg.add_digest_time,
+                content: msg.msg_content.map((msg) => {
+                    if (msg.msg_type === 1) {
+                        return {
+                            type: 'text',
+                            data: {
+                                text: msg?.text
+                            }
+                        };
+                    } else if (msg.msg_type === 3) {
+                        return {
+                            type: 'image',
+                            data: {
+                                url: msg?.image_url,
+                            }
+                        };
+                    }
+                    return undefined;
+                }).filter(e => e !== undefined),
+            };
+        }));
     }
 }

src/onebot/action/group/GetGroupIgnoredNotifies.ts

@@ -0,0 +1,39 @@
+import { GroupNotifyMsgStatus } from '@/core';
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: ['number', 'string'] },
+    },
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class GetGroupIgnoredNotifies extends BaseAction<void, any> {
+    actionName = ActionName.GetGroupIgnoredNotifies;
+
+    async _handle(payload: void) {
+        const NTQQUserApi = this.core.apis.UserApi;
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        const ignoredNotifies = await NTQQGroupApi.getSingleScreenNotifies(true, 10);
+        const retData: any = {
+            join_requests: await Promise.all(
+                ignoredNotifies
+                    .filter(notify => notify.type === 7)
+                    .map(async SSNotify => ({
+                        request_id: SSNotify.seq,
+                        requester_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
+                        requester_nick: SSNotify.user1?.nickName,
+                        group_id: SSNotify.group?.groupCode,
+                        group_name: SSNotify.group?.groupName,
+                        checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                        actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
+                    }))),
+        };
+
+        return retData;
+    }
+}

src/onebot/action/group/GetGroupInfo.ts

@@ -1,5 +1,5 @@
 import { OB11Group } from '@/onebot';
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';

src/onebot/action/group/GetGroupList.ts

@@ -1,5 +1,5 @@
 import { OB11Group } from '@/onebot';
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { Group } from '@/core/entities';

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -1,5 +1,5 @@
 import { OB11GroupMember } from '@/onebot';
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -31,18 +31,18 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
             NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache),
             NTQQUserApi.getUserDetailInfo(uid),
         ]);
-        if (member.status !== 'fulfilled') throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在 ${member.reason}`);
+        if (member.status !== 'fulfilled') throw new Error(`群(${payload.group_id})成员${payload.user_id}获取失败 ${member.reason}`);
+        if (!member.value) throw new Error(`群(${payload.group_id})成员${payload.user_id}不存在`);
         if (info.status === 'fulfilled') {
-            this.core.context.logger.logDebug('群成员详细信息结果', info.value);
-            Object.assign(member, info.value);
+            Object.assign(member.value, info.value);
         } else {
             this.core.context.logger.logDebug(`获取群成员详细信息失败, 只能返回基础信息 ${info.reason}`);
         }
         const date = Math.round(Date.now() / 1000);
         const retMember = OB11Entities.groupMember(payload.group_id.toString(), member.value as GroupMember);
         const Member = await this.core.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id);
-        retMember.last_sent_time = parseInt(Member?.lastSpeakTime || date.toString());
-        retMember.join_time = parseInt(Member?.joinTime || date.toString());
+        retMember.last_sent_time = parseInt(Member?.lastSpeakTime ?? date.toString());
+        retMember.join_time = parseInt(Member?.joinTime ?? date.toString());
         return retMember;
     }
 }

src/onebot/action/group/GetGroupMemberList.ts

@@ -1,5 +1,5 @@
 import { OB11GroupMember } from '@/onebot';
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';

src/onebot/action/group/GetGroupSystemMsg.ts

@@ -1,50 +0,0 @@
-import { GroupNotifyMsgStatus } from '@/core';
-import BaseAction from '../BaseAction';
-import { ActionName } from '../types';
-import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-
-const SchemaData = {
-    type: 'object',
-    properties: {
-        group_id: { type: ['number', 'string'] },
-    },
-} as const satisfies JSONSchema;
-
-type Payload = FromSchema<typeof SchemaData>;
-
-export class GetGroupSystemMsg extends BaseAction<void, any> {
-    actionName = ActionName.GetGroupSystemMsg;
-
-    async _handle(payload: void) {
-        const NTQQUserApi = this.core.apis.UserApi;
-        const NTQQGroupApi = this.core.apis.GroupApi;
-        // 默认10条 该api未完整实现 包括响应数据规范化 类型规范化 
-        const SingleScreenNotifies = await NTQQGroupApi.getSingleScreenNotifies(10);
-        const retData: any = { InvitedRequest: [], join_requests: [] };
-        for (const SSNotify of SingleScreenNotifies) {
-            if (SSNotify.type == 1) {
-                retData.InvitedRequest.push({
-                    request_id: SSNotify.seq,
-                    invitor_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
-                    invitor_nick: SSNotify.user1?.nickName,
-                    group_id: SSNotify.group?.groupCode,
-                    group_name: SSNotify.group?.groupName,
-                    checked: SSNotify.status === GroupNotifyMsgStatus.KUNHANDLE ? false : true,
-                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
-                });
-            } else if (SSNotify.type == 7) {
-                retData.join_requests.push({
-                    request_id: SSNotify.seq,
-                    requester_uin: await NTQQUserApi.getUinByUidV2(SSNotify.user1?.uid),
-                    requester_nick: SSNotify.user1?.nickName,
-                    group_id: SSNotify.group?.groupCode,
-                    group_name: SSNotify.group?.groupName,
-                    checked: SSNotify.status === GroupNotifyMsgStatus.KUNHANDLE ? false : true,
-                    actor: await NTQQUserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
-                });
-            }
-        }
-
-        return retData;
-    }
-}

src/onebot/action/index.ts

@@ -52,7 +52,7 @@ import { GetFriendWithCategory } from './extends/GetFriendWithCategory';
 import { SendGroupNotice } from './go-cqhttp/SendGroupNotice';
 import { GetGroupHonorInfo } from './go-cqhttp/GetGroupHonorInfo';
 import { GoCQHTTPHandleQuickAction } from './go-cqhttp/QuickAction';
-import { GetGroupSystemMsg } from './group/GetGroupSystemMsg';
+import { GetGroupIgnoredNotifies } from './group/GetGroupIgnoredNotifies';
 import { GetOnlineClient } from './go-cqhttp/GetOnlineClient';
 import { IOCRImage, OCRImage } from './extends/OCRImage';
 import { GetGroupFileCount } from './file/GetGroupFileCount';
@@ -81,11 +81,25 @@ import SetModelShow from './go-cqhttp/SetModelShow';
 import { SetInputStatus } from './extends/SetInputStatus';
 import { GetCSRF } from './system/GetCSRF';
 import { DelGroupNotice } from './group/DelGroupNotice';
+import { GetGroupInfoEx } from './extends/GetGroupInfoEx';
+import { DeleteGroupFile } from '@/onebot/action/go-cqhttp/DeleteGroupFile';
+import { CreateGroupFileFolder } from '@/onebot/action/go-cqhttp/CreateGroupFileFolder';
+import { DeleteGroupFileFolder } from '@/onebot/action/go-cqhttp/DeleteGroupFileFolder';
+import { GetGroupFileSystemInfo } from '@/onebot/action/go-cqhttp/GetGroupFileSystemInfo';
+import { GetGroupRootFiles } from '@/onebot/action/go-cqhttp/GetGroupRootFiles';
+import { GetGroupFilesByFolder } from '@/onebot/action/go-cqhttp/GetGroupFilesByFolder';
 
 export type ActionMap = Map<string, BaseAction<any, any>>;
 
 export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCore): ActionMap {
+    const ncDelGroupFile = new DelGroupFile(obContext, core);
+    const ncSetGroupFileFolder = new SetGroupFileFolder(obContext, core);
+    const ncDelGroupFileFolder = new DelGroupFileFolder(obContext, core);
+    const ncGetGroupFileCount = new GetGroupFileCount(obContext, core);
+    const goCqHttpGetGroupRootFiles = new GetGroupRootFiles(obContext, core, ncGetGroupFileCount);
+
     const actionHandlers = [
+        new GetGroupInfoEx(obContext, core),
         new FetchEmojiLike(obContext, core),
         new GetFile(obContext, core),
         new SetQQProfile(obContext, core),
@@ -99,11 +113,11 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new MarkPrivateMsgAsRead(obContext, core),
         new SetQQAvatar(obContext, core),
         new TranslateEnWordToZn(obContext, core),
-        new GetGroupFileCount(obContext, core),
+        ncGetGroupFileCount,
         new GetGroupFileList(obContext, core),
-        new SetGroupFileFolder(obContext, core),
-        new DelGroupFile(obContext, core),
-        new DelGroupFileFolder(obContext, core),
+        ncSetGroupFileFolder,
+        ncDelGroupFile,
+        ncDelGroupFileFolder,
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),
@@ -157,7 +171,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new GoCQHTTPGetForwardMsgAction(obContext, core),
         new GetFriendMsgHistory(obContext, core),
         new GoCQHTTPHandleQuickAction(obContext, core),
-        new GetGroupSystemMsg(obContext, core),
+        new GetGroupIgnoredNotifies(obContext, core),
         new DelEssenceMsg(obContext, core),
         new SetEssenceMsg(obContext, core),
         new GetRecentContact(obContext, core),
@@ -171,6 +185,12 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new SetInputStatus(obContext, core),
         new GetCSRF(obContext, core),
         new DelGroupNotice(obContext, core),
+        new DeleteGroupFile(obContext, core, ncDelGroupFile),
+        new CreateGroupFileFolder(obContext, core, ncSetGroupFileFolder),
+        new DeleteGroupFileFolder(obContext, core, ncDelGroupFileFolder),
+        new GetGroupFileSystemInfo(obContext, core),
+        goCqHttpGetGroupRootFiles,
+        new GetGroupFilesByFolder(obContext, core, goCqHttpGetGroupRootFiles),
     ];
     const actionMap = new Map();
     for (const action of actionHandlers) {

src/onebot/action/msg/GetMsg.ts

@@ -39,7 +39,7 @@ class GetMsg extends BaseAction<Payload, OB11Message> {
         const retMsg = await this.obContext.apis.MsgApi.parseMessage(msg.msgList[0], 'array');
         if (!retMsg) throw Error('消息为空');
         try {
-            retMsg.message_id = MessageUnique.createMsg(peer, msg.msgList[0].msgId)!;
+            retMsg.message_id = MessageUnique.createUniqueMsgId(peer, msg.msgList[0].msgId)!;
             retMsg.message_seq = retMsg.message_id;
             retMsg.real_id = retMsg.message_id;
         } catch (e) {

src/onebot/action/msg/SendMsg.ts

@@ -6,7 +6,7 @@ import {
     OB11PostSendMsg,
 } from '@/onebot/types';
 import { ActionName, BaseCheckResult } from '@/onebot/action/types';
-import { decodeCQCode } from '@/onebot/helper/cqcode';
+import { decodeCQCode } from '@/onebot/cqcode';
 import { MessageUnique } from '@/common/message-unique';
 import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendMessageElement } from '@/core';
 import BaseAction from '../BaseAction';
@@ -98,11 +98,6 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                 message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素',
             };
         }
-        if (payload.user_id && payload.message_type !== 'group') {
-            // const uid = await this.core.apis.UserApi.getUidByUinV2(payload.user_id.toString());
-            // const isBuddy = await NTQQFriendApi.isBuddy(uid!);
-            // if (!isBuddy) { }
-        }
         return { valid: true };
     }
 
@@ -119,7 +114,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
         if (getSpecialMsgNum(payload, OB11MessageDataType.node)) {
             const returnMsg = await this.handleForwardedNodes(peer, messages as OB11MessageNode[]);
             if (returnMsg) {
-                const msgShortId = MessageUnique.createMsg({
+                const msgShortId = MessageUnique.createUniqueMsgId({
                     guildId: '',
                     peerUid: peer.peerUid,
                     chatType: peer.chatType,
@@ -175,7 +170,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                         const nodeMsg = await this.handleForwardedNodes(selfPeer, OB11Data.filter(e => e.type === OB11MessageDataType.node));
                         if (nodeMsg) {
                             nodeMsgIds.push(nodeMsg.msgId);
-                            MessageUnique.createMsg(selfPeer, nodeMsg.msgId);
+                            MessageUnique.createUniqueMsgId(selfPeer, nodeMsg.msgId);
                         }
                         //完成子卡片生成跳过后续
                         continue;
@@ -193,7 +188,7 @@ export class SendMsg extends BaseAction<OB11PostSendMsg, ReturnDataType> {
                     (await Promise.allSettled(MsgNodeList)).map((result) => {
                         if (result.status === 'fulfilled' && result.value) {
                             nodeMsgIds.push(result.value.msgId);
-                            MessageUnique.createMsg(selfPeer, result.value.msgId);
+                            MessageUnique.createUniqueMsgId(selfPeer, result.value.msgId);
                         }
                     });
                 } catch (e) {

src/onebot/action/system/GetLoginInfo.ts

@@ -1,5 +1,5 @@
 import { OB11User } from '@/onebot';
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 

src/onebot/action/types.ts

@@ -83,11 +83,17 @@ export enum ActionName {
     MarkPrivateMsgAsRead = 'mark_private_msg_as_read',
     MarkGroupMsgAsRead = 'mark_group_msg_as_read',
     GoCQHTTP_UploadGroupFile = 'upload_group_file',
+    GOCQHTTP_DeleteGroupFile = 'delete_group_file',
+    GoCQHTTP_CreateGroupFileFolder = 'create_group_file_folder',
+    GoCQHTTP_DeleteGroupFileFolder = 'delete_group_file_folder',
+    GoCQHTTP_GetGroupFileSystemInfo = 'get_group_file_system_info',
+    GoCQHTTP_GetGroupRootFiles = 'get_group_root_files',
+    GoCQHTTP_GetGroupFilesByFolder = 'get_group_files_by_folder',
     GoCQHTTP_DownloadFile = 'download_file',
     GoCQHTTP_GetGroupMsgHistory = 'get_group_msg_history',
     GoCQHTTP_GetForwardMsg = 'get_forward_msg',
     GetFriendMsgHistory = 'get_friend_msg_history',
-    GetGroupSystemMsg = 'get_group_system_msg',
+    GetGroupIgnoredNotifies = 'get_group_ignored_notifies',
     GetOnlineClient = 'get_online_clients',
     OCRImage = 'ocr_image',
     IOCRImage = '.ocr_image',
@@ -110,4 +116,5 @@ export enum ActionName {
     SetInputStatus = 'set_input_status',
     GetCSRF = 'get_csrf_token',
     DelGroupNotice = '_del_group_notice',
+    GetGroupInfoEx = "get_group_info_ex"
 }

src/onebot/action/user/GetFriendList.ts

@@ -1,5 +1,5 @@
 import { OB11User } from '@/onebot';
-import { OB11Entities } from '@/onebot/helper/entities';
+import { OB11Entities } from '@/onebot/entities';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';

src/onebot/api/group.ts

@@ -1,4 +1,11 @@
-import { ChatType, GrayTipElement, NapCatCore } from '@/core';
+import {
+    ChatType,
+    GrayTipElement,
+    NapCatCore,
+    NTGrayTipElementSubTypeV2,
+    RawMessage,
+    TipGroupElementType,
+} from '@/core';
 import { NapCatOneBot11Adapter } from '@/onebot';
 import { OB11GroupBanEvent } from '../event/notice/OB11GroupBanEvent';
 import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
@@ -6,6 +13,12 @@ import { OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent';
 import fastXmlParser from 'fast-xml-parser';
 import { OB11GroupMsgEmojiLikeEvent } from '../event/notice/OB11MsgEmojiLikeEvent';
 import { MessageUnique } from '@/common/message-unique';
+import { OB11GroupCardEvent } from '@/onebot/event/notice/OB11GroupCardEvent';
+import { OB11GroupUploadNoticeEvent } from '@/onebot/event/notice/OB11GroupUploadNoticeEvent';
+import { OB11GroupPokeEvent } from '@/onebot/event/notice/OB11PokeEvent';
+import { OB11GroupEssenceEvent } from '@/onebot/event/notice/OB11GroupEssenceEvent';
+import { OB11GroupTitleEvent } from '@/onebot/event/notice/OB11GroupTitleEvent';
+import { FileNapCatOneBotUUID } from '@/common/helper';
 
 export class OneBotGroupApi {
     obContext: NapCatOneBot11Adapter;
@@ -16,6 +29,133 @@ export class OneBotGroupApi {
         this.core = core;
     }
 
+    async parseGroupEvent(msg: RawMessage) {
+        const NTQQGroupApi = this.core.apis.GroupApi;
+        const NTQQUserApi = this.core.apis.UserApi;
+        const NTQQMsgApi = this.core.apis.MsgApi;
+        const logger = this.core.context.logger;
+        if (msg.chatType !== ChatType.KCHATTYPEGROUP) {
+            return;
+        }
+        //log("group msg", msg);
+        if (msg.senderUin && msg.senderUin !== '0') {
+            const member = await NTQQGroupApi.getGroupMember(msg.peerUid, msg.senderUin);
+            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;
+            }
+        }
+
+        for (const element of msg.elements) {
+            if (element.grayTipElement && element.grayTipElement.groupElement) {
+                const groupElement = element.grayTipElement.groupElement;
+                if (groupElement.type == TipGroupElementType.memberIncrease) {
+                    const MemberIncreaseEvent = await this.obContext.apis.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
+                    if (MemberIncreaseEvent) return MemberIncreaseEvent;
+                } else if (groupElement.type === TipGroupElementType.ban) {
+                    const BanEvent = await this.obContext.apis.GroupApi.parseGroupBanEvent(msg.peerUid, element.grayTipElement);
+                    if (BanEvent) return BanEvent;
+                } else if (groupElement.type == TipGroupElementType.kicked) {
+                    NTQQGroupApi.quitGroup(msg.peerUid).then();
+                    try {
+                        const KickEvent = await this.obContext.apis.GroupApi.parseGroupKickEvent(msg.peerUid, element.grayTipElement);
+                        if (KickEvent) return KickEvent;
+                    } catch (e) {
+                        return new OB11GroupDecreaseEvent(
+                            this.core,
+                            parseInt(msg.peerUid),
+                            parseInt(this.core.selfInfo.uin),
+                            0,
+                            'leave',
+                        );
+                    }
+                }
+            } else if (element.fileElement) {
+                return new OB11GroupUploadNoticeEvent(
+                    this.core,
+                    parseInt(msg.peerUid), parseInt(msg.senderUin || ''),
+                    {
+                        id: FileNapCatOneBotUUID.encode({
+                            chatType: ChatType.KCHATTYPEGROUP,
+                            peerUid: msg.peerUid,
+                        }, msg.msgId, element.elementId),
+                        name: element.fileElement.fileName,
+                        size: parseInt(element.fileElement.fileSize),
+                        busid: element.fileElement.fileBizId || 0,
+                    },
+                );
+            }
+            if (element.grayTipElement) {
+                if (element.grayTipElement.xmlElement?.templId === '10382') {
+                    const emojiLikeEvent = await this.obContext.apis.GroupApi.parseGroupEmojiLikeEventByGrayTip(msg.peerUid, element.grayTipElement);
+                    if (emojiLikeEvent) return emojiLikeEvent;
+                }
+                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
+                    const GroupIncreaseEvent = await this.obContext.apis.GroupApi.parseGroupIncreaseEvent(msg.peerUid, element.grayTipElement);
+                    if (GroupIncreaseEvent) return GroupIncreaseEvent;
+                }
+
+                //代码歧义 GrayTipElementSubType.MEMBER_NEW_TITLE
+                else if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
+                    const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
+                    if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
+                        //判断业务类型
+                        //Poke事件
+                        const pokedetail: any[] = json.items;
+                        //筛选item带有uid的元素
+                        const poke_uid = pokedetail.filter(item => item.uid);
+                        if (poke_uid.length == 2) {
+                            return new OB11GroupPokeEvent(
+                                this.core,
+                                parseInt(msg.peerUid),
+                                parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[0].uid))!),
+                                parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[1].uid))!),
+                                pokedetail,
+                            );
+                        }
+                    }
+                    if (element.grayTipElement.jsonGrayTipElement.busiId == 2401) {
+                        const searchParams = new URL(json.items[0].jp).searchParams;
+                        const msgSeq = searchParams.get('msgSeq')!;
+                        const Group = searchParams.get('groupCode');
+                        if (!Group) return;
+                        // const businessId = searchParams.get('businessid');
+                        const Peer = {
+                            guildId: '',
+                            chatType: ChatType.KCHATTYPEGROUP,
+                            peerUid: Group,
+                        };
+                        const msgData = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true);
+                        const msgList = (await this.core.apis.WebApi.getGroupEssenceMsgAll(Group)).flatMap((e) => e.data.msg_list);
+                        const realMsg = msgList.find((e) => e.msg_seq.toString() == msgSeq);
+                        return new OB11GroupEssenceEvent(
+                            this.core,
+                            parseInt(msg.peerUid),
+                            MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!,
+                            parseInt(msgData.msgList[0].senderUin),
+                            parseInt(realMsg?.add_digest_uin ?? '0'),
+                        );
+                        // 获取MsgSeq+Peer可获取具体消息
+                    }
+                    if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
+                        //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
+                        const memberUin = json.items[1].param[0];
+                        const title = json.items[3].txt;
+                        logger.logDebug('收到群成员新头衔消息', json);
+                        return new OB11GroupTitleEvent(
+                            this.core,
+                            parseInt(msg.peerUid),
+                            parseInt(memberUin),
+                            title,
+                        );
+                    }
+                }
+            }
+        }
+    }
+
     async parseGroupBanEvent(GroupCode: string, grayTipElement: GrayTipElement) {
         const groupElement = grayTipElement?.groupElement;
         const NTQQGroupApi = this.core.apis.GroupApi;
@@ -112,8 +252,10 @@ export class OneBotGroupApi {
         return undefined;
     }
 
-    async parseGroupEmjioLikeEvent(GroupCode: string, grayTipElement: GrayTipElement) {
-        const NTQQMsgApi = this.core.apis.MsgApi;
+    async parseGroupEmojiLikeEventByGrayTip(
+        groupCode: string,
+        grayTipElement: GrayTipElement
+    ) {
         const emojiLikeData = new fastXmlParser.XMLParser({
             ignoreAttributes: false,
             attributeNamePrefix: '',
@@ -122,16 +264,27 @@ export class OneBotGroupApi {
         const senderUin = emojiLikeData.gtip.qq.jp;
         const msgSeq = emojiLikeData.gtip.url.msgseq;
         const emojiId = emojiLikeData.gtip.face.id;
+        return await this.createGroupEmojiLikeEvent(groupCode, senderUin, msgSeq, emojiId);
+    }
+
+    async createGroupEmojiLikeEvent(
+        groupCode: string,
+        senderUin: string,
+        msgSeq: string,
+        emojiId: string,
+    ) {
         const peer = {
             chatType: ChatType.KCHATTYPEGROUP,
             guildId: '',
-            peerUid: GroupCode,
+            peerUid: groupCode,
         };
-        const replyMsgList = (await NTQQMsgApi.getMsgExBySeq(peer, msgSeq)).msgList;
+        const replyMsgList = (await this.core.apis.MsgApi.getMsgExBySeq(peer, msgSeq)).msgList;
         if (replyMsgList.length < 1) {
             return;
         }
-        const replyMsg = replyMsgList.filter(e => e.msgSeq == msgSeq).sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0];
+        const replyMsg = replyMsgList
+            .filter(e => e.msgSeq == msgSeq)
+            .sort((a, b) => parseInt(a.msgTime) - parseInt(b.msgTime))[0];
         //console.log("表情回应消息长度检测", msgSeq, replyMsg.elements);
         if (!replyMsg) {
             this.core.context.logger.logError('解析表情回应消息失败: 未找到回应消息');
@@ -139,7 +292,7 @@ export class OneBotGroupApi {
         }
         return new OB11GroupMsgEmojiLikeEvent(
             this.core,
-            parseInt(GroupCode),
+            parseInt(groupCode),
             parseInt(senderUin),
             MessageUnique.getShortIdByMsgId(replyMsg.msgId)!,
             [{

src/onebot/api/msg.ts

@@ -1,4 +1,4 @@
-import { UUIDConverter } from '@/common/helper';
+import { FileNapCatOneBotUUID } from '@/common/helper';
 import { MessageUnique } from '@/common/message-unique';
 import {
     AtType,
@@ -10,6 +10,7 @@ import {
     IdMusicSignPostData,
     MessageElement,
     NapCatCore,
+    NTGrayTipElementSubTypeV2,
     Peer,
     RawMessage,
     SendMessageElement,
@@ -24,13 +25,14 @@ import {
     OB11MessageFileBase,
     OB11MessageForward,
 } from '@/onebot';
-import { OB11Entities } from '../helper';
+import { OB11Entities } from '@/onebot/entities';
 import { EventType } from '@/onebot/event/OB11BaseEvent';
-import { encodeCQCode } from '@/onebot/helper/cqcode';
+import { encodeCQCode } from '@/onebot/cqcode';
 import { uri2local } from '@/common/file';
 import { RequestUtil } from '@/common/request';
 import fs from 'node:fs';
 import fsPromise from 'node:fs/promises';
+import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNoticeEvent';
 
 type RawToOb11Converters = {
     [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: (
@@ -97,14 +99,19 @@ export class OneBotMsgApi {
             }
         },
 
-        picElement: async (element, msg) => {
+        picElement: async (element, msg, elementWrapper) => {
             try {
+                const peer = {
+                    chatType: msg.chatType,
+                    peerUid: msg.peerUid,
+                    guildId: '',
+                };
                 return {
                     type: OB11MessageDataType.image,
                     data: {
                         file: element.fileName,
                         sub_type: element.picSubType,
-                        file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                        file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                         url: await this.core.apis.FileApi.getImageUrl(element),
                         file_size: element.fileSize,
                     },
@@ -116,6 +123,11 @@ export class OneBotMsgApi {
         },
 
         fileElement: async (element, msg, elementWrapper) => {
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             await this.core.apis.FileApi.addFileCache(
                 {
                     peerUid: msg.peerUid,
@@ -136,7 +148,7 @@ export class OneBotMsgApi {
                     file: element.fileName,
                     path: element.filePath,
                     url: element.filePath,
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
                 },
             };
@@ -183,11 +195,16 @@ export class OneBotMsgApi {
                 '0',
                 'marketface',
             );
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             return {
                 type: OB11MessageDataType.image,
                 data: {
                     file: 'marketface',
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     path: elementWrapper.elementId,
                     url: elementWrapper.elementId,
                 },
@@ -206,13 +223,21 @@ export class OneBotMsgApi {
                 this.core.context.logger.logError('获取不到引用的消息', element.replayMsgSeq);
                 return null;
             }
+
+            const createReplyData = (msgId: string): OB11MessageData => ({
+                type: OB11MessageDataType.reply,
+                data: {
+                    id: MessageUnique.createUniqueMsgId(peer, msgId).toString(),
+                },
+            });
+
+            if (records.peerUin === '284840486') {
+                return createReplyData(records.msgId);
+            }
+
             let replyMsg: RawMessage | undefined;
             // Attempt 1
-            replyMsg = (await NTQQMsgApi.getMsgsBySeqAndCount({
-                peerUid: msg.peerUid,
-                guildId: '',
-                chatType: msg.chatType,
-            }, element.replayMsgSeq, 1, true, true))
+            replyMsg = (await NTQQMsgApi.getMsgsBySeqAndCount(peer,element.replayMsgSeq, 1, true, true))
                 .msgList
                 .find(msg => msg.msgRandom === records.msgRandom);
 
@@ -220,7 +245,7 @@ export class OneBotMsgApi {
                 // Attempt 2
                 replyMsg = (await NTQQMsgApi.getSingleMsg(peer, element.replayMsgSeq)).msgList[0];
 
-                if ((!replyMsg || records.msgRandom !== replyMsg.msgRandom) && msg.peerUin !== '284840486') {
+                if (!replyMsg || records.msgRandom !== replyMsg.msgRandom) {
                     // Attempt 3
                     const replyMsgList = (await NTQQMsgApi.getMsgExBySeq(peer, records.msgSeq)).msgList;
                     if (replyMsgList.length < 1) {
@@ -232,21 +257,16 @@ export class OneBotMsgApi {
                 }
             }
 
-            return {
-                type: OB11MessageDataType.reply,
-                data: {
-                    id: MessageUnique.createMsg({
-                        peerUid: msg.peerUid,
-                        guildId: '',
-                        chatType: msg.chatType,
-                    }, replyMsg.msgId).toString(),
-                },
-            };
+            return createReplyData(replyMsg.msgId);
         },
 
         videoElement: async (element, msg, elementWrapper) => {
             const NTQQFileApi = this.core.apis.FileApi;
-
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             //读取视频链接并兜底
             let videoUrlWrappers: Awaited<ReturnType<typeof NTQQFileApi.getVideoUrl>> | undefined;
 
@@ -301,13 +321,18 @@ export class OneBotMsgApi {
                     file: element.fileName,
                     path: videoDownUrl,
                     url: videoDownUrl,
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
                 },
             };
         },
 
         pttElement: async (element, msg, elementWrapper) => {
+            const peer = {
+                chatType: msg.chatType,
+                peerUid: msg.peerUid,
+                guildId: '',
+            };
             await this.core.apis.FileApi.addFileCache(
                 {
                     peerUid: msg.peerUid,
@@ -327,7 +352,7 @@ export class OneBotMsgApi {
                 data: {
                     file: element.fileName,
                     path: element.filePath,
-                    file_id: UUIDConverter.encode(msg.peerUin, msg.msgId),
+                    file_id: FileNapCatOneBotUUID.encode(peer, msg.msgId, elementWrapper.elementId),
                     file_size: element.fileSize,
                 },
             };
@@ -364,7 +389,7 @@ export class OneBotMsgApi {
                         async multiMsgItem => {
                             multiMsgItem.parentMsgPeer = parentMsgPeer;
                             multiMsgItem.parentMsgIdList = msg.parentMsgIdList;
-                            multiMsgItem.id = MessageUnique.createMsg(parentMsgPeer, multiMsgItem.msgId); //该ID仅用查看 无法调用
+                            multiMsgItem.id = MessageUnique.createUniqueMsgId(parentMsgPeer, multiMsgItem.msgId); //该ID仅用查看 无法调用
                             return await this.parseMessage(multiMsgItem);
                         },
                     ))).filter(item => item !== undefined),
@@ -656,6 +681,28 @@ export class OneBotMsgApi {
         this.core = core;
     }
 
+    async parsePrivateMsgEvent(msg: RawMessage) {
+        if (msg.chatType !== ChatType.KCHATTYPEC2C) {
+            return;
+        }
+        for (const element of msg.elements) {
+            if (element.grayTipElement) {
+                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
+                    if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
+                        const PokeEvent = await this.obContext.apis.FriendApi.parsePrivatePokeEvent(element.grayTipElement);
+                        if (PokeEvent) return PokeEvent;
+                    }
+                }
+                if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
+                    //好友添加成功事件
+                    if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
+                        return new OB11FriendAddNoticeEvent(this.core, parseInt(msg.peerUin));
+                    }
+                }
+            }
+        }
+    }
+
     async parseMessage(
         msg: RawMessage,
         messagePostFormat: string = this.obContext.configLoader.configData.messagePostFormat,
@@ -799,16 +846,12 @@ export class OneBotMsgApi {
             this.core.context.logger.logError('发送消息计算预计时间异常', e);
         }
         const returnMsg = await this.core.apis.MsgApi.sendMsg(peer, sendElements, waitComplete, timeout);
-        try {
-            returnMsg!.id = MessageUnique.createMsg({
-                chatType: peer.chatType,
-                guildId: '',
-                peerUid: peer.peerUid,
-            }, returnMsg!.msgId);
-        } catch (e: any) {
-            this.core.context.logger.logDebug('发送消息id获取失败', e);
-            returnMsg!.id = 0;
-        }
+        if (!returnMsg) throw new Error('发送消息失败');
+        returnMsg.id = MessageUnique.createUniqueMsgId({
+            chatType: peer.chatType,
+            guildId: '',
+            peerUid: peer.peerUid,
+        }, returnMsg.msgId);
         deleteAfterSentFiles.forEach(file => {
             fsPromise.unlink(file).then().catch(e => this.core.context.logger.logError('发送消息删除文件失败', e));
         });

src/onebot/api/quick-action.ts

@@ -10,12 +10,12 @@ import {
     QuickActionGroupMessage,
     QuickActionGroupRequest,
 } from '@/onebot';
-import { ChatType, GroupRequestOperateTypes, NapCatCore, Peer } from '@/core';
+import { GroupRequestOperateTypes, NapCatCore, Peer } from '@/core';
 import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
 import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
-import { ContextMode, normalize } from '@/onebot/action/msg/SendMsg';
+import { ContextMode, createContext, normalize } from '@/onebot/action/msg/SendMsg';
 import { isNull } from '@/common/helper';
-import { createContext } from '@/onebot/action/msg/SendMsg';
+
 export class OneBotQuickActionApi {
     constructor(
         public obContext: NapCatOneBot11Adapter,
@@ -78,7 +78,7 @@ export class OneBotQuickActionApi {
                 sendElements,
                 deleteAfterSentFiles,
             } = await this.obContext.apis.MsgApi.createSendElements(replyMessage, peer);
-            this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, sendElements, deleteAfterSentFiles, false).then().catch(this.core.context.logger.logError);
+            this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, sendElements, deleteAfterSentFiles, false).then().catch(this.core.context.logger.logError.bind(this.core.context.logger));
         }
     }
 
@@ -88,13 +88,13 @@ export class OneBotQuickActionApi {
                 request.flag,
                 quickAction.approve ? GroupRequestOperateTypes.approve : GroupRequestOperateTypes.reject,
                 quickAction.reason,
-            ).catch(this.core.context.logger.logError);
+            ).catch(this.core.context.logger.logError.bind(this.core.context.logger));
         }
     }
 
     async handleFriendRequest(request: OB11FriendRequestEvent, quickAction: QuickActionFriendRequest) {
         if (!isNull(quickAction.approve)) {
-            this.core.apis.FriendApi.handleFriendRequest(request.flag, !!quickAction.approve).then().catch(this.core.context.logger.logError);
+            this.core.apis.FriendApi.handleFriendRequest(request.flag, !!quickAction.approve).then().catch(this.core.context.logger.logError.bind(this.core.context.logger));
         }
     }
 }

src/onebot/config/index.ts

@@ -1,5 +1,5 @@
 import { ConfigBase } from '@/common/config-base';
-import ob11DefaultConfig from '@/onebot/external/onebot11.json';
+import ob11DefaultConfig from './onebot11.json';
 import { NapCatCore } from '@/core';
 
 export type OB11Config = typeof ob11DefaultConfig;

src/onebot/config/onebot11.json

@@ -1,6 +1,6 @@
 {
     "http": {
-        "enable": true,
+        "enable": false,
         "host": "",
         "port": 3000,
         "secret": "",

src/onebot/cqcode.ts

@@ -1,4 +1,4 @@
-import { OB11MessageData } from '../types';
+import { OB11MessageData } from './types';
 
 const pattern = /\[CQ:(\w+)((,\w+=[^,\]]*)*)]/;
 

src/onebot/entities.ts

@@ -1,6 +1,14 @@
-import { calcQQLevel } from '@/common/helper';
-import { Friend, FriendV2, Group, GroupMember, SelfInfo, Sex, User } from '@/core';
-import { OB11Group, OB11GroupMember, OB11GroupMemberRole, OB11User, OB11UserSex } from '../types';
+import { calcQQLevel, FileNapCatOneBotUUID } from '@/common/helper';
+import { Friend, FriendV2, Group, GroupFileInfoUpdateParamType, GroupMember, SelfInfo, Sex, User } from '@/core';
+import {
+    OB11Group,
+    OB11GroupFile,
+    OB11GroupFileFolder,
+    OB11GroupMember,
+    OB11GroupMemberRole,
+    OB11User,
+    OB11UserSex,
+} from './types';
 
 export class OB11Entities {
     static selfInfo(selfInfo: SelfInfo): OB11User {
@@ -97,4 +105,32 @@ export class OB11Entities {
     static groups(groups: Group[]): OB11Group[] {
         return groups.map(OB11Entities.group);
     }
+
+    static file(peerId: string, file: Exclude<GroupFileInfoUpdateParamType['item'][0]['fileInfo'], undefined>): OB11GroupFile {
+        return {
+            group_id: parseInt(peerId),
+            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId),
+            file_name: file.fileName,
+            busid: file.busId,
+            size: parseInt(file.fileSize),
+            upload_time: file.uploadTime,
+            dead_time: file.deadTime,
+            modify_time: file.modifyTime,
+            download_times: file.downloadTimes,
+            uploader: parseInt(file.uploaderUin),
+            uploader_name: file.uploaderName,
+        };
+    }
+
+    static folder(peerId: string, folder: Exclude<GroupFileInfoUpdateParamType['item'][0]['folderInfo'], undefined>): OB11GroupFileFolder {
+        return {
+            group_id: parseInt(peerId),
+            folder_id: folder.folderId,
+            folder_name: folder.folderName,
+            create_time: folder.createTime,
+            creator: parseInt(folder.createUin),
+            creator_name: folder.creatorName,
+            total_file_count: folder.totalFileCount,
+        };
+    }
 }

src/onebot/event/notice/OB11GroupEssenceEvent.ts

@@ -5,11 +5,14 @@ export class OB11GroupEssenceEvent extends OB11GroupNoticeEvent {
     notice_type = 'essence';
     message_id: number;
     sender_id: number;
+    operator_id: number;
     sub_type: 'add' | 'delete' = 'add';
 
-    constructor(core: NapCatCore, groupId: number, message_id: number, sender_id: number) {
+
+    constructor(core: NapCatCore, groupId: number, message_id: number, sender_id: number, operator_id: number) {
         super(core, groupId, sender_id);
         this.group_id = groupId;
+        this.operator_id = operator_id;
         this.message_id = message_id;
         this.sender_id = sender_id;
     }

src/onebot/helper/event.ts

@@ -1,154 +0,0 @@
-import { NapCatOneBot11Adapter } from '..';
-import { OB11BaseNoticeEvent } from '../event/notice/OB11BaseNoticeEvent';
-import { OB11FriendAddNoticeEvent } from '../event/notice/OB11FriendAddNoticeEvent';
-import { OB11GroupNoticeEvent } from '../event/notice/OB11GroupNoticeEvent';
-import { OB11GroupCardEvent } from '../event/notice/OB11GroupCardEvent';
-import { OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent';
-import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNoticeEvent';
-import { OB11GroupPokeEvent } from '../event/notice/OB11PokeEvent';
-import { OB11GroupEssenceEvent } from '../event/notice/OB11GroupEssenceEvent';
-import { MessageUnique } from '@/common/message-unique';
-import { OB11GroupTitleEvent } from '../event/notice/OB11GroupTitleEvent';
-import { ChatType, NapCatCore, NTGrayTipElementSubTypeV2, Peer, RawMessage, TipGroupElementType } from '@/core';
-
-export async function NT2PrivateEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise<OB11BaseNoticeEvent | undefined> {
-    if (msg.chatType !== ChatType.KCHATTYPEC2C) {
-        return;
-    }
-    for (const element of msg.elements) {
-        if (element.grayTipElement) {
-            if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
-                if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                    const PokeEvent = await obContext.apis.FriendApi.parsePrivatePokeEvent(element.grayTipElement);
-                    if (PokeEvent) return PokeEvent;
-                }
-            }
-            if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
-                //好友添加成功事件
-                if (element.grayTipElement.xmlElement.templId === '10229' && msg.peerUin !== '') {
-                    return new OB11FriendAddNoticeEvent(core, parseInt(msg.peerUin));
-                }
-            }
-        }
-    }
-}
-
-export async function NT2GroupEvent(core: NapCatCore, obContext: NapCatOneBot11Adapter, msg: RawMessage): Promise<OB11GroupNoticeEvent | undefined> {
-    const NTQQGroupApi = core.apis.GroupApi;
-    const NTQQUserApi = core.apis.UserApi;
-    const NTQQMsgApi = core.apis.MsgApi;
-    const logger = core.context.logger;
-    if (msg.chatType !== ChatType.KCHATTYPEGROUP) {
-        return;
-    }
-    //log("group msg", msg);
-    if (msg.senderUin && msg.senderUin !== '0') {
-        const member = await NTQQGroupApi.getGroupMember(msg.peerUid, msg.senderUin);
-        if (member && member.cardName !== msg.sendMemberName) {
-            const newCardName = msg.sendMemberName || '';
-            const event = new OB11GroupCardEvent(core, parseInt(msg.peerUid), parseInt(msg.senderUin), newCardName, member.cardName);
-            member.cardName = newCardName;
-            return event;
-        }
-    }
-
-    for (const element of msg.elements) {
-        if (element.grayTipElement && element.grayTipElement.groupElement) {
-            const groupElement = element.grayTipElement.groupElement;
-            if (groupElement.type == TipGroupElementType.memberIncrease) {
-                const MemberIncreaseEvent = await obContext.apis.GroupApi.parseGroupMemberIncreaseEvent(msg.peerUid, element.grayTipElement);
-                if (MemberIncreaseEvent) return MemberIncreaseEvent;
-            } else if (groupElement.type === TipGroupElementType.ban) {
-                const BanEvent = await obContext.apis.GroupApi.parseGroupBanEvent(msg.peerUid, element.grayTipElement);
-                if (BanEvent) return BanEvent;
-            } else if (groupElement.type == TipGroupElementType.kicked) {
-                NTQQGroupApi.quitGroup(msg.peerUid).then();
-                try {
-                    const KickEvent = await obContext.apis.GroupApi.parseGroupKickEvent(msg.peerUid, element.grayTipElement);
-                    if (KickEvent) return KickEvent;
-                } catch (e) {
-                    return new OB11GroupDecreaseEvent(
-                        core,
-                        parseInt(msg.peerUid),
-                        parseInt(core.selfInfo.uin),
-                        0,
-                        'leave',
-                    );
-                }
-            }
-        } else if (element.fileElement) {
-            return new OB11GroupUploadNoticeEvent(
-                core,
-                parseInt(msg.peerUid), parseInt(msg.senderUin || ''),
-                {
-                    id: element.fileElement.fileUuid!,
-                    name: element.fileElement.fileName,
-                    size: parseInt(element.fileElement.fileSize),
-                    busid: element.fileElement.fileBizId || 0,
-                },
-            );
-        }
-        if (element.grayTipElement) {
-            if (element.grayTipElement.xmlElement?.templId === '10382') {
-                const emojiLikeEvent = await obContext.apis.GroupApi.parseGroupEmjioLikeEvent(msg.peerUid, element.grayTipElement);
-                if (emojiLikeEvent) return emojiLikeEvent;
-            }
-            if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_XMLMSG) {
-                const GroupIncreaseEvent = await obContext.apis.GroupApi.parseGroupIncreaseEvent(msg.peerUid, element.grayTipElement);
-                if (GroupIncreaseEvent) return GroupIncreaseEvent;
-            }
-
-            //代码歧义 GrayTipElementSubType.MEMBER_NEW_TITLE
-            else if (element.grayTipElement.subElementType == NTGrayTipElementSubTypeV2.GRAYTIP_ELEMENT_SUBTYPE_JSON) {
-                const json = JSON.parse(element.grayTipElement.jsonGrayTipElement.jsonStr);
-                if (element.grayTipElement.jsonGrayTipElement.busiId == 1061) {
-                    //判断业务类型
-                    //Poke事件
-                    const pokedetail: any[] = json.items;
-                    //筛选item带有uid的元素
-                    const poke_uid = pokedetail.filter(item => item.uid);
-                    if (poke_uid.length == 2) {
-                        return new OB11GroupPokeEvent(
-                            core,
-                            parseInt(msg.peerUid),
-                            parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[0].uid))!),
-                            parseInt((await NTQQUserApi.getUinByUidV2(poke_uid[1].uid))!),
-                            pokedetail,
-                        );
-                    }
-                }
-                if (element.grayTipElement.jsonGrayTipElement.busiId == 2401) {
-                    const searchParams = new URL(json.items[0].jp).searchParams;
-                    const msgSeq = searchParams.get('msgSeq')!;
-                    const Group = searchParams.get('groupCode');
-                    // const businessId = searchParams.get('businessid');
-                    const Peer: Peer = {
-                        guildId: '',
-                        chatType: ChatType.KCHATTYPEGROUP,
-                        peerUid: Group!,
-                    };
-                    const msgData = await NTQQMsgApi.getMsgsBySeqAndCount(Peer, msgSeq.toString(), 1, true, true);
-                    return new OB11GroupEssenceEvent(
-                        core,
-                        parseInt(msg.peerUid),
-                        MessageUnique.getShortIdByMsgId(msgData.msgList[0].msgId)!,
-                        parseInt(msgData.msgList[0].senderUin),
-                    );
-                    // 获取MsgSeq+Peer可获取具体消息
-                }
-                if (element.grayTipElement.jsonGrayTipElement.busiId == 2407) {
-                    //下面得改 上面也是错的grayTipElement.subElementType == GrayTipElementSubType.MEMBER_NEW_TITLE
-                    const memberUin = json.items[1].param[0];
-                    const title = json.items[3].txt;
-                    logger.logDebug('收到群成员新头衔消息', json);
-                    return new OB11GroupTitleEvent(
-                        core,
-                        parseInt(msg.peerUid),
-                        parseInt(memberUin),
-                        title,
-                    );
-                }
-            }
-        }
-    }
-}

src/onebot/helper/index.ts

@@ -1,3 +0,0 @@
-export * from './config';
-export * from './entities';
-export * from './event';

src/onebot/index.ts

@@ -13,7 +13,7 @@ import {
     RawMessage,
     SendStatusType,
 } from '@/core';
-import { OB11Config, OB11ConfigLoader } from '@/onebot/helper/config';
+import { OB11Config, OB11ConfigLoader } from '@/onebot/config';
 import {
     OB11ActiveHttpAdapter,
     OB11ActiveWebSocketAdapter,
@@ -42,8 +42,10 @@ import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
 import { OB11FriendRecallNoticeEvent } from '@/onebot/event/notice/OB11FriendRecallNoticeEvent';
 import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecallNoticeEvent';
 import { LRUCache } from '@/common/lru-cache';
-import { NT2GroupEvent, NT2PrivateEvent } from './helper';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
+import { SysMessage } from '@/core/proto/SysMessage';
+import { GreyTipWrapper } from '@/core/proto/GreyTipWrapper';
+import { EmojiLikeToOthersWrapper1 } from '@/core/proto/EmojiLikeToOthers';
 
 //OneBot实现类
 export class NapCatOneBot11Adapter {
@@ -137,7 +139,7 @@ export class NapCatOneBot11Adapter {
 
     initRecentContactListener() {
         const recentContactListener = new NodeIKernelRecentContactListener();
-        recentContactListener.onRecentContactNotification = function(msgList: any[] /* arg0: { msgListUnreadCnt: string }, arg1: number */) {
+        recentContactListener.onRecentContactNotification = function (msgList: any[] /* arg0: { msgListUnreadCnt: string }, arg1: number */) {
             msgList.forEach((msg) => {
                 if (msg.chatType == ChatType.KCHATTYPEGROUP) {
                     // log("recent contact", msgList, arg0, arg1);
@@ -239,9 +241,35 @@ export class NapCatOneBot11Adapter {
 
     private initMsgListener() {
         const msgListener = new NodeIKernelMsgListener();
-        /* msgListener.onRecvSysMsg = msg => {
-            //console.log('onRecvSysMsg', Buffer.from(msg).toString('hex'));
-        }; */
+
+        msgListener.onRecvSysMsg = async msg => {
+            const sysMsg = SysMessage.fromBinary(Uint8Array.from(msg));
+            if (sysMsg.msgSpec.length === 0) {
+                return;
+            }
+            const { msgType, subType, subSubType } = sysMsg.msgSpec[0];
+            if (msgType === 732 && subType === 16 && subSubType === 16) {
+                const greyTip = GreyTipWrapper.fromBinary(Uint8Array.from(sysMsg.bodyWrapper!.wrappedBody.slice(7)));
+                if (greyTip.subTypeId === 36) {
+                    const emojiLikeToOthers = EmojiLikeToOthersWrapper1
+                        .fromBinary(greyTip.rest)
+                        .wrapper!
+                        .body!;
+                    if (emojiLikeToOthers.attributes?.operation !== 1) { // Un-like
+                        return;
+                    }
+                    const eventOrEmpty = await this.apis.GroupApi.createGroupEmojiLikeEvent(
+                        greyTip.groupCode.toString(),
+                        await this.core.apis.UserApi.getUinByUidV2(emojiLikeToOthers.attributes!.senderUid),
+                        emojiLikeToOthers.msgSpec!.msgSeq.toString(),
+                        emojiLikeToOthers.attributes!.emojiId,
+                    );
+                    // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+                    eventOrEmpty && await this.networkManager.emitEvent(eventOrEmpty);
+                }
+            }
+        };
+
         msgListener.onInputStatusPush = async data => {
             const uin = await this.core.apis.UserApi.getUinByUidV2(data.fromUin);
             this.context.logger.log(`[Notice] [输入状态] ${uin} ${data.statusText}`);
@@ -259,7 +287,7 @@ export class NapCatOneBot11Adapter {
                     this.context.logger.logDebug(`消息时间${m.msgTime}早于启动时间${this.bootTime}，忽略上报`);
                     continue;
                 }
-                m.id = MessageUnique.createMsg(
+                m.id = MessageUnique.createUniqueMsgId(
                     {
                         chatType: m.chatType,
                         peerUid: m.peerUid,
@@ -271,6 +299,7 @@ export class NapCatOneBot11Adapter {
                     .catch(e => this.context.logger.logError('处理消息失败', e));
             }
         };
+
         const msgIdSend = new LRUCache<string, boolean>(100);
         const recallMsgs = new LRUCache<string, boolean>(100);
         msgListener.onMsgInfoListUpdate = async msgList => {
@@ -286,7 +315,7 @@ export class NapCatOneBot11Adapter {
                             if (!ob11Msg) return;
                             ob11Msg.target_id = parseInt(msg.peerUin);
                             if (this.configLoader.configData.reportSelfMessage) {
-                                msg.id = MessageUnique.createMsg({
+                                msg.id = MessageUnique.createUniqueMsgId({
                                     chatType: msg.chatType,
                                     peerUid: msg.peerUid,
                                     guildId: '',
@@ -319,7 +348,7 @@ export class NapCatOneBot11Adapter {
                 // }
 
                 if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.KMEINITIATORWAITPEERCONFIRM)) {
-                    return;
+                    continue;
                 }
                 try {
                     const requesterUin = await this.core.apis.UserApi.getUinByUidV2(req.friendUid);
@@ -345,6 +374,7 @@ export class NapCatOneBot11Adapter {
 
         groupListener.onGroupNotifiesUpdated = async (_, notifies) => {
             //console.log('ob11 onGroupNotifiesUpdated', notifies[0]);
+            await this.core.apis.GroupApi.clearGroupNotifiesUnreadCount(false);
             if (![
                 GroupNotifyMsgType.SET_ADMIN,
                 GroupNotifyMsgType.CANCEL_ADMIN_NOTIFY_CANCELED,
@@ -443,6 +473,18 @@ export class NapCatOneBot11Adapter {
                         );
                         this.networkManager.emitEvent(groupInviteEvent)
                             .catch(e => this.context.logger.logError('处理邀请本人加群失败', e));
+                    } else if (notify.type == GroupNotifyMsgType.INVITED_NEED_ADMINI_STRATOR_PASS && notify.status == GroupNotifyMsgStatus.KUNHANDLE) {
+                        this.context.logger.logDebug(`收到群员邀请加群通知:${notify}`);
+                        const groupInviteEvent = new OB11GroupRequestEvent(
+                            this.core,
+                            parseInt(notify.group.groupCode),
+                            parseInt(await this.core.apis.UserApi.getUinByUidV2(notify.user1.uid)),
+                            'add',
+                            notify.postscript,
+                            flag,
+                        );
+                        this.networkManager.emitEvent(groupInviteEvent)
+                            .catch(e => this.context.logger.logError('处理邀请本人加群失败', e));
                     }
                 }
             }
@@ -501,14 +543,14 @@ export class NapCatOneBot11Adapter {
             this.networkManager.emitEvent(ob11Msg);
         }).catch(e => this.context.logger.logError('constructMessage error: ', e));
 
-        NT2GroupEvent(this.core, this, message).then(groupEvent => {
+        this.apis.GroupApi.parseGroupEvent(message).then(groupEvent => {
             if (groupEvent) {
                 // log("post group event", groupEvent);
                 this.networkManager.emitEvent(groupEvent);
             }
         }).catch(e => this.context.logger.logError('constructGroupEvent error: ', e));
 
-        NT2PrivateEvent(this.core, this, message).then(privateEvent => {
+        this.apis.MsgApi.parsePrivateMsgEvent(message).then(privateEvent => {
             if (privateEvent) {
                 // log("post private event", privateEvent);
                 this.networkManager.emitEvent(privateEvent);

src/onebot/types/entity.ts

@@ -63,3 +63,27 @@ export interface OB11Sender {
     level?: string,  // 群等级
     role?: OB11GroupMemberRole
 }
+
+export interface OB11GroupFile {
+    group_id: number,
+    file_id: string,
+    file_name: string,
+    busid: number,
+    size: number,
+    upload_time: number,
+    dead_time: number,
+    modify_time: number,
+    download_times: number,
+    uploader: number,
+    uploader_name: string
+}
+
+export interface OB11GroupFileFolder {
+    group_id: number,
+    folder_id: string,
+    folder_name: string,
+    create_time: number,
+    creator: number,
+    creator_name: string,
+    total_file_count: number,
+}

src/shell/napcat.ts

@@ -5,6 +5,7 @@ import { NodeIKernelLoginListener, NodeIKernelSessionListener } from '@/core/lis
 import { NodeIDependsAdapter, NodeIDispatcherAdapter, NodeIGlobalAdapter } from '@/core/adapters';
 import { NapCatPathWrapper } from '@/common/path';
 import {
+    genSessionConfig,
     InstanceContext,
     loadQQWrapper,
     NapCatCore,
@@ -14,7 +15,6 @@ import {
 } from '@/core';
 import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
 import { hostname, systemVersion } from '@/common/system';
-import { genSessionConfig } from '@/core/wrapper/helper';
 import { proxiedListenerOf } from '@/common/proxy-handler';
 
 import path from 'path';

src/webui/src/helper/Data.ts

@@ -1,4 +1,4 @@
-import { OB11Config } from '@/onebot/helper/config';
+import { OB11Config } from '@/onebot/config';
 
 interface LoginRuntimeType {
     LoginCurrentTime: number;

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.2.18', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.2.29', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V2.2.18", "napcat-update-button", "secondary")
+          SettingButton("V2.2.29", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([

vite.config.ts

@@ -46,7 +46,7 @@ const FrameworkBaseConfigPlugin: PluginOption[] = [
             { src: './manifest.json', dest: 'dist' },
             { src: './src/core/external/napcat.json', dest: 'dist/config/' },
             { src: './static/', dest: 'dist/static/', flatten: false },
-            { src: './src/onebot/external/onebot11.json', dest: 'dist/config/' },
+            { src: './src/onebot/config/onebot11.json', dest: 'dist/config/' },
             { src: './src/framework/liteloader.cjs', dest: 'dist' },
             { src: './src/framework/napcat.cjs', dest: 'dist' },
             { src: './src/framework/preload.cjs', dest: 'dist' },
@@ -80,7 +80,7 @@ const ShellBaseConfigPlugin: PluginOption[] = [
             { src: './static/', dest: 'dist/static/', flatten: false },
             // { src: './src/onebot11/onebot11.json', dest: 'dist/config/' },
             { src: './src/core/external/napcat.json', dest: 'dist/config/' },
-            { src: './src/onebot/external/onebot11.json', dest: 'dist/config/' },
+            { src: './src/onebot/config/onebot11.json', dest: 'dist/config/' },
             { src: './package.json', dest: 'dist' },
             // { src: './README.md', dest: 'dist' },
             // { src: './logo.png', dest: 'dist/logs' },