GuanM/NapCatQQ
1
0
Fork 0
mirror of https://github.com/NapNeko/NapCatQQ.git synced 2024-11-21 09:36:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: oidb

Browse Source
This commit is contained in:
手瓜一十雪 2024-10-13 10:10:12 +08:00
parent b7e875c77f
commit c517790391
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/core/apis/packet.ts
View File

@ -6,6 +6,7 @@ import { PacketClient } from '../helper/packet';
import { NapProtoMsg } from '../proto/NapProto'; import { NapProtoMsg } from '../proto/NapProto';
import { OidbSvcTrpcTcp0X9067_202 } from '../proto/oidb/Oidb.0x9067_202'; import { OidbSvcTrpcTcp0X9067_202 } from '../proto/oidb/Oidb.0x9067_202';
import { OidbSvcTrpcTcpBase } from '../proto/oidb/OidbBase'; import { OidbSvcTrpcTcpBase } from '../proto/oidb/OidbBase';
import { OidbSvcTrpcTcp0XFE1_2 } from '../proto/oidb/Oidb.fe1_2';
interface OffsetType { interface OffsetType {
[key: string]: { [key: string]: {
@ -68,7 +69,7 @@ export class NTQQPacketApi {
}).then((res) => resolve(res)).catch((e) => reject(e)); }).then((res) => resolve(res)).catch((e) => reject(e));
}); });
} }
async sendRkeyPacket() { async buildRkeyPacket() {
let oidb_0x9067_202 = new NapProtoMsg(OidbSvcTrpcTcp0X9067_202).encode({ let oidb_0x9067_202 = new NapProtoMsg(OidbSvcTrpcTcp0X9067_202).encode({
reqHead: { reqHead: {
common: { common: {
@ -84,13 +85,27 @@ export class NTQQPacketApi {
agentType: 2 agentType: 2
} }
}, },
downloadRKeyReq: Buffer.from('080a08140802', 'hex'), downloadRKeyReq: [10, 20, 2],
}); });
let oidb_packet = new NapProtoMsg(OidbSvcTrpcTcpBase).encode({ let oidb_packet = new NapProtoMsg(OidbSvcTrpcTcpBase).encode({
command: 0x9067, command: 0x9067,
subCommand: 202, subCommand: 202,
body: oidb_0x9067_202 body: oidb_0x9067_202,
isReserved: 1
}); });
return oidb_0x9067_202; return oidb_packet;
}
async buildStatusPacket(uin: number) {
let oidb_0xfe1_2 = new NapProtoMsg(OidbSvcTrpcTcp0XFE1_2).encode({
uin: uin,
key: [27327]
})
let oidb_packet = new NapProtoMsg(OidbSvcTrpcTcpBase).encode({
command: 0xfe1,
subCommand: 2,
body: oidb_0xfe1_2,
isReserved: 1
});
return oidb_packet;
} }
} }

5
src/core/proto/oidb/Oidb.0x9067_202.ts
View File

@ -4,5 +4,8 @@ import { MultiMediaReqHead } from "./common/Ntv2.RichMedia";
export const OidbSvcTrpcTcp0X9067_202 = { export const OidbSvcTrpcTcp0X9067_202 = {
ReqHead: ProtoField(1, () => MultiMediaReqHead), ReqHead: ProtoField(1, () => MultiMediaReqHead),
DownloadRKeyReq: ProtoField(4, ScalarType.BYTES), DownloadRKeyReq: ProtoField(4, () => OidbSvcTrpcTcp0X9067_202Key, true, false),
}
export const OidbSvcTrpcTcp0X9067_202Key = {
key: ProtoField(1, ScalarType.UINT32)
} }

2
src/core/proto/oidb/Oidb.fe1_2.ts
View File

@ -3,7 +3,7 @@ import {ProtoField} from "../NapProto";
export const OidbSvcTrpcTcp0XFE1_2 = { export const OidbSvcTrpcTcp0XFE1_2 = {
uid: ProtoField(1, ScalarType.STRING, true), uid: ProtoField(1, ScalarType.STRING, true),
field2: ProtoField(2, ScalarType.UINT32), uin: ProtoField(2, ScalarType.UINT32),
key: ProtoField(3, () => OidbSvcTrpcTcp0XFE1_2Key, false, true), key: ProtoField(3, () => OidbSvcTrpcTcp0XFE1_2Key, false, true),
} }