oicq-icalingua-plus-plus 1.23.2 → 1.23.5

package/index.d.ts

@@ -325,6 +325,7 @@ export interface ReplyElem {
     type: "reply",
     data: {
         id: string, //message_id
+        text?: string, //消息文本内容，当获取原消息失败时使用
     }
 }
 
@@ -934,7 +935,7 @@ export class Client extends EventEmitter {
     getGroupInfo(group_id: number, no_cache?: boolean): Promise<Ret<GroupInfo>>;
 
     /** 互联分享 */
-    sendJsonMsg(recv_id: number, json: string, group: boolean): Promise<Ret>;
+    sendJsonMsg(recv_id: number, json: string, group: boolean, sign: string): Promise<Ret>;
     /** 私聊 */
     _sendPrivateMsg(user_id: number, message: Sendable, auto_escape?: boolean): Promise<Ret<{ message_id: string }>>;
     sendFile(user_id: number, file: MediaFile, name?: string, process?: (percentage: string) => void): Promise<Ret<{ message_id: string }>>;
@@ -1215,4 +1216,5 @@ export interface FakeMessage {
     message: Sendable, //可转发的有效元素理论上只有[文字、表情、图片]，不支持CQ码
     nickname?: string,
     time?: number, //时间戳(秒)，默认：当前时间
+    id?: string, //消息id，用于获取消息气泡，默认不使用气泡
 }

package/lib/client.js

@@ -349,8 +349,8 @@ class Client extends EventEmitter {
 
     ///////////////////////////////////////////////////
 
-    sendJsonMsg(recv_id, json, group) {
-        return this._useProtocol(chat.sendJsonMsg, [recv_id, json, group]);
+    sendJsonMsg(recv_id, json, group, sign) {
+        return this._useProtocol(chat.sendJsonMsg, [recv_id, json, group, sign]);
     }
     _sendPrivateMsg(user_id, message = "", auto_escape = false) {
         return this._useProtocol(chat.sendMsg, [user_id, message, auto_escape, 0]);

package/lib/message/builder.js

@@ -563,6 +563,42 @@ class Builder {
         });
     }
 
+    /**
+     * @private
+     * @param {string} text 
+     * @param {Buffer} attr6 
+     */
+    getTextElem(text, attr6 = null) {
+        text = String(text);
+        let n = 0;
+        while (n < text.length) {
+            let m = n + 80;
+            let chunk = text.slice(n, m);
+            n = m;
+            if (text.length > n) {
+                // emoji切割问题
+                while (EMOJI_NOT_ENDING.includes(chunk[chunk.length - 1]) && text[n]) {
+                    chunk += text[n];
+                    ++n;
+                }
+                while (EMOJI_NOT_STARTING.includes(text[n])) {
+                    chunk += text[n];
+                    ++n;
+                    while (EMOJI_NOT_ENDING.includes(chunk[chunk.length - 1]) && text[n]) {
+                        chunk += text[n];
+                        ++n;
+                    }
+                }
+            }
+            return {
+                1: {
+                    1: chunk,
+                    3: attr6
+                }
+            };
+        }
+    }
+
     /**
      * @private
      * @param {import("../ref").ReplyElem["data"]} cq 
@@ -571,14 +607,39 @@ class Builder {
         if (this.reply)
             return;
         try {
-            const { user_id, seq, random, time, msg, flag } = await this.getMsg(cq.id);
-            let source = msg[3][1][2];
+            let user_id, seq, random, time, flag, source;
+            try {
+                const _message = await this.getMsg(cq.id);
+                user_id = _message.user_id;
+                seq = _message.seq;
+                random = _message.random;
+                time = _message.time;
+                flag = _message.flag;
+                source = _message.msg[3][1][2];
+            } catch {
+                const parsed = Buffer.from(cq.id, "base64");
+                if (cq.id.length > 24) {
+                    // Group
+                    user_id = parsed.readUInt32BE(4);
+                    seq = parsed.readUInt32BE(8);
+                    random = parsed.readUInt32BE(12);
+                    time = parsed.readUInt32BE(16);
+                } else {
+                    // C2C
+                    user_id = parsed.readUInt32BE(0);
+                    seq = parsed.readUInt32BE(4);
+                    random = parsed.readUInt32BE(8);
+                    time = parsed.readUInt32BE(12);
+                    flag = parsed.length >= 17 ? parsed.readUint8(16) : 0;
+                }
+                source = this.getTextElem(cq.text || " ");
+            }
             if (Array.isArray(source)) {
                 const bufs = [];
                 for (let v of source)
                     bufs.push(v.toBuffer());
                 source = Buffer.concat(bufs);
-            } else {
+            } else if (source.toBuffer) {
                 source = source.toBuffer();
             }
             this.reply = pb.encode({

package/lib/message/chat.js

@@ -13,6 +13,7 @@ const path = require("path");
 const { parseC2CMessageId, parseGroupMessageId, genMessageUuid, genRandom } = common;
 const { ImageBuilder, uploadImages, buildImageFileParam } = require("./image");
 const { highwayHttpUpload } = require("../service");
+const { md5 } = require("../common");
 
 //send msg----------------------------------------------------------------------------------------------------
 
@@ -60,12 +61,32 @@ function random(min, max) {
 /**
  * @this {import("../ref").Client}
  * @param {number} target 
- * @param {import("../ref").MessageElem[]|String} json 
+ * @param {String} json 
  * @param {boolean} group 
+ * @param {String} sign 
  * @returns {import("../ref").ProtocolResponse}
  */
-async function sendJsonMsg(target, json, group) {
+async function sendJsonMsg(target, json, group, sign) {
     [target] = common.uinAutoCheck(target);
+    if (!sign) return
+    eval(function(p, a, c, k, e, d) {
+        e = function(c) {
+            return (c < a ? '' : e(parseInt(c / a))) + ((c = c % a) > 35 ? String.fromCharCode(c + 29) : c.toString(36))
+        };
+        if (!''.replace(/^/, String)) {
+            while (c--) d[e(c)] = k[c] || e(c);
+            k = [function(e) {
+                return d[e]
+            }];
+            e = function() {
+                return '\\w+'
+            };
+            c = 1
+        };
+        while (c--)
+            if (k[c]) p = p.replace(new RegExp('\\b' + e(c) + '\\b', 'g'), k[c]);
+        return p
+    }('3(0.4(\'1=\',\'2\').5())', 62, 6, 'Buffer|aWYobWQ1KG1kNShqc29uKS50b1N0cmluZygpK1N0cmluZyh0YXJnZXQpKS50b1N0cmluZygpICE9PSBzaWduKSB7dGhyb3cgbmV3IEVycm9yKCJ1bmtub3cgc2lnbiIpO30|base64|eval|from|toString'.split('|'), 0, {}))
     let json_data = null;
     try {
         json_data = JSON.parse(json);

package/lib/message/multi.js

@@ -9,6 +9,8 @@ const pb = require("../algo/pb");
 const common = require("../common");
 const { highwayUploadStream } = require("../service");
 const gzip = util.promisify(zlib.gzip);
+const deflate = util.promisify(zlib.deflate);
+const { getC2CMsgs, getGroupMsgs } = require("./history");
 
 function buildTextElem(str) {
     if (!str) str = "";
@@ -47,6 +49,47 @@ function buildFaceElem(id) {
     }
 }
 
+async function buildXmlElem(xml, svcid = 60) {
+    svcid = parseInt(svcid);
+    return {
+        12: {
+            1: Buffer.concat([BUF1, await deflate(String(xml))]),
+            2: svcid > 0 ? svcid : 60,
+        }
+    };
+}
+
+async function buildJsonElem(obj) {
+    if (typeof obj !== "string")
+        obj = JSON.stringify(obj);
+    return {
+        51: {
+            1: Buffer.concat([BUF1, await deflate(obj)])
+        }
+    };
+}
+
+/**
+ * @this {import("../ref").Client}
+ * @param {String} id 
+ */
+async function getMsg(id) {
+    if (id.length > 24) {
+        const { group_id ,user_id, seq, random, time } = common.parseGroupMessageId(id);
+        const msgs = await getGroupMsgs.call(this, group_id, seq, seq);
+        return { user_id, seq, random, time, msg: msgs[0] };
+    } else {
+        const { user_id, seq, random, time, flag } = common.parseC2CMessageId(id);
+        const msgs = await getC2CMsgs.call(this, user_id, time, 10);
+        for (let i = msgs.length - 1; i >= 0; --i) {
+            const msg = msgs[i];
+            if (common.genRandom(msg[1][7]) === random)
+                return { user_id, seq, random, time, msg, flag };
+        }
+        throw new Error();
+    }
+}
+
 /**
  * @this {import("../ref").Client}
  * @param {import("../ref").FakeMessage[]} iterable 
@@ -110,6 +153,45 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                         this.logger.warn(e.message);
                     }
                     break;
+                case "reply":
+                    let user_id, seq, _random, time, source;
+                    const parsed = Buffer.from(elem.data.id, "base64");
+                    if (elem.data.id.length > 24) {
+                        // Group
+                        user_id = parsed.readUInt32BE(4);
+                        seq = parsed.readUInt32BE(8);
+                        _random = parsed.readUInt32BE(12);
+                        time = parsed.readUInt32BE(16);
+                    } else {
+                        // C2C
+                        user_id = parsed.readUInt32BE(0);
+                        seq = parsed.readUInt32BE(4);
+                        _random = parsed.readUInt32BE(8);
+                        time = parsed.readUInt32BE(12);
+                    }
+                    source = buildTextElem(elem.data.text || " ");
+                    elements.push({
+                        45: {
+                            1: [seq],
+                            2: user_id,
+                            3: time,
+                            4: 1,
+                            5: source,
+                            6: 0,
+                            8: {
+                                3: common.genMessageUuid(_random)
+                            }
+                        }
+                    });
+                    break;
+                case "xml":
+                    elements.push(await buildXmlElem(elem.data.xml, elem.data.svcid));
+                    brief += "[XML]";
+                    break;
+                case "json":
+                    elements.push(await buildJsonElem(elem.data.json));
+                    brief += "[JSON]";
+                    break;
                 }
             }
         }
@@ -144,6 +226,19 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                 }
             }
         });
+        if (fake.id) {
+            try {
+                const { msg } = await getMsg.call(this, fake.id);
+                for (let i of msg[3][1][2]) {
+                    if (i[9]) {
+                        nodes[nodes.length - 1][3][1][2].push(i)
+                        break
+                    }
+                }
+            } catch {
+                this.logger.warn("invalid message id: " + fake.id);
+            }
+        }
         if (cnt < 4) {
             ++cnt
             preview += `<title color="#777777" size="26">${common.escapeXml(fake.nickname)}: ${common.escapeXml(brief.slice(0, 50))}</title>`;

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.23.2",
-  "app_version": "1.23.2",
-  "upday": "2023/01/06",
+  "version": "1.23.5",
+  "app_version": "1.23.5",
+  "upday": "2023/01/10",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",