Merge branch 'main' into upmain

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.2.15",
+  "version": "2.2.16",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/event-v2.ts

@@ -10,7 +10,7 @@ export interface ListenerIBase {
     [key: string]: any;
 }
 
-export class NTEventChannel extends EventEmitter {
+export class NTEventWrapperV2 extends EventEmitter {
     private wrapperApi: WrapperNodeApi;
     private wrapperSession: NodeIQQNTWrapperSession;
     private listenerRefStorage = new Map<string, ListenerIBase>();

src/common/event.ts

@@ -11,7 +11,7 @@ interface InternalMapKey {
 
 export type ListenerClassBase = Record<string, string>;
 
-export class LegacyNTEventWrapper {
+export class NTEventWrapper {
     private WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
     private listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
     private EventTask = new Map<string, Map<string, Map<string, InternalMapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}

src/common/log.ts

@@ -1,5 +1,5 @@
 import log4js, { Configuration } from 'log4js';
-import { truncateString } from '@/common/utils/helper';
+import { truncateString } from '@/common/helper';
 import path from 'node:path';
 import chalk from 'chalk';
 import { AtType, ChatType, ElementType, MessageElement, RawMessage, SelfInfo } from '@/core';

src/common/path.ts

@@ -2,8 +2,6 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 
-export const napcat_version = '2.2.15';
-
 export class NapCatPathWrapper {
     binaryPath: string;
     logsPath: string;

src/common/qq-basic-info.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { systemPlatform } from '@/common/utils/system';
+import { systemPlatform } from '@/common/system';
 import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
 import AppidTable from '@/core/external/appid.json';
 import { LogWrapper } from './log';

src/common/version.ts

@@ -0,0 +1 @@
+export const napCatVersion = '2.2.16';

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');

src/framework/napcat.ts

@@ -1,7 +1,7 @@
-import { NapCatPathWrapper } from '@/common/framework/napcat';
-import { LogWrapper } from '@/common/utils/log';
-import { proxiedListenerOf } from '@/common/utils/proxy-handler';
-import { QQBasicInfoWrapper } from '@/common/utils/qq-basic-info';
+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 { SelfInfo } from '@/core/entities';

src/onebot/action/OB11Response.ts

@@ -1,6 +1,6 @@
 import { OB11Return } from '../types';
 
-import { isNull } from '../../common/utils/helper';
+import { isNull } from '../../common/helper';
 
 export class OB11Response {
     static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {

src/onebot/action/extends/FetchEmojiLike.ts

@@ -2,7 +2,7 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/extends/OCRImage.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { checkFileReceived, uri2local } from '@/common/utils/file';
+import { checkFileReceived, uri2local } from '@/common/file';
 import fs from 'fs';
 
 const SchemaData = {

src/onebot/action/extends/SetQQAvatar.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
-import { checkFileReceived, uri2local } from '@/common/utils/file';
+import { checkFileReceived, uri2local } from '@/common/file';
 
 interface Payload {
     file: string;

src/onebot/action/file/GetFile.ts

@@ -1,6 +1,6 @@
 import BaseAction from '../BaseAction';
 import fs from 'fs/promises';
-import { UUIDConverter } from '@/common/utils/helper';
+import { UUIDConverter } from '@/common/helper';
 import { ActionName } from '../types';
 import { ChatType, ElementType, FileElement, Peer, RawMessage, VideoElement } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';

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

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import fs from 'fs';
 import { join as joinPath } from 'node:path';
-import { calculateFileMD5, httpDownload } from '@/common/utils/file';
+import { calculateFileMD5, httpDownload } from '@/common/file';
 import { randomUUID } from 'crypto';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 

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

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { OB11ForwardMessage } from '@/onebot';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 const SchemaData = {
     type: 'object',

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

@@ -1,9 +1,9 @@
 import BaseAction from '../BaseAction';
 import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
-import { ChatType, RawMessage } from '@/core/entities';
+import { ChatType, Peer, RawMessage } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 interface Response {
     messages: OB11Message[];
@@ -13,7 +13,7 @@ const SchemaData = {
     type: 'object',
     properties: {
         user_id: { type: ['number', 'string'] },
-        message_seq: { type: 'number' },
+        message_seq: { type: ['number', 'string'] },
         count: { type: ['number', 'string'] },
         reverseOrder: { type: ['boolean', 'string'] },
     },
@@ -37,21 +37,19 @@ export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
         if (!uid) throw `记录${payload.user_id}不存在`;
         const friend = await NTQQFriendApi.isBuddy(uid);
         const peer = { chatType: friend ? ChatType.KCHATTYPEC2C : ChatType.KCHATTYPETEMPC2CFROMGROUP, peerUid: uid };
-
+        const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         //拉取消息
-        let msgList: RawMessage[];
-        if (!payload.message_seq || payload.message_seq == 0) {
-            msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, MsgCount)).msgList;
-        } else {
-            const startMsgId = MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq)?.MsgId;
-            if (!startMsgId) throw `消息${payload.message_seq}不存在`;
-            msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList;
-        }
+        const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
+        let msgList = hasMessageSeq ?
+            (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList : (await NTQQMsgApi.getAioFirstViewLatestMsgs(peer, MsgCount)).msgList;
+        if (msgList.length === 0) throw `消息${payload.message_seq}不存在`;
+        //翻转消息
         if (isReverseOrder) msgList.reverse();
+        //转换序号
         await Promise.all(msgList.map(async msg => {
             msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
-        //转换消息
+        //烘焙消息
         const ob11MsgList = (await Promise.all(
             msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg)))
         ).filter(msg => msg !== undefined);

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

@@ -3,7 +3,7 @@ import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
 import { ChatType, Peer, RawMessage } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 interface Response {
     messages: OB11Message[];
@@ -13,7 +13,7 @@ const SchemaData = {
     type: 'object',
     properties: {
         group_id: { type: ['number', 'string'] },
-        message_seq: { type: 'number' },
+        message_seq: { type: ['number', 'string'] },
         count: { type: ['number', 'string'] },
         reverseOrder: { type: ['boolean', 'string'] },
     },
@@ -32,21 +32,19 @@ export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Resp
         const isReverseOrder = typeof payload.reverseOrder === 'string' ? payload.reverseOrder === 'true' : !!payload.reverseOrder;
         const MsgCount = +(payload.count ?? 20);
         const peer: Peer = { chatType: ChatType.KCHATTYPEGROUP, peerUid: payload.group_id.toString() };
+        const hasMessageSeq = !payload.message_seq ? !!payload.message_seq : !(payload.message_seq?.toString() === '' || payload.message_seq?.toString() === '0');
         //拉取消息
-        let msgList: RawMessage[];
-        if (!payload.message_seq || payload.message_seq == 0) {
-            msgList = (await NTQQMsgApi.getLastestMsgByUids(peer, MsgCount)).msgList;
-        } else {
-            const startMsgId = MessageUnique.getMsgIdAndPeerByShortId(payload.message_seq)?.MsgId;
-            if (!startMsgId) throw `消息${payload.message_seq}不存在`;
-            msgList = (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList;
-        }
+        const startMsgId = hasMessageSeq ? (MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq!)?.MsgId ?? payload.message_seq!.toString()) : '0';
+        let msgList = hasMessageSeq ?
+            (await NTQQMsgApi.getMsgHistory(peer, startMsgId, MsgCount)).msgList : (await NTQQMsgApi.getAioFirstViewLatestMsgs(peer, MsgCount)).msgList;
+        if (msgList.length === 0) throw `消息${payload.message_seq}不存在`;
+        //翻转消息
         if (isReverseOrder) msgList.reverse();
+        //转换序号
         await Promise.all(msgList.map(async msg => {
             msg.id = MessageUnique.createMsg({ guildId: '', chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId);
         }));
-
-        //转换消息
+        //烘焙消息
         const ob11MsgList = (await Promise.all(
             msgList.map(msg => this.obContext.apis.MsgApi.parseMessage(msg)))
         ).filter(msg => msg !== undefined);

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

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { JSONSchema } from 'json-schema-to-ts';
-import { sleep } from '@/common/utils/helper';
+import { sleep } from '@/common/helper';
 
 const SchemaData = {
     type: 'object',

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

@@ -3,7 +3,7 @@ import { OB11User, OB11UserSex } from '@/onebot';
 import { OB11Entities } from '@/onebot/helper/entities';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { calcQQLevel } from '@/common/utils/helper';
+import { calcQQLevel } from '@/common/helper';
 
 const SchemaData = {
     type: 'object',

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

@@ -1,4 +1,4 @@
-import { checkFileReceived, uri2local } from '@/common/utils/file';
+import { checkFileReceived, uri2local } from '@/common/file';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { unlink } from 'node:fs';

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

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
-import { checkFileReceived, uri2local } from '@/common/utils/file';
+import { checkFileReceived, uri2local } from '@/common/file';
 
 interface Payload {
     file: string,

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

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { ChatType } from '@/core/entities';
 import fs from 'fs';
-import { uri2local } from '@/common/utils/file';
+import { uri2local } from '@/common/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 const SchemaData = {

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

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { ChatType, Peer, SendFileElement } from '@/core/entities';
 import fs from 'fs';
-import { uri2local } from '@/common/utils/file';
+import { uri2local } from '@/common/file';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
 const SchemaData = {

src/onebot/action/group/DelEssenceMsg.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/group/SetEssenceMsg.ts

@@ -1,7 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/msg/DeleteMsg.ts

@@ -1,7 +1,7 @@
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 import { NodeIKernelMsgListener } from '@/core';
 
 const SchemaData = {

src/onebot/action/msg/ForwardSingleMsg.ts

@@ -2,7 +2,7 @@ import BaseAction from '../BaseAction';
 import { ChatType, Peer } from '@/core/entities';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/msg/GetMsg.ts

@@ -2,7 +2,7 @@ import { OB11Message } from '@/onebot';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 
 export type ReturnDataType = OB11Message

src/onebot/action/msg/SendMsg.ts

@@ -7,7 +7,7 @@ import {
 } from '@/onebot/types';
 import { ActionName, BaseCheckResult } from '@/onebot/action/types';
 import { decodeCQCode } from '@/onebot/helper/cqcode';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendMessageElement } from '@/core';
 import BaseAction from '../BaseAction';
 

src/onebot/action/msg/SetMsgEmojiLike.ts

@@ -1,7 +1,7 @@
 import { ActionName } from '../types';
 import BaseAction from '../BaseAction';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 const SchemaData = {
     type: 'object',

src/onebot/action/system/GetVersionInfo.ts

@@ -1,6 +1,7 @@
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
-import { napcat_version } from '@/common/framework/napcat';
+
+import { napCatVersion } from '@/common/version';
 
 export default class GetVersionInfo extends BaseAction<any, any> {
     actionName = ActionName.GetVersionInfo;
@@ -9,7 +10,7 @@ export default class GetVersionInfo extends BaseAction<any, any> {
         return {
             app_name: 'NapCat.Onebot',
             protocol_version: 'v11',
-            app_version: napcat_version,
+            app_version: napCatVersion,
         };
     }
 }

src/onebot/api/group.ts

@@ -5,7 +5,7 @@ import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent';
 import { OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent';
 import fastXmlParser from 'fast-xml-parser';
 import { OB11GroupMsgEmojiLikeEvent } from '../event/notice/OB11MsgEmojiLikeEvent';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 
 export class OneBotGroupApi {
     obContext: NapCatOneBot11Adapter;

src/onebot/api/msg.ts

@@ -1,5 +1,5 @@
-import { UUIDConverter } from '@/common/utils/helper';
-import { MessageUnique } from '@/common/utils/message-unique';
+import { UUIDConverter } from '@/common/helper';
+import { MessageUnique } from '@/common/message-unique';
 import {
     AtType,
     ChatType,
@@ -27,8 +27,8 @@ import {
 import { OB11Entities } from '../helper';
 import { EventType } from '@/onebot/event/OB11BaseEvent';
 import { encodeCQCode } from '@/onebot/helper/cqcode';
-import { uri2local } from '@/common/utils/file';
-import { RequestUtil } from '@/common/utils/request';
+import { uri2local } from '@/common/file';
+import { RequestUtil } from '@/common/request';
 import fs from 'node:fs';
 import fsPromise from 'node:fs/promises';
 

src/onebot/api/quick-action.ts

@@ -14,7 +14,7 @@ import { ChatType, GroupRequestOperateTypes, NapCatCore, Peer } from '@/core';
 import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
 import { OB11GroupRequestEvent } from '@/onebot/event/request/OB11GroupRequest';
 import { normalize } from '@/onebot/action/msg/SendMsg';
-import { isNull } from '@/common/utils/helper';
+import { isNull } from '@/common/helper';
 
 export class OneBotQuickActionApi {
     constructor(

src/onebot/helper/config.ts

@@ -1,4 +1,4 @@
-import { ConfigBase } from '@/common/utils/config-base';
+import { ConfigBase } from '@/common/config-base';
 import ob11DefaultConfig from '@/onebot/external/onebot11.json';
 import { NapCatCore } from '@/core';
 

src/onebot/helper/entities.ts

@@ -1,4 +1,4 @@
-import { calcQQLevel } from '@/common/utils/helper';
+import { calcQQLevel } from '@/common/helper';
 import { Friend, FriendV2, Group, GroupMember, SelfInfo, Sex, User } from '@/core';
 import { OB11Group, OB11GroupMember, OB11GroupMemberRole, OB11User, OB11UserSex } from '../types';
 

src/onebot/helper/event.ts

@@ -7,7 +7,7 @@ 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/utils/message-unique';
+import { MessageUnique } from '@/common/message-unique';
 import { OB11GroupTitleEvent } from '../event/notice/OB11GroupTitleEvent';
 import { NapCatCore, RawMessage, ChatType, NTGrayTipElementSubTypeV2, TipGroupElementType, Peer } from '@/core';
 

src/onebot/index.ts

@@ -21,7 +21,7 @@ import {
     OB11PassiveHttpAdapter,
     OB11PassiveWebSocketAdapter,
 } from '@/onebot/network';
-import { NapCatPathWrapper } from '@/common/framework/napcat';
+import { NapCatPathWrapper } from '@/common/path';
 import {
     OneBotFriendApi,
     OneBotGroupApi,
@@ -33,15 +33,15 @@ import {
 import { ActionMap, createActionMap } from '@/onebot/action';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
 import { OB11InputStatusEvent } from '@/onebot/event/notice/OB11InputStatusEvent';
-import { MessageUnique } from '@/common/utils/message-unique';
-import { proxiedListenerOf } from '@/common/utils/proxy-handler';
+import { MessageUnique } from '@/common/message-unique';
+import { proxiedListenerOf } from '@/common/proxy-handler';
 import { OB11FriendRequestEvent } from '@/onebot/event/request/OB11FriendRequest';
 import { OB11GroupAdminNoticeEvent } from '@/onebot/event/notice/OB11GroupAdminNoticeEvent';
 import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '@/onebot/event/notice/OB11GroupDecreaseEvent';
 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/utils/lru-cache';
+import { LRUCache } from '@/common/lru-cache';
 import { NT2GroupEvent, NT2PrivateEvent } from './helper';
 import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener';
 

src/onebot/network/active-http.ts

@@ -1,6 +1,6 @@
 import { IOB11NetworkAdapter, OB11EmitEventContent } from '@/onebot/network/index';
 import { createHmac } from 'crypto';
-import { LogWrapper } from '@/common/utils/log';
+import { LogWrapper } from '@/common/log';
 import { QuickAction, QuickActionEvent } from '../types';
 import { NapCatCore } from '@/core';
 import { NapCatOneBot11Adapter } from '..';

src/onebot/network/active-websocket.ts

@@ -4,7 +4,7 @@ import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent';
 import { NapCatCore } from '@/core';
 import { ActionName } from '@/onebot/action/types';
 import { OB11Response } from '@/onebot/action/OB11Response';
-import { LogWrapper } from '@/common/utils/log';
+import { LogWrapper } from '@/common/log';
 import { ActionMap } from '@/onebot/action';
 import { LifeCycleSubType, OB11LifeCycleEvent } from '../event/meta/OB11LifeCycleEvent';
 

src/onebot/network/passive-websocket.ts

@@ -5,7 +5,7 @@ import { Mutex } from 'async-mutex';
 import { OB11Response } from '../action/OB11Response';
 import { ActionName } from '../action/types';
 import { NapCatCore } from '@/core';
-import { LogWrapper } from '@/common/utils/log';
+import { LogWrapper } from '@/common/log';
 import { OB11HeartbeatEvent } from '../event/meta/OB11HeartbeatEvent';
 import { IncomingMessage } from 'http';
 import { ActionMap } from '@/onebot/action';

src/shell/napcat.ts

@@ -1,9 +1,9 @@
 import type { SelfInfo } from '@/core/entities';
 
-import { LogWrapper } from '@/common/utils/log';
+import { LogWrapper } from '@/common/log';
 import { NodeIKernelLoginListener, NodeIKernelSessionListener } from '@/core/listeners';
 import { NodeIDependsAdapter, NodeIDispatcherAdapter, NodeIGlobalAdapter } from '@/core/adapters';
-import { napcat_version, NapCatPathWrapper } from '@/common/framework/napcat';
+import { NapCatPathWrapper } from '@/common/path';
 import {
     InstanceContext,
     loadQQWrapper,
@@ -12,10 +12,10 @@ import {
     NodeIQQNTWrapperSession,
     WrapperNodeApi,
 } from '@/core';
-import { QQBasicInfoWrapper } from '@/common/utils/qq-basic-info';
-import { hostname, systemVersion } from '@/common/utils/system';
+import { QQBasicInfoWrapper } from '@/common/qq-basic-info';
+import { hostname, systemVersion } from '@/common/system';
 import { genSessionConfig } from '@/core/wrapper/helper';
-import { proxiedListenerOf } from '@/common/utils/proxy-handler';
+import { proxiedListenerOf } from '@/common/proxy-handler';
 
 import path from 'path';
 import fs from 'fs';
@@ -26,6 +26,7 @@ import qrcode from 'qrcode-terminal';
 import { NapCatOneBot11Adapter } from '@/onebot';
 import { InitWebUi } from '@/webui';
 import { WebUiDataRuntime } from '@/webui/src/helper/Data';
+import { napCatVersion } from '@/common/version';
 
 program.option('-q, --qq [number]', 'QQ号').parse(process.argv);
 const cmdOptions = program.opts();
@@ -38,7 +39,7 @@ export async function NCoreInitShell() {
     const logger = new LogWrapper(pathWrapper.logsPath);
     const basicInfoWrapper = new QQBasicInfoWrapper({ logger });
     const wrapper = loadQQWrapper(basicInfoWrapper.getFullQQVesion());
-    logger.log(`[NapCat] [Core] NapCat.Core Version: ` + napcat_version);
+    logger.log(`[NapCat] [Core] NapCat.Core Version: ` + napCatVersion);
     InitWebUi(logger, pathWrapper).then().catch(logger.logError);
 
     // from constructor

src/webui/index.ts

@@ -1,7 +1,7 @@
 import express from 'express';
 import { ALLRouter } from './src/router';
-import { LogWrapper } from '@/common/utils/log';
-import { NapCatPathWrapper } from '@/common/framework/napcat';
+import { LogWrapper } from '@/common/log';
+import { NapCatPathWrapper } from '@/common/path';
 import { WebUiConfigWrapper } from './src/helper/config';
 
 const app = express();

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.15', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.2.16', '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.15", "napcat-update-button", "secondary")
+          SettingButton("V2.2.16", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([