Compare commits

..

7 Commits

Author SHA1 Message Date
手瓜一十雪
3d0f8ee657 fix 2025-05-03 16:06:51 +08:00
手瓜一十雪
6421bb4f5c feat: normalize 2025-05-02 15:10:31 +08:00
Mlikiowa
3919743885 release: v4.7.45 2025-04-30 13:43:59 +00:00
pk5ls20
a5a57b9e20 fix: fxxking fake forward element
- close #972, #977, #666
2025-04-30 20:31:03 +08:00
手瓜一十雪
e31d2810ad fix 2025-04-29 22:06:01 +08:00
Mlikiowa
140e62fdcd release: v4.7.44 2025-04-28 14:04:40 +00:00
手瓜一十雪
014b4deb87 feat: 34740 2025-04-28 22:04:20 +08:00
31 changed files with 240 additions and 1387 deletions

View File

@@ -40,8 +40,11 @@ _Modern protocol-side framework implemented based on NTQQ._
| Docs | [![Cloudflare.Pages](https://img.shields.io/badge/docs%20on-Cloudflare.Pages-blue)](https://napneko.pages.dev/) | [![Server.Other](https://img.shields.io/badge/docs%20on-Server.Other-green)](https://napcat.cyou/) | [![NapCat.Wiki](https://img.shields.io/badge/docs%20on-NapCat.Wiki-red)](https://www.napcat.wiki) |
|:-:|:-:|:-:|:-:|
| Contact | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
|:-:|:-:|:-:|:-:|
| QQ Group | [![QQ Group#4](https://img.shields.io/badge/QQ%20Group%234-Join-blue)](https://qm.qq.com/q/CMmPbGw0jA) | [![QQ Group#3](https://img.shields.io/badge/QQ%20Group%233-Join-blue)](https://qm.qq.com/q/8zJMLjqy2Y) | [![QQ Group#2](https://img.shields.io/badge/QQ%20Group%232-Join-blue)](https://qm.qq.com/q/HaRcfrHpUk) | [![QQ Group#1](https://img.shields.io/badge/QQ%20Group%231-Join-blue)](https://qm.qq.com/q/I6LU87a0Yq) |
|:-:|:-:|:-:|:-:|:-:|
| Telegram | [![Telegram](https://img.shields.io/badge/Telegram-MelodicMoonlight-blue)](https://t.me/MelodicMoonlight) |
|:-:|:-:|
## Thanks

View File

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

View File

@@ -2,7 +2,7 @@
"name": "napcat",
"private": true,
"type": "module",
"version": "4.7.43",
"version": "4.7.45",
"scripts": {
"build:universal": "npm run build:webui && vite build --mode universal || exit 1",
"build:framework": "npm run build:webui && vite build --mode framework || exit 1",
@@ -41,7 +41,6 @@
"ajv": "^8.13.0",
"async-mutex": "^0.5.0",
"commander": "^13.0.0",
"compressing": "^1.10.1",
"cors": "^2.8.5",
"esbuild": "0.25.0",
"eslint": "^9.14.0",
@@ -54,16 +53,16 @@
"image-size": "^1.1.1",
"json5": "^2.2.3",
"multer": "^1.4.5-lts.1",
"napcat.protobuf": "^1.1.4",
"typescript": "^5.3.3",
"typescript-eslint": "^8.13.0",
"vite": "^6.0.1",
"vite-plugin-cp": "^6.0.0",
"vite-tsconfig-paths": "^5.1.0",
"winston": "^3.17.0"
"napcat.protobuf": "^1.1.4",
"winston": "^3.17.0",
"compressing": "^1.10.1"
},
"dependencies": {
"@napi-rs/canvas": "^0.1.69",
"express": "^5.0.0",
"silk-wasm": "^3.6.1",
"ws": "^8.18.0"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 MiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 MiB

View File

@@ -145,8 +145,8 @@ export enum FileUriType {
export async function checkUriType(Uri: string) {
const LocalFileRet = await solveProblem((uri: string) => {
if (fs.existsSync(uri)) {
return { Uri: uri, Type: FileUriType.Local };
if (fs.existsSync(path.normalize(uri))) {
return { Uri: path.normalize(uri), Type: FileUriType.Local };
}
return undefined;
}, Uri);

View File

@@ -1 +1 @@
export const napCatVersion = '4.7.43';
export const napCatVersion = '4.7.45';

View File

@@ -274,5 +274,13 @@
"9.9.19-34606": {
"appid": 537282307,
"qua": "V1_WIN_NQ_9.9.19_34606_GW_B"
},
"9.9.19-34740": {
"appid": 537290691,
"qua": "V1_WIN_NQ_9.9.19_34740_GW_B"
},
"3.2.17-34740": {
"appid": 537290727,
"qua": "V1_LNX_NQ_3.2.17_34740_GW_B"
}
}

View File

@@ -350,5 +350,9 @@
"3.2.17-34606-arm64": {
"send": "7711270",
"recv": "7714BA0"
},
"9.9.19-34740-x64": {
"send": "3BDD8D0",
"recv": "3BE20D0"
}
}

View File

@@ -6,13 +6,14 @@ import {
PacketMsgFileElement,
PacketMsgPicElement,
PacketMsgPttElement,
PacketMsgVideoElement
PacketMsgReplyElement,
PacketMsgVideoElement,
} from '@/core/packet/message/element';
import { ChatType, MsgSourceType, NTMsgType, RawMessage } from '@/core';
import { MiniAppRawData, MiniAppReqParams } from '@/core/packet/entities/miniApp';
import { AIVoiceChatType } from '@/core/packet/entities/aiChat';
import { NapProtoDecodeStructType, NapProtoEncodeStructType, NapProtoMsg } from '@napneko/nap-proto-core';
import { IndexNode, LongMsgResult, MsgInfo } from '@/core/packet/transformer/proto';
import { IndexNode, LongMsgResult, MsgInfo, PushMsgBody } from '@/core/packet/transformer/proto';
import { OidbPacket } from '@/core/packet/transformer/base';
import { ImageOcrResult } from '@/core/packet/entities/ocrResult';
import { gunzipSync } from 'zlib';
@@ -76,22 +77,24 @@ export class PacketOperationContext {
async UploadResources(msg: PacketMsg[], groupUin: number = 0) {
const chatType = groupUin ? ChatType.KCHATTYPEGROUP : ChatType.KCHATTYPEC2C;
const peerUid = groupUin ? String(groupUin) : this.context.napcore.basicInfo.uid;
const reqList = msg.flatMap(m =>
m.msg.map(e => {
if (e instanceof PacketMsgPicElement) {
return this.context.highway.uploadImage({ chatType, peerUid }, e);
} else if (e instanceof PacketMsgVideoElement) {
return this.context.highway.uploadVideo({ chatType, peerUid }, e);
} else if (e instanceof PacketMsgPttElement) {
return this.context.highway.uploadPtt({ chatType, peerUid }, e);
} else if (e instanceof PacketMsgFileElement) {
return this.context.highway.uploadFile({ chatType, peerUid }, e);
}
return null;
}).filter(Boolean)
const reqList = msg.flatMap((m) =>
m.msg
.map((e) => {
if (e instanceof PacketMsgPicElement) {
return this.context.highway.uploadImage({ chatType, peerUid }, e);
} else if (e instanceof PacketMsgVideoElement) {
return this.context.highway.uploadVideo({ chatType, peerUid }, e);
} else if (e instanceof PacketMsgPttElement) {
return this.context.highway.uploadPtt({ chatType, peerUid }, e);
} else if (e instanceof PacketMsgFileElement) {
return this.context.highway.uploadFile({ chatType, peerUid }, e);
}
return null;
})
.filter(Boolean)
);
const res = await Promise.allSettled(reqList);
this.context.logger.info(`上传资源${res.length}个,失败${res.filter(r => r.status === 'rejected').length}`);
this.context.logger.info(`上传资源${res.length}个,失败${res.filter((r) => r.status === 'rejected').length}`);
res.forEach((result, index) => {
if (result.status === 'rejected') {
this.context.logger.error(`上传第${index + 1}个资源失败:${result.reason.stack}`);
@@ -100,10 +103,13 @@ export class PacketOperationContext {
}
async UploadImage(img: PacketMsgPicElement) {
await this.context.highway.uploadImage({
chatType: ChatType.KCHATTYPEC2C,
peerUid: this.context.napcore.basicInfo.uid
}, img);
await this.context.highway.uploadImage(
{
chatType: ChatType.KCHATTYPEC2C,
peerUid: this.context.napcore.basicInfo.uid,
},
img
);
const index = img.msgInfo?.msgInfoBody?.at(0)?.index;
if (!index) {
throw new Error('img.msgInfo?.msgInfoBody![0].index! is undefined');
@@ -137,24 +143,66 @@ export class PacketOperationContext {
coordinates: item.polygon.coordinates.map((c) => {
return {
x: c.x,
y: c.y
y: c.y,
};
}),
};
}),
language: res.ocrRspBody.language
language: res.ocrRspBody.language,
} as ImageOcrResult;
}
async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
private async SendPreprocess(msg: PacketMsg[], groupUin: number = 0) {
const ps = msg.map((m) => {
return m.msg.map(async(e) => {
if (e instanceof PacketMsgReplyElement && !e.targetElems) {
this.context.logger.debug(`Cannot find reply element's targetElems, prepare to fetch it...`);
if (!e.targetPeer?.peerUid) {
this.context.logger.error(`targetPeer is undefined!`);
}
let targetMsg: NapProtoEncodeStructType<typeof PushMsgBody>[] | undefined;
if (e.isGroupReply) {
targetMsg = await this.FetchGroupMessage(+(e.targetPeer?.peerUid ?? 0), e.targetMessageSeq, e.targetMessageSeq);
} else {
targetMsg = await this.FetchC2CMessage(await this.context.napcore.basicInfo.uin2uid(e.targetUin), e.targetMessageSeq, e.targetMessageSeq);
}
e.targetElems = targetMsg.at(0)?.body?.richText?.elems;
e.targetSourceMsg = targetMsg.at(0);
}
});
}).flat();
await Promise.all(ps)
await this.UploadResources(msg, groupUin);
}
async FetchGroupMessage(groupUin: number, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
const req = trans.FetchGroupMessage.build(groupUin, startSeq, endSeq);
const resp = await this.context.client.sendOidbPacket(req, true);
const res = trans.FetchGroupMessage.parse(resp);
return res.body.messages
}
async FetchC2CMessage(targetUid: string, startSeq: number, endSeq: number): Promise<NapProtoDecodeStructType<typeof PushMsgBody>[]> {
const req = trans.FetchC2CMessage.build(targetUid, startSeq, endSeq);
const resp = await this.context.client.sendOidbPacket(req, true);
const res = trans.FetchC2CMessage.parse(resp);
return res.messages
}
async UploadForwardMsg(msg: PacketMsg[], groupUin: number = 0) {
await this.SendPreprocess(msg, groupUin);
const req = trans.UploadForwardMsg.build(this.context.napcore.basicInfo.uid, msg, groupUin);
const resp = await this.context.client.sendOidbPacket(req, true);
const res = trans.UploadForwardMsg.parse(resp);
return res.result.resId;
}
async MoveGroupFile(groupUin: number, fileUUID: string, currentParentDirectory: string, targetParentDirectory: string) {
async MoveGroupFile(
groupUin: number,
fileUUID: string,
currentParentDirectory: string,
targetParentDirectory: string
) {
const req = trans.MoveGroupFile.build(groupUin, fileUUID, currentParentDirectory, targetParentDirectory);
const resp = await this.context.client.sendOidbPacket(req, true);
const res = trans.MoveGroupFile.parse(resp);
@@ -203,12 +251,17 @@ export class PacketOperationContext {
return res.content.map((item) => {
return {
category: item.category,
voices: item.voices
voices: item.voices,
};
});
}
async GetAiVoice(groupUin: number, voiceId: string, text: string, chatType: AIVoiceChatType): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
async GetAiVoice(
groupUin: number,
voiceId: string,
text: string,
chatType: AIVoiceChatType
): Promise<NapProtoDecodeStructType<typeof MsgInfo>> {
let reqTime = 0;
const reqMaxTime = 30;
const sessionId = crypto.randomBytes(4).readUInt32BE(0);
@@ -236,6 +289,7 @@ export class PacketOperationContext {
if (!main?.actionData.msgBody) {
throw new Error('msgBody is empty');
}
this.context.logger.debug('rawChains ', inflate.toString('hex'));
const messagesPromises = main.actionData.msgBody.map(async (msg) => {
if (!msg?.body?.richText?.elems) {
@@ -251,12 +305,12 @@ export class PacketOperationContext {
const groupUin = msg?.responseHead.grp?.groupUin ?? 0;
element.picElement = {
...element.picElement,
originImageUrl: await this.GetGroupImageUrl(groupUin, index!)
originImageUrl: await this.GetGroupImageUrl(groupUin, index!),
};
} else {
element.picElement = {
...element.picElement,
originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!)
originImageUrl: await this.GetImageUrl(this.context.napcore.basicInfo.uid, index!),
};
}
return element;
@@ -269,7 +323,7 @@ export class PacketOperationContext {
elements: elements,
guildId: '',
isOnlineMsg: false,
msgId: '7467703692092974645', // TODO: no necessary
msgId: '7467703692092974645', // TODO: no necessary
msgRandom: '0',
msgSeq: String(msg.contentHead.sequence ?? 0),
msgTime: String(msg.contentHead.timeStamp ?? 0),

View File

@@ -24,12 +24,15 @@ export class PacketMsgBuilder {
}
return {
responseHead: {
fromUid: '',
fromUin: node.senderUin,
toUid: node.groupId ? undefined : selfUid,
type: 0,
sigMap: 0,
toUin: 0,
fromUid: '',
forward: node.groupId ? undefined : {
friendName: node.senderName,
},
toUid: node.groupId ? undefined : selfUid,
grp: node.groupId ? {
groupUin: node.groupId,
memberName: node.senderName,
@@ -40,16 +43,13 @@ export class PacketMsgBuilder {
type: node.groupId ? 82 : 9,
subType: node.groupId ? undefined : 4,
divSeq: node.groupId ? undefined : 4,
msgId: crypto.randomBytes(4).readUInt32LE(0),
autoReply: 0,
sequence: crypto.randomBytes(4).readUInt32LE(0),
timeStamp: +node.time.toString().substring(0, 10),
field7: BigInt(1),
field8: 0,
field9: 0,
forward: {
field1: 0,
field2: 0,
field3: node.groupId ? 0 : 2,
field3: node.groupId ? 1 : 2,
unknownBase64: avatar,
avatar: avatar
}

View File

@@ -10,6 +10,7 @@ import {
MsgInfo,
NotOnlineImage,
OidbSvcTrpcTcp0XE37_800Response,
PushMsgBody,
QBigFaceExtra,
QSmallFaceExtra,
} from '@/core/packet/transformer/proto';
@@ -29,7 +30,8 @@ import {
SendReplyElement,
SendMultiForwardMsgElement,
SendTextElement,
SendVideoElement
SendVideoElement,
Peer
} from '@/core';
import {ForwardMsgBuilder} from '@/common/forward-msg-builder';
import {PacketMsg, PacketSendMsgElement} from '@/core/packet/message/message';
@@ -146,41 +148,40 @@ export class PacketMsgAtElement extends PacketMsgTextElement {
}
export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
messageId: bigint;
messageSeq: number;
messageClientSeq: number;
time: number;
targetMessageId: bigint;
targetMessageSeq: number;
targetMessageClientSeq: number;
targetUin: number;
targetUid: string;
time: number;
elems: PacketMsg[];
targetElems?: NapProtoEncodeStructType<typeof Elem>[];
targetSourceMsg?: NapProtoEncodeStructType<typeof PushMsgBody>;
targetPeer?: Peer;
constructor(element: SendReplyElement) {
super(element);
this.messageId = BigInt(element.replyElement.replayMsgId ?? 0);
this.messageSeq = +(element.replyElement.replayMsgSeq ?? 0);
this.messageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
this.time = +(element.replyElement.replyMsgTime ?? Math.floor(Date.now() / 1000));
this.targetMessageId = BigInt(element.replyElement.replayMsgId ?? 0);
this.targetMessageSeq = +(element.replyElement.replayMsgSeq ?? 0);
this.targetMessageClientSeq = +(element.replyElement.replyMsgClientSeq ?? 0);
this.targetUin = +(element.replyElement.senderUin ?? 0);
this.targetUid = element.replyElement.senderUidStr ?? '';
this.time = +(element.replyElement.replyMsgTime ?? 0);
this.elems = []; // TODO: in replyElement.sourceMsgTextElems
this.targetPeer = element.replyElement._replyMsgPeer;
}
get isGroupReply(): boolean {
return this.messageClientSeq === 0;
return this.targetMessageClientSeq === 0;
}
override buildElement(): NapProtoEncodeStructType<typeof Elem>[] {
return [{
srcMsg: {
origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq],
origSeqs: [this.isGroupReply ? this.targetMessageSeq : this.targetMessageClientSeq],
senderUin: BigInt(this.targetUin),
time: this.time,
elems: [], // TODO: in replyElement.sourceMsgTextElems
pbReserve: {
messageId: this.messageId,
},
toUin: BigInt(this.targetUin),
type: 1,
elems: this.targetElems ?? [],
sourceMsg: new NapProtoMsg(PushMsgBody).encode(this.targetSourceMsg ?? {}),
toUin: BigInt(0),
}
}];
}

View File

@@ -0,0 +1,27 @@
import * as proto from '@/core/packet/transformer/proto';
import { NapProtoMsg } from '@napneko/nap-proto-core';
import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
class FetchC2CMessage extends PacketTransformer<typeof proto.SsoGetC2cMsgResponse> {
constructor() {
super();
}
build(targetUid: string, startSeq: number, endSeq: number): OidbPacket {
const req = new NapProtoMsg(proto.SsoGetC2cMsg).encode({
friendUid: targetUid,
startSequence: startSeq,
endSequence: endSeq,
});
return {
cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetC2cMsg',
data: PacketHexStrBuilder(req)
};
}
parse(data: Buffer) {
return new NapProtoMsg(proto.SsoGetC2cMsgResponse).decode(data);
}
}
export default new FetchC2CMessage();

View File

@@ -0,0 +1,30 @@
import * as proto from '@/core/packet/transformer/proto';
import { NapProtoMsg } from '@napneko/nap-proto-core';
import { OidbPacket, PacketHexStrBuilder, PacketTransformer } from '@/core/packet/transformer/base';
class FetchGroupMessage extends PacketTransformer<typeof proto.SsoGetGroupMsgResponse> {
constructor() {
super();
}
build(groupUin: number, startSeq: number, endSeq: number): OidbPacket {
const req = new NapProtoMsg(proto.SsoGetGroupMsg).encode({
info: {
groupUin: groupUin,
startSequence: startSeq,
endSequence: endSeq
},
direction: true
});
return {
cmd: 'trpc.msg.register_proxy.RegisterProxy.SsoGetGroupMsg',
data: PacketHexStrBuilder(req)
};
}
parse(data: Buffer) {
return new NapProtoMsg(proto.SsoGetGroupMsgResponse).decode(data);
}
}
export default new FetchGroupMessage();

View File

@@ -1,2 +1,4 @@
export { default as UploadForwardMsg } from './UploadForwardMsg';
export { default as DownloadForwardMsg } from './DownloadForwardMsg';
export { default as FetchGroupMessage } from './FetchGroupMessage';
export { default as FetchC2CMessage } from './FetchC2CMessage';
export { default as DownloadForwardMsg } from './DownloadForwardMsg';

View File

@@ -13,13 +13,15 @@ import {
export const ContentHead = {
type: ProtoField(1, ScalarType.UINT32),
subType: ProtoField(2, ScalarType.UINT32, true),
divSeq: ProtoField(3, ScalarType.UINT32, true),
msgId: ProtoField(4, ScalarType.UINT32, true),
c2cCmd: ProtoField(3, ScalarType.UINT32, true),
ranDom: ProtoField(4, ScalarType.UINT32, true),
sequence: ProtoField(5, ScalarType.UINT32, true),
timeStamp: ProtoField(6, ScalarType.UINT32, true),
field7: ProtoField(7, ScalarType.UINT64, true),
field8: ProtoField(8, ScalarType.UINT32, true),
field9: ProtoField(9, ScalarType.UINT32, true),
pkgNum: ProtoField(7, ScalarType.UINT64, true),
pkgIndex: ProtoField(8, ScalarType.UINT32, true),
divSeq: ProtoField(9, ScalarType.UINT32, true),
autoReply: ProtoField(10, ScalarType.UINT32),
ntMsgSeq: ProtoField(10, ScalarType.UINT32, true),
newId: ProtoField(12, ScalarType.UINT64, true),
forward: ProtoField(15, () => ForwardHead, true),
};

View File

@@ -1,4 +1,15 @@
import { ElementType, MessageElement, NTGrayTipElementSubTypeV2, PicSubType, PicType, TipAioOpGrayTipElement, TipGroupElement, NTVideoType, FaceType } from './msg';
import {
ElementType,
MessageElement,
NTGrayTipElementSubTypeV2,
PicSubType,
PicType,
TipAioOpGrayTipElement,
TipGroupElement,
NTVideoType,
FaceType,
Peer
} from './msg';
type ElementFullBase = Omit<MessageElement, 'elementType' | 'elementId' | 'extBufForUI'>;
@@ -213,6 +224,9 @@ export interface ReplyElement {
senderUidStr?: string;
replyMsgTime?: string;
replyMsgClientSeq?: string;
// HACK: Attributes that were not originally available,
// but were added due to NTQQ and NapCat's internal implementation, are used to supplement NapCat
_replyMsgPeer?: Peer;
}
export interface CalendarElement {

View File

@@ -403,7 +403,7 @@ export interface NTGroupGrayMember {
}
/**
* 群灰色提示邀请者和被邀请者接口
*
*
* */
export interface NTGroupGrayInviterAndInvite {
invited: NTGroupGrayMember;
@@ -501,6 +501,7 @@ export interface RawMessage {
elements: MessageElement[];// 消息元素
sourceType: MsgSourceType;// 消息来源类型
isOnlineMsg: boolean;// 是否为在线消息
clientSeq?: string;
}
/**
@@ -565,4 +566,4 @@ export enum FaceType {
AniSticke = 3, // 动画贴纸
Lottie = 4,// 新格式表情
Poke = 5 // 可变Poke
}
}

View File

@@ -467,6 +467,8 @@ export class OneBotMsgApi {
replayMsgId: replyMsg.msgId, // raw.msgId
senderUin: replyMsg.senderUin,
senderUinStr: replyMsg.senderUin,
replyMsgClientSeq: replyMsg.clientSeq,
_replyMsgPeer: replyMsgM.Peer
},
} :
undefined;

View File

@@ -50,7 +50,6 @@ import {
import { OB11Message } from './types';
import { IOB11NetworkAdapter } from '@/onebot/network/adapter';
import { OB11HttpSSEServerAdapter } from './network/http-server-sse';
import { OB11PluginAdapter } from './network/plugin';
//OneBot实现类
export class NapCatOneBot11Adapter {
@@ -114,9 +113,9 @@ export class NapCatOneBot11Adapter {
//创建NetWork服务
// 注册Plugin 如果需要基于NapCat进行快速开发
this.networkManager.registerAdapter(
new OB11PluginAdapter('myPlugin', this.core, this,this.actions)
);
// this.networkManager.registerAdapter(
// new OB11PluginAdapter('myPlugin', this.core, this,this.actions)
// );
for (const key of ob11Config.network.httpServers) {
if (key.enable) {
this.networkManager.registerAdapter(

View File

@@ -22,7 +22,7 @@ export class OB11PluginAdapter extends IOB11NetworkAdapter<PluginConfig> {
onEvent<T extends OB11EmitEventContent>(event: T) {
if (event.post_type === 'message') {
plugin_onmessage(this.config.name, this.core, this.obContext, event as OB11Message, this.actions, this).then().catch(console.log);
plugin_onmessage(this.config.name, this.core, this.obContext, event as OB11Message, this.actions, this).then().catch();
}
}

View File

@@ -39,8 +39,11 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
wsClient.close();
return;
}
//鉴权
this.authorize(this.config.token, wsClient, wsReq);
// 鉴权 close 不会立刻销毁 当前返回可避免挂载message事件 close 并未立刻关闭 而是存在timer操作后关闭
// 引发高危漏洞
if (!this.authorize(this.config.token, wsClient, wsReq)) {
return;
}
const paramUrl = wsReq.url?.indexOf('?') !== -1 ? wsReq.url?.substring(0, wsReq.url?.indexOf('?')) : wsReq.url;
const isApiConnect = paramUrl === '/api' || paramUrl === '/api/';
if (!isApiConnect) {
@@ -150,10 +153,11 @@ export class OB11WebSocketServerAdapter extends IOB11NetworkAdapter<WebsocketSer
const HeaderClientToken = wsReq.headers.authorization?.split('Bearer ').pop() || '';
const ClientToken = typeof (QueryClientToken) === 'string' && QueryClientToken !== '' ? QueryClientToken : HeaderClientToken;
if (ClientToken === token) {
return;
return true;
}
wsClient.send(JSON.stringify(OB11Response.res(null, 'failed', 1403, 'token验证失败')));
wsClient.close();
return false;
}
private checkStateAndReply<T>(data: T, wsClient: WebSocket) {

View File

@@ -1,203 +0,0 @@
/**
* TapTap账号管理类
*/
import * as fs from 'fs';
import * as path from 'path';
export class TapAccountManager {
private userBindTapMap = new Map<string, {
default: string;
list: Array<{
id: string;
name: string;
}>;
}>();
private dataFilePath: string;
constructor(dataDir: string = './data') {
// 确保数据目录存在
if (!fs.existsSync(dataDir)) {
fs.mkdirSync(dataDir, { recursive: true });
}
this.dataFilePath = path.join(dataDir, 'tap_accounts.json');
this.loadData();
}
saveData() {
try {
// 将 Map 转换为可序列化的对象
const dataObj: Record<string, any> = {};
this.userBindTapMap.forEach((value, key) => {
dataObj[key] = value;
});
fs.writeFileSync(
this.dataFilePath,
JSON.stringify(dataObj, null, 2),
'utf-8'
);
} catch (error) {
console.error('保存 TapTap 账号数据失败:', error);
}
}
loadData() {
try {
if (fs.existsSync(this.dataFilePath)) {
const fileContent = fs.readFileSync(this.dataFilePath, 'utf-8');
const dataObj = JSON.parse(fileContent);
// 清空当前数据并加载新数据
this.userBindTapMap.clear();
for (const [key, value] of Object.entries(dataObj)) {
this.userBindTapMap.set(key, value as any);
}
console.log('TapTap 账号数据已加载');
} else {
console.log('未找到 TapTap 账号数据文件,将创建新的数据存储');
}
} catch (error) {
console.error('加载 TapTap 账号数据失败:', error);
}
}
/**
* 绑定TapTap ID
*/
async bindAccount(userId: string, tapId: string, characterName: string): Promise<boolean> {
// 用户首次绑定账号
if (!this.userBindTapMap.has(userId)) {
this.userBindTapMap.set(userId, {
default: tapId,
list: [{
id: tapId,
name: characterName
}]
});
await this.saveData();
return true;
}
// 用户已有账号,追加新账号
const userData = this.userBindTapMap.get(userId)!;
// 检查是否已经绑定过该ID
if (!userData.list.some(item => item.id === tapId)) {
userData.list.push({
id: tapId,
name: characterName
});
userData.default = tapId; // 新绑定的账号自动设为默认
await this.saveData();
return true;
}
// 账号已存在
return false;
}
/**
* 切换默认TapTap ID
*/
async switchAccount(userId: string, tapId: string): Promise<boolean> {
const userData = this.userBindTapMap.get(userId);
if (!userData) return false;
const accountItem = userData.list.find(item => item.id === tapId);
if (!accountItem) return false;
userData.default = tapId;
await this.saveData();
return true;
}
/**
* 删除绑定的TapTap ID
* @returns 删除结果、剩余默认账号信息(如果有)
*/
async deleteAccount(userId: string, tapId: string): Promise<{
success: boolean;
deletedAccount?: { id: string; name: string; };
defaultAccount?: { id: string; name: string; };
isEmpty: boolean;
}> {
const userData = this.userBindTapMap.get(userId);
if (!userData) {
return { success: false, isEmpty: true };
}
const index = userData.list.findIndex(item => item.id === tapId);
if (index === -1) {
return { success: false, isEmpty: false };
}
const deletedAccount = userData.list[index];
userData.list.splice(index, 1);
// 如果删除的是当前默认账号,则需要重新设置默认账号
if (userData.default === tapId) {
userData.default = userData.list.length > 0 ? userData.list[0]?.id ?? '' : '';
}
// 如果没有绑定账号了,则删除该用户的记录
let result;
if (userData.list.length === 0) {
this.userBindTapMap.delete(userId);
result = {
success: true,
deletedAccount,
isEmpty: true
};
} else {
const defaultAccount = userData.list.find(item => item.id === userData.default);
result = {
success: true,
deletedAccount,
defaultAccount,
isEmpty: false
};
}
await this.saveData();
return result;
}
/**
* 获取用户账号列表
*/
getAccountList(userId: string): {
hasAccounts: boolean;
accounts?: Array<{
id: string;
name: string;
isDefault: boolean;
}>;
} {
const userData = this.userBindTapMap.get(userId);
if (!userData || userData.list.length === 0) {
return { hasAccounts: false };
}
const accounts = userData.list.map(item => ({
id: item.id,
name: item.name,
isDefault: item.id === userData.default
}));
return { hasAccounts: true, accounts };
}
/**
* 获取用户当前默认账号ID
*/
getDefaultAccount(userId: string): {
hasDefault: boolean;
tapId?: string;
} {
const userData = this.userBindTapMap.get(userId);
if (!userData || !userData.default) {
return { hasDefault: false };
}
return { hasDefault: true, tapId: userData.default };
}
}

View File

@@ -1,255 +0,0 @@
export interface GameUserDetail {
data: Data;
now: number;
success: boolean;
[property: string]: any;
}
export interface Data {
config: Config;
external_url: string;
is_bind: boolean;
list: DataList[];
next_page: string;
prev_page: string;
role_id: string;
sharing: Sharing;
show_bind_button: boolean;
[property: string]: any;
}
export interface Config {
app_icon: AppIcon;
banner: Banner;
font_class: string;
font_color: string;
label: Label;
show_bind_expired_alert: boolean;
tint: number;
title: string;
[property: string]: any;
}
export interface AppIcon {
color: string;
height: number;
medium_url: string;
original_format: string;
original_size: number;
original_url: string;
small_url: string;
url: string;
width: number;
[property: string]: any;
}
export interface Banner {
color: string;
height: number;
medium_url: string;
original_format: string;
original_size: number;
original_url: string;
small_url: string;
url: string;
width: number;
[property: string]: any;
}
export interface Label {
color: string;
medium_url: string;
original_format: string;
original_url: string;
small_url: string;
url: string;
[property: string]: any;
}
export interface DataList {
basic_module?: BasicModule;
character_module?: CharacterModule;
episode_module?: EpisodeModule;
is_sharing: boolean;
item_progress?: ItemProgress;
module_type: number;
weapon_module?: WeaponModule;
[property: string]: any;
}
export interface BasicModule {
avatar: BasicModuleAvatar;
custom_items: BasicModuleCustomItem[];
custom_title: string;
info: Info[];
name: string;
role_id: string;
subtitle: string;
[property: string]: any;
}
export interface BasicModuleAvatar {
color: string;
medium_url: string;
original_format: string;
original_url: string;
small_url: string;
url: string;
[property: string]: any;
}
export interface BasicModuleCustomItem {
is_main: boolean;
key: string;
value: string;
[property: string]: any;
}
export interface Info {
main_value: string;
name: string;
sub_value: string;
value: string;
[property: string]: any;
}
export interface CharacterModule {
custom_title: string;
list: CharacterModuleList[];
total: number;
[property: string]: any;
}
export interface CharacterModuleList {
grade: string;
image: PurpleImage;
level: number;
name: string;
talent_level: number;
[property: string]: any;
}
export interface PurpleImage {
color: string;
medium_url: string;
original_format: string;
original_url: string;
small_url: string;
url: string;
[property: string]: any;
}
export interface EpisodeModule {
custom_items: EpisodeModuleCustomItem[];
custom_title: string;
[property: string]: any;
}
export interface EpisodeModuleCustomItem {
is_main: boolean;
key: string;
value: string;
[property: string]: any;
}
export interface ItemProgress {
custom_title: string;
list: ItemProgressList[];
table_tabs: string[];
total: number;
[property: string]: any;
}
export interface ItemProgressList {
avatar: ListAvatar;
name: string;
progress: Progress;
sort: Sort;
[property: string]: any;
}
export interface ListAvatar {
color: string;
medium_url: string;
original_format: string;
original_url: string;
small_url: string;
url: string;
[property: string]: any;
}
export interface Progress {
current: number;
max: number;
[property: string]: any;
}
export interface Sort {
icon: Icon;
value: string;
[property: string]: any;
}
export interface Icon {
color: string;
medium_url: string;
original_format: string;
original_url: string;
small_url: string;
url: string;
[property: string]: any;
}
export interface WeaponModule {
custom_title: string;
list: WeaponModuleList[];
total: number;
[property: string]: any;
}
export interface WeaponModuleList {
grade: string;
image: FluffyImage;
level: number;
name: string;
props: string[];
rarity: Rarity;
[property: string]: any;
}
export interface FluffyImage {
color: string;
medium_url: string;
original_format: string;
original_url: string;
small_url: string;
url: string;
[property: string]: any;
}
export interface Rarity {
color: string;
medium_url: string;
original_format: string;
original_url: string;
small_url: string;
url: string;
[property: string]: any;
}
export interface Sharing {
description: string;
image: null;
moment_params: MomentParams;
qr_code: string;
title: string;
url: string;
[property: string]: any;
}
export interface MomentParams {
app_id: number;
group_label_id: number;
hashtag_ids: number[];
[property: string]: any;
}

View File

@@ -1,195 +0,0 @@
import { createCanvas, loadImage, GlobalFonts } from '@napi-rs/canvas';
interface MenuCommand {
command: string;
description: string;
highlight?: boolean;
}
/**
* 生成REVERSE.1999帮助菜单图片 (自适应美化版)
* @returns 生成的图片的base64编码
*/
export async function generate1999HelpMenu(): Promise<string> {
try {
// 字体注册
const fontsToTry = [
{ path: 'C:\\Windows\\Fonts\\msyh.ttc', name: 'Microsoft YaHei' },
{ path: 'C:\\Windows\\Fonts\\msyhbd.ttc', name: 'Microsoft YaHei Bold' },
{ path: 'C:\\Windows\\Fonts\\simhei.ttf', name: 'SimHei' }
];
let fontFamily = 'sans-serif';
let fontFamilyBold = 'sans-serif';
for (const font of fontsToTry) {
try {
if (!GlobalFonts.has(font.name)) {
GlobalFonts.registerFromPath(font.path, font.name);
}
if (font.name.includes('Bold')) {
fontFamilyBold = font.name;
} else if (fontFamily === 'sans-serif') {
fontFamily = font.name;
}
} catch { }
}
if (fontFamilyBold === 'sans-serif') fontFamilyBold = fontFamily;
// 画布设置
const width = 2560;
const height = 1440;
const canvas = createCanvas(width, height);
const ctx = canvas.getContext('2d');
// 背景处理
const backgroundPath = "E:\\NewDevelop\\NapCatQQ\\src\\canvas\\image\\normal\\01.jpg";
try {
const backgroundImage = await loadImage(backgroundPath);
const scale = Math.max(width / backgroundImage.width, height / backgroundImage.height);
const scaledWidth = backgroundImage.width * scale;
const scaledHeight = backgroundImage.height * scale;
const x = (width - scaledWidth) / 2;
const y = (height - scaledHeight) / 2;
ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
ctx.save();
ctx.filter = 'blur(20px) brightness(0.75)';
ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
ctx.restore();
} catch {
const gradient = ctx.createLinearGradient(0, 0, width, height);
gradient.addColorStop(0, '#2a2a40');
gradient.addColorStop(1, '#4a3a60');
ctx.fillStyle = gradient;
ctx.fillRect(0, 0, width, height);
}
// 半透明叠加层
ctx.fillStyle = 'rgba(15, 15, 25, 0.65)';
ctx.fillRect(0, 0, width, height);
// 命令列表
const commands: MenuCommand[] = [
{ command: '#1999 绑定 <TapTap ID>', description: '将您的 TapTap ID 与机器人绑定', highlight: true },
{ command: '#1999 切换 <TapTap ID>', description: '切换当前操作的 TapTap ID' },
{ command: '#1999 删除 <TapTap ID>', description: '解除指定的 TapTap ID 绑定' },
{ command: '#1999 账号', description: '查看所有已绑定的 TapTap 账号', highlight: true },
{ command: '#1999 信息', description: '查询当前选中账号的游戏信息', highlight: true },
{ command: '#1999 心相', description: '浏览当前账号拥有的心相详情' },
{ command: '#1999 角色', description: '浏览当前账号拥有的角色详情' },
{ command: '#1999 帮助', description: '显示此帮助菜单' }
];
// 动态计算卡片宽度
ctx.font = `bold 40px ${fontFamilyBold}`;
let maxCommandWidth = 0;
let maxDescWidth = 0;
for (const cmd of commands) {
maxCommandWidth = Math.max(maxCommandWidth, ctx.measureText(cmd.command).width);
ctx.font = `32px ${fontFamily}`;
maxDescWidth = Math.max(maxDescWidth, ctx.measureText(cmd.description).width);
ctx.font = `bold 40px ${fontFamilyBold}`;
}
const baseCardWidth = Math.max(maxCommandWidth, maxDescWidth) + 120;
const minCardWidth = 420;
const maxCardWidth = Math.min(baseCardWidth, width * 0.38);
const cardWidth = Math.max(minCardWidth, Math.min(maxCardWidth, baseCardWidth));
// 卡片参数
const cardHeight = Math.floor(height * 0.07) + 44;
const cardBorderRadius = 24;
const cardShadow = 'rgba(60, 40, 120, 0.18)';
const textPaddingLeft = 38;
// 自适应间距,最大不超过指定值
const maxColGap = 44;
const maxRowGap = 32;
const minColGap = 24;
const minRowGap = 18;
// 动态计算列数,保证整体不空旷且不挤
let cols = Math.min(commands.length, Math.floor((width - 160) / (cardWidth + minColGap)));
cols = Math.max(1, cols);
let colGap = Math.floor((width - cols * cardWidth) / (cols + 1));
colGap = Math.max(minColGap, Math.min(colGap, maxColGap));
const rows = Math.ceil(commands.length / cols);
let rowGap = Math.floor((height - rows * cardHeight - 120) / (rows + 1));
rowGap = Math.max(minRowGap, Math.min(rowGap, maxRowGap));
// 计算整体卡片区尺寸,实现居中
const cardsAreaWidth = cols * cardWidth + (cols - 1) * colGap;
const cardsAreaHeight = rows * cardHeight + (rows - 1) * rowGap;
const cardsStartX = Math.floor((width - cardsAreaWidth) / 2);
const cardsStartY = Math.floor((height - cardsAreaHeight) / 2);
// 绘制命令卡片
ctx.textAlign = 'left';
ctx.textBaseline = 'middle';
for (let i = 0; i < commands.length; i++) {
const cmd = commands[i];
if (!cmd) continue;
const col = i % cols;
const row = Math.floor(i / cols);
const x = cardsStartX + col * (cardWidth + colGap);
const y = cardsStartY + row * (cardHeight + rowGap);
// 卡片阴影
ctx.save();
ctx.shadowColor = cardShadow;
ctx.shadowBlur = 16;
ctx.shadowOffsetY = 6;
// 卡片背景
ctx.beginPath();
ctx.roundRect(x, y, cardWidth, cardHeight, cardBorderRadius);
ctx.closePath();
if (cmd.highlight) {
const cardGradient = ctx.createLinearGradient(x, y, x + cardWidth, y);
cardGradient.addColorStop(0, 'rgba(110, 80, 250, 0.60)');
cardGradient.addColorStop(1, 'rgba(150, 110, 255, 0.72)');
ctx.fillStyle = cardGradient;
} else {
ctx.fillStyle = 'rgba(45, 45, 65, 0.89)';
}
ctx.fill();
ctx.restore();
// 左侧高亮条
if (cmd.highlight) {
ctx.save();
ctx.beginPath();
ctx.roundRect(x, y, cardWidth, cardHeight, cardBorderRadius);
ctx.clip();
ctx.fillStyle = '#c5a8ff';
ctx.fillRect(x, y, 12, cardHeight);
ctx.restore();
}
// 文本
const commandTextX = x + textPaddingLeft;
const commandTextY = y + cardHeight * 0.38;
const descriptionTextY = y + cardHeight * 0.74;
ctx.fillStyle = cmd.highlight ? '#f0e8ff' : '#c0d4ff';
ctx.font = `bold 40px ${fontFamilyBold}`;
ctx.fillText(cmd.command, commandTextX, commandTextY);
ctx.fillStyle = cmd.highlight ? 'rgba(255,255,255,1)' : 'rgba(225,230,245,0.92)';
ctx.font = `32px ${fontFamily}`;
ctx.fillText(cmd.description, commandTextX, descriptionTextY);
}
// 底部 NapCat & Plugin
const bottomTextY = height - 36;
ctx.font = `23px ${fontFamily}`;
ctx.fillStyle = 'rgba(255,255,255,0.62)';
ctx.textAlign = 'center';
ctx.textBaseline = 'bottom';
ctx.fillText('NapCat & Plugin', width / 2, bottomTextY);
// 转换为base64
const buffer = canvas.toBuffer('image/png');
const base64Image = `base64://${buffer.toString('base64')}`;
return base64Image;
} catch (error) {
console.error('生成菜单时发生错误:', error);
throw error;
}
}

View File

@@ -1,25 +0,0 @@
import { RequestUtil } from '@/common/request';
import { GameUserDetail } from './api';
/**
* 获取用户游戏记录信息
* @param tap_id TapTap用户ID
* @returns 用户游戏记录信息
*/
export async function get_user(tap_id: string): Promise<GameUserDetail> {
try {
const params = new URLSearchParams({
'app_id': '221062',
'user_id': tap_id,
'X-UA': 'V=1&PN=WebApp&LANG=zh_CN&VN_CODE=102&VN=0.1.0&LOC=CN&PLT=Android&DS=Android&UID=00e000ee-00e0-0e0e-ee00-f0c95d8ca115&VID=444444444&OS=Android&OSV=14.0.1'
});
const url = `https://www.taptap.cn/webapiv2/game-record/v1/detail-by-user?${params.toString()}`;
return await RequestUtil.HttpGetJson(url, 'GET');
} catch (error) {
console.error('获取用户游戏记录失败:', error);
throw error;
}
}

View File

@@ -1,219 +1,11 @@
import { NapCatOneBot11Adapter, OB11Message, OB11MessageDataType } from '@/onebot';
import { NapCatOneBot11Adapter, OB11Message } from '@/onebot';
import { NapCatCore } from '@/core';
import { ActionMap } from '@/onebot/action';
import { OB11PluginAdapter } from '@/onebot/network/plugin';
import { TapAccountManager } from './TapAccountManager';
import { sendMessage } from './sendMessage';
import { get_user } from './get_user';
import { generate1999HelpMenu } from './canvas';
import { generate1999AccountListImage, generate1999BindImage, generate1999CharacterImage, generate1999InfoImage, generate1999SwitchImage, generate1999WeaponImage } from './new';
const tapAccountManager = new TapAccountManager();
export const plugin_onmessage = async (
_adapter: string,
_core: NapCatCore,
_obCtx: NapCatOneBot11Adapter,
message: OB11Message,
action: ActionMap,
_instance: OB11PluginAdapter
) => {
if (message.raw_message.startsWith('#1999 绑定')) {
const tap_id = message.raw_message.slice(8).trim();
const userId = message.user_id.toString();
if (tap_id.length === 0) {
await sendMessage(message, action, '请输入正确的 TapTap ID');
return;
}
try {
// 验证账号有效性并获取角色名称
const userInfo = await get_user(tap_id);
const characterName = userInfo.data.list[0]?.basic_module?.name;
if (!characterName) {
await sendMessage(message, action, '获取角色名称失败,请检查账号是否有效');
return;
}
// 使用账号管理器绑定账号
tapAccountManager.bindAccount(userId, tap_id, characterName);
await sendMessage(message, action, [{
type: OB11MessageDataType.image,
data: {
file: await generate1999BindImage(tap_id, characterName),
summary: '绑定成功'
}
}]);
} catch (error) {
await sendMessage(message, action, `绑定失败可能是TapTap ID无效或未关联游戏账号`);
console.error(`绑定TapTap ID失败:`, error);
}
export const plugin_onmessage = async (adapter: string, _core: NapCatCore, _obCtx: NapCatOneBot11Adapter, message: OB11Message, action: ActionMap, instance: OB11PluginAdapter) => {
if (message.raw_message === 'ping') {
const ret = await action.get('send_group_msg')?.handle({ group_id: String(message.group_id), message: 'pong' }, adapter, instance.config);
console.log(ret);
}
else if (message.raw_message.startsWith('#1999 切换')) {
const tap_id = message.raw_message.slice(8).trim();
const userId = message.user_id.toString();
if (tap_id.length === 0) {
await sendMessage(message, action, '请输入要切换的 TapTap ID');
return;
}
// 使用账号管理器切换账号
const result = tapAccountManager.switchAccount(userId, tap_id);
if (!result) {
const accountList = tapAccountManager.getAccountList(userId);
if (!accountList.hasAccounts) {
await sendMessage(message, action, '您尚未绑定任何账号,请先使用"#1999 绑定"命令');
} else {
await sendMessage(message, action, `未找到ID为 ${tap_id} 的绑定记录,请先绑定该账号`);
}
return;
}
const accountInfo = tapAccountManager.getAccountList(userId);
const account = accountInfo.accounts?.find(a => a.id === tap_id);
await sendMessage(message, action, [{
type: OB11MessageDataType.image,
data: {
file: await generate1999SwitchImage(tap_id, account?.name ?? ''),
summary: '切换成功'
}
}]);
}
else if (message.raw_message.startsWith('#1999 删除')) {
const tap_id = message.raw_message.slice(8).trim();
const userId = message.user_id.toString();
if (tap_id.length === 0) {
await sendMessage(message, action, '请输入要删除的 TapTap ID');
return;
}
// 使用账号管理器删除账号
const result = await tapAccountManager.deleteAccount(userId, tap_id);
if (!result.success) {
if (result.isEmpty) {
await sendMessage(message, action, '您尚未绑定任何账号');
} else {
await sendMessage(message, action, `未找到ID为 ${tap_id} 的绑定记录`);
}
return;
}
if (result.isEmpty) {
await sendMessage(message, action, `已删除账号 ${tap_id}(${result.deletedAccount?.name}),您当前没有绑定任何账号`);
} else {
await sendMessage(message, action, `已删除账号 ${tap_id}(${result.deletedAccount?.name}),当前默认账号为 ${result.defaultAccount?.id}(${result.defaultAccount?.name})`);
}
}
else if (message.raw_message.startsWith('#1999 账号')) {
const userId = message.user_id.toString();
const accountList = tapAccountManager.getAccountList(userId);
if (!accountList.hasAccounts) {
await sendMessage(message, action, '您尚未绑定任何账号');
return;
}
await sendMessage(message, action, [{
type: OB11MessageDataType.image,
data: {
file: await generate1999AccountListImage(accountList.accounts!),
summary: '账号列表'
}
}]);
}
else if (message.raw_message.startsWith('#1999 信息')) {
const userId = message.user_id.toString();
const defaultAccount = tapAccountManager.getDefaultAccount(userId);
if (!defaultAccount.hasDefault) {
await sendMessage(message, action, '请先绑定 TapTap ID');
return;
}
const tap_id = defaultAccount.tapId!;
try {
const userInfo = await get_user(tap_id);
const user_1999_name = userInfo.data.list[0]?.basic_module?.name;
if (!user_1999_name) {
await sendMessage(message, action, '获取账号信息失败,请检查账号是否有效');
return;
}
await sendMessage(message, action, [{
type: OB11MessageDataType.image,
data: {
file: await generate1999InfoImage(userInfo),
summary: '账号信息'
}
}]);
} catch (error) {
await sendMessage(message, action, '获取账号信息失败,请检查账号是否有效');
console.error('获取用户信息失败:', error);
}
}
else if (message.raw_message.startsWith('#1999 心相')) {
const userId = message.user_id.toString();
const defaultAccount = tapAccountManager.getDefaultAccount(userId);
if (!defaultAccount.hasDefault) {
await sendMessage(message, action, '请先绑定 TapTap ID');
return;
}
const tap_id = defaultAccount.tapId!;
try {
const userInfo = await get_user(tap_id);
await sendMessage(message, action, [
{
type: OB11MessageDataType.image,
data: {
file: await generate1999WeaponImage(userInfo),
summary: '心相信息'
}
}
]);
} catch (error) {
await sendMessage(message, action, '获取心相信息失败,请检查账号是否有效');
console.error('获取心相信息失败:', error);
}
}
else if (message.raw_message.startsWith('#1999 角色')) {
const userId = message.user_id.toString();
const defaultAccount = tapAccountManager.getDefaultAccount(userId);
if (!defaultAccount.hasDefault) {
await sendMessage(message, action, '请先绑定 TapTap ID');
return;
}
const tap_id = defaultAccount.tapId!;
try {
const userInfo = await get_user(tap_id);
const user_1999_name = userInfo.data.list[0]?.basic_module?.name;
if (!user_1999_name) {
await sendMessage(message, action, '获取角色信息失败,请检查账号是否有效');
return;
}
await sendMessage(message, action, [
{
type: OB11MessageDataType.image,
data: {
file: await generate1999CharacterImage(userInfo),
summary: '角色信息'
}
}
]);
} catch (error) {
await sendMessage(message, action, '获取角色信息失败,请检查账号是否有效');
console.error('获取角色信息失败:', error);
}
}
else if (message.raw_message.startsWith('#1999 帮助') || message.raw_message.startsWith('#1999 菜单')) {
await sendMessage(message, action, [
{ type: OB11MessageDataType.image, data: { file: await generate1999HelpMenu() } }
]);
}
};
};

View File

@@ -1,387 +0,0 @@
import { createCanvas, loadImage, GlobalFonts } from '@napi-rs/canvas';
import { GameUserDetail } from './api';
// 字体注册工具
function getFontFamily() {
const fontsToTry = [
{ path: 'C:\\Windows\\Fonts\\msyh.ttc', name: 'Microsoft YaHei' },
{ path: 'C:\\Windows\\Fonts\\msyhbd.ttc', name: 'Microsoft YaHei Bold' },
{ path: 'C:\\Windows\\Fonts\\simhei.ttf', name: 'SimHei' }
];
let fontFamily = 'sans-serif';
let fontFamilyBold = 'sans-serif';
for (const font of fontsToTry) {
try {
if (!GlobalFonts.has(font.name)) {
GlobalFonts.registerFromPath(font.path, font.name);
}
if (font.name.includes('Bold')) {
fontFamilyBold = font.name;
} else if (fontFamily === 'sans-serif') {
fontFamily = font.name;
}
} catch { }
}
if (fontFamilyBold === 'sans-serif') fontFamilyBold = fontFamily;
return { fontFamily, fontFamilyBold };
}
// 背景绘制工具
async function drawBackground(ctx: any, width: number, height: number) {
const backgroundPath = "E:\\NewDevelop\\NapCatQQ\\src\\canvas\\image\\normal\\01.jpg";
try {
const backgroundImage = await loadImage(backgroundPath);
const scale = Math.max(width / backgroundImage.width, height / backgroundImage.height);
const scaledWidth = backgroundImage.width * scale;
const scaledHeight = backgroundImage.height * scale;
const x = (width - scaledWidth) / 2;
const y = (height - scaledHeight) / 2;
ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
ctx.save();
ctx.filter = 'blur(20px) brightness(0.75)';
ctx.drawImage(backgroundImage, x, y, scaledWidth, scaledHeight);
ctx.restore();
} catch {
const gradient = ctx.createLinearGradient(0, 0, width, height);
gradient.addColorStop(0, '#2a2a40');
gradient.addColorStop(1, '#4a3a60');
ctx.fillStyle = gradient;
ctx.fillRect(0, 0, width, height);
}
ctx.fillStyle = 'rgba(15, 15, 25, 0.65)';
ctx.fillRect(0, 0, width, height);
}
// 标题美化工具
function drawTitle(ctx: any, text: string, width: number, y: number, fontFamilyBold: string) {
// 小标题条
ctx.save();
ctx.globalAlpha = 0.32;
ctx.fillStyle = '#c5a8ff';
ctx.fillRect(width / 2 - 220, y - 38, 440, 54);
ctx.restore();
// 标题
ctx.font = `bold 44px ${fontFamilyBold}`;
ctx.fillStyle = '#f0e8ff';
ctx.textAlign = 'center';
ctx.fillText(text, width / 2, y);
// 下划线
ctx.save();
ctx.strokeStyle = '#c5a8ff';
ctx.lineWidth = 3;
ctx.beginPath();
ctx.moveTo(width / 2 - 80, y + 18);
ctx.lineTo(width / 2 + 80, y + 18);
ctx.stroke();
ctx.restore();
}
// 信息行绘制
function drawInfoLine(ctx: any, text: string, x: number, y: number, font: string, color: string | CanvasGradient | CanvasPattern) {
ctx.font = font;
// 兼容 CanvasGradient/CanvasPattern 和 string
if (typeof color === 'string' || color instanceof CanvasGradient || color instanceof CanvasPattern) {
ctx.fillStyle = color;
} else {
ctx.fillStyle = '#c5a8ff';
}
ctx.textAlign = 'left';
ctx.fillText(text, x, y);
}
// 卡片小块绘制
function drawMiniCard(ctx: any, x: number, y: number, w: number, h: number, radius: number, shadow = true, color?: string, shadowColor?: string) {
ctx.save();
if (shadow) {
ctx.shadowColor = shadowColor ?? 'rgba(60, 40, 120, 0.13)';
ctx.shadowBlur = 12;
}
ctx.beginPath();
ctx.roundRect(x, y, w, h, radius);
ctx.closePath();
ctx.fillStyle = color ?? 'rgba(45, 45, 65, 0.89)';
ctx.fill();
ctx.restore();
}
// 底部标识
function drawFooter(ctx: any, width: number, height: number, fontFamily: string) {
ctx.font = `22px ${fontFamily}`;
ctx.fillStyle = 'rgba(255,255,255,0.62)';
ctx.textAlign = 'center';
ctx.textBaseline = 'bottom';
ctx.fillText('NapCat & Plugin', width / 2, height - 24);
}
/**
* 生成REVERSE.1999 信息图片
*/
export async function generate1999InfoImage(userInfo: any): Promise<string> {
const { fontFamily, fontFamilyBold } = getFontFamily();
const width = 2560, height = 1440;
const canvas = createCanvas(width, height);
const ctx = canvas.getContext('2d');
await drawBackground(ctx, width, height);
// 标题
drawTitle(ctx, '账号信息', width, 120, fontFamilyBold);
// 信息内容
const startX = width / 2 - 350, startY = 220, lineH = 62;
const infoList = [
`昵称: ${userInfo.data.list[0]?.basic_module?.name ?? '-'}`,
`角色ID: ${userInfo.data.list[0]?.basic_module?.role_id ?? '-'}`,
`角色数量: ${userInfo.data.list[0]?.basic_module?.custom_items[0]?.value ?? '-'}`,
`登录天数: ${userInfo.data.list[0]?.basic_module?.custom_items[1]?.value ?? '-'}`,
`雨滴数量: ${userInfo.data.list[0]?.basic_module?.custom_items[2]?.value ?? '-'}`,
`你何时睁眼看这个世界: ${userInfo.data.list[1]?.episode_module?.custom_items[0]?.value ?? '-'}`,
`你在哪一幕: ${userInfo.data.list[1]?.episode_module?.custom_items[1]?.value ?? '-'}`,
`人工梦游: ${userInfo.data.list[1]?.episode_module?.custom_items[2]?.value ?? '-'}`,
];
ctx.font = `bold 36px ${fontFamilyBold}`;
ctx.fillStyle = '#c5a8ff';
infoList.forEach((txt, i) => {
drawInfoLine(ctx, txt, startX, startY + i * lineH, ctx.font, ctx.fillStyle);
});
drawFooter(ctx, width, height, fontFamily);
const buffer = canvas.toBuffer('image/png');
return `base64://${buffer.toString('base64')}`;
}
/**
* 生成REVERSE.1999 心相图片
*/
export async function generate1999WeaponImage(userInfo: GameUserDetail): Promise<string> {
const { fontFamily, fontFamilyBold } = getFontFamily();
const width = 2560, height = 1440;
const canvas = createCanvas(width, height);
const ctx = canvas.getContext('2d');
await drawBackground(ctx, width, height);
drawTitle(ctx, '心相', width, 120, fontFamilyBold);
ctx.font = `bold 34px ${fontFamilyBold}`;
ctx.fillStyle = '#c5a8ff';
drawInfoLine(ctx, `昵称: ${userInfo.data.list[0]?.basic_module?.name ?? '-'}`, width / 2 - 350, 180, ctx.font, ctx.fillStyle);
drawInfoLine(ctx, `角色ID: ${userInfo.data.list[0]?.basic_module?.role_id ?? '-'}`, width / 2 - 350, 230, ctx.font, ctx.fillStyle);
const weaponList = userInfo.data.list[3]?.weapon_module?.list ?? [];
const cardW = 420, cardH = 110, gapX = 38, gapY = 32;
const imgSize = 90;
const textLeft = 36 + imgSize + 18; // 缩略图+间隔
const cols = Math.min(5, Math.floor((width - 2 * gapX) / (cardW + gapX)));
const areaW = cols * cardW + (cols - 1) * gapX;
const startX = (width - areaW) / 2;
let y = 280;
ctx.font = `bold 32px ${fontFamilyBold}`;
for (let idx = 0; idx < weaponList.length; idx++) {
const item = weaponList[idx];
const col = idx % cols, row = Math.floor(idx / cols);
const x = startX + col * (cardW + gapX);
const cy = y + row * (cardH + gapY);
drawMiniCard(ctx, x, cy, cardW, cardH, 22);
if (!item) continue; // 跳过空值
// 绘制缩略图
if (item.image?.small_url) {
try {
const img = await loadImage(item.image.small_url);
const imgX = x + 18;
const imgY = cy + (cardH - imgSize) / 2;
ctx.save();
ctx.beginPath();
ctx.arc(imgX + imgSize / 2, imgY + imgSize / 2, imgSize / 2, 0, Math.PI * 2);
ctx.closePath();
ctx.clip();
ctx.drawImage(img, imgX, imgY, imgSize, imgSize);
ctx.restore();
} catch { }
}
ctx.fillStyle = '#f0e8ff';
ctx.font = `bold 32px ${fontFamilyBold}`;
ctx.fillText(item.name ?? '-', x + textLeft, cy + cardH / 2 - 12);
ctx.font = `28px ${fontFamily}`;
ctx.fillStyle = '#c5a8ff';
ctx.fillText(`LV.${item.level ?? '-'}`, x + textLeft, cy + cardH / 2 + 32);
}
drawFooter(ctx, width, height, fontFamily);
const buffer = canvas.toBuffer('image/png');
return `base64://${buffer.toString('base64')}`;
}
/**
* 生成REVERSE.1999 角色图片
*/
export async function generate1999CharacterImage(userInfo: GameUserDetail): Promise<string> {
const { fontFamily, fontFamilyBold } = getFontFamily();
const width = 2560, height = 1440;
const canvas = createCanvas(width, height);
const ctx = canvas.getContext('2d');
await drawBackground(ctx, width, height);
drawTitle(ctx, '角色', width, 120, fontFamilyBold);
ctx.font = `bold 34px ${fontFamilyBold}`;
ctx.fillStyle = '#c5a8ff';
drawInfoLine(ctx, `昵称: ${userInfo.data.list[0]?.basic_module?.name ?? '-'}`, width / 2 - 350, 180, ctx.font, ctx.fillStyle);
drawInfoLine(ctx, `角色ID: ${userInfo.data.list[0]?.basic_module?.role_id ?? '-'}`, width / 2 - 350, 230, ctx.font, ctx.fillStyle);
const charList = userInfo.data.list[2]?.character_module?.list ?? [];
const cardW = 420, cardH = 110, gapX = 38, gapY = 32;
const imgSize = 90;
const textLeft = 36 + imgSize + 18;
const cols = Math.min(5, Math.floor((width - 2 * gapX) / (cardW + gapX)));
const areaW = cols * cardW + (cols - 1) * gapX;
const startX = (width - areaW) / 2;
let y = 280;
ctx.font = `bold 32px ${fontFamilyBold}`;
for (let idx = 0; idx < charList.length; idx++) {
const item = charList[idx];
const col = idx % cols, row = Math.floor(idx / cols);
const x = startX + col * (cardW + gapX);
const cy = y + row * (cardH + gapY);
drawMiniCard(ctx, x, cy, cardW, cardH, 22);
// 绘制缩略图
if (!item) continue; // 跳过空值
if (item.image?.small_url) {
try {
const img = await loadImage(item.image.small_url);
const imgX = x + 18;
const imgY = cy + (cardH - imgSize) / 2;
ctx.save();
ctx.beginPath();
ctx.arc(imgX + imgSize / 2, imgY + imgSize / 2, imgSize / 2, 0, Math.PI * 2);
ctx.closePath();
ctx.clip();
ctx.drawImage(img, imgX, imgY, imgSize, imgSize);
ctx.restore();
} catch { }
}
ctx.fillStyle = '#f0e8ff';
ctx.font = `bold 32px ${fontFamilyBold}`;
ctx.fillText(item.name ?? '-', x + textLeft, cy + cardH / 2 - 12);
ctx.font = `28px ${fontFamily}`;
ctx.fillStyle = '#c5a8ff';
ctx.fillText(`LV.${item.level ?? '-'}`, x + textLeft, cy + cardH / 2 + 32);
}
drawFooter(ctx, width, height, fontFamily);
const buffer = canvas.toBuffer('image/png');
return `base64://${buffer.toString('base64')}`;
}
/**
* 生成REVERSE.1999 绑定/切换结果图片
*/
async function generateSimpleResultImage(title: string, tapId: string, characterName: string): Promise<string> {
const { fontFamily, fontFamilyBold } = getFontFamily();
const width = 900, height = 340;
const canvas = createCanvas(width, height);
const ctx = canvas.getContext('2d');
await drawBackground(ctx, width, height);
// 标题
drawTitle(ctx, title, width, 80, fontFamilyBold);
// 内容卡片
const cardW = 700, cardH = 120, cardX = (width - cardW) / 2, cardY = 120;
drawMiniCard(
ctx,
cardX,
cardY,
cardW,
cardH,
20,
true,
'rgba(197,168,255,0.18)',
'rgba(197,168,255,0.13)'
);
// TapTap ID
ctx.font = `bold 28px ${fontFamilyBold}`;
ctx.fillStyle = '#c5a8ff';
ctx.textAlign = 'left';
ctx.fillText(`TapTap ID:`, cardX + 36, cardY + 48);
ctx.font = `bold 28px ${fontFamilyBold}`;
ctx.fillStyle = '#fffbe6';
ctx.fillText(tapId, cardX + 180, cardY + 48);
// 角色名称
ctx.font = `bold 28px ${fontFamilyBold}`;
ctx.fillStyle = '#c5a8ff';
ctx.fillText(`角色名称:`, cardX + 36, cardY + 88);
ctx.font = `bold 28px ${fontFamilyBold}`;
ctx.fillStyle = '#ffe066';
ctx.fillText(characterName, cardX + 180, cardY + 88);
drawFooter(ctx, width, height, fontFamily);
const buffer = canvas.toBuffer('image/png');
return `base64://${buffer.toString('base64')}`;
}
export async function generate1999BindImage(tapId: string, characterName: string): Promise<string> {
return generateSimpleResultImage('绑定成功', tapId, characterName);
}
export async function generate1999SwitchImage(tapId: string, characterName: string): Promise<string> {
return generateSimpleResultImage('切换成功', tapId, characterName);
}
/**
* 生成REVERSE.1999 账号列表图片
*/
export async function generate1999AccountListImage(accountList: { id: string, name: string, isDefault?: boolean }[]): Promise<string> {
const { fontFamily, fontFamilyBold } = getFontFamily();
const width = 900;
const cardW = 700, cardH = 56, gapY = 18;
const listH = accountList.length * cardH + (accountList.length - 1) * gapY;
const height = Math.max(340, 120 + listH + 60);
const canvas = createCanvas(width, height);
const ctx = canvas.getContext('2d');
await drawBackground(ctx, width, height);
// 标题
drawTitle(ctx, '已绑定账号列表', width, 80, fontFamilyBold);
// 列表区域起始Y垂直居中
const startY = Math.max(140, (height - listH) / 2);
for (let i = 0; i < accountList.length; i++) {
const item = accountList[i];
if (!item) continue; // 跳过空值
const x = (width - cardW) / 2;
const y = startY + i * (cardH + gapY);
// 卡片颜色
const cardColor = item.isDefault ? 'rgba(255, 224, 102, 0.22)' : 'rgba(197, 168, 255, 0.18)';
const shadowColor = item.isDefault ? 'rgba(255, 224, 102, 0.18)' : 'rgba(197, 168, 255, 0.13)';
drawMiniCard(ctx, x, y, cardW, cardH, 16, true, cardColor, shadowColor);
// 账号ID小号灰色
ctx.font = `22px ${fontFamily}`;
ctx.fillStyle = '#b0b0c8';
ctx.textAlign = 'left';
ctx.fillText(`ID: ${item.id}`, x + 28, y + 26);
// 账号名(大号,主色)
ctx.font = `bold 26px ${fontFamilyBold}`;
ctx.fillStyle = item.isDefault ? '#ffe066' : '#c5a8ff';
ctx.fillText(item.name, x + 28, y + 48);
// 当前使用标识
if (item.isDefault) {
ctx.font = `bold 18px ${fontFamilyBold}`;
ctx.fillStyle = '#fffbe6';
ctx.fillText('(当前使用)', x + 28 + ctx.measureText(item.name).width + 12, y + 48);
}
}
drawFooter(ctx, width, height, fontFamily);
const buffer = canvas.toBuffer('image/png');
return `base64://${buffer.toString('base64')}`;
}

View File

@@ -1,23 +0,0 @@
import { OB11Message, OB11MessageData } from '@/onebot';
import { ActionMap } from '@/onebot/action';
/**
* 发送消息工具函数
*/
export async function sendMessage<T extends OB11MessageData[] | string>(
message: OB11Message,
action: ActionMap,
content: T
) {
if (message.message_type === 'private') {
await action.get('send_msg')?._handle({
user_id: message.user_id.toString(),
message: content,
});
} else {
await action.get('send_msg')?._handle({
group_id: message.group_id?.toString(),
message: content,
});
}
};

View File

@@ -7,8 +7,7 @@ import { builtinModules } from 'module';
const external = [
'silk-wasm',
'ws',
'express',
'@napi-rs/canvas'
'express'
];
const nodeModules = [...builtinModules, builtinModules.map((m) => `node:${m}`)].flat();