release: 3.1.4

优化 contact 支持群聊和私聊

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "3.1.1",
+  "version": "3.1.4",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",
@@ -13,6 +13,7 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.24.7",
     "@log4js-node/log4js-api": "^1.0.2",
+    "@protobuf-ts/runtime": "^2.9.4",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/cors": "^2.8.17",
@@ -23,29 +24,28 @@
     "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^8.3.0",
     "@typescript-eslint/parser": "^8.3.0",
+    "ajv": "^8.13.0",
+    "async-mutex": "^0.5.0",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "cors": "^2.8.5",
     "eslint": "^8.57.0",
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-import": "^2.29.1",
+    "fast-xml-parser": "^4.3.6",
+    "file-type": "^19.0.0",
+    "image-size": "^1.1.1",
+    "json-schema-to-ts": "^3.1.1",
     "typescript": "^5.3.3",
     "vite": "^5.2.6",
     "vite-plugin-cp": "^4.0.8",
-    "vite-tsconfig-paths": "^4.3.2",
-    "@protobuf-ts/runtime": "^2.9.4",
-    "ajv": "^8.13.0",
-    "fast-xml-parser": "^4.3.6",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "async-mutex": "^0.5.0",
-    "file-type": "^19.0.0",
-    "json-schema-to-ts": "^3.1.1",
-    "image-size": "^1.1.1",
-    "cors": "^2.8.5"
+    "vite-tsconfig-paths": "^4.3.2"
   },
   "dependencies": {
-    "qrcode-terminal": "^0.12.0",
-    "fluent-ffmpeg": "^2.1.2",
     "express": "^5.0.0-beta.2",
+    "fluent-ffmpeg": "^2.1.2",
     "log4js": "^6.9.1",
+    "qrcode-terminal": "^0.12.0",
     "silk-wasm": "^3.6.1",
     "ws": "^8.18.0"
   }

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.1.1';
+export const napCatVersion = '3.1.4';

src/core/apis/file.ts

@@ -30,7 +30,7 @@ export class NTQQFileApi {
     context: InstanceContext;
     core: NapCatCore;
     rkeyManager: RkeyManager;
-    packetRkey: Array<{ rkey: string; time: number; type: number; }> | undefined;
+    packetRkey: Array<{ rkey: string; time: number; type: number; ttl: bigint }> | undefined;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
@@ -378,10 +378,12 @@ export class NTQQFileApi {
             };
             try {
                 if (this.core.apis.PacketApi.available) {
-                    if ((!this.packetRkey || this.packetRkey[0].time > Date.now() / 1000)) {
+                    let rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                    let rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                    if (rkey_expired_private || rkey_expired_group) {
                         this.packetRkey = await this.core.apis.PacketApi.sendRkeyPacket();
                     }
-                    if (this.packetRkey.length > 0) {
+                    if (this.packetRkey && this.packetRkey.length > 0) {
                         rkeyData.group_rkey = this.packetRkey[1].rkey.slice(6);
                         rkeyData.private_rkey = this.packetRkey[0].rkey.slice(6);
                         rkeyData.online_rkey = true;

src/core/apis/packet.ts

@@ -86,7 +86,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

@@ -18,6 +18,7 @@ import { OidbSvcTrpcTcp0x6D6 } from "@/core/packet/proto/oidb/Oidb.0x6D6";
 import { OidbSvcTrpcTcp0XE37_1200 } from "@/core/packet/proto/oidb/Oidb.0xE37_1200";
 import { PacketMsgConverter } from "@/core/packet/msg/converter";
 import { PacketClient } from "@/core/packet/client";
+import { OidbSvcTrpcTcp0XEB7 } from "./proto/oidb/Oidb.0xEB7";
 
 export type PacketHexStr = string & { readonly hexNya: unique symbol };
 
@@ -321,4 +322,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.0x9067_202.ts

@@ -14,6 +14,7 @@ export const OidbSvcTrpcTcp0X9067_202Key = {
 //Rsp
 export const OidbSvcTrpcTcp0X9067_202_RkeyList = {
     rkey: ProtoField(1, ScalarType.STRING),
+    ttl: ProtoField(2, ScalarType.UINT64),
     time: ProtoField(4, ScalarType.UINT32),
     type: ProtoField(5, ScalarType.UINT32),
 

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,

src/onebot/action/extends/GetGroupAddRequest.ts

@@ -1,3 +1,4 @@
+import { GroupNotifyMsgStatus } from '@/core';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 
@@ -11,18 +12,22 @@ export default class GetGroupAddRequest extends BaseAction<null, OB11GroupReques
     actionName = ActionName.GetGroupIgnoreAddRequest;
 
     async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {
-        // const data = await this.core.apis.GroupApi.getGroupIgnoreNotifies();
-        // log(data);
-        // const notifies: GroupNotify[] = data.notifies.filter(notify => notify.status === GroupNotifyStatus.WAIT_HANDLE);
-        // const returnData: OB11GroupRequestNotify[] = [];
-        // for (const notify of notifies) {
-        //   const uin = || (await NTQQUserApi.getUserDetailInfo(notify.user1.uid))?.uin;
-        //   returnData.push({
-        //     group_id: parseInt(notify.group.groupCode),
-        //     user_id: parseInt(uin),
-        //     flag: notify.seq
-        //   });
-        // }
-        return null;
+        const ignoredNotifies = await this.core.apis.GroupApi.getSingleScreenNotifies(true, 10);
+        const retData: any = {
+            join_requests: await Promise.all(
+                ignoredNotifies
+                    .filter(notify => notify.type === 7)
+                    .map(async SSNotify => ({
+                        request_id: SSNotify.seq,
+                        requester_uin: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user1?.uid),
+                        requester_nick: SSNotify.user1?.nickName,
+                        group_id: SSNotify.group?.groupCode,
+                        group_name: SSNotify.group?.groupName,
+                        checked: SSNotify.status !== GroupNotifyMsgStatus.KUNHANDLE,
+                        actor: await this.core.apis.UserApi.getUinByUidV2(SSNotify.user2?.uid) || 0,
+                    }))),
+        };
+
+        return retData;
     }
 }

src/onebot/action/extends/SetGroupSign.ts

@@ -0,0 +1,22 @@
+import BaseAction from '../BaseAction';
+import { ActionName } from '../types';
+import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+
+const SchemaData = {
+    type: 'object',
+    properties: {
+        group_id: { type: 'string' },
+    },
+    required: ['group_id'],
+} as const satisfies JSONSchema;
+
+type Payload = FromSchema<typeof SchemaData>;
+
+export class SetGroupSign extends BaseAction<Payload, any> {
+    actionName = ActionName.SetGroupSign;
+    payloadSchema = SchemaData;
+
+    async _handle(payload: Payload) {
+        return await this.core.apis.PacketApi.sendGroupSignPacket(payload.group_id);
+    }
+}

src/onebot/action/index.ts

@@ -93,6 +93,7 @@ import { GetGroupFileUrl } from "@/onebot/action/file/GetGroupFileUrl";
 import { GetPacketStatus } from "@/onebot/action/packet/GetPacketStatus";
 import { FriendPoke } from "@/onebot/action/user/FriendPoke";
 import { GetCredentials } from './system/GetCredentials';
+import { SetGroupSign } from './extends/SetGroupSign';
 
 
 export type ActionMap = Map<string, BaseAction<any, any>>;
@@ -115,6 +116,7 @@ export function createActionMap(obContext: NapCatOneBot11Adapter, core: NapCatCo
         new SetQQAvatar(obContext, core),
         new TranslateEnWordToZn(obContext, core),
         new GetGroupRootFiles(obContext, core),
+        new SetGroupSign(obContext, core),
         // onebot11
         new SendLike(obContext, core),
         new GetMsg(obContext, core),

src/onebot/action/types.ts

@@ -59,7 +59,7 @@ export enum ActionName {
     // QidianGetAccountInfo = 'qidian_get_account_info',
     // GetModelShow = '_get_model_show',
     // SetModelShow = '_set_model_show',
-    // GetOnlineClient = 'get_online_clients',
+    GetOnlineClient = 'get_online_clients',
     // GetUnidirectionalFriendList = 'get_unidirectional_friend_list',
     // DeleteFriend = 'delete_friend',
     // DeleteUnidirectionalFriendList = 'delete_unidirectional_friend',
@@ -105,11 +105,6 @@ export enum ActionName {
     ForwardFriendSingleMsg = 'forward_friend_single_msg',
     ForwardGroupSingleMsg = 'forward_group_single_msg',
     TranslateEnWordToZn = 'translate_en2zh',
-    GetGroupFileCount = 'get_group_file_count',
-    GetGroupFileList = 'get_group_file_list',
-    SetGroupFileFolder = 'set_group_file_folder',
-    DelGroupFile = 'del_group_file',
-    DelGroupFileFolder = 'del_group_file_folder',
     SetMsgEmojiLike = 'set_msg_emoji_like',
     GoCQHTTP_SendForwardMsg = 'send_forward_msg',
     MarkPrivateMsgAsRead = 'mark_private_msg_as_read',
@@ -125,7 +120,7 @@ export enum ActionName {
     FetchEmojiLike = 'fetch_emoji_like',
     SetInputStatus = 'set_input_status',
     GetGroupInfoEx = 'get_group_info_ex',
-    GetGroupIgnoredNotifies = 'get_group_ignored_notifies',
+    GetGroupIgnoreAddRequest = 'get_group_ignore_add_request',
     DelGroupNotice = '_del_group_notice',
     FetchUserProfileLike = 'fetch_user_profile_like',
     FriendPoke = 'friend_poke',
@@ -135,12 +130,11 @@ export enum ActionName {
     GetRkey = 'nc_get_rkey',
     GetGroupShutList = 'get_group_shut_list',
 
-    // GetGroupIgnoreAddRequest = 'get_group_ignore_add_request',
-    // GetConfig = 'get_config',
-    // SetConfig = 'set_config',
-    // Debug = 'debug',
-    // GetGuildList = 'get_guild_list',
-    // TestApi01 = 'test_api_01',
-    // GetGuildProfile = 'get_guild_service_profile',
+    GetGuildList = 'get_guild_list',
+    GetGuildProfile = 'get_guild_service_profile',
+
+    GetGroupIgnoredNotifies = 'get_group_ignored_notifies',
+    
+    SetGroupSign = "set_group_sign",
     // UploadForwardMsg = "upload_forward_msg",
 }

src/onebot/api/msg.ts

@@ -624,12 +624,20 @@ export class OneBotMsgApi {
 
         [OB11MessageDataType.miniapp]: async () => undefined,
 
-        [OB11MessageDataType.contact]: async ({ data }, context) => {
-            const arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(data.id.toString(), '');
-            return this.ob11ToRawConverters.json({
-                data: { data: arkJson.arkMsg },
-                type: OB11MessageDataType.json
-            }, context);
+        [OB11MessageDataType.contact]: async ({ data: { type = "qq", id } }, context) => {
+            if(type === "qq"){
+                const arkJson = await this.core.apis.UserApi.getBuddyRecommendContactArkJson(id.toString(), '');
+                return this.ob11ToRawConverters.json({
+                    data: { data: arkJson.arkMsg },
+                    type: OB11MessageDataType.json
+                }, context);
+            }else if(type === "group"){
+                const arkJson = await this.core.apis.GroupApi.getGroupRecommendContactArkJson(id.toString());
+                return this.ob11ToRawConverters.json({
+                    data: { data: arkJson.arkJson },
+                    type: OB11MessageDataType.json
+                }, context);
+            }
         }
     };
 

src/onebot/types/message.ts

@@ -85,6 +85,7 @@ export interface OB11MessageText {
 export interface OB11MessageContext {
     type: OB11MessageDataType.contact,
     data: {
+        type:"qq"|"group",
         id: string,
     }
 }

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V3.1.1', 'napcat-update-button', 'secondary'),
+                    SettingButton('V3.1.4', 'napcat-update-button', 'secondary'),
                 ),
             ]),
             SettingList([

static/assets/renderer.js

@@ -164,7 +164,7 @@ async function onSettingWindowCreated(view) {
         SettingItem(
           '<span id="napcat-update-title">Napcat</span>',
           void 0,
-          SettingButton("V3.1.1", "napcat-update-button", "secondary")
+          SettingButton("V3.1.4", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([