oicq-icalingua-plus-plus 1.26.3 → 1.26.4

package/index.d.ts

@@ -1076,8 +1076,10 @@ export class Client extends EventEmitter {
     /**
      * 制作一个合并转发消息，得到的XmlElem可直接发送
      * @param dm 默认(false)以群模式上传图片，设为true则以私聊模式上传图片
+     * @param target 指定合并转发来源
+     * @param nt 默认(true)使用NT协议上传，设为false则使用旧协议
      */
-    makeForwardMsg(fakes: FakeMessage | Iterable<FakeMessage>, dm?: boolean, target?: number): Promise<Ret<XmlElem>>;
+    makeForwardMsg(fakes: FakeMessage | Iterable<FakeMessage>, dm?: boolean, target?: number, nt?: boolean): Promise<Ret<XmlElem>>;
 
     /** 发简易群公告 */
     sendGroupNotice(group_id: number, content: string): Promise<Ret>;

package/lib/client.js

@@ -495,7 +495,7 @@ class Client extends EventEmitter {
     getForwardMsg(id, fileName = "MultiMsg") {
         return this._useProtocol(chat.getForwardMsg, arguments);
     }
-    makeForwardMsg(fakes, dm = false, target = 0) {
+    makeForwardMsg(fakes, dm = false, target = 0, nt = true) {
         return this._useProtocol(multi.makeForwardMsg, arguments);
     }
 

package/lib/message/image.js

@@ -296,6 +296,19 @@ class ImageBuilder {
      */
     async download() {
         this.c.logger.debug("开始下载网络图片: " + this.address);
+        if (this.address.includes('&fileid=') && (this.address.startsWith('https://multimedia.nt.qq.com.cn/download') || this.address.startsWith('https://gchat.qpic.cn/download'))) {
+            // 如果是QQNT图片，尝试获取rkey刷新URL
+            try {
+                const url = new URL(this.address);
+                const fileid = url.searchParams.get('fileid');
+                if (fileid) {
+                    this.address = await getNTPicURLbyFileid.call(this.c, fileid);
+                    this.c.logger.debug("下载QQNT网络图片: " + this.address);
+                }
+            } catch (e) {
+                this.c.logger.warn(`获取QQNT图片rkey失败: ${e.message}`);
+            }
+        }
         try {
             this.tmpfile = this.filepath + common.uuid() + ".img";
             var res = await downloadFromWeb(this.address, this.headers);

package/lib/message/multi.js

@@ -53,12 +53,12 @@ function buildFaceElem(id) {
     }
 }
 
-async function buildXmlElem(xml, svcid = 60) {
+async function buildXmlElem(xml, svcid = 35) {
     svcid = parseInt(svcid);
     return {
         12: {
             1: Buffer.concat([BUF1, await deflate(String(xml))]),
-            2: svcid > 0 ? svcid : 60,
+            2: svcid > 0 ? svcid : 35,
         }
     };
 }
@@ -155,11 +155,46 @@ async function _downloadMultiMsg(resid, bu) {
     });
 }
 
+/**
+ * @this {import("../ref").Client}
+ * @param {Buffer} resid 
+ * @param {Number} bu 
+ * @returns {Promise<Buffer>}
+ */
+async function _downloadMultiMsgNt(resid, bu) {
+    const body = pb.encode({
+        1: {
+            1: {
+                2: this.uin,
+            },
+            2: resid,
+            3: bu === 2 ? 3 : 1,
+        },
+        15: {
+            1: 2,
+            2: 2,
+            3: 9,
+            4: 0,
+        },
+    });
+    const payload = await this.sendUni("trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg", body);
+    try {
+        const rsp = pb.decode(payload)[1];
+        return common.unzip(rsp[4].toBuffer());
+    } catch (e) {
+        e.message = "wrong resid";
+        throw e;
+    }
+}
+
 /**
  * @this {import("../ref").Client}
  * @param {import("../ref").FakeMessage[]} iterable 
+ * @param {boolean} dm
+ * @param {number} target
+ * @param {boolean} nt
  */
-async function makeForwardMsg(iterable, dm = false, target = 0) {
+async function makeForwardMsg(iterable, dm = false, target = 0, nt = true) {
 
     if (typeof iterable[Symbol.iterator] !== "function")
         iterable = [iterable];
@@ -284,7 +319,7 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                     if (resIdRegex.test(elem.data.data) && fileNameRegex.test(elem.data.data)) {
                         const resId = resIdRegex.exec(elem.data.data)[1];
                         const fileName = fileNameRegex.exec(elem.data.data)[1];
-                        const buf = await _downloadMultiMsg.call(this, resId, 2);
+                        const buf = await (nt ? _downloadMultiMsgNt : _downloadMultiMsg).call(this, resId, 2);
                         let msgs = pb.decode(buf)[2];
                         if (!Array.isArray(msgs)) {
                             msgs = [msgs];
@@ -316,7 +351,7 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                         }
                     } catch {}
                     if (resId && fileName) {
-                        const buf = await _downloadMultiMsg.call(this, resId, 2);
+                        const buf = await (nt ? _downloadMultiMsgNt : _downloadMultiMsg).call(this, resId, 2);
                         let msgs = pb.decode(buf)[2];
                         if (!Array.isArray(msgs)) {
                             msgs = [msgs];
@@ -394,31 +429,67 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                 }
             });
         }
-        nodes.push({
-            1: {
-                1: fake.user_id,
-                2: !target ? this.uin : target,
-                3: dm ? 166 : 82,
-                4: dm ? 11 : null,
-                5: seq,
-                6: fake.time || common.timestamp(),
-                7: common.genMessageUuid(random),
-                9: dm ? null : {
-                    1: !target ? this.uin : target,
-                    4: fake.nickname,
+        if (!nt) {
+            nodes.push({
+                1: {
+                    1: fake.user_id,
+                    2: !target ? this.uin : target,
+                    3: dm ? 166 : 82,
+                    4: dm ? 11 : null,
+                    5: seq,
+                    6: fake.time || common.timestamp(),
+                    7: common.genMessageUuid(random),
+                    9: dm ? null : {
+                        1: !target ? this.uin : target,
+                        4: fake.nickname,
+                    },
+                    14: dm ? fake.nickname : null,
+                    20: {
+                        1: 0,
+                        2: random
+                    }
                 },
-                14: dm ? fake.nickname : null,
-                20: {
-                    1: 0,
-                    2: random
+                3: {
+                    1: {
+                        2: elements
+                    }
                 }
-            },
-            3: {
+            });
+        } else {
+            nodes.push({
                 1: {
-                    2: elements
+                    1: fake.user_id,
+                    //2: this.uid,
+                    5: dm ? this.uin : null,
+                    6: dm ? this.uid || null : null,
+                    7: dm ? { 6: fake.nickname } : null,
+                    8: dm ? null : { 1: target || this.uin, 4: fake.nickname },
+                },
+                2: {
+                    1: dm ? 166 : 82,
+                    2: dm ? 11 : null,
+                    3: dm ? 11 : null,
+                    4: random,
+                    5: seq,
+                    6: fake.time || common.timestamp(),
+                    7: 1,
+                    8: 0,
+                    9: 0,
+                    15: {
+                        1: 0,
+                        2: 0,
+                        3: 0,
+                        4: "",
+                        5: "",
+                    },
+                },
+                3: {
+                    1: {
+                        2: elements
+                    }
                 }
-            }
-        });
+            });
+        }
         if (cnt < 4) {
             ++cnt
             preview += `<title color="#777777" size="26">${common.escapeXml(fake.nickname)}: ${common.escapeXml(brief.slice(0, 50))}</title>`;
@@ -442,9 +513,14 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
         2: Multi
     }));
     try {
-        var resid = await uploadMultiMsg.call(this, this.uin, compressed);
+        var resid = await (nt ? uploadMultiMsgNt : uploadMultiMsg).call(this, target, compressed, dm);
     } catch (e) {
-        throw new Error("failed to upload forward msg");
+        if (String(e.message).includes("-10122")) {
+            // 设备类型不支持nt
+            this.logger.warn("failed to upload forward msg with NT protocol, try old protocol -> " + e.message);
+            return makeForwardMsg.call(this, iterable, dm, target, false);
+        }
+        throw new Error("failed to upload forward msg -> " + e.message);
     }
     
     const xml = `<?xml version="1.0" encoding="utf-8"?>
@@ -464,9 +540,10 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
  * @this {import("../ref").Client}
  * @param {number} target 
  * @param {Buffer} compressed 
+ * @param {boolean} dm 是否为私聊消息
  * @returns {Promise<Buffer>} resid
  */
-async function uploadMultiMsg(target, compressed) {
+async function uploadMultiMsg(target, compressed, dm = false) {
     const body = pb.encode({
         1: 1,
         2: 5,
@@ -491,7 +568,7 @@ async function uploadMultiMsg(target, compressed) {
         2: 5,
         3: 9,
         4: [{
-            //1: 3,
+            1: dm ? 1 : 3,
             2: target,
             4: compressed,
             5: 2,
@@ -514,6 +591,35 @@ async function uploadMultiMsg(target, compressed) {
     return rsp[2].toBuffer();
 }
 
+/**
+ * @this {import("../ref").Client}
+ * @param {number} target 
+ * @param {Buffer} compressed 
+ * @param {boolean} dm 是否为私聊消息
+ * @returns {Promise<Buffer>} resid
+ */
+async function uploadMultiMsgNt(target, compressed, dm = false) {
+    const body = pb.encode({
+        2: {
+            1: dm ? 1 : 3,
+            2: {
+                2: this.uin,
+            },
+            3: dm ? 0 : target,
+            4: compressed,
+        },
+        15: {
+            1: 4,
+            2: 2,
+            3: 9,
+            4: 0,
+        },
+    });
+    const payload = await this.sendUni("trpc.group.long_msg_interface.MsgService.SsoSendLongMsg", body);
+    const rsp = pb.decode(payload)[2];
+    return rsp[3].toString();
+}
+
 module.exports = {
-    makeForwardMsg, uploadMultiMsg,
+    makeForwardMsg, uploadMultiMsg, uploadMultiMsgNt
 };

package/lib/message/parser.js

@@ -89,6 +89,38 @@ async function _downloadMultiMsg(resid, bu) {
     });
 }
 
+/**
+ * @this {import("../ref").Client}
+ * @param {Buffer} resid 
+ * @param {Number} bu 
+ * @returns {Promise<Buffer>}
+ */
+async function _downloadMultiMsgNt(resid, bu) {
+    const body = pb.encode({
+        1: {
+            1: {
+                2: this.uin,
+            },
+            2: resid,
+            3: bu === 2 ? 3 : 1,
+        },
+        15: {
+            1: 2,
+            2: 2,
+            3: 9,
+            4: 0,
+        },
+    });
+    const payload = await this.sendUni("trpc.group.long_msg_interface.MsgService.SsoRecvLongMsg", body);
+    try {
+        const rsp = pb.decode(payload)[1];
+        return unzip(rsp[4].toBuffer());
+    } catch (e) {
+        e.message = "wrong resid";
+        throw e;
+    }
+}
+
 /**
  * 解析消息
  */
@@ -486,7 +518,7 @@ class Parser {
             } else if (type === 37) { //generalFlags 超长消息，气泡等
                 if (elem[6] === 1 && elem[7]) {
                     try {
-                        const buf = await _downloadMultiMsg.call(this.c, elem[7].toBuffer(), 1);
+                        const buf = await _downloadMultiMsgNt.call(this.c, elem[7].toBuffer(), 1);
                         let msg = pb.decode(buf)[1];
                         if (Array.isArray(msg)) msg = msg[0];
                         const parser = Parser.invoke(this.c, this.uid, this.gid, msg[3][1]);
@@ -1042,11 +1074,12 @@ async function parseDiscussMsg(msg) {
  * 解析转发消息
  * @this {import("../ref").Client}
  * @param {string} resid 
+ * @param {string} fileName
  * @returns {import("../ref").ProtocolResponse}
  */
 async function parseForwardMsg(resid, fileName) {
     const data = [];
-    const blob = await _downloadMultiMsg.call(this, String(resid), 2);
+    const blob = await _downloadMultiMsgNt.call(this, String(resid), 2);
     /**
      * @type {import("../ref").Msg[]}
      */
@@ -1067,30 +1100,32 @@ async function parseForwardMsg(resid, fileName) {
         msgs = [msgs];
     for (let msg of msgs) {
         const head = msg[1];
-        let time = head[6];
-        let seq = head[5];
+        const content = msg[2];
+        const body = msg[3];
+        let time = content[6];
+        let seq = content[5];
         let user_id = head[1], nickname = "unknown", group_id;
         let head_img = "";
-        if (head[14]) {
-            nickname = String(head[14]);
+        if (head[8]) { // group
+            nickname = String(head[8][4]);
             try {
-                group_id = head[9][1];
+                group_id = head[8][1];
             } catch { }
-        } else {
+        } else { // c2c
             try {
-                nickname = String(head[9][4]);
-                group_id = head[9][1];
+                nickname = String(head[7][6]);
+                group_id = head[8][1];
             } catch { }
         }
         try {
-            head_img = String(head[20][5]);
+            head_img = String(content[15][5]);
         } catch { }
         try {
             let parser;
-            if (head[3] === 529 && head[4] === 4 && msg[3][2]) {
-                const file_msg = msg[3][2];
+            if (content[1] === 529 && content[2] === 4 && body[2]) { // 合并转发的文件
+                const file_msg = body[2];
                 try {
-                    if (String(file_msg[6][2][4])[0] === "/") {
+                    if (String(file_msg[6][2][4])[0] === "/") { // 合并转发目的地是群
                         const gid = file_msg[6][2][3];
                         const fid = file_msg[6][2][4];
                         const gfs = new Gfs(this, gid);
@@ -1105,9 +1140,9 @@ async function parseForwardMsg(resid, fileName) {
                         }
                     }
                 } catch { }
-                parser = parser ?? await _parseC2CFileElem.call(this, file_msg[1]);
+                parser = parser ?? await _parseC2CFileElem.call(this, file_msg[1]); // 合并转发目的地是私聊
             } else {
-                parser = await Parser.invoke(this, user_id, group_id, msg[3][1]);
+                parser = await Parser.invoke(this, user_id, group_id, body[1]); // 普通消息
             }
             data.push({
                 group_id, user_id, nickname, time, seq,

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.26.3",
-  "app_version": "1.26.3",
-  "upday": "2026/06/28",
+  "version": "1.26.4",
+  "app_version": "1.26.4",
+  "upday": "2026/06/30",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",
@@ -21,7 +21,7 @@
   "author": "The Icalingua++ Authors",
   "license": "MPL-2.0",
   "dependencies": {
-    "axios": "1.14.0",
+    "axios": "1.18.1",
     "jsqr": "1.4.0",
     "log4js": "6.9.1",
     "long": "4.0.0",