oicq-icalingua-plus-plus 1.23.21 → 1.23.23

package/lib/message/multi.js

@@ -246,12 +246,12 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                     });
                     break;
                 case "xml":
-                    elements.push(await buildXmlElem(elem.data.xml, elem.data.svcid));
+                    elements.push(await buildXmlElem(elem.data.data, elem.data.type));
                     const resIdRegex = /m_resid="([\w+=/]+)"/
                     const fileNameRegex = /m_fileName="([\w+-=/]+)"/
-                    if (resIdRegex.test(elem.data.xml) && fileNameRegex.test(elem.data.xml)) {
-                        const resId = resIdRegex.exec(elem.data.xml)[1];
-                        const fileName = fileNameRegex.exec(elem.data.xml)[1];
+                    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);
                         let msgs = pb.decode(buf)[2];
                         if (!Array.isArray(msgs)) {
@@ -259,7 +259,7 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                         }
                         for (let msg of msgs) {
                             const m_fileName = msg[1].toString();
-                            if (m_fileName === 'MultiMsg') {
+                            if (m_fileName === "MultiMsg") {
                                 Multi.push({
                                     1: fileName,
                                     2: msg[2]
@@ -274,8 +274,36 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                     }
                     break;
                 case "json":
-                    elements.push(await buildJsonElem(elem.data.json));
-                    brief += "[JSON]";
+                    elements.push(await buildJsonElem(elem.data.data));
+                    let jsonObj, resId, fileName
+                    try {
+                        jsonObj = JSON.parse(elem.data.data)
+                        if (jsonObj.app === "com.tencent.multimsg") {
+                            resId = jsonObj.meta.detail.resid
+                            fileName = jsonObj.meta.detail.uniseq
+                        }
+                    } catch {}
+                    if (resId && fileName) {
+                        const buf = await _downloadMultiMsg.call(this, resId, 2);
+                        let msgs = pb.decode(buf)[2];
+                        if (!Array.isArray(msgs)) {
+                            msgs = [msgs];
+                        }
+                        for (let msg of msgs) {
+                            const m_fileName = msg[1].toString();
+                            if (m_fileName === "MultiMsg") {
+                                Multi.push({
+                                    1: fileName,
+                                    2: msg[2]
+                                });
+                            } else {
+                                Multi.push(msg);
+                            }
+                        }
+                        brief += "[聊天记录]";
+                    } else {
+                        brief += "[JSON]";
+                    }
                     break;
                 }
             }

package/lib/wtlogin/wt.js

@@ -177,14 +177,14 @@ class WtLogin {
                         hash = createHash("sha256").update(Buffer.from(inputNum.toString(16), "hex")).digest();
                         cnt++;
                         if (cnt > 1000000) {
-                            this.logger.error("Calc PoW cost too many times, maybe something wrong");
-                            throw new Error("Calc PoW cost too many times, maybe something wrong");
+                            this.logger.error("Calculating PoW cost too much time, maybe something wrong");
+                            throw new Error("Calculating PoW cost too much time, maybe something wrong");
                         }
                     }
                     ok = true;
-                    this.logger.info(`Calc PoW cost ${cnt} ms`);
                     dst = Buffer.from(inputNum.toString(16), "hex");
                     elp = Date.now() - start;
+                    this.logger.info(`Calculating PoW of plus ${cnt} times cost ${elp} ms`);
                 }
                 if (!ok) return Buffer.alloc(0);
                 const body = new Writer()
@@ -259,10 +259,10 @@ class WtLogin {
             });
         }
     
-        if (type === 160 || type === 162) {
-            if (!t[0x204])
-                return;
-            const url = String(t[0x204]).replace("verify", "qrcode");
+        if (type === 160 || type === 162 || type === 239) {
+            let url = ""
+            if (t[0x204])
+                url = String(t[0x204]).replace("verify", "qrcode");
             this.logger.mark("登录保护二维码验证地址：" + url);
             if (t[0x174] && t[0x178]) {
                 this.t104 = t[0x104];

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.23.21",
-  "app_version": "1.23.21",
-  "upday": "2023/02/23",
+  "version": "1.23.23",
+  "app_version": "1.23.23",
+  "upday": "2023/02/24",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",