release: v3.0.4

feat: More user-friendly packetServer error message

launcher/qqnt.json

@@ -1,8 +1,8 @@
 {
   "name": "qq-chat",
-  "version": "9.9.15-28788",
+  "version": "9.9.16-28788",
   "verHash": "73b0c8f6",
-  "linuxVersion": "3.2.12-28788",
+  "linuxVersion": "3.2.13-28788",
   "linuxVerHash": "55fb6434",
   "type": "module",
   "private": true,
@@ -23,4 +23,4 @@
   "isByteCodeShell": true,
   "platform": "win32",
   "eleArch": "x64"
-}
+}

manifest.json

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

package.json

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

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '3.0.0';
+export const napCatVersion = '3.0.4';

src/core/apis/friend.ts

@@ -11,7 +11,7 @@ export class NTQQFriendApi {
         this.core = core;
     }
     async setBuddyRemark(uid: string, remark: string) {
-        return this.context.session.getBuddyService().setBuddyRemark(uid, remark);
+        return this.context.session.getBuddyService().setBuddyRemark({ uid, remark });
     }
     async getBuddyV2SimpleInfoMap(refresh = false) {
         const buddyService = this.context.session.getBuddyService();

src/core/entities/msg.ts

@@ -517,6 +517,12 @@ export enum AtType {
     atAll = 1,
     atUser = 2
 }
+export enum MsgSourceType {
+    K_DOWN_SOURCETYPE_AIOINNER = 1,
+    K_DOWN_SOURCETYPE_BIGSCREEN = 2,
+    K_DOWN_SOURCETYPE_HISTORY = 3,
+    K_DOWN_SOURCETYPE_UNKNOWN = 0
+}
 
 // 来自Android分析
 export enum ChatType {
@@ -874,6 +880,8 @@ export interface RawMessage {
     /**
      * 扩展字段，与 Ob11 msg ID 有关
      */
+
+
     id?: number;
 
     guildId: string;
@@ -950,6 +958,8 @@ export interface RawMessage {
     records: RawMessage[];
 
     elements: MessageElement[];
+
+    sourceType: MsgSourceType;
 }
 export interface QueryMsgsParams {
     chatInfo: Peer;

src/core/packet/highway/session.ts

@@ -49,8 +49,8 @@ export class PacketHighwaySession {
 
     private async checkAvailable() {
         if (!this.packetClient.available) {
-            this.logger.logError('[Highway] packetClient not available!');
-            throw new Error('packetClient not available!');
+            this.logger.logError('[Highway] packetServer not available!');
+            throw new Error('packetServer不可用，请参照文档 https://napneko.github.io/config/advanced 检查packetServer状态或进行配置');
         }
         if (this.sig.sigSession === null || this.sig.sessionKey === null) {
             this.logger.logWarn('[Highway] sigSession or sessionKey not available!');

src/core/packet/msg/element.ts

@@ -363,6 +363,10 @@ export class PacketMultiMsgElement extends IPacketMsgElement<SendStructLongMsgEl
         this.message = message ?? [];
     }
 
+    get isGroupMsg(): boolean {
+        return this.message.some(msg => msg.groupId !== undefined);
+    }
+
     get JSON() {
         const id = crypto.randomUUID();
         return {
@@ -387,7 +391,11 @@ export class PacketMultiMsgElement extends IPacketMsgElement<SendStructLongMsgEl
                         text: `${packetMsg.senderName}: ${packetMsg.msg.map(msg => msg.toPreview()).join('')}`,
                     })),
                     resid: this.resid,
-                    source: "聊天记录",  // TODO:
+                    source: this.isGroupMsg ? "群聊的聊天记录" :
+                        this.message.length
+                            ? Array.from(new Set(this.message.map(msg => msg.senderName)))
+                            .join('和') + '的聊天记录'
+                            : '聊天记录',
                     summary: `查看${this.message.length}条转发消息`,
                     uniseq: id,
                 }

src/core/packet/packer.ts

@@ -114,9 +114,7 @@ export class PacketPacker {
                 }
             }
         );
-        this.logger.logDebug("packUploadForwardMsg LONGMSGRESULT!!!", this.toHexStr(longMsgResultData));
         const payload = zlib.gzipSync(Buffer.from(longMsgResultData));
-        // this.logger.logDebug("packUploadForwardMsg PAYLOAD!!!", payload);
         const req = new NapProtoMsg(SendLongMsgReq).encode(
             {
                 info: {

src/core/services/NodeIKernelBuddyService.ts

@@ -36,7 +36,7 @@ export interface NodeIKernelBuddyService {
 
     getBuddyRemark(uid: number): string;
 
-    setBuddyRemark(uid: string, remark: string): void;
+    setBuddyRemark(param: { uid: string, remark: string, signInfo?: unknown }): void;
 
     getAvatarUrl(uid: number): string;
 

src/onebot/action/extends/GetUserStatus.ts

@@ -1,6 +1,6 @@
-import BaseAction from '../BaseAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
+import {GetPacketStatusDepends} from "@/onebot/action/packet/GetPacketStatus";
 // no_cache get时传字符串
 const SchemaData = {
     type: 'object',
@@ -12,14 +12,11 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetUserStatus extends BaseAction<Payload, { status: number; ext_status: number; } | undefined> {
+export class GetUserStatus extends GetPacketStatusDepends<Payload, { status: number; ext_status: number; } | undefined> {
     actionName = ActionName.GetUserStatus;
     payloadSchema = SchemaData;
 
     async _handle(payload: Payload) {
-        if (!this.core.apis.PacketApi?.available) {
-            throw new Error('PacketClient is not init');
-        }
         return await this.core.apis.PacketApi.sendStatusPacket(+payload.user_id);
     }
 }

src/onebot/action/packet/GetPacketStatus.ts

@@ -9,7 +9,7 @@ export abstract class GetPacketStatusDepends<PT, RT> extends BaseAction<PT, RT>
         if (!this.core.apis.PacketApi.available) {
             return {
                 valid: false,
-                message: "PacketClient is not available!",
+                message: "packetServer不可用，请参照文档 https://napneko.github.io/config/advanced 检查packetServer状态或进行配置！",
             }
         }
         return {

src/onebot/action/types.ts

@@ -126,5 +126,5 @@ export enum ActionName {
     GetRkey = "nc_get_rkey",
     SetSpecialTittle = "set_group_special_title",
     // UploadForwardMsg = "upload_forward_msg",
-    GetGroupShutList = "get_goup_shut_list",
+    GetGroupShutList = "get_group_shut_list",
 }

src/onebot/entities.ts

@@ -111,7 +111,7 @@ export class OB11Entities {
     static file(peerId: string, file: Exclude<GroupFileInfoUpdateParamType['item'][0]['fileInfo'], undefined>): OB11GroupFile {
         return {
             group_id: parseInt(peerId),
-            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId, file.fileId, file.fileName),
+            file_id: FileNapCatOneBotUUID.encodeModelId({ chatType: 2, peerUid: peerId }, file.fileModelId, file.fileId, file.fileId ?? ''),
             file_name: file.fileName,
             busid: file.busId,
             size: parseInt(file.fileSize),

src/onebot/index.ts

@@ -6,6 +6,7 @@ import {
     GroupNotifyMsgStatus,
     GroupNotifyMsgType,
     InstanceContext,
+    MsgSourceType,
     NapCatCore,
     NodeIKernelBuddyListener,
     NodeIKernelGroupListener,
@@ -303,8 +304,10 @@ export class NapCatOneBot11Adapter {
                     },
                     m.msgId,
                 );
-                await this.emitMsg(m)
-                    .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e));
+                if (m.sourceType == MsgSourceType.K_DOWN_SOURCETYPE_AIOINNER) {
+                    await this.emitMsg(m)
+                        .catch(e => this.context.logger.logError.bind(this.context.logger)('处理消息失败', e));
+                }
             }
         };
 
@@ -572,7 +575,7 @@ export class NapCatOneBot11Adapter {
             // }
             this.networkManager.emitEvent(ob11Msg);
         }).catch(e => this.context.logger.logError.bind(this.context.logger)('constructMessage error: ', e));
-
+        
         this.apis.GroupApi.parseGroupEvent(message).then(groupEvent => {
             if (groupEvent) {
                 // log("post group event", groupEvent);

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.0.0', 'napcat-update-button', 'secondary'),
+                    SettingButton('V3.0.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.0.0", "napcat-update-button", "secondary")
+          SettingButton("V3.0.4", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([