release: v2.0.33

fix: 多处修复

manifest.json

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

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "scripts": {
     "build:framework": "vite build --mode framework",
     "build:shell": "vite build --mode shell",

src/common/framework/napcat.ts

@@ -2,7 +2,7 @@ import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
 
-export const napcat_version = '2.0.32';
+export const napcat_version = '2.0.33';
 
 export class NapCatPathWrapper {
     binaryPath: string;

src/core/apis/group.ts

@@ -261,7 +261,7 @@ export class NTQQGroupApi {
         (
             'NodeIKernelGroupListener/onMemberInfoChange',
             1,
-            forced ? 5000 : 500,
+            forced ? 5000 : 250,
             (params) => {
                 return params === GroupCode;
             },
@@ -269,7 +269,7 @@ export class NTQQGroupApi {
         const EventFunc = this.core.eventWrapper.createEventFunction<EventType>('NodeIKernelGroupService/getMemberInfo');
         const retData = await EventFunc!(GroupCode, [uid], forced);
         if (retData.result !== 0) {
-            throw new Error(`获取群成员信息失败: ${retData.errMsg}`);
+            throw new Error(`${retData.errMsg}`);
         }
         const result = await Listener as unknown;
         let member: GroupMember | undefined;

src/core/apis/user.ts

@@ -120,7 +120,7 @@ export class NTQQUserApi {
             ...profile.simpleInfo.vasInfo,
             ...profile.commonExt,
             ...profile.simpleInfo.baseInfo,
-            qqLevel: profile.commonExt.qqLevel,
+            qqLevel: profile.commonExt?.qqLevel,
             age: profile.simpleInfo.baseInfo.age,
             pendantId: '',
         };
@@ -130,7 +130,7 @@ export class NTQQUserApi {
     async getUserDetailInfo(uid: string) {
         const ret = await this.fetchUserDetailInfo(uid, UserDetailSource.KDB);
         if (ret.uin === '0') {
-            console.log('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.')
+            this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.')
             return await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
         }
         return ret;
@@ -207,9 +207,9 @@ export class NTQQUserApi {
 
     //后期改成流水线处理
     async getUinByUidV2(Uid: string) {
-        let uin = (await this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid])).get(Uid);
+        let uin = (await this.context.session.getGroupService().getUinByUids([Uid])).uins.get(Uid);
         if (uin) return uin;
-        uin = (await this.context.session.getGroupService().getUinByUids([Uid])).uins.get(Uid);
+        uin = (await this.context.session.getProfileService().getUinByUid('FriendsServiceImpl', [Uid])).get(Uid);
         if (uin) return uin;
         uin = (await this.context.session.getUixConvertService().getUin([Uid])).uinInfo.get(Uid);
         if (uin) return uin;

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -3,6 +3,7 @@ import { OB11Constructor } from '../../helper/data';
 import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import { GroupMember } from '@/core';
 
 const SchemaData = {
     type: 'object',
@@ -23,23 +24,25 @@ class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
     async _handle(payload: Payload) {
         const NTQQUserApi = this.CoreContext.apis.UserApi;
         const NTQQGroupApi = this.CoreContext.apis.GroupApi;
-        const NTQQWebApi = this.CoreContext.apis.WebApi;
         const isNocache = typeof payload.no_cache === 'string' ? payload.no_cache === 'true' : !!payload.no_cache;
         const uid = await NTQQUserApi.getUidByUinV2(payload.user_id.toString());
         if (!uid) throw (`Uin2Uid Error ${payload.user_id}不存在`);
-        const member = await NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache);
-        if (!member) throw (`群(${payload.group_id})成员${payload.user_id}不存在`);
-        try {
-            const info = (await NTQQUserApi.getUserDetailInfo(member.uid));
-            this.CoreContext.context.logger.logDebug('群成员详细信息结果', info);
-            Object.assign(member, info);
-        } catch (e) {
-            this.CoreContext.context.logger.logDebug('获取群成员详细信息失败, 只能返回基础信息', e);
+        const [member, info] = await Promise.allSettled([
+            NTQQGroupApi.getGroupMemberV2(payload.group_id.toString(), uid, isNocache),
+            NTQQUserApi.getUserDetailInfo(uid),
+        ]);
+        if (member.status !== 'fulfilled') throw (`群(${payload.group_id})成员${payload.user_id}不存在 ${member.reason}`);
+        if (info.status === 'fulfilled') {
+            this.CoreContext.context.logger.logDebug("群成员详细信息结果", info.value);
+            Object.assign(member, info.value);
+        } else {
+            this.CoreContext.context.logger.logDebug(`获取群成员详细信息失败, 只能返回基础信息 ${info.reason}`);
         }
         const date = Math.round(Date.now() / 1000);
-        const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member);
-        retMember.last_sent_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.lastSpeakTime || date.toString());
-        retMember.join_time = parseInt((await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id))?.joinTime || date.toString());
+        const retMember = OB11Constructor.groupMember(payload.group_id.toString(), member.value as GroupMember);
+        const Member = await this.CoreContext.apis.GroupApi.getGroupMember(payload.group_id.toString(), retMember.user_id);
+        retMember.last_sent_time = parseInt(Member?.lastSpeakTime || date.toString());
+        retMember.join_time = parseInt(Member?.joinTime || date.toString());
         return retMember;
     }
 }

src/onebot/action/msg/SendMsg/create-send-elements.ts

@@ -56,7 +56,7 @@ const _handlers: {
         if (atQQ === 'all') return SendMsgElementConstructor.at(coreContext, atQQ, atQQ, AtType.atAll, '全体成员');
 
         // then the qq is a group member
-        // Mlikiowa V2.0.32 Refactor Todo
+        // Mlikiowa V2.0.33 Refactor Todo
         const uid = await coreContext.apis.UserApi.getUidByUinV2(`${atQQ}`);
         if (!uid) throw new Error('Get Uid Error');
         return SendMsgElementConstructor.at(coreContext, atQQ, uid, AtType.atUser, '');
@@ -161,7 +161,7 @@ const _handlers: {
         } else {
             postData = data;
         }
-        // Mlikiowa V2.0.32 Refactor Todo
+        // Mlikiowa V2.0.33 Refactor Todo
         const signUrl = obContext.configLoader.configData.musicSignUrl;
         if (!signUrl) {
             if (data.type === 'qq') {

src/onebot/helper/data.ts

@@ -419,7 +419,7 @@ export class OB11Constructor {
             return;
         }
         //log("group msg", msg);
-        // Mlikiowa V2.0.32 Refactor Todo
+        // Mlikiowa V2.0.33 Refactor Todo
         // if (msg.senderUin && msg.senderUin !== '0') {
         //   const member = await getGroupMember(msg.peerUid, msg.senderUin);
         //   if (member && member.cardName !== msg.sendMemberName) {

src/webui/ui/NapCat.ts

@@ -30,7 +30,7 @@ async function onSettingWindowCreated(view: Element) {
                 SettingItem(
                     '<span id="napcat-update-title">Napcat</span>',
                     undefined,
-                    SettingButton('V2.0.32', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.0.33', '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("V2.0.32", "napcat-update-button", "secondary")
+          SettingButton("V2.0.33", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([