release: v2.6.17

[Hook] NapcatNative

manifest.json

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

package.json

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

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.6.16';
+export const napCatVersion = '2.6.17';

src/native/index.ts

@@ -1,6 +1,7 @@
 import { constants } from "node:os";
 import path from "path";
 import { dlopen } from "process";
+import fs from "fs";
 export class Native {
     platform: string;
     supportedPlatforms = ['win32'];
@@ -11,13 +12,22 @@ export class Native {
         if (!this.supportedPlatforms.includes(this.platform)) {
             throw new Error(`Platform ${this.platform} is not supported`);
         }
-        dlopen(this.MoeHooExport, path.join(nodePath, './native/MoeHoo.win32.node'), constants.dlopen.RTLD_LAZY);
+        let nativeNode = path.join(nodePath, './native/MoeHoo.win32.node');
+        if (fs.existsSync(nativeNode)) {
+            dlopen(this.MoeHooExport, nativeNode, constants.dlopen.RTLD_LAZY);
+        }
     }
     isSetReCallEnabled(): boolean {
         return this.recallHookEnabled;
     }
     registerRecallCallback(callback: (hex: string) => any): void {
-        this.recallHookEnabled = true;
-        return this.MoeHooExport.exports.registMsgPush(callback);
+        try {
+            if (this.MoeHooExport.exports?.registMsgPush) {
+                this.MoeHooExport.exports.registMsgPush(callback);
+                this.recallHookEnabled = true;
+            }
+        } catch (error) {
+            this.recallHookEnabled = false;
+        }
     }
 }

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -1,9 +1,16 @@
 import BaseAction from '../BaseAction';
-import { OB11ForwardMessage } from '@/onebot';
+import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNode as OriginalOB11MessageNode } from '@/onebot';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
 
+type OB11MessageNode = OriginalOB11MessageNode & {
+    data: {
+        content?: Array<OB11MessageData>;
+        message: Array<OB11MessageData>;
+    };
+};
+
 const SchemaData = {
     type: 'object',
     properties: {
@@ -18,36 +25,69 @@ export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_GetForwardMsg;
     payloadSchema = SchemaData;
 
+    private createTemplateNode(message: OB11Message): OB11MessageNode {
+        return {
+            type: OB11MessageDataType.node,
+            data: {
+                user_id: message.user_id,
+                nickname: message.sender.nickname,
+                message: [],
+                content: []
+            }
+        };
+    }
+
+    async parseForward(messages: OB11Message[]): Promise<OB11MessageNode[]> {
+        const retMsg: OB11MessageNode[] = [];
+
+        for (const message of messages) {
+            const templateNode = this.createTemplateNode(message);
+
+            for (const msgdata of message.message) {
+                if ((msgdata as OB11MessageData).type === OB11MessageDataType.forward) {
+                    const newNode = this.createTemplateNode(message);
+                    newNode.data.message = await this.parseForward((msgdata as OB11MessageForward).data.content);
+
+                    templateNode.data.message.push(newNode);
+                } else {
+                    templateNode.data.message.push(msgdata as OB11MessageData);
+                }
+            }
+            retMsg.push(templateNode);
+        }
+
+        return retMsg;
+    }
+
     async _handle(payload: Payload): Promise<any> {
         const msgId = payload.message_id || payload.id;
         if (!msgId) {
-            throw Error('message_id is required');
+            throw new Error('message_id is required');
         }
+
         const rootMsgId = MessageUnique.getShortIdByMsgId(msgId);
         const rootMsg = MessageUnique.getMsgIdAndPeerByShortId(rootMsgId || parseInt(msgId));
         if (!rootMsg) {
-            throw Error('msg not found');
+            throw new Error('msg not found');
         }
-        const data = await this.core.apis.MsgApi.getMultiMsg(rootMsg.Peer, rootMsg.MsgId, rootMsg.MsgId);
+        const data = await this.core.apis.MsgApi.getMsgsByMsgId(rootMsg.Peer, [rootMsg.MsgId]);
+
         if (!data || data.result !== 0) {
-            throw Error('找不到相关的聊天记录' + data?.errMsg);
+            throw new Error('找不到相关的聊天记录' + data?.errMsg);
         }
-        const msgList = data.msgList;
-        const messages = (await Promise.all(msgList.map(async msg => {
-            const resMsg = await this.obContext.apis.MsgApi
-                .parseMessage(msg);
-            if (!resMsg) return;
-            resMsg.message_id = MessageUnique.createUniqueMsgId({
-                guildId: '',
-                chatType: msg.chatType,
-                peerUid: msg.peerUid,
-            }, msg.msgId)!;
-            return resMsg;
-        }))).filter(msg => !!msg);
-        messages.map(msg => {
-            (<OB11ForwardMessage>msg).content = msg.message;
-            delete (<any>msg).message;
-        });
-        return { messages };
+
+        const singleMsg = data.msgList[0];
+        const resMsg = await this.obContext.apis.MsgApi.parseMessage(singleMsg, 'array');//强制array 以便处理
+        if (!resMsg) {
+            throw new Error('找不到相关的聊天记录');
+        }
+        //if (this.obContext.configLoader.configData.messagePostFormat === 'array') {
+        //提取
+        let realmsg = ((await this.parseForward([resMsg]))[0].data.message as OB11MessageNode[])[0].data.message;
+        //里面都是offline消息 id都是0 没得说话
+        return { message: realmsg };
+        //}
+
+        // return { message: resMsg };
     }
-}
+}

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.6.16', 'napcat-update-button', 'secondary'),
+                    SettingButton('V2.6.17', '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.6.16", "napcat-update-button", "secondary")
+          SettingButton("V2.6.17", "napcat-update-button", "secondary")
         )
       ]),
       SettingList([