From f9e44820c1469482b057424063a38bb16bf4de15 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: Tue, 15 Oct 2024 09:20:54 +0800 Subject: [PATCH] =?UTF-8?q?style:=20=E6=A0=87=E5=87=86=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/core/apis/group.ts | 6 ------ src/core/apis/packet.ts | 7 +++---- src/core/packet/client.ts | 8 ++++---- src/core/packet/packer.ts | 2 +- src/core/packet/session.ts | 2 +- src/onebot/action/extends/UploadForwardMsg.ts | 2 -- src/onebot/action/file/GetRecord.ts | 2 +- src/onebot/index.ts | 5 ++--- 8 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/core/apis/group.ts b/src/core/apis/group.ts index 633193c3..9e8023f1 100644 --- a/src/core/apis/group.ts +++ b/src/core/apis/group.ts @@ -45,12 +45,6 @@ export class NTQQGroupApi { ); } - async sendPacketRkey() { - const data = this.core.apis.PacketApi.packetPacker.packRkeyPacket(); - const ret = await this.core.apis.PacketApi.sendPacket('OidbSvcTrpcTcp.0x9067_202', data, true); - //console.log('ret: ', ret); - } - async fetchGroupEssenceList(groupCode: string) { const pskey = (await this.core.apis.UserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!; return this.context.session.getGroupService().fetchGroupEssenceList({ diff --git a/src/core/apis/packet.ts b/src/core/apis/packet.ts index 070bb680..9cf877e4 100644 --- a/src/core/apis/packet.ts +++ b/src/core/apis/packet.ts @@ -61,13 +61,12 @@ export class NTQQPacketApi { } async sendPacket(cmd: string, data: PacketHexStr, rsp = false): Promise { - return this.packetSession!.client!.sendPacket(cmd, data, rsp); + return this.packetSession!.client.sendPacket(cmd, data, rsp); } async sendPokePacket(group: number, peer: number) { const data = this.packetPacker.packPokePacket(group, peer); - const ret = await this.sendPacket('OidbSvcTrpcTcp.0xed3_1', data, false); - //console.log('ret: ', ret); + await this.sendPacket('OidbSvcTrpcTcp.0xed3_1', data, false); } async sendRkeyPacket() { @@ -102,7 +101,7 @@ export class NTQQPacketApi { async sendSetSpecialTittlePacket(groupCode: string, uid: string, tittle: string) { const data = this.packetPacker.packSetSpecialTittlePacket(groupCode, uid, tittle); - const ret = await this.sendPacket('OidbSvcTrpcTcp.0x8fc_2', data, true); + await this.sendPacket('OidbSvcTrpcTcp.0x8fc_2', data, true); } async sendUploadForwardMsg(msg: PacketForwardNode[], groupUin: number = 0) { diff --git a/src/core/packet/client.ts b/src/core/packet/client.ts index fde3d8f3..18d61da5 100644 --- a/src/core/packet/client.ts +++ b/src/core/packet/client.ts @@ -21,8 +21,8 @@ export class PacketClient { private websocket: WebSocket | undefined; private isConnected: boolean = false; private reconnectAttempts: number = 0; - private maxReconnectAttempts: number = 5; - private cb = new LRUCache Promise>(500); // trace_id-type callback + private readonly maxReconnectAttempts: number = 5;//现在暂时不可配置 + private readonly cb = new LRUCache Promise>(500); // trace_id-type callback private readonly clientUrl: string = ''; private readonly napCatCore: NapCatCore; private readonly logger: LogWrapper; @@ -61,7 +61,7 @@ export class PacketClient { this.websocket.onerror = (error) => { this.logger.logError.bind(this.logger)(`WebSocket error: ${error}`); - reject(error); + reject(new Error(`${error.message}`)); }; this.websocket.onmessage = (event) => { @@ -172,7 +172,7 @@ export class PacketClient { const trace_id = (this.randText(4) + md5 + data).slice(0, data.length / 2); this.sendCommand(cmd, data, trace_id, rsp, 5000, async () => { await this.napCatCore.context.session.getMsgService().sendSsoCmdReqByContend(cmd, trace_id); - }).then((res) => resolve(res)).catch((e) => reject(e)); + }).then((res) => resolve(res)).catch((e: Error) => reject(e)); }); } } diff --git a/src/core/packet/packer.ts b/src/core/packet/packer.ts index 9dd58928..9893d6d6 100644 --- a/src/core/packet/packer.ts +++ b/src/core/packet/packer.ts @@ -12,7 +12,7 @@ import { PacketForwardNode } from "@/core/packet/msg/entity/forward"; export type PacketHexStr = string & { readonly hexNya: unique symbol }; export class PacketPacker { - private packetBuilder: PacketMsgBuilder; + private readonly packetBuilder: PacketMsgBuilder; constructor() { this.packetBuilder = new PacketMsgBuilder(); diff --git a/src/core/packet/session.ts b/src/core/packet/session.ts index 83ed2e59..775e1bc7 100644 --- a/src/core/packet/session.ts +++ b/src/core/packet/session.ts @@ -5,7 +5,7 @@ import { LogWrapper } from "@/common/log"; export class PacketSession { readonly logger: LogWrapper; readonly client: PacketClient; - private highwayClient: PacketHighwayClient; + private readonly highwayClient: PacketHighwayClient; constructor(logger: LogWrapper, client: PacketClient) { this.logger = logger; diff --git a/src/onebot/action/extends/UploadForwardMsg.ts b/src/onebot/action/extends/UploadForwardMsg.ts index 65fb14c4..239895aa 100644 --- a/src/onebot/action/extends/UploadForwardMsg.ts +++ b/src/onebot/action/extends/UploadForwardMsg.ts @@ -1,8 +1,6 @@ import BaseAction from '../BaseAction'; import { ActionName } from '../types'; import { FromSchema, JSONSchema } from 'json-schema-to-ts'; -import { PacketMsgTextElement } from "@/core/packet/msg/element"; -import { SendTextElement } from "@/core"; const SchemaData = { diff --git a/src/onebot/action/file/GetRecord.ts b/src/onebot/action/file/GetRecord.ts index 05288c20..742a8b50 100644 --- a/src/onebot/action/file/GetRecord.ts +++ b/src/onebot/action/file/GetRecord.ts @@ -58,7 +58,7 @@ export default class GetRecord extends GetFileBase { } }); - ffmpeg.on('error', (error) => { + ffmpeg.on('error', (error: Error) => { reject(error); }); }); diff --git a/src/onebot/index.ts b/src/onebot/index.ts index 066b1575..43af0253 100644 --- a/src/onebot/index.ts +++ b/src/onebot/index.ts @@ -45,8 +45,7 @@ import { OB11GroupRecallNoticeEvent } from '@/onebot/event/notice/OB11GroupRecal import { LRUCache } from '@/common/lru-cache'; import { NodeIKernelRecentContactListener } from '@/core/listeners/NodeIKernelRecentContactListener'; import { Native } from '@/native'; -import { decodeMessage, decodeRecallGroup, Message, RecallGroup } from '@/core/packet/proto/old/Message'; -import { OB11MessageDataType } from './types'; +import { decodeMessage, decodeRecallGroup } from '@/core/packet/proto/old/Message'; //OneBot实现类 export class NapCatOneBot11Adapter { @@ -85,7 +84,7 @@ export class NapCatOneBot11Adapter { if (!this.nativeCore.inited) throw new Error('Native Not Init'); this.nativeCore.registerRecallCallback(async (hex: string) => { try { - const data = decodeMessage(Buffer.from(hex, 'hex')) as any; + const data = decodeMessage(Buffer.from(hex, 'hex')); //data.MsgHead.BodyInner.MsgType SubType const bodyInner = data.msgHead?.bodyInner; //context.logger.log("[appNative] Parse MsgType:" + bodyInner.msgType + " / SubType:" + bodyInner.subType);