Merge branch 'main' into upmain

src/core/apis/file.ts

@@ -23,12 +23,12 @@ import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
 import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
 import { RkeyManager } from '../helper/rkey';
-import { calculateFileMD5, isGIF } from '@/common/utils/file';
+import { calculateFileMD5, isGIF } from '@/common/file';
 import pathLib from 'node:path';
-import { defaultVideoThumbB64, getVideoInfo } from '@/common/utils/video';
+import { defaultVideoThumbB64, getVideoInfo } from '@/common/video';
 import ffmpeg from 'fluent-ffmpeg';
 import fsnormal from 'node:fs';
-import { encodeSilk } from '@/common/utils/audio';
+import { encodeSilk } from '@/common/audio';
 
 
 export class NTQQFileApi {

src/core/apis/friend.ts

@@ -1,6 +1,6 @@
 import { FriendV2 } from '@/core/entities';
 import { BuddyListReqType, InstanceContext, NapCatCore, NodeIKernelProfileService } from '@/core';
-import { LimitedHashTable } from '@/common/utils/message-unique';
+import { LimitedHashTable } from '@/common/message-unique';
 
 export class NTQQFriendApi {
     context: InstanceContext;

src/core/apis/group.ts

@@ -11,7 +11,7 @@ import {
     NapCatCore,
     NodeIKernelGroupService,
 } from '@/core';
-import { isNumeric, runAllWithTimeout, sleep } from '@/common/utils/helper';
+import { isNumeric, runAllWithTimeout, sleep } from '@/common/helper';
 
 export class NTQQGroupApi {
     context: InstanceContext;

src/core/apis/msg.ts

@@ -3,6 +3,10 @@ import { InstanceContext, NapCatCore } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
+    // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
+    // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
+    // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
+
     context: InstanceContext;
     core: NapCatCore;
 
@@ -10,7 +14,12 @@ export class NTQQMsgApi {
         this.context = context;
         this.core = core;
     }
-
+    async getAioFirstViewLatestMsgs(peer: Peer, MsgCount: number) {
+        return this.context.session.getMsgService().getAioFirstViewLatestMsgs(peer, MsgCount);
+    }
+    async getLatestDbMsgs(peer: Peer, MsgCount: number) {
+        return this.context.session.getMsgService().getLatestDbMsgs(peer, MsgCount);
+    }
     async FetchLongMsg(peer: Peer, msgId: string) {
         return this.context.session.getMsgService().fetchLongMsg(peer, msgId);
     }

src/core/apis/sign.ts

@@ -1,4 +1,4 @@
-import { RequestUtil } from '@/common/utils/request';
+import { RequestUtil } from '@/common/request';
 import { MiniAppLuaJsonType } from '@/core';
 import { InstanceContext, NapCatCore } from '..';
 

src/core/apis/user.ts

@@ -1,8 +1,8 @@
 import type { ModifyProfileParams, User, UserDetailInfoByUinV2 } from '@/core/entities';
-import { RequestUtil } from '@/common/utils/request';
+import { RequestUtil } from '@/common/request';
 import { ProfileBizType, UserDetailSource } from '@/core/services';
 import { InstanceContext, NapCatCore } from '..';
-import { solveAsyncProblem } from '@/common/utils/helper';
+import { solveAsyncProblem } from '@/common/helper';
 
 export class NTQQUserApi {
     context: InstanceContext;

src/core/apis/webapi.ts

@@ -1,4 +1,4 @@
-import { RequestUtil } from '@/common/utils/request';
+import { RequestUtil } from '@/common/request';
 import {
     GroupEssenceMsgRet,
     InstanceContext,

src/core/core.ts

@@ -2,15 +2,15 @@ import { NodeQQNTWrapperUtil, StableNTApiWrapper, WrapperNodeApi } from '@/core/
 import path from 'node:path';
 import fs from 'node:fs';
 import { InstanceContext } from './wrapper';
-import { proxiedListenerOf } from '@/common/utils/proxy-handler';
+import { proxiedListenerOf } from '@/common/proxy-handler';
 import { NodeIKernelGroupListener, NodeIKernelMsgListener, NodeIKernelProfileListener } from './listeners';
 import { DataSource, GroupMember, SelfInfo } from './entities';
-import { LegacyNTEventWrapper } from '@/common/framework/event-legacy';
+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/utils/log';
+import { LogLevel } from '@/common/log';
 
 export enum NapCatCoreWorkingEnv {
     Unknown = 0,
@@ -31,7 +31,7 @@ export function loadQQWrapper(QQVersion: string): WrapperNodeApi {
 export class NapCatCore {
     readonly context: InstanceContext;
     readonly apis: StableNTApiWrapper;
-    readonly eventWrapper: LegacyNTEventWrapper;
+    readonly eventWrapper: NTEventWrapper;
     // readonly eventChannel: NTEventChannel;
     NapCatDataPath: string;
     NapCatTempPath: string;
@@ -45,7 +45,7 @@ export class NapCatCore {
         this.selfInfo = selfInfo;
         this.context = context;
         this.util = this.context.wrapper.NodeQQNTWrapperUtil;
-        this.eventWrapper = new LegacyNTEventWrapper(context.session);
+        this.eventWrapper = new NTEventWrapper(context.session);
         this.apis = {
             FileApi: new NTQQFileApi(this.context, this),
             SystemApi: new NTQQSystemApi(this.context, this),

src/core/helper/config.ts

@@ -1,11 +1,9 @@
-import { ConfigBase } from '@/common/utils/config-base';
+import { ConfigBase } from '@/common/config-base';
 import napCatDefaultConfig from '@/core/external/napcat.json';
 import { NapCatCore } from '@/core';
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export type NapCatConfig = typeof napCatDefaultConfig;
 
-// eslint-disable-next-line @typescript-eslint/no-unsafe-declaration-merging
 export class NapCatConfigLoader extends ConfigBase<NapCatConfig> {
     constructor(core: NapCatCore, configPath: string) {
         super('napcat', core, configPath);

src/core/helper/rkey.ts

@@ -1,5 +1,5 @@
-import { LogWrapper } from '@/common/utils/log';
-import { RequestUtil } from '@/common/utils/request';
+import { LogWrapper } from '@/common/log';
+import { RequestUtil } from '@/common/request';
 
 interface ServerRkeyData {
     group_rkey: string;

src/core/listeners/NodeIKernelGroupListener.ts

@@ -1,6 +1,7 @@
 import { DataSource, Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/core/entities';
 
 export class NodeIKernelGroupListener {
+    onGroupListInited(listEmpty: boolean): void { }
     // 发现于Win 9.9.9 23159
     onGroupMemberLevelInfoChange(...args: unknown[]): void {
 

src/core/services/NodeIKernelMsgService.ts

@@ -167,11 +167,17 @@ export interface NodeIKernelMsgService {
 
     getAllOnlineFileMsgs(...args: unknown[]): unknown;
 
-    getLatestDbMsgs(peer: Peer, cnt: number): Promise<unknown>;
+    getLatestDbMsgs(peer: Peer, cnt: number): Promise<GeneralCallResult & {
+        msgList: RawMessage[]
+    }>;
 
-    getLastMessageList(peer: Peer[]): Promise<unknown>;
+    getLastMessageList(peer: Peer[]): Promise<GeneralCallResult & {
+        msgList: RawMessage[]
+    }>;
 
-    getAioFirstViewLatestMsgs(peer: Peer, num: number): unknown;
+    getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & {
+        msgList: RawMessage[]
+    }>;
 
     getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>;
 
@@ -512,11 +518,11 @@ export interface NodeIKernelMsgService {
         result: number,
         errMsg: string,
         emojiLikesList:
-            Array<{
-                tinyId: string,
-                nickName: string,
-                headUrl: string
-            }>,
+        Array<{
+            tinyId: string,
+            nickName: string,
+            headUrl: string
+        }>,
         cookie: string,
         isLastPage: boolean,
         isFirstPage: boolean

src/core/wrapper/context.ts

@@ -1,9 +1,9 @@
-import { LogWrapper } from '@/common/utils/log';
-import { QQBasicInfoWrapper } from '@/common/utils/qq-basic-info';
+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/framework/napcat';
+import { NapCatPathWrapper } from '@/common/path';
 
 export interface InstanceContext {
     readonly workingEnv: NapCatCoreWorkingEnv;

src/core/wrapper/helper.ts

@@ -1,7 +1,7 @@
 import path from 'node:path';
 import fs from 'node:fs';
 import { PlatformType, VendorType, WrapperSessionInitConfig } from './wrapper';
-import { getMachineId, hostname, systemName, systemVersion } from '@/common/utils/system';
+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');