diff --git a/package.json b/package.json index cf32cd66..e647d763 100644 --- a/package.json +++ b/package.json @@ -7,12 +7,14 @@ "build:shell": "pnpm --filter napcat-shell run build || exit 1", "build:framework": "pnpm --filter napcat-framework run build || exit 1", "build:webui": "pnpm --filter napcat-webui-frontend run build || exit 1", - "dev:shell": "pnpm --filter napcat-develop run dev || exit 1" + "dev:shell": "pnpm --filter napcat-develop run dev || exit 1", + "typecheck": "pnpm -w -r --filter napcat-shell --filter napcat-framework run typecheck" }, "devDependencies": { "@rollup/plugin-node-resolve": "^16.0.3", "vite": "^6.4.1", - "vite-plugin-cp": "^6.0.3" + "vite-plugin-cp": "^6.0.3", + "typescript": "^5.3.0" }, "dependencies": { "silk-wasm": "^3.6.1", diff --git a/packages/napcat-common/src/version.ts b/packages/napcat-common/src/version.ts index fda5cf2f..b1afab9c 100644 --- a/packages/napcat-common/src/version.ts +++ b/packages/napcat-common/src/version.ts @@ -1 +1,3 @@ -export const napCatVersion = import.meta.env.VITE_NAPCAT_VERSION || 'alpha'; +// @ts-ignore +export const napCatVersion = (typeof import.meta?.env !== 'undefined' && import.meta.env.VITE_NAPCAT_VERSION) || 'alpha'; + diff --git a/packages/napcat-core/apis/file.ts b/packages/napcat-core/apis/file.ts index 0325b582..f0df201a 100644 --- a/packages/napcat-core/apis/file.ts +++ b/packages/napcat-core/apis/file.ts @@ -26,7 +26,7 @@ import { SendMessageContext } from 'napcat-onebot/api/msg'; import { getFileTypeForSendType } from '../helper/msg'; import { FFmpegService } from 'napcat-common/src/ffmpeg'; import { rkeyDataType } from '../types/file'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { FileId } from '../packet/transformer/proto/misc/fileid'; import { imageSizeFallBack } from 'napcat-image-size'; diff --git a/packages/napcat-core/helper/adaptDecoder.ts b/packages/napcat-core/helper/adaptDecoder.ts index 8939f318..e4614750 100644 --- a/packages/napcat-core/helper/adaptDecoder.ts +++ b/packages/napcat-core/helper/adaptDecoder.ts @@ -1,5 +1,5 @@ // TODO: further refactor in NapCat.Packet v2 -import { NapProtoMsg, ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { NapProtoMsg, ProtoField, ScalarType } from 'napcat-protobuf'; const LikeDetail = { txt: ProtoField(1, ScalarType.STRING), diff --git a/packages/napcat-core/package.json b/packages/napcat-core/package.json index 09599cc7..9dc60db6 100644 --- a/packages/napcat-core/package.json +++ b/packages/napcat-core/package.json @@ -14,7 +14,7 @@ }, "dependencies": { "@protobuf-ts/runtime": "^2.11.1", - "@napneko/nap-proto-core": "^0.0.4", + "napcat-protobuf": "workspace:*", "ajv": "^8.13.0", "@sinclair/typebox": "^0.34.38", "file-type": "^21.0.0", diff --git a/packages/napcat-core/packet/context/operationContext.ts b/packages/napcat-core/packet/context/operationContext.ts index d6357008..5ba97a6d 100644 --- a/packages/napcat-core/packet/context/operationContext.ts +++ b/packages/napcat-core/packet/context/operationContext.ts @@ -12,7 +12,7 @@ import { import { ChatType, MsgSourceType, NTMsgType, RawMessage } from 'napcat-core/index'; import { MiniAppRawData, MiniAppReqParams } from '@/napcat-core/packet/entities/miniApp'; import { AIVoiceChatType } from '@/napcat-core/packet/entities/aiChat'; -import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { IndexNode, LongMsgResult, MsgInfo, PushMsgBody } from '@/napcat-core/packet/transformer/proto'; import { OidbPacket } from '@/napcat-core/packet/transformer/base'; import { ImageOcrResult } from '@/napcat-core/packet/entities/ocrResult'; diff --git a/packages/napcat-core/packet/highway/highwayContext.ts b/packages/napcat-core/packet/highway/highwayContext.ts index 124b3671..caea0cca 100644 --- a/packages/napcat-core/packet/highway/highwayContext.ts +++ b/packages/napcat-core/packet/highway/highwayContext.ts @@ -11,7 +11,7 @@ import { import { ChatType, Peer } from '@/napcat-core/index'; import { calculateSha1, calculateSha1StreamBytes, computeMd5AndLengthWithLimit } from '@/napcat-core/packet/utils/crypto/hash'; import UploadGroupImage from '@/napcat-core/packet/transformer/highway/UploadGroupImage'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import * as proto from '@/napcat-core/packet/transformer/proto'; import * as trans from '@/napcat-core/packet/transformer'; import fs from 'fs'; diff --git a/packages/napcat-core/packet/highway/uploader/highwayHttpUploader.ts b/packages/napcat-core/packet/highway/uploader/highwayHttpUploader.ts index 7aed0399..32e2f5b4 100644 --- a/packages/napcat-core/packet/highway/uploader/highwayHttpUploader.ts +++ b/packages/napcat-core/packet/highway/uploader/highwayHttpUploader.ts @@ -1,6 +1,6 @@ import crypto from 'node:crypto'; import http from 'node:http'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { IHighwayUploader } from '@/napcat-core/packet/highway/uploader/highwayUploader'; import { Frame } from '@/napcat-core/packet/highway/frame'; import * as proto from '@/napcat-core/packet/transformer/proto'; diff --git a/packages/napcat-core/packet/highway/uploader/highwayTcpUploader.ts b/packages/napcat-core/packet/highway/uploader/highwayTcpUploader.ts index 29a1e4e7..b970f0e1 100644 --- a/packages/napcat-core/packet/highway/uploader/highwayTcpUploader.ts +++ b/packages/napcat-core/packet/highway/uploader/highwayTcpUploader.ts @@ -1,7 +1,7 @@ import net from 'node:net'; import stream from 'node:stream'; import crypto from 'node:crypto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { BlockSize } from '@/napcat-core/packet/highway/highwayContext'; import { Frame } from '@/napcat-core/packet/highway/frame'; import { IHighwayUploader } from '@/napcat-core/packet/highway/uploader/highwayUploader'; diff --git a/packages/napcat-core/packet/highway/uploader/highwayUploader.ts b/packages/napcat-core/packet/highway/uploader/highwayUploader.ts index d5057754..e68ce062 100644 --- a/packages/napcat-core/packet/highway/uploader/highwayUploader.ts +++ b/packages/napcat-core/packet/highway/uploader/highwayUploader.ts @@ -1,5 +1,5 @@ // import * as tea from '@/napcat-core/packet/utils/crypto/tea'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { PacketHighwayTrans } from '@/napcat-core/packet/highway/client'; import { PacketLogger } from '@/napcat-core/packet/context/loggerContext'; import * as proto from '@/napcat-core/packet/transformer/proto'; diff --git a/packages/napcat-core/packet/highway/utils.ts b/packages/napcat-core/packet/highway/utils.ts index b68f9b3f..2df49b30 100644 --- a/packages/napcat-core/packet/highway/utils.ts +++ b/packages/napcat-core/packet/highway/utils.ts @@ -1,4 +1,4 @@ -import { NapProtoEncodeStructType } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType } from 'napcat-protobuf'; import * as proto from '@/napcat-core/packet/transformer/proto'; export const int32ip2str = (ip: number) => { diff --git a/packages/napcat-core/packet/message/builder.ts b/packages/napcat-core/packet/message/builder.ts index cc3fb9a8..611ab994 100644 --- a/packages/napcat-core/packet/message/builder.ts +++ b/packages/napcat-core/packet/message/builder.ts @@ -1,6 +1,6 @@ import * as crypto from 'crypto'; import { PushMsgBody } from '@/napcat-core/packet/transformer/proto'; -import { NapProtoEncodeStructType } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType } from 'napcat-protobuf'; import { PacketMsg, PacketSendMsgElement } from '@/napcat-core/packet/message/message'; import { IPacketMsgElement, PacketMsgTextElement } from '@/napcat-core/packet/message/element'; import { SendTextElement } from '@/napcat-core/index'; diff --git a/packages/napcat-core/packet/message/converter.ts b/packages/napcat-core/packet/message/converter.ts index fcc7a3c1..e185ba0b 100644 --- a/packages/napcat-core/packet/message/converter.ts +++ b/packages/napcat-core/packet/message/converter.ts @@ -32,7 +32,7 @@ import { PacketMultiMsgElement, } from '@/napcat-core/packet/message/element'; import { PacketMsg, PacketSendMsgElement } from '@/napcat-core/packet/message/message'; -import { NapProtoDecodeStructType } from '@napneko/nap-proto-core'; +import { NapProtoDecodeStructType } from 'napcat-protobuf'; import { Elem } from '@/napcat-core/packet/transformer/proto'; const SupportedElementTypes = [ diff --git a/packages/napcat-core/packet/message/element.ts b/packages/napcat-core/packet/message/element.ts index 32decabf..a9839ada 100644 --- a/packages/napcat-core/packet/message/element.ts +++ b/packages/napcat-core/packet/message/element.ts @@ -1,5 +1,5 @@ import * as zlib from 'node:zlib'; -import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { CustomFace, Elem, diff --git a/packages/napcat-core/packet/transformer/action/FetchAiVoiceList.ts b/packages/napcat-core/packet/transformer/action/FetchAiVoiceList.ts index 558caf0a..2c75c9e0 100644 --- a/packages/napcat-core/packet/transformer/action/FetchAiVoiceList.ts +++ b/packages/napcat-core/packet/transformer/action/FetchAiVoiceList.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { AIVoiceChatType } from '@/napcat-core/packet/entities/aiChat'; diff --git a/packages/napcat-core/packet/transformer/action/GetAiVoice.ts b/packages/napcat-core/packet/transformer/action/GetAiVoice.ts index dc485b25..e8321b32 100644 --- a/packages/napcat-core/packet/transformer/action/GetAiVoice.ts +++ b/packages/napcat-core/packet/transformer/action/GetAiVoice.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { AIVoiceChatType } from '@/napcat-core/packet/entities/aiChat'; diff --git a/packages/napcat-core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts b/packages/napcat-core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts index e1575bb1..299c34a5 100644 --- a/packages/napcat-core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts +++ b/packages/napcat-core/packet/transformer/action/GetMiniAppAdaptShareInfo.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import { MiniAppReqParams } from '@/napcat-core/packet/entities/miniApp'; diff --git a/packages/napcat-core/packet/transformer/action/GetStrangerInfo.ts b/packages/napcat-core/packet/transformer/action/GetStrangerInfo.ts index a708d0cb..6e323ef9 100644 --- a/packages/napcat-core/packet/transformer/action/GetStrangerInfo.ts +++ b/packages/napcat-core/packet/transformer/action/GetStrangerInfo.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/action/GroupSign.ts b/packages/napcat-core/packet/transformer/action/GroupSign.ts index 6957c95a..044d37de 100644 --- a/packages/napcat-core/packet/transformer/action/GroupSign.ts +++ b/packages/napcat-core/packet/transformer/action/GroupSign.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/action/ImageOCR.ts b/packages/napcat-core/packet/transformer/action/ImageOCR.ts index fbb96449..941359c0 100644 --- a/packages/napcat-core/packet/transformer/action/ImageOCR.ts +++ b/packages/napcat-core/packet/transformer/action/ImageOCR.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/action/MoveGroupFile.ts b/packages/napcat-core/packet/transformer/action/MoveGroupFile.ts index 639de382..33d9c3ea 100644 --- a/packages/napcat-core/packet/transformer/action/MoveGroupFile.ts +++ b/packages/napcat-core/packet/transformer/action/MoveGroupFile.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/action/RenameGroupFile.ts b/packages/napcat-core/packet/transformer/action/RenameGroupFile.ts index f5e97cf7..77eefb26 100644 --- a/packages/napcat-core/packet/transformer/action/RenameGroupFile.ts +++ b/packages/napcat-core/packet/transformer/action/RenameGroupFile.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/action/SendPoke.ts b/packages/napcat-core/packet/transformer/action/SendPoke.ts index c59eb869..72d126cf 100644 --- a/packages/napcat-core/packet/transformer/action/SendPoke.ts +++ b/packages/napcat-core/packet/transformer/action/SendPoke.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/action/SetGroupTodo.ts b/packages/napcat-core/packet/transformer/action/SetGroupTodo.ts index d92b9437..efc994bf 100644 --- a/packages/napcat-core/packet/transformer/action/SetGroupTodo.ts +++ b/packages/napcat-core/packet/transformer/action/SetGroupTodo.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/action/SetSpecialTitle.ts b/packages/napcat-core/packet/transformer/action/SetSpecialTitle.ts index ec9cab73..307a51f4 100644 --- a/packages/napcat-core/packet/transformer/action/SetSpecialTitle.ts +++ b/packages/napcat-core/packet/transformer/action/SetSpecialTitle.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/base.ts b/packages/napcat-core/packet/transformer/base.ts index cd337e95..c144808f 100644 --- a/packages/napcat-core/packet/transformer/base.ts +++ b/packages/napcat-core/packet/transformer/base.ts @@ -1,4 +1,4 @@ -import { NapProtoDecodeStructType } from '@napneko/nap-proto-core'; +import { NapProtoDecodeStructType } from 'napcat-protobuf'; import { PacketMsgBuilder } from '@/napcat-core/packet/message/builder'; export type PacketBuf = Buffer & { readonly hexNya: unique symbol; }; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadGroupFile.ts b/packages/napcat-core/packet/transformer/highway/DownloadGroupFile.ts index e51e3fa7..6841d538 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadGroupFile.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadGroupFile.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadGroupImage.ts b/packages/napcat-core/packet/transformer/highway/DownloadGroupImage.ts index 7f5f09da..5a3ca117 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadGroupImage.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadGroupImage.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { IndexNode } from '@/napcat-core/packet/transformer/proto'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadGroupPtt.ts b/packages/napcat-core/packet/transformer/highway/DownloadGroupPtt.ts index 5b8c2767..7f0b5e3c 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadGroupPtt.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadGroupPtt.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadGroupVideo.ts b/packages/napcat-core/packet/transformer/highway/DownloadGroupVideo.ts index dc0d8c81..f6ee0291 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadGroupVideo.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadGroupVideo.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { IndexNode } from '@/napcat-core/packet/transformer/proto'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadImage.ts b/packages/napcat-core/packet/transformer/highway/DownloadImage.ts index 75b69da2..4c512e58 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadImage.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadImage.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { IndexNode } from '@/napcat-core/packet/transformer/proto'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadOfflineFile.ts b/packages/napcat-core/packet/transformer/highway/DownloadOfflineFile.ts index 9228fff5..3d0efd5e 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadOfflineFile.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadOfflineFile.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadPrivateFile.ts b/packages/napcat-core/packet/transformer/highway/DownloadPrivateFile.ts index 0a074327..d1a219a4 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadPrivateFile.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadPrivateFile.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadPtt.ts b/packages/napcat-core/packet/transformer/highway/DownloadPtt.ts index f46d4bb2..c490204a 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadPtt.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadPtt.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { IndexNode } from '@/napcat-core/packet/transformer/proto'; diff --git a/packages/napcat-core/packet/transformer/highway/DownloadVideo.ts b/packages/napcat-core/packet/transformer/highway/DownloadVideo.ts index 45a9a28b..9e3c91b4 100644 --- a/packages/napcat-core/packet/transformer/highway/DownloadVideo.ts +++ b/packages/napcat-core/packet/transformer/highway/DownloadVideo.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoEncodeStructType, NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { IndexNode } from '@/napcat-core/packet/transformer/proto'; diff --git a/packages/napcat-core/packet/transformer/highway/FetchSessionKey.ts b/packages/napcat-core/packet/transformer/highway/FetchSessionKey.ts index 2d1e593d..22f6ce85 100644 --- a/packages/napcat-core/packet/transformer/highway/FetchSessionKey.ts +++ b/packages/napcat-core/packet/transformer/highway/FetchSessionKey.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/napcat-core/packet/transformer/base'; class FetchSessionKey extends PacketTransformer { diff --git a/packages/napcat-core/packet/transformer/highway/UploadGroupFile.ts b/packages/napcat-core/packet/transformer/highway/UploadGroupFile.ts index 00f39b31..f1424e36 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadGroupFile.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadGroupFile.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { PacketMsgFileElement } from '@/napcat-core/packet/message/element'; diff --git a/packages/napcat-core/packet/transformer/highway/UploadGroupImage.ts b/packages/napcat-core/packet/transformer/highway/UploadGroupImage.ts index db9ba933..fcf6b9fe 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadGroupImage.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadGroupImage.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import crypto from 'node:crypto'; diff --git a/packages/napcat-core/packet/transformer/highway/UploadGroupPtt.ts b/packages/napcat-core/packet/transformer/highway/UploadGroupPtt.ts index 9b33e79d..010227b7 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadGroupPtt.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadGroupPtt.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import crypto from 'node:crypto'; diff --git a/packages/napcat-core/packet/transformer/highway/UploadGroupVideo.ts b/packages/napcat-core/packet/transformer/highway/UploadGroupVideo.ts index abbcc9ff..64dbbb98 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadGroupVideo.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadGroupVideo.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import crypto from 'node:crypto'; diff --git a/packages/napcat-core/packet/transformer/highway/UploadPrivateFile.ts b/packages/napcat-core/packet/transformer/highway/UploadPrivateFile.ts index 11048f2c..aee0edca 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadPrivateFile.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadPrivateFile.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import { PacketMsgFileElement } from '@/napcat-core/packet/message/element'; diff --git a/packages/napcat-core/packet/transformer/highway/UploadPrivateImage.ts b/packages/napcat-core/packet/transformer/highway/UploadPrivateImage.ts index 3ac65071..927bc7f4 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadPrivateImage.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadPrivateImage.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import crypto from 'node:crypto'; diff --git a/packages/napcat-core/packet/transformer/highway/UploadPrivatePtt.ts b/packages/napcat-core/packet/transformer/highway/UploadPrivatePtt.ts index 737de506..dedba66e 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadPrivatePtt.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadPrivatePtt.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import crypto from 'node:crypto'; diff --git a/packages/napcat-core/packet/transformer/highway/UploadPrivateVideo.ts b/packages/napcat-core/packet/transformer/highway/UploadPrivateVideo.ts index 99a2788c..b6a8e3fa 100644 --- a/packages/napcat-core/packet/transformer/highway/UploadPrivateVideo.ts +++ b/packages/napcat-core/packet/transformer/highway/UploadPrivateVideo.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; import crypto from 'node:crypto'; diff --git a/packages/napcat-core/packet/transformer/message/DownloadForwardMsg.ts b/packages/napcat-core/packet/transformer/message/DownloadForwardMsg.ts index ce404f28..46c4ceb1 100644 --- a/packages/napcat-core/packet/transformer/message/DownloadForwardMsg.ts +++ b/packages/napcat-core/packet/transformer/message/DownloadForwardMsg.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/napcat-core/packet/transformer/base'; class DownloadForwardMsg extends PacketTransformer { diff --git a/packages/napcat-core/packet/transformer/message/FetchC2CMessage.ts b/packages/napcat-core/packet/transformer/message/FetchC2CMessage.ts index 5a2f24cf..5577a5f2 100644 --- a/packages/napcat-core/packet/transformer/message/FetchC2CMessage.ts +++ b/packages/napcat-core/packet/transformer/message/FetchC2CMessage.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/napcat-core/packet/transformer/base'; class FetchC2CMessage extends PacketTransformer { diff --git a/packages/napcat-core/packet/transformer/message/FetchGroupMessage.ts b/packages/napcat-core/packet/transformer/message/FetchGroupMessage.ts index d64c2ae2..8dea7e98 100644 --- a/packages/napcat-core/packet/transformer/message/FetchGroupMessage.ts +++ b/packages/napcat-core/packet/transformer/message/FetchGroupMessage.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/napcat-core/packet/transformer/base'; class FetchGroupMessage extends PacketTransformer { diff --git a/packages/napcat-core/packet/transformer/message/UploadForwardMsg.ts b/packages/napcat-core/packet/transformer/message/UploadForwardMsg.ts index b1f04629..d4ec576a 100644 --- a/packages/napcat-core/packet/transformer/message/UploadForwardMsg.ts +++ b/packages/napcat-core/packet/transformer/message/UploadForwardMsg.ts @@ -1,6 +1,6 @@ import zlib from 'node:zlib'; import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import { PacketMsg } from '@/napcat-core/packet/message/message'; diff --git a/packages/napcat-core/packet/transformer/oidb/oidbBase.ts b/packages/napcat-core/packet/transformer/oidb/oidbBase.ts index a832cf7f..d792a213 100644 --- a/packages/napcat-core/packet/transformer/oidb/oidbBase.ts +++ b/packages/napcat-core/packet/transformer/oidb/oidbBase.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketBufBuilder, PacketTransformer } from '@/napcat-core/packet/transformer/base'; class OidbBase extends PacketTransformer { diff --git a/packages/napcat-core/packet/transformer/proto/action/action.ts b/packages/napcat-core/packet/transformer/proto/action/action.ts index 05ee72c7..f3a774ff 100644 --- a/packages/napcat-core/packet/transformer/proto/action/action.ts +++ b/packages/napcat-core/packet/transformer/proto/action/action.ts @@ -1,5 +1,5 @@ import { ScalarType } from '@protobuf-ts/runtime'; -import { ProtoField } from '@napneko/nap-proto-core'; +import { ProtoField } from 'napcat-protobuf'; import { ContentHead, MessageBody, MessageControl, RoutingHead } from '@/napcat-core/packet/transformer/proto'; export const FaceRoamRequest = { diff --git a/packages/napcat-core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts b/packages/napcat-core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts index 19f18dc4..cf61d96d 100644 --- a/packages/napcat-core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts +++ b/packages/napcat-core/packet/transformer/proto/action/miniAppAdaptShareInfo.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const MiniAppAdaptShareInfoReq = { appId: ProtoField(2, ScalarType.STRING), diff --git a/packages/napcat-core/packet/transformer/proto/highway/highway.ts b/packages/napcat-core/packet/transformer/proto/highway/highway.ts index 1fafd1a5..24d93799 100644 --- a/packages/napcat-core/packet/transformer/proto/highway/highway.ts +++ b/packages/napcat-core/packet/transformer/proto/highway/highway.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { MsgInfoBody } from '@/napcat-core/packet/transformer/proto'; export const DataHighwayHead = { diff --git a/packages/napcat-core/packet/transformer/proto/message/action.ts b/packages/napcat-core/packet/transformer/proto/message/action.ts index 8a66428a..5622b398 100644 --- a/packages/napcat-core/packet/transformer/proto/message/action.ts +++ b/packages/napcat-core/packet/transformer/proto/message/action.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { PushMsgBody } from '@/napcat-core/packet/transformer/proto'; export const LongMsgResult = { diff --git a/packages/napcat-core/packet/transformer/proto/message/c2c.ts b/packages/napcat-core/packet/transformer/proto/message/c2c.ts index 44346efd..c7b1361c 100644 --- a/packages/napcat-core/packet/transformer/proto/message/c2c.ts +++ b/packages/napcat-core/packet/transformer/proto/message/c2c.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const C2C = { uin: ProtoField(1, ScalarType.UINT32, true), diff --git a/packages/napcat-core/packet/transformer/proto/message/component.ts b/packages/napcat-core/packet/transformer/proto/message/component.ts index af4ba2e0..7b1956df 100644 --- a/packages/napcat-core/packet/transformer/proto/message/component.ts +++ b/packages/napcat-core/packet/transformer/proto/message/component.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { Elem } from '@/napcat-core/packet/transformer/proto'; export const Attr = { diff --git a/packages/napcat-core/packet/transformer/proto/message/element.ts b/packages/napcat-core/packet/transformer/proto/message/element.ts index acadefd3..72d437eb 100644 --- a/packages/napcat-core/packet/transformer/proto/message/element.ts +++ b/packages/napcat-core/packet/transformer/proto/message/element.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const Elem = { text: ProtoField(1, () => Text, true), diff --git a/packages/napcat-core/packet/transformer/proto/message/group.ts b/packages/napcat-core/packet/transformer/proto/message/group.ts index 76baa63f..673ef54b 100644 --- a/packages/napcat-core/packet/transformer/proto/message/group.ts +++ b/packages/napcat-core/packet/transformer/proto/message/group.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const GroupRecallMsg = { type: ProtoField(1, ScalarType.UINT32), diff --git a/packages/napcat-core/packet/transformer/proto/message/groupAdmin.ts b/packages/napcat-core/packet/transformer/proto/message/groupAdmin.ts index ac6cf077..96026ded 100644 --- a/packages/napcat-core/packet/transformer/proto/message/groupAdmin.ts +++ b/packages/napcat-core/packet/transformer/proto/message/groupAdmin.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const GroupAdminExtra = { adminUid: ProtoField(1, ScalarType.STRING), diff --git a/packages/napcat-core/packet/transformer/proto/message/message.ts b/packages/napcat-core/packet/transformer/proto/message/message.ts index 3f694233..fdcb6576 100644 --- a/packages/napcat-core/packet/transformer/proto/message/message.ts +++ b/packages/napcat-core/packet/transformer/proto/message/message.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { C2C, ForwardHead, diff --git a/packages/napcat-core/packet/transformer/proto/message/notify.ts b/packages/napcat-core/packet/transformer/proto/message/notify.ts index b55cf09b..91c40333 100644 --- a/packages/napcat-core/packet/transformer/proto/message/notify.ts +++ b/packages/napcat-core/packet/transformer/proto/message/notify.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const FriendRecall = { info: ProtoField(1, () => FriendRecallInfo), diff --git a/packages/napcat-core/packet/transformer/proto/message/routing.ts b/packages/napcat-core/packet/transformer/proto/message/routing.ts index 9f3b2a84..f2d05256 100644 --- a/packages/napcat-core/packet/transformer/proto/message/routing.ts +++ b/packages/napcat-core/packet/transformer/proto/message/routing.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const ForwardHead = { field1: ProtoField(1, ScalarType.UINT32, true), diff --git a/packages/napcat-core/packet/transformer/proto/misc/fileid.ts b/packages/napcat-core/packet/transformer/proto/misc/fileid.ts index 2026b550..6fd54c0e 100644 --- a/packages/napcat-core/packet/transformer/proto/misc/fileid.ts +++ b/packages/napcat-core/packet/transformer/proto/misc/fileid.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const FileId = { appid: ProtoField(4, ScalarType.UINT32, true), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts index 70b174d9..dd3d3204 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XE37_800.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { OidbSvcTrpcTcp0XE37_800_1200Metadata } from '@/napcat-core/packet/transformer/proto'; export const OidbSvcTrpcTcp0XE37_800 = { diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts index c4904e3c..0978e424 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0XFE1_2.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcp0XFE1_2 = { uin: ProtoField(1, ScalarType.UINT32), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x6D6.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x6D6.ts index 40205a5d..c4184af5 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x6D6.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x6D6.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcp0x6D6 = { file: ProtoField(1, () => OidbSvcTrpcTcp0x6D6Upload, true), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts index 4edd3bae..bd717cbd 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x8FC_2.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; // 设置群头衔 OidbSvcTrpcTcp.0x8fc_2 export const OidbSvcTrpcTcp0X8FC_2_Body = { diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts index 5f6dc331..a100c105 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x9067_202.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { MultiMediaReqHead } from './common/Ntv2.RichMediaReq'; // Req diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x929.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x929.ts index ab4c8cfc..052fe665 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x929.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0x929.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { MsgInfo } from '@/napcat-core/packet/transformer/proto'; export const OidbSvcTrpcTcp0X929D_0 = { diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE07.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE07.ts index 274e479c..932266fe 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE07.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE07.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcp0xE07_0 = { version: ProtoField(1, ScalarType.UINT32), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts index b739aefe..cd996aa7 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1200.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcp0XE37_1200 = { subCommand: ProtoField(1, ScalarType.UINT32, true), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts index 9e82557f..21d523bd 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xE37_1700.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcp0XE37_1700 = { command: ProtoField(1, ScalarType.UINT32, true), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xEB7.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xEB7.ts index ed75e358..0ef6be1c 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xEB7.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xEB7.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcp0XEB7_Body = { uin: ProtoField(1, ScalarType.STRING), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts index b51d4c85..dda5f032 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xED3_1.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; // Send Poke export const OidbSvcTrpcTcp0XED3_1 = { diff --git a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xf90_1.ts b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xf90_1.ts index 4516a742..483fe7f2 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xf90_1.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/Oidb.0xf90_1.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcp0XF90_1 = { groupUin: ProtoField(1, ScalarType.UINT32), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/OidbBase.ts b/packages/napcat-core/packet/transformer/proto/oidb/OidbBase.ts index 157f7503..24b3431b 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/OidbBase.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/OidbBase.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const OidbSvcTrpcTcpBase = { command: ProtoField(1, ScalarType.UINT32), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts b/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts index a243fa9f..74139688 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaReq.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; export const NTV2RichMediaReq = { ReqHead: ProtoField(1, () => MultiMediaReqHead), diff --git a/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts b/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts index ec583452..23d71e5b 100644 --- a/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts +++ b/packages/napcat-core/packet/transformer/proto/oidb/common/Ntv2.RichMediaResp.ts @@ -1,4 +1,4 @@ -import { ProtoField, ScalarType } from '@napneko/nap-proto-core'; +import { ProtoField, ScalarType } from 'napcat-protobuf'; import { CommonHead, MsgInfo, PicUrlExtInfo, VideoExtInfo } from '@/napcat-core/packet/transformer/proto'; export const NTV2RichMediaResp = { diff --git a/packages/napcat-core/packet/transformer/system/FetchRkey.ts b/packages/napcat-core/packet/transformer/system/FetchRkey.ts index ff0417f7..b6bf519c 100644 --- a/packages/napcat-core/packet/transformer/system/FetchRkey.ts +++ b/packages/napcat-core/packet/transformer/system/FetchRkey.ts @@ -1,5 +1,5 @@ import * as proto from '@/napcat-core/packet/transformer/proto'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OidbPacket, PacketTransformer } from '@/napcat-core/packet/transformer/base'; import OidbBase from '@/napcat-core/packet/transformer/oidb/oidbBase'; diff --git a/packages/napcat-framework/package.json b/packages/napcat-framework/package.json index 6e0789e0..48c2195c 100644 --- a/packages/napcat-framework/package.json +++ b/packages/napcat-framework/package.json @@ -5,7 +5,8 @@ "type": "module", "main": "index.ts", "scripts": { - "build": "vite build" + "build": "vite build", + "typecheck": "tsc --noEmit --skipLibCheck -p tsconfig.json" }, "exports": { ".": { diff --git a/packages/napcat-framework/tsconfig.json b/packages/napcat-framework/tsconfig.json index d1744ff4..b1a09c97 100644 --- a/packages/napcat-framework/tsconfig.json +++ b/packages/napcat-framework/tsconfig.json @@ -35,6 +35,12 @@ "allowSyntheticDefaultImports": true, "resolveJsonModule": true, "baseUrl": ".", + "paths": { + "@/napcat-onebot/*": ["../napcat-onebot/*"], + "@/napcat-core/*": ["../napcat-core/*"], + "@/napcat-common/*": ["../napcat-common/src/*"], + "@/napcat-webui-backend/*": ["../napcat-webui-backend/src/*"] + }, "skipLibCheck": true, "skipDefaultLibCheck": true }, diff --git a/packages/napcat-onebot/api/group.ts b/packages/napcat-onebot/api/group.ts index 36863f5a..8ad255b6 100644 --- a/packages/napcat-onebot/api/group.ts +++ b/packages/napcat-onebot/api/group.ts @@ -24,7 +24,7 @@ import { OB11GroupUploadNoticeEvent } from '../event/notice/OB11GroupUploadNotic import { OB11GroupNameEvent } from '../event/notice/OB11GroupNameEvent'; import { FileNapCatOneBotUUID } from 'napcat-common/src/file-uuid'; import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { GroupReactNotify, PushMsg } from 'napcat-core/packet/transformer/proto'; export class OneBotGroupApi { diff --git a/packages/napcat-onebot/api/msg.ts b/packages/napcat-onebot/api/msg.ts index 22688f91..ae092382 100644 --- a/packages/napcat-onebot/api/msg.ts +++ b/packages/napcat-onebot/api/msg.ts @@ -37,7 +37,7 @@ import { RequestUtil } from 'napcat-common/src/request'; import fsPromise from 'node:fs/promises'; import { OB11FriendAddNoticeEvent } from '@/napcat-onebot/event/notice/OB11FriendAddNoticeEvent'; import { ForwardMsgBuilder } from 'napcat-common/src/forward-msg-builder'; -import { NapProtoMsg } from '@napneko/nap-proto-core'; +import { NapProtoMsg } from 'napcat-protobuf'; import { OB11GroupIncreaseEvent } from '../event/notice/OB11GroupIncreaseEvent'; import { GroupDecreaseSubType, OB11GroupDecreaseEvent } from '../event/notice/OB11GroupDecreaseEvent'; import { GroupAdmin } from 'napcat-core/packet/transformer/proto/message/groupAdmin'; diff --git a/packages/napcat-onebot/package.json b/packages/napcat-onebot/package.json index 8ac455de..d0d3296a 100644 --- a/packages/napcat-onebot/package.json +++ b/packages/napcat-onebot/package.json @@ -24,7 +24,7 @@ "ws": "^8.18.3", "file-type": "^21.0.0", "async-mutex": "^0.5.0", - "@napneko/nap-proto-core": "^0.0.4", + "napcat-protobuf": "workspace:*", "json5": "^2.2.3", "napcat-core": "workspace:*", "napcat-webui-backend": "workspace:*", diff --git a/packages/napcat-protobuf/NapProto.ts b/packages/napcat-protobuf/NapProto.ts new file mode 100644 index 00000000..ecf842ad --- /dev/null +++ b/packages/napcat-protobuf/NapProto.ts @@ -0,0 +1,200 @@ +// @ts-nocheck +import { MessageType, PartialMessage, RepeatType, ScalarType } from '@protobuf-ts/runtime'; +import { PartialFieldInfo } from '@protobuf-ts/runtime/build/types/reflection-info'; + +type LowerCamelCase = CamelCaseHelper; + +type CamelCaseHelper< + S extends string, + CapNext extends boolean, + IsFirstChar extends boolean, +> = S extends `${infer F}${infer R}` + ? F extends '_' + ? CamelCaseHelper + : F extends `${number}` + ? `${F}${CamelCaseHelper}` + : CapNext extends true + ? `${Uppercase}${CamelCaseHelper}` + : IsFirstChar extends true + ? `${Lowercase}${CamelCaseHelper}` + : `${F}${CamelCaseHelper}` + : ''; + +type ScalarTypeToTsType = T extends + | ScalarType.DOUBLE + | ScalarType.FLOAT + | ScalarType.INT32 + | ScalarType.FIXED32 + | ScalarType.UINT32 + | ScalarType.SFIXED32 + | ScalarType.SINT32 + ? number + : T extends ScalarType.INT64 | ScalarType.UINT64 | ScalarType.FIXED64 | ScalarType.SFIXED64 | ScalarType.SINT64 + ? bigint + : T extends ScalarType.BOOL + ? boolean + : T extends ScalarType.STRING + ? string + : T extends ScalarType.BYTES + ? Uint8Array + : never; + +interface BaseProtoFieldType { + kind: 'scalar' | 'message'; + no: number; + type: T; + optional: O; + repeat: R; +} + +export interface ScalarProtoFieldType + extends BaseProtoFieldType { + kind: 'scalar'; +} + +export interface MessageProtoFieldType< + T extends () => ProtoMessageType, + O extends boolean, + R extends O extends true ? false : boolean, +> extends BaseProtoFieldType { + kind: 'message'; +} + +type ProtoFieldType = + | ScalarProtoFieldType + | MessageProtoFieldType<() => ProtoMessageType, boolean, boolean>; + +type ProtoMessageType = { + [key: string]: ProtoFieldType; +}; + +export function ProtoField< + T extends ScalarType, + O extends boolean = false, + R extends O extends true ? false : boolean = false, +>(no: number, type: T, optional?: O, repeat?: R): ScalarProtoFieldType; +export function ProtoField< + T extends () => ProtoMessageType, + O extends boolean = false, + R extends O extends true ? false : boolean = false, +>(no: number, type: T, optional?: O, repeat?: R): MessageProtoFieldType; +export function ProtoField( + no: number, + type: ScalarType | (() => ProtoMessageType), + optional?: boolean, + repeat?: boolean +): ProtoFieldType { + if (typeof type === 'function') { + return { kind: 'message', no: no, type: type, optional: optional ?? false, repeat: repeat ?? false }; + } else { + return { kind: 'scalar', no: no, type: type, optional: optional ?? false, repeat: repeat ?? false }; + } +} + +type ProtoFieldReturnType = + NonNullable extends ScalarProtoFieldType + ? ScalarTypeToTsType + : T extends NonNullable> + ? NonNullable, E>> + : never; + +type RequiredFieldsBaseType = { + [K in keyof T as T[K] extends { optional: true } ? never : LowerCamelCase]: T[K] extends { + repeat: true; + } + ? ProtoFieldReturnType[] + : ProtoFieldReturnType; +}; + +type OptionalFieldsBaseType = { + [K in keyof T as T[K] extends { optional: true } ? LowerCamelCase : never]?: T[K] extends { + repeat: true; + } + ? ProtoFieldReturnType[] + : ProtoFieldReturnType; +}; + +type RequiredFieldsType = E extends true + ? Partial> + : RequiredFieldsBaseType; + +type OptionalFieldsType = E extends true + ? Partial> + : OptionalFieldsBaseType; + +type NapProtoStructType = RequiredFieldsType & OptionalFieldsType; + +export type NapProtoEncodeStructType = NapProtoStructType; + +export type NapProtoDecodeStructType = NapProtoStructType; + +class NapProtoRealMsg { + private readonly _field: PartialFieldInfo[]; + private readonly _proto_msg: MessageType>; + private static cache = new WeakMap>(); + + private constructor(fields: T) { + this._field = Object.keys(fields).map((key) => { + const field = fields[key]; + if (field.kind === 'scalar') { + const repeatType = field.repeat + ? [ScalarType.STRING, ScalarType.BYTES].includes(field.type) + ? RepeatType.UNPACKED + : RepeatType.PACKED + : RepeatType.NO; + return { + no: field.no, + name: key, + kind: 'scalar', + T: field.type, + opt: field.optional, + repeat: repeatType, + }; + } else if (field.kind === 'message') { + return { + no: field.no, + name: key, + kind: 'message', + repeat: field.repeat ? RepeatType.PACKED : RepeatType.NO, + T: () => NapProtoRealMsg.getInstance(field.type())._proto_msg, + }; + } + }) as PartialFieldInfo[]; + this._proto_msg = new MessageType>('nya', this._field); + } + + static getInstance(fields: T): NapProtoRealMsg { + let instance = this.cache.get(fields); + if (!instance) { + instance = new NapProtoRealMsg(fields); + this.cache.set(fields, instance); + } + return instance; + } + + encode(data: NapProtoEncodeStructType): Uint8Array { + return this._proto_msg.toBinary(this._proto_msg.create(data as PartialMessage>)); + } + + decode(data: Uint8Array): NapProtoDecodeStructType { + return this._proto_msg.fromBinary(data) as NapProtoDecodeStructType; + } +} + +export class NapProtoMsg { + private realMsg: NapProtoRealMsg; + + constructor(fields: T) { + this.realMsg = NapProtoRealMsg.getInstance(fields); + } + + encode(data: NapProtoEncodeStructType): Uint8Array { + return this.realMsg.encode(data); + } + + decode(data: Uint8Array): NapProtoDecodeStructType { + return this.realMsg.decode(data); + } +} + +export { ScalarType } from '@protobuf-ts/runtime'; diff --git a/packages/napcat-protobuf/package.json b/packages/napcat-protobuf/package.json new file mode 100644 index 00000000..70809669 --- /dev/null +++ b/packages/napcat-protobuf/package.json @@ -0,0 +1,17 @@ +{ + "name": "napcat-protobuf", + "type": "module", + "version": "0.0.4", + "description": "A lightweight, elegant, and efficient protobuf-ts solution", + "main": "NapProto.ts", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1", + "prepack": "tsc" + }, + "dependencies": { + "@protobuf-ts/runtime": "^2.9.4" + }, + "devDependencies": { + "typescript": "^5.6" + } +} diff --git a/packages/napcat-protobuf/tsconfig.json b/packages/napcat-protobuf/tsconfig.json new file mode 100644 index 00000000..ab84a2f6 --- /dev/null +++ b/packages/napcat-protobuf/tsconfig.json @@ -0,0 +1,18 @@ +{ + "compilerOptions": { + "target": "ESNext", + "module": "ESNext", + "moduleResolution": "Node", + "esModuleInterop": true, + "forceConsistentCasingInFileNames": true, + "strict": true, + "skipLibCheck": true, + "outDir": "dist", + "declaration": true, + "declarationDir": "dist", + "sourceMap": true + }, + "include": [ + "*.ts" + ] +} \ No newline at end of file diff --git a/packages/napcat-shell/package.json b/packages/napcat-shell/package.json index b264b51d..13ca4154 100644 --- a/packages/napcat-shell/package.json +++ b/packages/napcat-shell/package.json @@ -5,7 +5,8 @@ "type": "module", "main": "index.ts", "scripts": { - "build": "vite build" + "build": "vite build", + "typecheck": "tsc --noEmit --skipLibCheck -p tsconfig.json" }, "exports": { ".": { diff --git a/packages/napcat-shell/tsconfig.json b/packages/napcat-shell/tsconfig.json index d1744ff4..b1a09c97 100644 --- a/packages/napcat-shell/tsconfig.json +++ b/packages/napcat-shell/tsconfig.json @@ -35,6 +35,12 @@ "allowSyntheticDefaultImports": true, "resolveJsonModule": true, "baseUrl": ".", + "paths": { + "@/napcat-onebot/*": ["../napcat-onebot/*"], + "@/napcat-core/*": ["../napcat-core/*"], + "@/napcat-common/*": ["../napcat-common/src/*"], + "@/napcat-webui-backend/*": ["../napcat-webui-backend/src/*"] + }, "skipLibCheck": true, "skipDefaultLibCheck": true }, diff --git a/packages/napcat-webui-backend/src/helper/Data.ts b/packages/napcat-webui-backend/src/helper/Data.ts index 3c766906..f5c4b9cd 100644 --- a/packages/napcat-webui-backend/src/helper/Data.ts +++ b/packages/napcat-webui-backend/src/helper/Data.ts @@ -1,6 +1,6 @@ -import type { LoginRuntimeType } from '../types/data'; import store from 'napcat-common/src/store'; import { napCatVersion } from 'napcat-common/src/version'; +import type { LoginRuntimeType } from '../types'; const LoginRuntime: LoginRuntimeType = { LoginCurrentTime: Date.now(), diff --git a/packages/napcat-webui-backend/src/helper/SignToken.ts b/packages/napcat-webui-backend/src/helper/SignToken.ts index 263431b1..78332afa 100644 --- a/packages/napcat-webui-backend/src/helper/SignToken.ts +++ b/packages/napcat-webui-backend/src/helper/SignToken.ts @@ -1,5 +1,6 @@ import crypto from 'crypto'; import store from 'napcat-common/src/store'; +import type { WebUiCredentialJson, WebUiCredentialInnerJson } from '@/napcat-webui-backend/types'; export class AuthHelper { private static readonly secretKey = Math.random().toString(36).slice(2); diff --git a/packages/napcat-webui-backend/src/index.ts b/packages/napcat-webui-backend/src/index.ts index 125bd546..8fefe013 100644 --- a/packages/napcat-webui-backend/src/index.ts +++ b/packages/napcat-webui-backend/src/index.ts @@ -3,6 +3,7 @@ */ import express from 'express'; +import type { WebUiConfigType } from './types'; import { createServer } from 'http'; import { randomUUID } from 'node:crypto'; import { createServer as createHttpsServer } from 'https'; diff --git a/packages/napcat-webui-backend/src/middleware/auth.ts b/packages/napcat-webui-backend/src/middleware/auth.ts index f7c9874d..b570305a 100644 --- a/packages/napcat-webui-backend/src/middleware/auth.ts +++ b/packages/napcat-webui-backend/src/middleware/auth.ts @@ -4,6 +4,7 @@ import { getInitialWebUiToken } from '@/napcat-webui-backend/index'; import { AuthHelper } from '@/napcat-webui-backend/helper/SignToken'; import { sendError } from '@/napcat-webui-backend/utils/response'; +import type { WebUiCredentialJson } from '@/napcat-webui-backend/types'; // 鉴权中间件 export async function auth (req: Request, res: Response, next: NextFunction) { diff --git a/packages/napcat-webui-backend/src/terminal/terminal_manager.ts b/packages/napcat-webui-backend/src/terminal/terminal_manager.ts index 71124f8f..76d698dd 100644 --- a/packages/napcat-webui-backend/src/terminal/terminal_manager.ts +++ b/packages/napcat-webui-backend/src/terminal/terminal_manager.ts @@ -1,6 +1,7 @@ // import './init-dynamic-dirname'; import { WebUiConfig } from '../index'; import { AuthHelper } from '../helper/SignToken'; +import type { WebUiCredentialJson } from '@/napcat-webui-backend/types'; import { LogWrapper } from 'napcat-common/src/log'; import { WebSocket, WebSocketServer } from 'ws'; import os from 'os'; diff --git a/packages/napcat-webui-backend/src/types/config.d.ts b/packages/napcat-webui-backend/src/types/config.d.ts deleted file mode 100644 index 42aefc28..00000000 --- a/packages/napcat-webui-backend/src/types/config.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -interface WebUiConfigType { - host: string; - port: number; - token: string; - loginRate: number; -} diff --git a/packages/napcat-webui-backend/src/types/data.d.ts b/packages/napcat-webui-backend/src/types/index.ts similarity index 67% rename from packages/napcat-webui-backend/src/types/data.d.ts rename to packages/napcat-webui-backend/src/types/index.ts index 11ea67a8..3d4a97d9 100644 --- a/packages/napcat-webui-backend/src/types/data.d.ts +++ b/packages/napcat-webui-backend/src/types/index.ts @@ -1,7 +1,23 @@ import type { LoginListItem, SelfInfo } from 'napcat-core'; import type { OneBotConfig } from 'napcat-onebot/config/config'; -interface LoginRuntimeType { +export interface WebUiConfigType { + host: string; + port: number; + token: string; + loginRate: number; +} +export interface WebUiCredentialInnerJson { + CreatedTime: number; + HashEncoded: string; +} + +export interface WebUiCredentialJson { + Data: WebUiCredentialInnerJson; + Hmac: string; +} + +export interface LoginRuntimeType { LoginCurrentTime: number; LoginCurrentRate: number; QQLoginStatus: boolean; @@ -20,3 +36,5 @@ interface LoginRuntimeType { }; NapCatVersion: string; } + +export default {}; diff --git a/packages/napcat-webui-backend/src/types/server.d.ts b/packages/napcat-webui-backend/src/types/server.d.ts deleted file mode 100644 index 0519ebfb..00000000 --- a/packages/napcat-webui-backend/src/types/server.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -interface APIResponse { - code: number; - message: string; - data: T; -} - -type Protocol = 'http' | 'https' | 'ws' | 'wss'; diff --git a/packages/napcat-webui-backend/src/types/sign_token.d.ts b/packages/napcat-webui-backend/src/types/sign_token.d.ts deleted file mode 100644 index d5cfaa5a..00000000 --- a/packages/napcat-webui-backend/src/types/sign_token.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -interface WebUiCredentialInnerJson { - CreatedTime: number; - HashEncoded: string; -} - -interface WebUiCredentialJson { - Data: WebUiCredentialInnerJson; - Hmac: string; -} diff --git a/packages/napcat-webui-backend/tsconfig.json b/packages/napcat-webui-backend/tsconfig.json index cfe58f59..9dd57e57 100644 --- a/packages/napcat-webui-backend/tsconfig.json +++ b/packages/napcat-webui-backend/tsconfig.json @@ -44,7 +44,8 @@ "skipDefaultLibCheck": true }, "include": [ - "src/**/*.ts" + "src/**/*.ts", + "src/**/*.d.ts" ], "exclude": [ "node_modules",