From dacfefe6443313fc0d140fd38ca4170c41a87e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=89=8B=E7=93=9C=E4=B8=80=E5=8D=81=E9=9B=AA?= Date: Mon, 21 Oct 2024 10:17:31 +0800 Subject: [PATCH] style: lint --- src/common/forward-msg-builder.ts | 10 +- src/core/apis/group.ts | 2 +- src/core/apis/packet.ts | 8 +- src/core/packet/highway/client.ts | 8 +- src/core/packet/highway/session.ts | 40 ++--- src/core/packet/highway/uploader.ts | 38 ++--- src/core/packet/highway/utils.ts | 14 +- src/core/packet/msg/builder.ts | 8 +- src/core/packet/msg/converter.ts | 34 ++-- src/core/packet/msg/element.ts | 36 ++-- src/core/packet/msg/message.ts | 4 +- src/core/packet/packer.ts | 158 +++++++++--------- src/core/packet/proto/action/action.ts | 2 +- src/core/packet/proto/highway/highway.ts | 48 +++--- src/core/packet/proto/message/element.ts | 10 +- .../proto/oidb/common/Ntv2.RichMediaReq.ts | 6 +- .../proto/oidb/common/Ntv2.RichMediaResp.ts | 38 ++--- src/core/packet/session.ts | 2 +- src/core/packet/utils/crypto/tea.ts | 2 +- src/onebot/action/extends/GetUserStatus.ts | 2 +- src/onebot/action/file/GetGroupFileUrl.ts | 2 +- src/onebot/action/go-cqhttp/GetForwardMsg.ts | 2 +- src/onebot/action/group/GroupPoke.ts | 2 +- src/onebot/action/index.ts | 4 +- src/onebot/action/msg/SendMsg.ts | 40 ++--- src/onebot/action/packet/GetPacketStatus.ts | 8 +- src/onebot/action/user/FriendPoke.ts | 2 +- src/onebot/api/msg.ts | 18 +- src/onebot/index.ts | 4 +- 29 files changed, 276 insertions(+), 276 deletions(-) diff --git a/src/common/forward-msg-builder.ts b/src/common/forward-msg-builder.ts index aa165b1f..bcd521b0 100644 --- a/src/common/forward-msg-builder.ts +++ b/src/common/forward-msg-builder.ts @@ -1,4 +1,4 @@ -import {PacketMsg} from "@/core/packet/msg/message"; +import { PacketMsg } from "@/core/packet/msg/message"; import * as crypto from "node:crypto"; interface ForwardMsgJson { @@ -78,7 +78,7 @@ export class ForwardMsgBuilder { source: isGroupMsg ? "群聊的聊天记录" : msg.length ? Array.from(new Set(msg.map(m => m.senderName))) - .join('和') + '的聊天记录' + .join('和') + '的聊天记录' : '聊天记录', summary: `查看${msg.length}条转发消息`, uniseq: id, @@ -87,11 +87,11 @@ export class ForwardMsgBuilder { prompt: "[聊天记录]", ver: "0.0.0.5", view: "contact", - } + }; } static fromResId(resId: string): ForwardMsgJson { - return this.build(resId, []) + return this.build(resId, []); } static fromPacketMsg(resId: string, packetMsg: PacketMsg[]): ForwardMsgJson { @@ -101,6 +101,6 @@ export class ForwardMsgBuilder { msg: msg.msg.map(m => ({ preview: m.toPreview(), })) - }))) + }))); } } diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index c907ca3b..cd84ae86 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -318,7 +318,7 @@ export class NTQQGroupApi { async getGroupMembersV2(groupQQ: string, num = 3000): Promise> { const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow'); - let once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 1, 2000, (params) => params.sceneId === sceneId) + const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', 1, 2000, (params) => params.sceneId === sceneId) .catch(); const result = await this.context.session.getGroupService().getNextMemberList(sceneId!, undefined, num); if (result.errCode !== 0) { diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts index dd5a6bb6..e6ff6aa3 100644 --- a/src/core/apis/packet.ts +++ b/src/core/apis/packet.ts @@ -27,7 +27,7 @@ const typedOffset: OffsetType = offset; export class NTQQPacketApi { context: InstanceContext; core: NapCatCore; - logger: LogWrapper + logger: LogWrapper; serverUrl: string | undefined; qqVersion: string | undefined; packetSession: PacketSession | undefined; @@ -64,7 +64,7 @@ export class NTQQPacketApi { if (this.packetSession && this.packetSession.client) { this.packetSession.client.init(process.pid, table.recv, table.send).then().catch(this.logger.logError.bind(this.logger)); } - } + }; await this.packetSession.client.connect(cb); return true; } @@ -112,7 +112,7 @@ export class NTQQPacketApi { } private async uploadResources(msg: PacketMsg[], groupUin: number = 0) { - const reqList = [] + const reqList = []; for (const m of msg) { for (const e of m.msg) { if (e instanceof PacketMsgPicElement) { @@ -143,6 +143,6 @@ export class NTQQPacketApi { if (resp.download.retCode !== 0) { throw new Error(`sendGroupFileDownloadReq error: ${resp.download.clientWording}`); } - return `https://${resp.download.downloadDns}/ftn_handler/${Buffer.from(resp.download.downloadUrl).toString('hex')}/?fname=` + return `https://${resp.download.downloadDns}/ftn_handler/${Buffer.from(resp.download.downloadUrl).toString('hex')}/?fname=`; } } diff --git a/src/core/packet/highway/client.ts b/src/core/packet/highway/client.ts index 0583e676..dcf4ca5c 100644 --- a/src/core/packet/highway/client.ts +++ b/src/core/packet/highway/client.ts @@ -1,8 +1,8 @@ import * as stream from 'node:stream'; -import {ReadStream} from "node:fs"; -import {PacketHighwaySig} from "@/core/packet/highway/session"; -import {HighwayHttpUploader, HighwayTcpUploader} from "@/core/packet/highway/uploader"; -import {LogWrapper} from "@/common/log"; +import { ReadStream } from "node:fs"; +import { PacketHighwaySig } from "@/core/packet/highway/session"; +import { HighwayHttpUploader, HighwayTcpUploader } from "@/core/packet/highway/uploader"; +import { LogWrapper } from "@/common/log"; export interface PacketHighwayTrans { uin: string; diff --git a/src/core/packet/highway/session.ts b/src/core/packet/highway/session.ts index 3a16fecc..54384840 100644 --- a/src/core/packet/highway/session.ts +++ b/src/core/packet/highway/session.ts @@ -1,16 +1,16 @@ import * as fs from "node:fs"; -import {ChatType, Peer} from "@/core"; -import {LogWrapper} from "@/common/log"; -import {PacketClient} from "@/core/packet/client"; -import {PacketPacker} from "@/core/packet/packer"; -import {NapProtoMsg} from "@/core/packet/proto/NapProto"; -import {HttpConn0x6ff_501Response} from "@/core/packet/proto/action/action"; -import {PacketHighwayClient} from "@/core/packet/highway/client"; -import {NTV2RichMediaResp} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp"; -import {OidbSvcTrpcTcpBaseRsp} from "@/core/packet/proto/oidb/OidbBase"; -import {PacketMsgPicElement} from "@/core/packet/msg/element"; -import {NTV2RichMediaHighwayExt} from "@/core/packet/proto/highway/highway"; -import {int32ip2str, oidbIpv4s2HighwayIpv4s} from "@/core/packet/highway/utils"; +import { ChatType, Peer } from "@/core"; +import { LogWrapper } from "@/common/log"; +import { PacketClient } from "@/core/packet/client"; +import { PacketPacker } from "@/core/packet/packer"; +import { NapProtoMsg } from "@/core/packet/proto/NapProto"; +import { HttpConn0x6ff_501Response } from "@/core/packet/proto/action/action"; +import { PacketHighwayClient } from "@/core/packet/highway/client"; +import { NTV2RichMediaResp } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp"; +import { OidbSvcTrpcTcpBaseRsp } from "@/core/packet/proto/oidb/OidbBase"; +import { PacketMsgPicElement } from "@/core/packet/msg/element"; +import { NTV2RichMediaHighwayExt } from "@/core/packet/proto/highway/highway"; +import { int32ip2str, oidbIpv4s2HighwayIpv4s } from "@/core/packet/highway/utils"; export const BlockSize = 1024 * 1024; @@ -42,7 +42,7 @@ export class PacketHighwaySession { sigSession: null, sessionKey: null, serverAddr: [], - } + }; this.packer = packer; this.packetHighwayClient = new PacketHighwayClient(this.sig, this.logger); } @@ -69,8 +69,8 @@ export class PacketHighwaySession { const rsp = new NapProtoMsg(HttpConn0x6ff_501Response).decode( Buffer.from(req.hex_data, 'hex') ); - this.sig.sigSession = rsp.httpConn.sigSession - this.sig.sessionKey = rsp.httpConn.sessionKey + this.sig.sigSession = rsp.httpConn.sigSession; + this.sig.sessionKey = rsp.httpConn.sessionKey; for (const info of rsp.httpConn.serverInfos) { if (info.serviceType !== 1) continue; for (const addr of info.serverAddrs) { @@ -78,7 +78,7 @@ export class PacketHighwaySession { this.sig.serverAddr.push({ ip: int32ip2str(addr.ip), port: addr.port - }) + }); } } } @@ -118,10 +118,10 @@ export class PacketHighwaySession { hash: { fileSha1: [sha1] } - }) + }); await this.packetHighwayClient.upload( 1004, - fs.createReadStream(img.path, {highWaterMark: BlockSize}), + fs.createReadStream(img.path, { highWaterMark: BlockSize }), img.size, md5, extend @@ -157,10 +157,10 @@ export class PacketHighwaySession { hash: { fileSha1: [sha1] } - }) + }); await this.packetHighwayClient.upload( 1003, - fs.createReadStream(img.path, {highWaterMark: BlockSize}), + fs.createReadStream(img.path, { highWaterMark: BlockSize }), img.size, md5, extend diff --git a/src/core/packet/highway/uploader.ts b/src/core/packet/highway/uploader.ts index bef63045..4b4a864f 100644 --- a/src/core/packet/highway/uploader.ts +++ b/src/core/packet/highway/uploader.ts @@ -2,13 +2,13 @@ import * as net from "node:net"; import * as crypto from "node:crypto"; import * as http from "node:http"; import * as stream from "node:stream"; -import {LogWrapper} from "@/common/log"; +import { LogWrapper } from "@/common/log"; import * as tea from "@/core/packet/utils/crypto/tea"; -import {NapProtoMsg} from "@/core/packet/proto/NapProto"; -import {ReqDataHighwayHead, RespDataHighwayHead} from "@/core/packet/proto/highway/highway"; -import {BlockSize} from "@/core/packet/highway/session"; -import {PacketHighwayTrans} from "@/core/packet/highway/client"; -import {Frame} from "@/core/packet/highway/frame"; +import { NapProtoMsg } from "@/core/packet/proto/NapProto"; +import { ReqDataHighwayHead, RespDataHighwayHead } from "@/core/packet/proto/highway/highway"; +import { BlockSize } from "@/core/packet/highway/session"; +import { PacketHighwayTrans } from "@/core/packet/highway/client"; +import { Frame } from "@/core/packet/highway/frame"; abstract class HighwayUploader { readonly trans: PacketHighwayTrans; @@ -53,7 +53,7 @@ abstract class HighwayUploader { uint32LoginSigType: 8, appId: 1600001604, } - }) + }); } abstract upload(): Promise; @@ -89,8 +89,8 @@ export class HighwayTcpUploader extends HighwayUploader { const highwayTransForm = new HighwayTcpUploaderTransform(this); const upload = new Promise((resolve, _) => { const socket = net.connect(this.trans.port, this.trans.server, () => { - this.trans.data.pipe(highwayTransForm).pipe(socket, {end: false}); - }) + this.trans.data.pipe(highwayTransForm).pipe(socket, { end: false }); + }); const handleRspHeader = (header: Buffer) => { const rsp = new NapProtoMsg(RespDataHighwayHead).decode(header); if (rsp.errorCode !== 0) { @@ -111,25 +111,25 @@ export class HighwayTcpUploader extends HighwayUploader { } catch (e) { this.logger.logError(`[Highway] tcpUpload parse response error: ${e}`); } - }) + }); socket.on('close', () => { this.logger.logDebug('[Highway] tcpUpload socket closed.'); resolve(); - }) + }); socket.on('error', (err) => { this.logger.logError('[Highway] tcpUpload socket.on error:', err); - }) + }); this.trans.data.on('error', (err) => { this.logger.logError('[Highway] tcpUpload readable error:', err); socket.end(); - }) - }) + }); + }); const timeout = new Promise((_, reject) => { setTimeout(() => { - reject(new Error(`[Highway] tcpUpload timeout after ${this.trans.timeout}s`)) + reject(new Error(`[Highway] tcpUpload timeout after ${this.trans.timeout}s`)); }, (this.trans.timeout ?? Infinity) * 1000 - ) - }) + ); + }); await Promise.race([upload, timeout]); } } @@ -139,7 +139,7 @@ export class HighwayHttpUploader extends HighwayUploader { async upload(): Promise { let offset = 0; for await (const chunk of this.trans.data) { - let block = chunk as Buffer; + const block = chunk as Buffer; try { await this.uploadBlock(block, offset); } catch (err) { @@ -153,7 +153,7 @@ export class HighwayHttpUploader extends HighwayUploader { private async uploadBlock(block: Buffer, offset: number): Promise { const chunkMD5 = crypto.createHash('md5').update(block).digest(); const payload = this.buildPicUpHead(offset, block.length, chunkMD5); - const frame = Frame.pack(Buffer.from(payload), block) + const frame = Frame.pack(Buffer.from(payload), block); const resp = await this.httpPostHighwayContent(frame, `http://${this.trans.server}:${this.trans.port}/cgi-bin/httpconn?htcmd=0x6FF0087&uin=${this.trans.uin}`); const [head, body] = Frame.unpack(resp); const headData = new NapProtoMsg(RespDataHighwayHead).decode(head); diff --git a/src/core/packet/highway/utils.ts b/src/core/packet/highway/utils.ts index 65e0be44..e786afbd 100644 --- a/src/core/packet/highway/utils.ts +++ b/src/core/packet/highway/utils.ts @@ -1,11 +1,11 @@ -import {NapProtoEncodeStructType} from "@/core/packet/proto/NapProto"; -import {IPv4} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp"; -import {NTHighwayIPv4} from "@/core/packet/proto/highway/highway"; +import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto"; +import { IPv4 } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaResp"; +import { NTHighwayIPv4 } from "@/core/packet/proto/highway/highway"; export const int32ip2str = (ip: number) => { ip = ip & 0xffffffff; return [ip & 0xff, (ip & 0xff00) >> 8, (ip & 0xff0000) >> 16, ((ip & 0xff000000) >> 24) & 0xff].join('.'); -} +}; export const oidbIpv4s2HighwayIpv4s = (ipv4s: NapProtoEncodeStructType[]): NapProtoEncodeStructType[] =>{ return ipv4s.map((ip) => { @@ -15,6 +15,6 @@ export const oidbIpv4s2HighwayIpv4s = (ipv4s: NapProtoEncodeStructType - }) -} + } as NapProtoEncodeStructType; + }); +}; diff --git a/src/core/packet/msg/builder.ts b/src/core/packet/msg/builder.ts index a169cb3f..97736ae2 100644 --- a/src/core/packet/msg/builder.ts +++ b/src/core/packet/msg/builder.ts @@ -1,8 +1,8 @@ import * as crypto from "crypto"; -import {PushMsgBody} from "@/core/packet/proto/message/message"; -import {NapProtoEncodeStructType} from "@/core/packet/proto/NapProto"; -import {LogWrapper} from "@/common/log"; -import {PacketMsg} from "@/core/packet/msg/message"; +import { PushMsgBody } from "@/core/packet/proto/message/message"; +import { NapProtoEncodeStructType } from "@/core/packet/proto/NapProto"; +import { LogWrapper } from "@/common/log"; +import { PacketMsg } from "@/core/packet/msg/message"; export class PacketMsgBuilder { private logger: LogWrapper; diff --git a/src/core/packet/msg/converter.ts b/src/core/packet/msg/converter.ts index 3cd4b8b2..8e2091ec 100644 --- a/src/core/packet/msg/converter.ts +++ b/src/core/packet/msg/converter.ts @@ -28,8 +28,8 @@ import { PacketMsgVideoElement, PacketMultiMsgElement } from "@/core/packet/msg/element"; -import {PacketMsg, PacketSendMsgElement} from "@/core/packet/msg/message"; -import {LogWrapper} from "@/common/log"; +import { PacketMsg, PacketSendMsgElement } from "@/core/packet/msg/message"; +import { LogWrapper } from "@/common/log"; type SendMessageElementMap = { textElement: SendTextElement, @@ -82,50 +82,50 @@ export class PacketMsgConverter { ); if (key) { const elementData = (element as any)[key]; // TODO: - if (elementData) return this.rawToPacketMsgConverters[key](element as any) + if (elementData) return this.rawToPacketMsgConverters[key](element as any); } return null; }).filter((e) => e !== null) - } + }; } private rawToPacketMsgConverters: RawToPacketMsgConverters = { textElement: (element: SendTextElement) => { if (element.textElement.atType) { - return new PacketMsgAtElement(element) + return new PacketMsgAtElement(element); } - return new PacketMsgTextElement(element) + return new PacketMsgTextElement(element); }, picElement: (element: SendPicElement) => { - return new PacketMsgPicElement(element) + return new PacketMsgPicElement(element); }, replyElement: (element: SendReplyElement) => { - return new PacketMsgReplyElement(element) + return new PacketMsgReplyElement(element); }, faceElement: (element: SendFaceElement) => { - return new PacketMsgFaceElement(element) + return new PacketMsgFaceElement(element); }, marketFaceElement: (element: SendMarketFaceElement) => { - return new PacketMsgMarkFaceElement(element) + return new PacketMsgMarkFaceElement(element); }, videoElement: (element: SendVideoElement) => { - return new PacketMsgVideoElement(element) + return new PacketMsgVideoElement(element); }, fileElement: (element: SendFileElement) => { - return new PacketMsgFileElement(element) + return new PacketMsgFileElement(element); }, pttElement: (element: SendPttElement) => { - return new PacketMsgPttElement(element) + return new PacketMsgPttElement(element); }, arkElement: (element: SendArkElement) => { - return new PacketMsgLightAppElement(element) + return new PacketMsgLightAppElement(element); }, markdownElement: (element: SendMarkdownElement) => { - return new PacketMsgMarkDownElement(element) + return new PacketMsgMarkDownElement(element); }, // TODO: check this logic, move it in arkElement? structLongMsgElement: (element: SendStructLongMsgElement) => { - return new PacketMultiMsgElement(element) + return new PacketMultiMsgElement(element); } - } + }; } diff --git a/src/core/packet/msg/element.ts b/src/core/packet/msg/element.ts index dc2984c4..81d1401f 100644 --- a/src/core/packet/msg/element.ts +++ b/src/core/packet/msg/element.ts @@ -1,6 +1,6 @@ import assert from "node:assert"; import * as zlib from "node:zlib"; -import {NapProtoEncodeStructType, NapProtoMsg} from "@/core/packet/proto/NapProto"; +import { NapProtoEncodeStructType, NapProtoMsg } from "@/core/packet/proto/NapProto"; import { CustomFace, Elem, @@ -25,9 +25,9 @@ import { SendTextElement, SendVideoElement } from "@/core"; -import {MsgInfo} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; -import {PacketMsg, PacketSendMsgElement} from "@/core/packet/msg/message"; -import {ForwardMsgBuilder} from "@/common/forward-msg-builder"; +import { MsgInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; +import { PacketMsg, PacketSendMsgElement } from "@/core/packet/msg/message"; +import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; // raw <-> packet // TODO: SendStructLongMsgElement @@ -84,11 +84,11 @@ export class PacketMsgAtElement extends PacketMsgTextElement { text: { str: this.text, pbReserve: new NapProtoMsg(MentionExtra).encode({ - type: this.atAll ? 1 : 2, - uin: 0, - field5: 0, - uid: this.targetUid, - } + type: this.atAll ? 1 : 2, + uin: 0, + field5: 0, + uid: this.targetUid, + } ) } }]; @@ -101,7 +101,7 @@ export class PacketMsgAtElement extends PacketMsgTextElement { export class PacketMsgPicElement extends IPacketMsgElement { path: string; - name: string + name: string; size: number; md5: string; width: number; @@ -131,7 +131,7 @@ export class PacketMsgPicElement extends IPacketMsgElement { pbElem: new NapProtoMsg(MsgInfo).encode(this.msgInfo), businessType: 10, } - }] + }]; } toPreview(): string { @@ -185,7 +185,7 @@ export class PacketMsgReplyElement extends IPacketMsgElement { uid: String(this.targetUid), }), } : undefined, - }] + }]; } toPreview(): string { @@ -219,7 +219,7 @@ export class PacketMsgFaceElement extends IPacketMsgElement { }), businessType: 1 } - }] + }]; } else if (this.faceId < 260) { return [{ face: { @@ -237,7 +237,7 @@ export class PacketMsgFaceElement extends IPacketMsgElement { }), businessType: 1 } - }] + }]; } } @@ -276,7 +276,7 @@ export class PacketMsgMarkFaceElement extends IPacketMsgElement zlib.deflateSync(Buffer.from(this.payload, 'utf-8')) ]) } - }] + }]; } toPreview(): string { @@ -343,7 +343,7 @@ export class PacketMsgMarkDownElement extends IPacketMsgElement { const req = new NapProtoMsg(NTV2RichMediaReq).encode({ - reqHead: { - common: { - requestId: 1, - command: 100 + reqHead: { + common: { + requestId: 1, + command: 100 + }, + scene: { + requestType: 2, + businessType: 1, + sceneType: 1, + c2C: { + accountType: 2, + targetUid: peerUin }, - scene: { - requestType: 2, - businessType: 1, - sceneType: 1, - c2C: { - accountType: 2, - targetUid: peerUin + }, + client: { + agentType: 2, + } + }, + upload: { + uploadInfo: [ + { + fileInfo: { + fileSize: Number(img.size), + fileHash: img.md5, + fileSha1: this.toHexStr(await calculateSha1(img.path)), + fileName: img.name, + type: { + type: 1, + picFormat: img.picType, //TODO: extend NapCat imgType /cc @MliKiowa + videoFormat: 0, + voiceFormat: 0, + }, + width: img.width, + height: img.height, + time: 0, + original: 1 }, + subFileType: 0, + } + ], + tryFastUploadCompleted: true, + srvSendMsg: false, + clientRandomId: crypto.randomBytes(8).readBigUInt64BE() & BigInt('0x7FFFFFFFFFFFFFFF'), + compatQMsgSceneType: 1, + extBizInfo: { + pic: { + bytesPbReserveTroop: Buffer.from("0800180020004200500062009201009a0100a2010c080012001800200028003a00", 'hex'), + textSummary: "Nya~", // TODO: }, - client: { - agentType: 2, + video: { + bytesPbReserve: Buffer.alloc(0), + }, + ptt: { + bytesPbReserve: Buffer.alloc(0), + bytesReserve: Buffer.alloc(0), + bytesGeneralFlags: Buffer.alloc(0), } }, - upload: { - uploadInfo: [ - { - fileInfo: { - fileSize: Number(img.size), - fileHash: img.md5, - fileSha1: this.toHexStr(await calculateSha1(img.path)), - fileName: img.name, - type: { - type: 1, - picFormat: img.picType, //TODO: extend NapCat imgType /cc @MliKiowa - videoFormat: 0, - voiceFormat: 0, - }, - width: img.width, - height: img.height, - time: 0, - original: 1 - }, - subFileType: 0, - } - ], - tryFastUploadCompleted: true, - srvSendMsg: false, - clientRandomId: crypto.randomBytes(8).readBigUInt64BE() & BigInt('0x7FFFFFFFFFFFFFFF'), - compatQMsgSceneType: 1, - extBizInfo: { - pic: { - bytesPbReserveTroop: Buffer.from("0800180020004200500062009201009a0100a2010c080012001800200028003a00", 'hex'), - textSummary: "Nya~", // TODO: - }, - video: { - bytesPbReserve: Buffer.alloc(0), - }, - ptt: { - bytesPbReserve: Buffer.alloc(0), - bytesReserve: Buffer.alloc(0), - bytesGeneralFlags: Buffer.alloc(0), - } - }, - clientSeq: 0, - noNeedCompatMsg: false, - } + clientSeq: 0, + noNeedCompatMsg: false, } - ) + } + ); return this.toHexStr(this.packOidbPacket(0x11c5, 100, req, true, false)); } @@ -299,7 +299,7 @@ export class PacketPacker { fileId: fileUUID } }), true, false) - ) + ); } packC2CFileDownloadReq(selfUid: string, fileUUID: string, fileHash: string): PacketHexStr { @@ -319,6 +319,6 @@ export class PacketPacker { field200: 1, field99999: Buffer.from([0xc0, 0x85, 0x2c, 0x01]) }) - ) + ); } } diff --git a/src/core/packet/proto/action/action.ts b/src/core/packet/proto/action/action.ts index 3d4c9e44..af6b45d6 100644 --- a/src/core/packet/proto/action/action.ts +++ b/src/core/packet/proto/action/action.ts @@ -1,6 +1,6 @@ import { ScalarType } from "@protobuf-ts/runtime"; import { ProtoField } from "../NapProto"; -import {ContentHead, MessageBody, MessageControl, RoutingHead} from "@/core/packet/proto/message/message"; +import { ContentHead, MessageBody, MessageControl, RoutingHead } from "@/core/packet/proto/message/message"; export const FaceRoamRequest = { comm: ProtoField(1, () => PlatInfo, true), diff --git a/src/core/packet/proto/highway/highway.ts b/src/core/packet/proto/highway/highway.ts index cd9cce5d..f69b9e4b 100644 --- a/src/core/packet/proto/highway/highway.ts +++ b/src/core/packet/proto/highway/highway.ts @@ -1,6 +1,6 @@ -import {ScalarType} from "@protobuf-ts/runtime"; -import {ProtoField} from "../NapProto"; -import {MsgInfo, MsgInfoBody} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; +import { ScalarType } from "@protobuf-ts/runtime"; +import { ProtoField } from "../NapProto"; +import { MsgInfo, MsgInfoBody } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; export const DataHighwayHead = { version: ProtoField(1, ScalarType.UINT32), @@ -12,7 +12,7 @@ export const DataHighwayHead = { dataFlag: ProtoField(7, ScalarType.UINT32), commandId: ProtoField(8, ScalarType.UINT32), buildVer: ProtoField(9, ScalarType.BYTES, true), -} +}; export const FileUploadExt = { unknown1: ProtoField(1, ScalarType.INT32), @@ -20,7 +20,7 @@ export const FileUploadExt = { unknown3: ProtoField(3, ScalarType.INT32), entry: ProtoField(100, () => FileUploadEntry), unknown200: ProtoField(200, ScalarType.INT32), -} +}; export const FileUploadEntry = { busiBuff: ProtoField(100, () => ExcitingBusiInfo), @@ -28,14 +28,14 @@ export const FileUploadEntry = { clientInfo: ProtoField(300, () => ExcitingClientInfo), fileNameInfo: ProtoField(400, () => ExcitingFileNameInfo), host: ProtoField(500, () => ExcitingHostConfig), -} +}; export const ExcitingBusiInfo = { busId: ProtoField(1, ScalarType.INT32), senderUin: ProtoField(100, ScalarType.UINT64), receiverUin: ProtoField(200, ScalarType.UINT64), groupCode: ProtoField(400, ScalarType.UINT64), -} +}; export const ExcitingFileEntry = { fileSize: ProtoField(100, ScalarType.UINT64), @@ -44,7 +44,7 @@ export const ExcitingFileEntry = { md5S2: ProtoField(400, ScalarType.BYTES), fileId: ProtoField(600, ScalarType.STRING), uploadKey: ProtoField(700, ScalarType.BYTES), -} +}; export const ExcitingClientInfo = { clientType: ProtoField(100, ScalarType.INT32), @@ -52,31 +52,31 @@ export const ExcitingClientInfo = { terminalType: ProtoField(300, ScalarType.INT32), clientVer: ProtoField(400, ScalarType.STRING), unknown: ProtoField(600, ScalarType.INT32), -} +}; export const ExcitingFileNameInfo = { fileName: ProtoField(100, ScalarType.STRING), -} +}; export const ExcitingHostConfig = { hosts: ProtoField(200, () => ExcitingHostInfo, false, true), -} +}; export const ExcitingHostInfo = { url: ProtoField(1, () => ExcitingUrlInfo), port: ProtoField(2, ScalarType.UINT32), -} +}; export const ExcitingUrlInfo = { unknown: ProtoField(1, ScalarType.INT32), host: ProtoField(2, ScalarType.STRING), -} +}; export const LoginSigHead = { uint32LoginSigType: ProtoField(1, ScalarType.UINT32), bytesLoginSig: ProtoField(2, ScalarType.BYTES), appId: ProtoField(3, ScalarType.UINT32), -} +}; export const NTV2RichMediaHighwayExt = { fileUuid: ProtoField(1, ScalarType.STRING), @@ -85,25 +85,25 @@ export const NTV2RichMediaHighwayExt = { msgInfoBody: ProtoField(6, () => MsgInfoBody, false, true), blockSize: ProtoField(10, ScalarType.UINT32), hash: ProtoField(11, () => NTHighwayHash), -} +}; export const NTHighwayHash = { fileSha1: ProtoField(1, ScalarType.BYTES, false, true), -} +}; export const NTHighwayNetwork = { ipv4s: ProtoField(1, () => NTHighwayIPv4, false, true), -} +}; export const NTHighwayIPv4 = { domain: ProtoField(1, () => NTHighwayDomain), port: ProtoField(2, ScalarType.UINT32), -} +}; export const NTHighwayDomain = { isEnable: ProtoField(1, ScalarType.BOOL), ip: ProtoField(2, ScalarType.STRING), -} +}; export const ReqDataHighwayHead = { msgBaseHead: ProtoField(1, () => DataHighwayHead, true), @@ -111,7 +111,7 @@ export const ReqDataHighwayHead = { bytesReqExtendInfo: ProtoField(3, ScalarType.BYTES, true), timestamp: ProtoField(4, ScalarType.UINT64), msgLoginSigHead: ProtoField(5, () => LoginSigHead, true), -} +}; export const RespDataHighwayHead = { msgBaseHead: ProtoField(1, () => DataHighwayHead, true), @@ -124,7 +124,7 @@ export const RespDataHighwayHead = { timestamp: ProtoField(8, ScalarType.UINT64), range: ProtoField(9, ScalarType.UINT64), isReset: ProtoField(10, ScalarType.UINT32), -} +}; export const SegHead = { serviceId: ProtoField(1, ScalarType.UINT32, true), @@ -140,7 +140,7 @@ export const SegHead = { queryTimes: ProtoField(11, ScalarType.UINT32), updateCacheIp: ProtoField(12, ScalarType.UINT32), cachePort: ProtoField(13, ScalarType.UINT32, true), -} +}; export const GroupAvatarExtra = { type: ProtoField(1, ScalarType.UINT32), @@ -148,8 +148,8 @@ export const GroupAvatarExtra = { field3: ProtoField(3, () => GroupAvatarExtraField3), field5: ProtoField(5, ScalarType.UINT32), field6: ProtoField(6, ScalarType.UINT32), -} +}; export const GroupAvatarExtraField3 = { field1: ProtoField(1, ScalarType.UINT32), -} +}; diff --git a/src/core/packet/proto/message/element.ts b/src/core/packet/proto/message/element.ts index 4290870a..3ed728e3 100644 --- a/src/core/packet/proto/message/element.ts +++ b/src/core/packet/proto/message/element.ts @@ -1,5 +1,5 @@ -import {ScalarType} from "@protobuf-ts/runtime"; -import {ProtoField} from "../NapProto"; +import { ScalarType } from "@protobuf-ts/runtime"; +import { ProtoField } from "../NapProto"; export const Elem = { text: ProtoField(1, () => Text, true), @@ -118,7 +118,7 @@ export const MarketFace = { export const MarketFacePbRes = { field8: ProtoField(8, ScalarType.INT32) -} +}; export const CustomFace = { guid: ProtoField(1, ScalarType.BYTES), @@ -315,7 +315,7 @@ export const SrcMsgPbRes = { senderUid: ProtoField(6, ScalarType.STRING, true), receiverUid: ProtoField(7, ScalarType.STRING, true), friendSeq: ProtoField(8, ScalarType.UINT32, true), -} +}; export const LightAppElem = { data: ProtoField(1, ScalarType.BYTES), @@ -358,4 +358,4 @@ export const QSmallFaceExtra = { export const MarkdownData = { content: ProtoField(1, ScalarType.STRING) -} +}; diff --git a/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts b/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts index 0d768159..2f117520 100644 --- a/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts +++ b/src/core/packet/proto/oidb/common/Ntv2.RichMediaReq.ts @@ -1,5 +1,5 @@ -import {ScalarType} from "@protobuf-ts/runtime"; -import {ProtoField} from "../../NapProto"; +import { ScalarType } from "@protobuf-ts/runtime"; +import { ProtoField } from "../../NapProto"; export const NTV2RichMediaReq = { ReqHead: ProtoField(1, () => MultiMediaReqHead), @@ -160,7 +160,7 @@ export const PicUrlExtInfo = { export const VideoExtInfo = { VideoCodecFormat: ProtoField(1, ScalarType.UINT32), -} +}; export const ExtBizInfo = { Pic: ProtoField(1, () => PicExtBizInfo), diff --git a/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts b/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts index 0b85b36e..e1d16556 100644 --- a/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts +++ b/src/core/packet/proto/oidb/common/Ntv2.RichMediaResp.ts @@ -1,6 +1,6 @@ -import {ScalarType} from "@protobuf-ts/runtime"; -import {ProtoField} from "../../NapProto"; -import {CommonHead, MsgInfo, PicUrlExtInfo, VideoExtInfo} from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; +import { ScalarType } from "@protobuf-ts/runtime"; +import { ProtoField } from "../../NapProto"; +import { CommonHead, MsgInfo, PicUrlExtInfo, VideoExtInfo } from "@/core/packet/proto/oidb/common/Ntv2.RichMediaReq"; export const NTV2RichMediaResp = { respHead: ProtoField(1, () => MultiMediaRespHead), @@ -13,20 +13,20 @@ export const NTV2RichMediaResp = { uploadKeyRenewal: ProtoField(8, () => UploadKeyRenewalResp), downloadSafe: ProtoField(9, () => DownloadSafeResp), extension: ProtoField(99, ScalarType.BYTES, true), -} +}; export const MultiMediaRespHead = { common: ProtoField(1, () => CommonHead), retCode: ProtoField(2, ScalarType.UINT32), message: ProtoField(3, ScalarType.STRING), -} +}; export const DownloadResp = { rKeyParam: ProtoField(1, ScalarType.STRING), rKeyTtlSecond: ProtoField(2, ScalarType.UINT32), info: ProtoField(3, () => DownloadInfo), rKeyCreateTime: ProtoField(4, ScalarType.UINT32), -} +}; export const DownloadInfo = { domain: ProtoField(1, ScalarType.STRING), @@ -36,7 +36,7 @@ export const DownloadInfo = { ipv6s: ProtoField(5, () => IPv6, false, true), picUrlExtInfo: ProtoField(6, () => PicUrlExtInfo), videoExtInfo: ProtoField(7, () => VideoExtInfo), -} +}; export const IPv4 = { outIP: ProtoField(1, ScalarType.UINT32), @@ -44,7 +44,7 @@ export const IPv4 = { inIP: ProtoField(3, ScalarType.UINT32), inPort: ProtoField(4, ScalarType.UINT32), ipType: ProtoField(5, ScalarType.UINT32), -} +}; export const IPv6 = { outIP: ProtoField(1, ScalarType.BYTES), @@ -52,7 +52,7 @@ export const IPv6 = { inIP: ProtoField(3, ScalarType.BYTES), inPort: ProtoField(4, ScalarType.UINT32), ipType: ProtoField(5, ScalarType.UINT32), -} +}; export const UploadResp = { uKey: ProtoField(1, ScalarType.STRING, true), @@ -64,13 +64,13 @@ export const UploadResp = { ext: ProtoField(7, () => RichMediaStorageTransInfo, false, true), compatQMsg: ProtoField(8, ScalarType.BYTES), subFileInfos: ProtoField(10, () => SubFileInfo, false, true), -} +}; export const RichMediaStorageTransInfo = { subType: ProtoField(1, ScalarType.UINT32), extType: ProtoField(2, ScalarType.UINT32), extValue: ProtoField(3, ScalarType.BYTES), -} +}; export const SubFileInfo = { subType: ProtoField(1, ScalarType.UINT32), @@ -78,32 +78,32 @@ export const SubFileInfo = { uKeyTtlSecond: ProtoField(3, ScalarType.UINT32), ipv4s: ProtoField(4, () => IPv4, false, true), ipv6s: ProtoField(5, () => IPv6, false, true), -} +}; export const DownloadSafeResp = { -} +}; export const UploadKeyRenewalResp = { ukey: ProtoField(1, ScalarType.STRING), ukeyTtlSec: ProtoField(2, ScalarType.UINT64), -} +}; export const MsgInfoAuthResp = { authCode: ProtoField(1, ScalarType.UINT32), msg: ProtoField(2, ScalarType.BYTES), resultTime: ProtoField(3, ScalarType.UINT64), -} +}; export const UploadCompletedResp = { msgSeq: ProtoField(1, ScalarType.UINT64), -} +}; export const DeleteResp = { -} +}; export const DownloadRKeyResp = { rKeys: ProtoField(1, () => RKeyInfo, false, true), -} +}; export const RKeyInfo = { rkey: ProtoField(1, ScalarType.STRING), @@ -111,4 +111,4 @@ export const RKeyInfo = { storeId: ProtoField(3, ScalarType.UINT32), rkeyCreateTime: ProtoField(4, ScalarType.UINT32, true), type: ProtoField(5, ScalarType.UINT32, true), -} +}; diff --git a/src/core/packet/session.ts b/src/core/packet/session.ts index 3b95c422..7e636281 100644 --- a/src/core/packet/session.ts +++ b/src/core/packet/session.ts @@ -1,7 +1,7 @@ import { PacketClient } from "@/core/packet/client"; import { PacketHighwaySession } from "@/core/packet/highway/session"; import { LogWrapper } from "@/common/log"; -import {PacketPacker} from "@/core/packet/packer"; +import { PacketPacker } from "@/core/packet/packer"; export class PacketSession { readonly logger: LogWrapper; diff --git a/src/core/packet/utils/crypto/tea.ts b/src/core/packet/utils/crypto/tea.ts index 0c8c1c99..94826a38 100644 --- a/src/core/packet/utils/crypto/tea.ts +++ b/src/core/packet/utils/crypto/tea.ts @@ -76,7 +76,7 @@ export function decrypt(encrypted: Buffer, key: Buffer) { encrypted.writeInt32BE(r1, i); encrypted.writeInt32BE(r2, i + 4); } - if (Buffer.compare(encrypted.subarray(encrypted.length - 7), BUF7) !== 0) throw ERROR_ENCRYPTED_ILLEGAL + if (Buffer.compare(encrypted.subarray(encrypted.length - 7), BUF7) !== 0) throw ERROR_ENCRYPTED_ILLEGAL; // if (Buffer.compare(encrypted.slice(encrypted.length - 7), BUF7) !== 0) throw ERROR_ENCRYPTED_ILLEGAL; return encrypted.subarray((encrypted[0] & 0x07) + 3, encrypted.length - 7); // return encrypted.slice((encrypted[0] & 0x07) + 3, encrypted.length - 7); diff --git a/src/onebot/action/extends/GetUserStatus.ts b/src/onebot/action/extends/GetUserStatus.ts index 5e1b699e..3e7774b7 100644 --- a/src/onebot/action/extends/GetUserStatus.ts +++ b/src/onebot/action/extends/GetUserStatus.ts @@ -1,6 +1,6 @@ import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import {GetPacketStatusDepends} from "@/onebot/action/packet/GetPacketStatus"; +import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; // no_cache get时传字符串 const SchemaData = { type: 'object', diff --git a/src/onebot/action/file/GetGroupFileUrl.ts b/src/onebot/action/file/GetGroupFileUrl.ts index 147df302..fade88ca 100644 --- a/src/onebot/action/file/GetGroupFileUrl.ts +++ b/src/onebot/action/file/GetGroupFileUrl.ts @@ -27,7 +27,7 @@ export class GetGroupFileUrl extends GetPacketStatusDepends>; diff --git a/src/onebot/action/msg/SendMsg.ts b/src/onebot/action/msg/SendMsg.ts index d0efa0df..eab2b2ae 100644 --- a/src/onebot/action/msg/SendMsg.ts +++ b/src/onebot/action/msg/SendMsg.ts @@ -6,14 +6,14 @@ import { OB11PostContext, OB11PostSendMsg, } from '@/onebot/types'; -import {ActionName, BaseCheckResult} from '@/onebot/action/types'; -import {decodeCQCode} from '@/onebot/cqcode'; -import {MessageUnique} from '@/common/message-unique'; -import {ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement} from '@/core'; +import { ActionName, BaseCheckResult } from '@/onebot/action/types'; +import { decodeCQCode } from '@/onebot/cqcode'; +import { MessageUnique } from '@/common/message-unique'; +import { ChatType, ElementType, NapCatCore, Peer, RawMessage, SendArkElement, SendMessageElement } from '@/core'; import BaseAction from '../BaseAction'; -import {rawMsgWithSendMsg} from "@/core/packet/msg/converter"; -import {PacketMsg} from "@/core/packet/msg/message"; -import {ForwardMsgBuilder} from "@/common/forward-msg-builder"; +import { rawMsgWithSendMsg } from "@/core/packet/msg/converter"; +import { PacketMsg } from "@/core/packet/msg/message"; +import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; export interface ReturnDataType { message_id: number; @@ -30,7 +30,7 @@ export enum ContextMode { export function normalize(message: OB11MessageMixType, autoEscape = false): OB11MessageData[] { return typeof message === 'string' ? ( autoEscape ? - [{type: OB11MessageDataType.text, data: {text: message}}] : + [{ type: OB11MessageDataType.text, data: { text: message } }] : decodeCQCode(message) ) : Array.isArray(message) ? message : [message]; } @@ -100,7 +100,7 @@ export class SendMsg extends BaseAction { message: '转发消息不能和普通消息混在一起发送,转发需要保证message只有type为node的元素', }; } - return {valid: true}; + return { valid: true }; } async _handle(payload: OB11PostSendMsg): Promise { @@ -115,7 +115,7 @@ export class SendMsg extends BaseAction { ); if (getSpecialMsgNum(payload, OB11MessageDataType.node)) { - const packetMode = this.core.apis.PacketApi.available + const packetMode = this.core.apis.PacketApi.available; const returnMsgAndResId = packetMode ? await this.handleForwardedNodesPacket(peer, messages as OB11MessageNode[]) : await this.handleForwardedNodes(peer, messages as OB11MessageNode[]); @@ -125,7 +125,7 @@ export class SendMsg extends BaseAction { peerUid: peer.peerUid, chatType: peer.chatType, }, (returnMsgAndResId.message)!.msgId); - return {message_id: msgShortId!, res_id: returnMsgAndResId.res_id}; + return { message_id: msgShortId!, res_id: returnMsgAndResId.res_id }; } else if (returnMsgAndResId.res_id && !returnMsgAndResId.message) { throw Error(`发送转发消息（res_id：${returnMsgAndResId.res_id} 失败`); } @@ -139,10 +139,10 @@ export class SendMsg extends BaseAction { } // log("send msg:", peer, sendElements) - const {sendElements, deleteAfterSentFiles} = await this.obContext.apis.MsgApi + const { sendElements, deleteAfterSentFiles } = await this.obContext.apis.MsgApi .createSendElements(messages, peer); const returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(peer, sendElements, deleteAfterSentFiles); - return {message_id: returnMsg!.id!}; + return { message_id: returnMsg!.id! }; } // TODO: recursively handle forwarded nodes @@ -155,14 +155,14 @@ export class SendMsg extends BaseAction { for (const node of messageNodes) { if ((node.data.id && typeof node.data.content !== "string") || !node.data.id) { const OB11Data = normalize(node.data.content); - const {sendElements} = await this.obContext.apis.MsgApi.createSendElements(OB11Data, msgPeer); + const { sendElements } = await this.obContext.apis.MsgApi.createSendElements(OB11Data, msgPeer); const packetMsgElements: rawMsgWithSendMsg = { senderUin: node.data.user_id ?? +this.core.selfInfo.uin, senderName: node.data.nickname, groupId: msgPeer.chatType === ChatType.KCHATTYPEGROUP ? +msgPeer.peerUid : undefined, time: Date.now(), msg: sendElements, - } + }; logger.logDebug(`handleForwardedNodesPacket 开始转换 ${JSON.stringify(packetMsgElements)}`); const transformedMsg = this.core.apis.PacketApi.packetSession?.packer.packetConverter.rawMsgWithSendMsgToPacketMsg(packetMsgElements); logger.logDebug(`handleForwardedNodesPacket 转换为 ${JSON.stringify(transformedMsg)}`); @@ -179,14 +179,14 @@ export class SendMsg extends BaseAction { arkElement: { bytesData: JSON.stringify(forwardJson), }, - } as SendArkElement + } as SendArkElement; let returnMsg: RawMessage | undefined; try { - returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], [], true).catch(_ => undefined) + returnMsg = await this.obContext.apis.MsgApi.sendMsgWithOb11UniqueId(msgPeer, [finallySendElements], [], true).catch(_ => undefined); } catch (e) { logger.logWarn("发送伪造合并转发消息失败！", e); } - return {message: returnMsg ?? null, res_id: resid}; + return { message: returnMsg ?? null, res_id: resid }; } private async handleForwardedNodes(destPeer: Peer, messageNodes: OB11MessageNode[]): Promise<{ @@ -228,7 +228,7 @@ export class SendMsg extends BaseAction { //完成子卡片生成跳过后续 continue; } - const {sendElements} = await this.obContext.apis.MsgApi + const { sendElements } = await this.obContext.apis.MsgApi .createSendElements(OB11Data, destPeer); //拆分消息 @@ -269,7 +269,7 @@ export class SendMsg extends BaseAction { continue; } const nodeMsg = (await this.core.apis.MsgApi.getMsgsByMsgId(nodeMsgPeer.Peer, [msgId])).msgList[0]; - srcPeer = srcPeer ?? {chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid}; + srcPeer = srcPeer ?? { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid }; if (srcPeer.peerUid !== nodeMsg.peerUid) { needSendSelf = true; } diff --git a/src/onebot/action/packet/GetPacketStatus.ts b/src/onebot/action/packet/GetPacketStatus.ts index d6a2e57f..84c0168c 100644 --- a/src/onebot/action/packet/GetPacketStatus.ts +++ b/src/onebot/action/packet/GetPacketStatus.ts @@ -1,5 +1,5 @@ import BaseAction from '../BaseAction'; -import {ActionName, BaseCheckResult} from '../types'; +import { ActionName, BaseCheckResult } from '../types'; export abstract class GetPacketStatusDepends extends BaseAction { @@ -10,16 +10,16 @@ export abstract class GetPacketStatusDepends extends BaseAction return { valid: false, message: "packetServer不可用，请参照文档 https://napneko.github.io/config/advanced 检查packetServer状态或进行配置！", - } + }; } return { valid: true, - } + }; } } export class GetPacketStatus extends GetPacketStatusDepends { async _handle(payload: any) { - return null + return null; } } diff --git a/src/onebot/action/user/FriendPoke.ts b/src/onebot/action/user/FriendPoke.ts index 5b242fb1..267c6367 100644 --- a/src/onebot/action/user/FriendPoke.ts +++ b/src/onebot/action/user/FriendPoke.ts @@ -1,6 +1,6 @@ import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import {GetPacketStatusDepends} from "@/onebot/action/packet/GetPacketStatus"; +import { GetPacketStatusDepends } from "@/onebot/action/packet/GetPacketStatus"; const SchemaData = { type: 'object', diff --git a/src/onebot/api/msg.ts b/src/onebot/api/msg.ts index d1e2179e..afe3e9cb 100644 --- a/src/onebot/api/msg.ts +++ b/src/onebot/api/msg.ts @@ -26,16 +26,16 @@ import { OB11MessageFileBase, OB11MessageForward, } from '@/onebot'; -import {OB11Entities} from '@/onebot/entities'; -import {EventType} from '@/onebot/event/OB11BaseEvent'; -import {encodeCQCode} from '@/onebot/cqcode'; -import {uri2local} from '@/common/file'; -import {RequestUtil} from '@/common/request'; +import { OB11Entities } from '@/onebot/entities'; +import { EventType } from '@/onebot/event/OB11BaseEvent'; +import { encodeCQCode } from '@/onebot/cqcode'; +import { uri2local } from '@/common/file'; +import { RequestUtil } from '@/common/request'; import fs from 'node:fs'; import fsPromise from 'node:fs/promises'; -import {OB11FriendAddNoticeEvent} from '@/onebot/event/notice/OB11FriendAddNoticeEvent'; -import {decodeSysMessage} from '@/core/packet/proto/old/ProfileLike'; -import {ForwardMsgBuilder} from "@/common/forward-msg-builder"; +import { OB11FriendAddNoticeEvent } from '@/onebot/event/notice/OB11FriendAddNoticeEvent'; +import { decodeSysMessage } from '@/core/packet/proto/old/ProfileLike'; +import { ForwardMsgBuilder } from "@/common/forward-msg-builder"; type RawToOb11Converters = { [Key in keyof MessageElement as Key extends `${string}Element` ? Key : never]: ( @@ -602,7 +602,7 @@ export class OneBotMsgApi { [OB11MessageDataType.node]: async () => undefined, [OB11MessageDataType.forward]: async ({ data }, context) => { - const jsonData = ForwardMsgBuilder.fromResId(data.id) + const jsonData = ForwardMsgBuilder.fromResId(data.id); return this.ob11ToRawConverters.json({ data: { data: JSON.stringify(jsonData) }, type: OB11MessageDataType.json diff --git a/src/onebot/index.ts b/src/onebot/index.ts index e56656ef..0ab7c9d0 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -305,8 +305,8 @@ export class NapCatOneBot11Adapter { m.msgId, ); // if (m.sourceType == MsgSourceType.K_DOWN_SOURCETYPE_AIOINNER) { - await this.emitMsg(m) - .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e)); + await this.emitMsg(m) + .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e)); // } } };