oicq-icalingua-plus-plus 1.23.71 → 1.23.73

package/index.d.ts

@@ -219,7 +219,8 @@ export interface FaceElem {
     data: {
         id: number,
         text?: string,
-        qlottie?: string
+        qlottie?: string,
+        extra?: string
     }
 }
 

package/lib/client-ext.js

@@ -372,7 +372,7 @@ Client.prototype.registerQSign = async function(retry = 0) {
     const { data } = await axios.get(url,
         {
             params,
-            timeout: 15000,
+            timeout: 45000,
             headers: {
                 'User-Agent': "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.199 Safari/537.36 OICQ/1.23 ILPP/2",
                 'Content-Type': "application/x-www-form-urlencoded"
@@ -438,7 +438,7 @@ Client.prototype.submitSsoCallback = async function(cmd, callbackId, body, retry
     const { data } = await axios.get(url,
         {
             params,
-            timeout: 15000,
+            timeout: 45000,
             headers: {
                 'User-Agent': "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.199 Safari/537.36 OICQ/1.23 ILPP/2",
                 'Content-Type': "application/x-www-form-urlencoded"
@@ -478,7 +478,7 @@ Client.prototype.refreshQSignToken = async function(retry = 0) {
     const { data } = await axios.get(url,
         {
             params,
-            timeout: 15000,
+            timeout: 45000,
             headers: {
                 'User-Agent': "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.199 Safari/537.36 OICQ/1.23 ILPP/2",
                 'Content-Type': "application/x-www-form-urlencoded"
@@ -563,7 +563,7 @@ Client.prototype.getSign = async function(cmd, body, retry = 0) {
             key: this.config.sign_api_key
         },
         {
-            timeout: 15000,
+            timeout: 45000,
             headers: {
                 'User-Agent': "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.199 Safari/537.36 OICQ/1.23 ILPP/2",
                 'Content-Type': "application/x-www-form-urlencoded"
@@ -628,7 +628,7 @@ Client.prototype.getT544 = async function(cmd, retry = 0) {
     const { data } = await axios.get(url,
         {
             params,
-            timeout: 15000,
+            timeout: 45000,
             headers: {
                 'User-Agent': "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.5249.199 Safari/537.36 OICQ/1.23 ILPP/2",
                 'Content-Type': "application/x-www-form-urlencoded"

package/lib/message/builder.js

@@ -250,29 +250,46 @@ class Builder {
                 text = "/" + id;
             if (!text.startsWith("/"))
                 text = "/" + text;
+            let lottieElem = {
+                packId: "1",
+                lottieId: cq.qlottie,
+                faceId: id,
+                sourceType: 1,
+                lottieType: 1,
+                resultId: "",
+                text: text,
+                surpriseId: "",
+                ramdomType: 1,
+            };
+            if (cq.extra) {
+                try {
+                    const extra = JSON.parse(cq.extra);
+                    Object.assign(lottieElem, extra);
+                }
+            }
             this.elems2.push([
                 {
                     53: {
                         1: 37,
                         2: {
-                            1: "1",
-                            2: cq.qlottie,
-                            3: id,
-                            4: 1,
-                            5: 1,
-                            6: "",
-                            7: text,
-                            8: "",
-                            9: 1
+                            1: lottieElem.packId,
+                            2: lottieElem.lottieId,
+                            3: lottieElem.faceId,
+                            4: lottieElem.sourceType,
+                            5: lottieElem.lottieType,
+                            6: lottieElem.resultId,
+                            7: lottieElem.text,
+                            8: lottieElem.surpriseId,
+                            9: lottieElem.ramdomType,
                         },
                         3: 1
                     }
                 },
                 {
                     1: {
-                        1: text,
+                        1: lottieElem.text,
                         12: {
-                            1: "[" + text.replace("/", "") + "]请使用最新版手机QQ体验新功能"
+                            1: "[" + lottieElem.text.replace("/", "") + "]请使用最新版手机QQ体验新功能"
                         }
                     }
                 }

package/lib/message/face.js

@@ -276,6 +276,8 @@ const map = {
     346: "/你真棒棒",
     347: "/大展宏兔",
     348: "/福萝卜",
+    358: "/骰子",
+    359: "/包剪锤",
 };
 
 const FACE_OLD_BUF = Buffer.from([0x00, 0x01, 0x00, 0x04, 0x52, 0xCC, 0xF5, 0xD0]);

package/lib/message/image.js

@@ -532,6 +532,69 @@ async function uploadImages(target, imgs, c2c = false) {
     }
 }
 
+/**
+ * 下载QQNT群图
+ * @this {import("../ref").Client}
+ * @param {number} group_id 
+ * @param {import("../ref").Proto} elem 
+ */
+async function groupNTPicDown(group_id, elem) {
+    const req = {
+        1: group_id,
+        2: this.uin,
+        3: elem[7], //fileid
+        4: elem[13], //fileMd5
+        5: 4, //urlFlag
+        6: 32, //urlType
+        7: 5, //reqTerm
+        8: 9, //reqPlatformType
+        10: 212, //buType
+        12: 0, //fileId
+        19: common.timestamp(),
+        20: 2, //reqTransferType
+    };
+    const body = pb.encode({
+        1: 3,
+        2: 2,
+        4: req,
+    });
+    const blob = await this.sendUni("ImgStore.GroupPicDown", body);
+    const rsp = pb.decode(blob)[4];
+    return "https://" + String(rsp[11]) + String(rsp[13]);
+}
+
+/**
+ * 下载QQNT私聊图
+ * @this {import("../ref").Client}
+ * @param {number} user_id 
+ * @param {import("../ref").Proto} elem 
+ */
+async function offNTPicDown(user_id, elem) {
+    const req = {
+        1: user_id,
+        2: this.uin,
+        3: elem[2], //fileResId
+        4: 4, //urlFlag
+        6: 32, //urlType
+        7: 5, //reqTerm
+        8: 9, //reqPlatformType
+        9: 1, //srcFileType
+        11: 0, //addressBook
+        12: 8, //buType
+        14: common.timestamp(),
+        15: 2, //reqTransferType
+    };
+    const body = pb.encode({
+        1: 2,
+        3: req,
+        10: 3
+    });
+    const blob = await this.sendUni("LongConn.OffPicDown", body);
+    const rsp = pb.decode(blob)[3];
+    return "https://gchat.qpic.cn" + String(rsp[11]);
+}
+
 module.exports = {
-    ImageBuilder, uploadImages, buildImageFileParam
+    ImageBuilder, uploadImages, buildImageFileParam,
+    groupNTPicDown, offNTPicDown,
 };

package/lib/message/parser.js

@@ -10,7 +10,7 @@ const pb = require("../algo/pb");
 const face = require("./face");
 const { getGroupMsgs } = require("./history");
 const { int32ip2str } = require("../service");
-const { buildImageFileParam } = require("./image");
+const { buildImageFileParam, groupNTPicDown, offNTPicDown } = require("./image");
 const { Gfs, getC2CFileUrl } = require("./file");
 const { getVideoUrl, getPttUrl } = require("./ptt");
 const { genC2CMessageId, genGroupMessageId, timestamp, parseFunString, code2uin, genRandom, unzip } = require("../common");
@@ -202,20 +202,15 @@ class Parser {
             break;
         case 3: //flash
             msg.type = "flash";
-            msg.data = this.parseImgElem(elem);
+            msg.data = await this.parseImgElem(elem);
             brief = "[闪照]";
             break;
         case 0: //ptt
             msg.type = "record";
             msg.data.file = "protobuf://" + elem.toBase64();
-            if (elem[20]) {
-                const url = String(elem[20]);
-                msg.data.url = url.startsWith("http") ? url : "https://grouptalk.c2c.qq.com" + url;
-            } else {
-                try {
-                    msg.data.url = await getPttUrl.call(this.c, elem, this.gid);
-                } catch { }
-            }
+            try {
+                msg.data.url = await getPttUrl.call(this.c, elem, this.gid);
+            } catch { }
             brief = "[语音]";
             break;
         case 19: //video
@@ -256,6 +251,17 @@ class Parser {
                 msg.type = "face";
                 msg.data.id = elem[2][3];
                 if (elem[2][2]) msg.data.qlottie = String(elem[2][2]);
+                if (elem[2][2]) msg.data.extra = JSON.stringify({
+                    packId: elem[2][1], //string
+                    lottieId: elem[2][2], //string
+                    faceId: elem[2][3], //number
+                    sourceType: elem[2][4], //number
+                    lottieType: elem[2][5], //number
+                    resultId: elem[2][6], //string
+                    text: elem[2][7], //string
+                    surpriseId: elem[2][8], //string
+                    ramdomType: elem[2][9], //number
+                });
                 msg.data.text = face.map[msg.data.id];
                 if (!msg.data.text)
                     msg.data.text = elem[2][7] ? String(elem[2][7]) : ("/" + msg.data.id);
@@ -279,7 +285,7 @@ class Parser {
      * @param {number} type 
      * @param {import("../ref").Proto} elem 
      */
-    parsePartialElem(type, elem) {
+    async parsePartialElem(type, elem) {
         /**
          * @type {import("../ref").MessageElem}
          */
@@ -336,7 +342,7 @@ class Parser {
         case 4:
         case 8:
             msg.type = "image";
-            msg.data = this.parseImgElem(elem);
+            msg.data = await this.parseImgElem(elem);
             brief = "[图片]";
             break;
         case 34: //sface
@@ -422,7 +428,7 @@ class Parser {
                 case 8: //customFace
                 case 31: //mirai
                 case 34: //sface
-                    this.parsePartialElem(type, elem);
+                    await this.parsePartialElem(type, elem);
                     break;
                 case 5: //transElem
                 case 12: //xml
@@ -435,7 +441,7 @@ class Parser {
                     if (elem[1] === 3) { //flash
                         await this.parseExclusiveElem(3, elem[2][1] ? elem[2][1] : elem[2][2]);
                     } else if (elem[1] === 33) { //face(id>255)
-                        this.parsePartialElem(33, elem[2]);
+                        await this.parsePartialElem(33, elem[2]);
                     } else if (elem[1] === 2) { //poke
                         await this.parseExclusiveElem(126, elem);
                     } else if (elem[1] === 37) { //qlottie
@@ -459,9 +465,12 @@ class Parser {
      * @private
      * @param {import("../ref").Proto} elem 
      */
-    parseImgElem(elem) {
+    async parseImgElem(elem) {
         const data = { };
-        if (elem[7].toHex) { //私图
+        if (!elem[7]) { //QQNT私图
+            data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
+            data.url = await offNTPicDown.call(this.c, this.uid, elem);
+        } else if (elem[7].toHex) { //私图
             data.file = buildImageFileParam(elem[7].toHex(), elem[2], elem[9], elem[8], elem[5]);
             if (elem[29] && elem[29][30])
                 data.url = "https://gchat.qpic.cn" + elem[29][30] + "&spec=0&rf=naio";
@@ -469,12 +478,16 @@ class Parser {
                 data.url = "https://c2cpicdw.qpic.cn" + elem[15];
             else if (elem[10])
                 data.url = `https://c2cpicdw.qpic.cn/offpic_new/${this.uid}/${elem[10]}/0?term=2`;
+            if (!data.url || !data.url.includes("offpic_new"))
+                data.url = await offNTPicDown.call(this.c, this.uid, elem);
         } else { //群图
             data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
             if (elem[16])
                 data.url = "https://gchat.qpic.cn" + elem[16];
             else
                 data.url = `https://gchat.qpic.cn/gchatpic_new/${this.uid}/${code2uin(this.gid)||0}-${elem[7]>>>0}-${elem[13].toHex().toUpperCase()}/0?term=2`;
+            if (!data.url.includes("gchatpic_new"))
+                data.url = await groupNTPicDown.call(this.c, this.gid, elem);
         }
         return data;
     }

package/lib/message/ptt.js

@@ -293,7 +293,7 @@ async function getVideoUrl(elem) {
         });
         const blob = await this.sendUni("PttStore.GroupPttDown", body);
         const rsp = pb.decode(blob)[6];
-        return `https://grouptalk.c2c.qq.com${rsp[9].toString()}`;
+        return `https://${rsp[8].toString()}${rsp[9].toString()}`;
     } else {
         const body = pb.encode({
             1: 1200,

package/package.json

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