From 17e680f7affa0e958bda987a040a891d0c00d9e7 Mon Sep 17 00:00:00 2001 From: "Wesley F. Young" Date: Tue, 27 Aug 2024 10:17:19 +0800 Subject: [PATCH] refactor: move all utility files to /common --- src/common/{utils => }/audio.ts | 0 src/common/{utils => }/config-base.ts | 0 src/common/{framework => }/event-v2.ts | 0 src/common/{framework => }/event.ts | 0 src/common/{utils => }/file.ts | 0 src/common/{utils => }/helper.ts | 0 src/common/{utils => }/log.ts | 2 +- src/common/{utils => }/lru-cache.ts | 0 src/common/{utils => }/message-unique.ts | 0 src/common/{framework/napcat.ts => path.ts} | 0 src/common/{utils => }/proxy-handler.ts | 0 src/common/{utils => }/qq-basic-info.ts | 2 +- src/common/{utils => }/request.ts | 0 src/common/{utils => }/system.ts | 0 src/common/{utils => }/types.ts | 0 src/common/{utils => }/video.ts | 0 src/core/apis/file.ts | 6 +++--- src/core/apis/friend.ts | 2 +- src/core/apis/group.ts | 2 +- src/core/apis/sign.ts | 2 +- src/core/apis/user.ts | 4 ++-- src/core/apis/webapi.ts | 2 +- src/core/core.ts | 6 +++--- src/core/helper/config.ts | 2 +- src/core/helper/rkey.ts | 4 ++-- src/core/wrapper/context.ts | 6 +++--- src/core/wrapper/helper.ts | 2 +- src/framework/napcat.ts | 8 ++++---- src/onebot/action/OB11Response.ts | 2 +- src/onebot/action/extends/FetchEmojiLike.ts | 2 +- src/onebot/action/extends/OCRImage.ts | 2 +- src/onebot/action/extends/SetQQAvatar.ts | 2 +- src/onebot/action/file/GetFile.ts | 2 +- src/onebot/action/go-cqhttp/DownloadFile.ts | 2 +- src/onebot/action/go-cqhttp/GetForwardMsg.ts | 2 +- src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts | 2 +- src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts | 2 +- src/onebot/action/go-cqhttp/GetOnlineClient.ts | 2 +- src/onebot/action/go-cqhttp/GetStrangerInfo.ts | 2 +- src/onebot/action/go-cqhttp/SendGroupNotice.ts | 2 +- src/onebot/action/go-cqhttp/SetGroupPortrait.ts | 2 +- src/onebot/action/go-cqhttp/UploadGroupFile.ts | 2 +- src/onebot/action/go-cqhttp/UploadPrivateFile.ts | 2 +- src/onebot/action/group/DelEssenceMsg.ts | 2 +- src/onebot/action/group/SetEssenceMsg.ts | 2 +- src/onebot/action/msg/DeleteMsg.ts | 2 +- src/onebot/action/msg/ForwardSingleMsg.ts | 2 +- src/onebot/action/msg/GetMsg.ts | 2 +- src/onebot/action/msg/SendMsg.ts | 2 +- src/onebot/action/msg/SetMsgEmojiLike.ts | 2 +- src/onebot/action/system/GetVersionInfo.ts | 2 +- src/onebot/api/group.ts | 2 +- src/onebot/api/msg.ts | 8 ++++---- src/onebot/api/quick-action.ts | 2 +- src/onebot/helper/config.ts | 2 +- src/onebot/helper/entities.ts | 2 +- src/onebot/helper/event.ts | 2 +- src/onebot/index.ts | 8 ++++---- src/onebot/network/active-http.ts | 2 +- src/onebot/network/active-websocket.ts | 2 +- src/onebot/network/passive-websocket.ts | 2 +- src/shell/napcat.ts | 10 +++++----- src/webui/index.ts | 4 ++-- 63 files changed, 71 insertions(+), 71 deletions(-) rename src/common/{utils => }/audio.ts (100%) rename src/common/{utils => }/config-base.ts (100%) rename src/common/{framework => }/event-v2.ts (100%) rename src/common/{framework => }/event.ts (100%) rename src/common/{utils => }/file.ts (100%) rename src/common/{utils => }/helper.ts (100%) rename src/common/{utils => }/log.ts (99%) rename src/common/{utils => }/lru-cache.ts (100%) rename src/common/{utils => }/message-unique.ts (100%) rename src/common/{framework/napcat.ts => path.ts} (100%) rename src/common/{utils => }/proxy-handler.ts (100%) rename src/common/{utils => }/qq-basic-info.ts (98%) rename src/common/{utils => }/request.ts (100%) rename src/common/{utils => }/system.ts (100%) rename src/common/{utils => }/types.ts (100%) rename src/common/{utils => }/video.ts (100%) diff --git a/src/common/utils/audio.ts b/src/common/audio.ts similarity index 100% rename from src/common/utils/audio.ts rename to src/common/audio.ts diff --git a/src/common/utils/config-base.ts b/src/common/config-base.ts similarity index 100% rename from src/common/utils/config-base.ts rename to src/common/config-base.ts diff --git a/src/common/framework/event-v2.ts b/src/common/event-v2.ts similarity index 100% rename from src/common/framework/event-v2.ts rename to src/common/event-v2.ts diff --git a/src/common/framework/event.ts b/src/common/event.ts similarity index 100% rename from src/common/framework/event.ts rename to src/common/event.ts diff --git a/src/common/utils/file.ts b/src/common/file.ts similarity index 100% rename from src/common/utils/file.ts rename to src/common/file.ts diff --git a/src/common/utils/helper.ts b/src/common/helper.ts similarity index 100% rename from src/common/utils/helper.ts rename to src/common/helper.ts diff --git a/src/common/utils/log.ts b/src/common/log.ts similarity index 99% rename from src/common/utils/log.ts rename to src/common/log.ts index 0ff3a69f..0e185632 100644 --- a/src/common/utils/log.ts +++ b/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'; diff --git a/src/common/utils/lru-cache.ts b/src/common/lru-cache.ts similarity index 100% rename from src/common/utils/lru-cache.ts rename to src/common/lru-cache.ts diff --git a/src/common/utils/message-unique.ts b/src/common/message-unique.ts similarity index 100% rename from src/common/utils/message-unique.ts rename to src/common/message-unique.ts diff --git a/src/common/framework/napcat.ts b/src/common/path.ts similarity index 100% rename from src/common/framework/napcat.ts rename to src/common/path.ts diff --git a/src/common/utils/proxy-handler.ts b/src/common/proxy-handler.ts similarity index 100% rename from src/common/utils/proxy-handler.ts rename to src/common/proxy-handler.ts diff --git a/src/common/utils/qq-basic-info.ts b/src/common/qq-basic-info.ts similarity index 98% rename from src/common/utils/qq-basic-info.ts rename to src/common/qq-basic-info.ts index 669a3a80..cb39d6be 100644 --- a/src/common/utils/qq-basic-info.ts +++ b/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'; diff --git a/src/common/utils/request.ts b/src/common/request.ts similarity index 100% rename from src/common/utils/request.ts rename to src/common/request.ts diff --git a/src/common/utils/system.ts b/src/common/system.ts similarity index 100% rename from src/common/utils/system.ts rename to src/common/system.ts diff --git a/src/common/utils/types.ts b/src/common/types.ts similarity index 100% rename from src/common/utils/types.ts rename to src/common/types.ts diff --git a/src/common/utils/video.ts b/src/common/video.ts similarity index 100% rename from src/common/utils/video.ts rename to src/common/video.ts diff --git a/src/core/apis/file.ts b/src/core/apis/file.ts index 586c74f1..fa5e83c2 100644 --- a/src/core/apis/file.ts +++ b/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 { diff --git a/src/core/apis/friend.ts b/src/core/apis/friend.ts index 7870bc01..937a7bcb 100644 --- a/src/core/apis/friend.ts +++ b/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; diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index e7f6fc58..9bf306ef 100644 --- a/src/core/apis/group.ts +++ b/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; diff --git a/src/core/apis/sign.ts b/src/core/apis/sign.ts index 1670068f..53f20289 100644 --- a/src/core/apis/sign.ts +++ b/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 '..'; diff --git a/src/core/apis/user.ts b/src/core/apis/user.ts index 8b1fdebb..682aa3e0 100644 --- a/src/core/apis/user.ts +++ b/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; diff --git a/src/core/apis/webapi.ts b/src/core/apis/webapi.ts index 5b113014..f544cede 100644 --- a/src/core/apis/webapi.ts +++ b/src/core/apis/webapi.ts @@ -1,4 +1,4 @@ -import { RequestUtil } from '@/common/utils/request'; +import { RequestUtil } from '@/common/request'; import { GroupEssenceMsgRet, InstanceContext, diff --git a/src/core/core.ts b/src/core/core.ts index 81e630e6..9e859d39 100644 --- a/src/core/core.ts +++ b/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 { NTEventWrapper } from '@/common/framework/event'; +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, diff --git a/src/core/helper/config.ts b/src/core/helper/config.ts index 5f8a04f7..eb9b15e7 100644 --- a/src/core/helper/config.ts +++ b/src/core/helper/config.ts @@ -1,4 +1,4 @@ -import { ConfigBase } from '@/common/utils/config-base'; +import { ConfigBase } from '@/common/config-base'; import napCatDefaultConfig from '@/core/external/napcat.json'; import { NapCatCore } from '@/core'; diff --git a/src/core/helper/rkey.ts b/src/core/helper/rkey.ts index 607fdccf..dd7b5059 100644 --- a/src/core/helper/rkey.ts +++ b/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; diff --git a/src/core/wrapper/context.ts b/src/core/wrapper/context.ts index 078085f8..b5c33a3a 100644 --- a/src/core/wrapper/context.ts +++ b/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; diff --git a/src/core/wrapper/helper.ts b/src/core/wrapper/helper.ts index 9e3dfe5a..015b201a 100644 --- a/src/core/wrapper/helper.ts +++ b/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 { const downloadPath = path.join(account_path, 'NapCat', 'temp'); diff --git a/src/framework/napcat.ts b/src/framework/napcat.ts index f48c9d4c..3d4fefa7 100644 --- a/src/framework/napcat.ts +++ b/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'; diff --git a/src/onebot/action/OB11Response.ts b/src/onebot/action/OB11Response.ts index aec721b7..2f7f4deb 100644 --- a/src/onebot/action/OB11Response.ts +++ b/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(data: T, status: string, retcode: number, message: string = ''): OB11Return { diff --git a/src/onebot/action/extends/FetchEmojiLike.ts b/src/onebot/action/extends/FetchEmojiLike.ts index c2dbea97..cf3dcb17 100644 --- a/src/onebot/action/extends/FetchEmojiLike.ts +++ b/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', diff --git a/src/onebot/action/extends/OCRImage.ts b/src/onebot/action/extends/OCRImage.ts index cd3fd64d..63f5f086 100644 --- a/src/onebot/action/extends/OCRImage.ts +++ b/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 = { diff --git a/src/onebot/action/extends/SetQQAvatar.ts b/src/onebot/action/extends/SetQQAvatar.ts index 4939f7bc..0f73993d 100644 --- a/src/onebot/action/extends/SetQQAvatar.ts +++ b/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; diff --git a/src/onebot/action/file/GetFile.ts b/src/onebot/action/file/GetFile.ts index afae43fd..6686c0b3 100644 --- a/src/onebot/action/file/GetFile.ts +++ b/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'; diff --git a/src/onebot/action/go-cqhttp/DownloadFile.ts b/src/onebot/action/go-cqhttp/DownloadFile.ts index 1dae2cbc..cded4143 100644 --- a/src/onebot/action/go-cqhttp/DownloadFile.ts +++ b/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'; diff --git a/src/onebot/action/go-cqhttp/GetForwardMsg.ts b/src/onebot/action/go-cqhttp/GetForwardMsg.ts index e2239689..54e6ad56 100644 --- a/src/onebot/action/go-cqhttp/GetForwardMsg.ts +++ b/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', diff --git a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts index 5490ae7c..adc717ef 100644 --- a/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts +++ b/src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts @@ -3,7 +3,7 @@ import { OB11Message } from '@/onebot'; import { ActionName } from '../types'; import { ChatType, 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[]; diff --git a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts b/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts index 9897a84c..d62aef29 100644 --- a/src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts +++ b/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[]; diff --git a/src/onebot/action/go-cqhttp/GetOnlineClient.ts b/src/onebot/action/go-cqhttp/GetOnlineClient.ts index ec45747b..b03050b0 100644 --- a/src/onebot/action/go-cqhttp/GetOnlineClient.ts +++ b/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', diff --git a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts b/src/onebot/action/go-cqhttp/GetStrangerInfo.ts index 54f594e9..bcb3cb39 100644 --- a/src/onebot/action/go-cqhttp/GetStrangerInfo.ts +++ b/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', diff --git a/src/onebot/action/go-cqhttp/SendGroupNotice.ts b/src/onebot/action/go-cqhttp/SendGroupNotice.ts index 8953f0f4..18165478 100644 --- a/src/onebot/action/go-cqhttp/SendGroupNotice.ts +++ b/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'; diff --git a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts b/src/onebot/action/go-cqhttp/SetGroupPortrait.ts index c329906b..fb23689d 100644 --- a/src/onebot/action/go-cqhttp/SetGroupPortrait.ts +++ b/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, diff --git a/src/onebot/action/go-cqhttp/UploadGroupFile.ts b/src/onebot/action/go-cqhttp/UploadGroupFile.ts index defec767..4f0f9111 100644 --- a/src/onebot/action/go-cqhttp/UploadGroupFile.ts +++ b/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 = { diff --git a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts b/src/onebot/action/go-cqhttp/UploadPrivateFile.ts index d827a2fe..49e83f3f 100644 --- a/src/onebot/action/go-cqhttp/UploadPrivateFile.ts +++ b/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 = { diff --git a/src/onebot/action/group/DelEssenceMsg.ts b/src/onebot/action/group/DelEssenceMsg.ts index 5b2cf14c..c951cbdb 100644 --- a/src/onebot/action/group/DelEssenceMsg.ts +++ b/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', diff --git a/src/onebot/action/group/SetEssenceMsg.ts b/src/onebot/action/group/SetEssenceMsg.ts index 0f7f2d0d..3e0d0323 100644 --- a/src/onebot/action/group/SetEssenceMsg.ts +++ b/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', diff --git a/src/onebot/action/msg/DeleteMsg.ts b/src/onebot/action/msg/DeleteMsg.ts index 834a24bb..c11b6c21 100644 --- a/src/onebot/action/msg/DeleteMsg.ts +++ b/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 = { diff --git a/src/onebot/action/msg/ForwardSingleMsg.ts b/src/onebot/action/msg/ForwardSingleMsg.ts index 12e344dd..f9787e7b 100644 --- a/src/onebot/action/msg/ForwardSingleMsg.ts +++ b/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', diff --git a/src/onebot/action/msg/GetMsg.ts b/src/onebot/action/msg/GetMsg.ts index d90133d5..e4cfa33a 100644 --- a/src/onebot/action/msg/GetMsg.ts +++ b/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 diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index 4fddc341..d96680f0 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/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'; diff --git a/src/onebot/action/msg/SetMsgEmojiLike.ts b/src/onebot/action/msg/SetMsgEmojiLike.ts index 3312b020..6593604d 100644 --- a/src/onebot/action/msg/SetMsgEmojiLike.ts +++ b/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', diff --git a/src/onebot/action/system/GetVersionInfo.ts b/src/onebot/action/system/GetVersionInfo.ts index 421cd7da..cc6b2f29 100644 --- a/src/onebot/action/system/GetVersionInfo.ts +++ b/src/onebot/action/system/GetVersionInfo.ts @@ -1,6 +1,6 @@ import BaseAction from '../BaseAction'; import { ActionName } from '../types'; -import { napcat_version } from '@/common/framework/napcat'; +import { napcat_version } from '@/common/path'; export default class GetVersionInfo extends BaseAction { actionName = ActionName.GetVersionInfo; diff --git a/src/onebot/api/group.ts b/src/onebot/api/group.ts index 10a6fc3e..0ca6fe6f 100644 --- a/src/onebot/api/group.ts +++ b/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; diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index 0f6d745e..fd120f22 100644 --- a/src/onebot/api/msg.ts +++ b/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'; diff --git a/src/onebot/api/quick-action.ts b/src/onebot/api/quick-action.ts index 33b0135a..b0101c7e 100644 --- a/src/onebot/api/quick-action.ts +++ b/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( diff --git a/src/onebot/helper/config.ts b/src/onebot/helper/config.ts index b6cd12bd..8a57c41d 100644 --- a/src/onebot/helper/config.ts +++ b/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'; diff --git a/src/onebot/helper/entities.ts b/src/onebot/helper/entities.ts index a8b5e1bc..d781147b 100644 --- a/src/onebot/helper/entities.ts +++ b/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'; diff --git a/src/onebot/helper/event.ts b/src/onebot/helper/event.ts index 7694e30e..5017442d 100644 --- a/src/onebot/helper/event.ts +++ b/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'; diff --git a/src/onebot/index.ts b/src/onebot/index.ts index c9481377..d7643455 100644 --- a/src/onebot/index.ts +++ b/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'; diff --git a/src/onebot/network/active-http.ts b/src/onebot/network/active-http.ts index 35485735..9992f6bf 100644 --- a/src/onebot/network/active-http.ts +++ b/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 '..'; diff --git a/src/onebot/network/active-websocket.ts b/src/onebot/network/active-websocket.ts index 4f6fb4a8..ec6c3002 100644 --- a/src/onebot/network/active-websocket.ts +++ b/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'; diff --git a/src/onebot/network/passive-websocket.ts b/src/onebot/network/passive-websocket.ts index a71a9684..fe197f4f 100644 --- a/src/onebot/network/passive-websocket.ts +++ b/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'; diff --git a/src/shell/napcat.ts b/src/shell/napcat.ts index 54e95e65..4134dd6a 100644 --- a/src/shell/napcat.ts +++ b/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 { napcat_version, 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'; diff --git a/src/webui/index.ts b/src/webui/index.ts index 20933fd0..c0e660a1 100644 --- a/src/webui/index.ts +++ b/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();