Merge branch 'main' into feat/packet-more

src/core/apis/packet.ts

@@ -91,7 +91,10 @@ export class NTQQPacketApi {
         const retData = new NapProtoMsg(OidbSvcTrpcTcp0X9067_202_Rsp_Body).decode(body);
         return retData.data.rkeyList;
     }
-
+    async sendGroupSignPacket(groupCode: string) {
+        const packet = this.packetSession?.packer.packGroupSignReq(this.core.selfInfo.uin, groupCode);
+        await this.sendPacket('OidbSvcTrpcTcp.0xeb7', packet!, true);
+    }
     async sendStatusPacket(uin: number): Promise<{ status: number; ext_status: number; } | undefined> {
         let status = 0;
         try {

src/core/packet/packer.ts

@@ -25,6 +25,7 @@ import { PacketMsgConverter } from "@/core/packet/msg/converter";
 import { PacketClient } from "@/core/packet/client";
 import { OidbSvcTrpcTcp0XE37_1700 } from "@/core/packet/proto/oidb/Oidb.0xE37_1700";
 import { OidbSvcTrpcTcp0XE37_800 } from "@/core/packet/proto/oidb/Oidb.0XE37_800";
+import { OidbSvcTrpcTcp0XEB7 } from "./proto/oidb/Oidb.0xEB7";
 
 export type PacketHexStr = string & { readonly hexNya: unique symbol };
 
@@ -694,4 +695,17 @@ export class PacketPacker {
             })
         );
     }
+    packGroupSignReq(uin: string, groupCode: string): PacketHexStr {
+        return this.toHexStr(
+            this.packOidbPacket(0XEB7, 1, new NapProtoMsg(OidbSvcTrpcTcp0XEB7).encode(
+                {
+                    body: {
+                        uin: uin,
+                        groupUin: groupCode,
+                        version: "9.0.90"
+                    }
+                }
+            ), false, false)
+        );
+    }
 }

src/core/packet/proto/oidb/Oidb.0xEB7.ts

@@ -0,0 +1,12 @@
+import { ScalarType } from "@protobuf-ts/runtime";
+import { ProtoField } from "../NapProto";
+
+export const OidbSvcTrpcTcp0XEB7_Body = {
+    uin: ProtoField(1, ScalarType.STRING),
+    groupUin: ProtoField(2, ScalarType.STRING),
+    version: ProtoField(3, ScalarType.STRING),
+};
+
+export const OidbSvcTrpcTcp0XEB7 = {
+    body: ProtoField(2, () => OidbSvcTrpcTcp0XEB7_Body),
+}

src/core/services/NodeIKernelGroupService.ts

@@ -239,7 +239,7 @@ export interface NodeIKernelGroupService {
 
     setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>;
 
-    getGroupRecommendContactArkJson(groupCode: string): unknown;
+    getGroupRecommendContactArkJson(groupCode: string): Promise<GeneralCallResult & { arkJson: string }>;
 
     getJoinGroupLink(param: {
         groupCode: string,