oicq-icalingua-plus-plus 1.24.0 → 1.24.2

package/index.d.ts

@@ -162,6 +162,7 @@ export interface MemberBaseInfo {
     readonly role: GroupRole, //权限
     readonly title: string, //头衔
     readonly subid: number,
+    readonly uid: string,
 }
 /** 群员资料 */
 export interface MemberInfo extends MemberBaseInfo {
@@ -195,7 +196,8 @@ export interface MemberInfo extends MemberBaseInfo {
  */
 export type MessageElem = TextElem | AtElem | FaceElem | BfaceElem | MfaceElem |
     ImgPttElem | LocationElem | MusicElem | ShareElem | JsonElem | XmlElem |
-    AnonymousElem | ReplyElem | NodeElem | ShakeElem | PokeElem | FileElem | VideoElem | MiraiElem | RawElem;
+    AnonymousElem | ReplyElem | NodeElem | ShakeElem | PokeElem | FileElem | VideoElem |
+    MiraiElem | RawElem | MarkdownElem;
 
 export type Sendable = string | MessageElem | Iterable<MessageElem | string>
 
@@ -374,6 +376,13 @@ export interface MiraiElem {
     }
 }
 
+/** Markdown消息 */
+export interface MarkdownElem {
+    type: "markdown",
+    data: {
+        markdown: string
+    }
+}
 /** 该元素为需要直接发送的原始消息体，JSON 格式 */
 export interface RawElem {
     type: "raw",

package/lib/client-ext.js

@@ -102,7 +102,7 @@ Client.prototype.sendOidbSvcTrpcTcp = async function (cmd, body) {
         1: type1,
         2: isNaN(type2) ? 1 : type2,
         4: body,
-        6: "android " + this.apk.ver,
+        12: 0,
     });
     const payload = await this.sendUni(cmd, body);
     const rsp = pb.decode(payload);

package/lib/client.js

@@ -278,6 +278,8 @@ class Client extends EventEmitter {
         this.on("internal.login", onlineListener);
         this.on("internal.packet", packetListener);
         this.on("internal.network", networkErrorListener);
+
+        this.readStorageConfig();
     }
 
     /**
@@ -688,6 +690,33 @@ class Client extends EventEmitter {
     acquireGfs(group_id) {
         return new Gfs(this, group_id);
     }
+    saveStorageConfig() {
+        try {
+            fs.writeFileSync(path.join(this.dir, "storage.json"), JSON.stringify({
+                sig_session: this.storage.sig_session.toString("base64"),
+                session_key: this.storage.session_key.toString("base64"),
+                ip: this.storage.ip,
+                port: this.storage.port,
+            }));
+        } catch (e) {
+            this.logger.error(e);
+        }
+    }
+    readStorageConfig() {
+        try {
+            const bakPath = path.join(this.dir, "storage.json");
+            if (!fs.existsSync(bakPath))
+                return;
+            const bakJSON = fs.readFileSync(bakPath).toString();
+            const bakConfig = JSON.parse(bakJSON);
+            this.storage.sig_session = Buffer.from(bakConfig.sig_session, "base64");
+            this.storage.session_key = Buffer.from(bakConfig.session_key, "base64");
+            this.storage.ip = bakConfig.ip;
+            this.storage.port = bakConfig.port;
+        } catch (e) {
+            this.logger.error(e);
+        }
+    }
 }
 
 function createDataDir(dir, uin) {

package/lib/core/friendlist.js

@@ -159,7 +159,7 @@ async function __getGML(group_id, next_uin) {
         method: "GetTroopMemberListReq",
     };
     const body = jce.encodeWrapper({ GTML }, extra);
-    const blob = await this.sendUni("friendlist.GetTroopMemberListReq", body, 10);
+    const blob = await this.sendUni("friendlist.GetTroopMemberList", body, 10);
     const nested = jce.decode(blob);
     const map = new Map(), next = nested[4];
     for (let v of nested[3]) {
@@ -182,6 +182,7 @@ async function __getGML(group_id, next_uin) {
             card_changeable: true,
             shutup_time: v[30] * 1000 > Date.now() ? v[30] : 0,
             update_time: 0,
+            uid: v[42] || "",
         });
     }
     try {

package/lib/device.js

@@ -432,6 +432,58 @@ const apk = {
         ssover: 21,
         qua: 'V1_AND_SQ_9.0.0_5282_YYB_D',
     },
+
+    //android phone 9.0.8
+    41: {
+        ...DEFAULT_ANDROID_APK_INFO,
+        name: "A9.0.8.10368491",
+        version: "9.0.8.14755",
+        ver: "9.0.8",
+        buildtime: 1702888273,
+        subid: 537200218,
+        sdkver: "6.0.0.2558",
+        ssover: 21,
+        qua: 'V1_AND_SQ_9.0.8_5540_YYB_D',
+    },
+
+    //android phone 9.0.17
+    43: {
+        ...DEFAULT_ANDROID_APK_INFO,
+        name: "A9.0.17.6a4a36ca",
+        version: "9.0.17.151855",
+        ver: "9.0.17",
+        buildtime: 1702888273,
+        subid: 537204056,
+        sdkver: "6.0.0.2558",
+        ssover: 21,
+        qua: 'V1_AND_SQ_9.0.17_5712_YYB_D',
+    },
+
+    //android phone 9.0.25
+    45: {
+        ...DEFAULT_ANDROID_APK_INFO,
+        name: "A9.0.25.63b29b33",
+        version: "9.0.25.15760",
+        ver: "9.0.25",
+        buildtime: 1702888273,
+        subid: 537210084,
+        sdkver: "6.0.0.2558",
+        ssover: 21,
+        qua: 'V1_AND_SQ_9.0.25_5942_YYB_D',
+    },
+
+    //android phone 9.0.35
+    47: {
+        ...DEFAULT_ANDROID_APK_INFO,
+        name: "A9.0.35.52ab3f26",
+        version: "9.0.35.16275",
+        ver: "9.0.35",
+        buildtime: 1710769234,
+        subid: 537215475,
+        sdkver: "6.0.0.2559",
+        ssover: 21,
+        qua: 'V1_AND_SQ_9.0.35_6150_YYB_D',
+    },
 };
 
 //apad
@@ -502,6 +554,22 @@ apk[38].subid = 537187437;
 apk[40] = { ...apk[39] };
 apk[40].subid = 537194390;
 
+//apad 9.0.8
+apk[42] = { ...apk[41] };
+apk[42].subid = 537200257;
+
+//apad 9.0.17
+apk[44] = { ...apk[43] };
+apk[44].subid = 537204095;
+
+//apad 9.0.25
+apk[46] = { ...apk[45] };
+apk[46].subid = 537210123;
+
+//apad 9.0.35
+apk[48] = { ...apk[47] };
+apk[48].subid = 537215514;
+
 //ipad
 apk[5] = { ...apk[1] };
 apk[5].subid = 537155074;

package/lib/message/builder.js

@@ -879,6 +879,9 @@ class Builder {
         case "mirai":
             this.buildMiraiElem(data);
             break;
+        case "markdown":
+            this.c.logger.warn("暂不支持发送markdown消息");
+            break;
         case "raw":
             try {
                 this.elems.push(...JSON.parse(data.data));
@@ -1068,6 +1071,11 @@ class Builder {
         }
         if (retcode === 0) {
             if (this.type === 0) { //私聊
+                if (rsp[14] === 0) {
+                    let emsg = rsp[2] ? String(rsp[2]) : "";
+                    this.c.logger.error(`send failed: [${TYPES[this.type]}: ${this.target}] ${emsg}`);
+                    return { result: -1, emsg };
+                }
                 message_id = genC2CMessageId(this.target, this.seq, this.random, rsp[3], 1);
             }
             if (this.type === 1 && !message_id) { //群聊

package/lib/message/image.js

@@ -8,6 +8,7 @@ const fs = require("fs");
 const path = require("path");
 const { randomBytes } = require("crypto");
 const probe = require("probe-image-size");
+const axios = require("axios");
 const pb = require("../algo/pb");
 const common = require("../common");
 const { downloadFromWeb, highwayUploadStream, MAX_UPLOAD_SIZE } = require("../service");
@@ -595,7 +596,115 @@ async function offNTPicDown(user_id, fileResId) {
     return "https://gchat.qpic.cn" + String(rsp[11]);
 }
 
+/**
+ * 判断图片URL是否有效
+ * @this {import("../ref").Client}
+ * @param {string} url 
+ */
+async function checkImgUrl(url) {
+    const data = await axios.get(url, {
+        headers: { Range: 'bytes=0-1' }
+    }).then(res => res.data).catch(() => null);
+    return !!data;
+}
+
+/**
+ * 获取QQNT私聊图URL
+ * @this {import("../ref").Client}
+ * @param {Buffer} imgInfo 
+ * @param {String} uid
+ */
+async function getOffNTPicURL(imgInfo, uid = String(this.uid || this.uin)) {
+    const body = pb.encode({
+        1: {
+            1: {
+                1: 1,
+                2: 200,
+            },
+            2: {
+                101: 2,
+                102: 1,
+                200: 1,
+                201: {
+                    1: 2,
+                    2: uid,
+                },
+            },
+            3: {
+                1: 2,
+            },
+        },
+        3: {
+            1: imgInfo,
+            2: {
+                2: {
+                    1: 0,
+                    3: 0,
+                },
+            },
+        },
+    });
+    try {
+        const rsp = await this.sendOidbSvcTrpcTcp("OidbSvcTrpcTcp.0x11c5_200", body);
+        const rkey = rsp[3][1];
+        if (!rkey)
+            throw new Error("rkey不存在");
+        return `https://${rsp[3][3][1]}${rsp[3][3][2]}${rkey}&spec=0`;
+    } catch (e) {
+        this.logger.warn("获取QQNT图片URL失败", e.message);
+        return null;
+    }
+}
+
+/**
+ * 获取QQNT群图URL
+ * @this {import("../ref").Client}
+ * @param {Buffer} imgInfo 
+ * @param {number} gid
+ */
+async function getGroupNTPicURL(imgInfo, gid = 284840486) {
+    const body = pb.encode({
+        1: {
+            1: {
+                1: 1,
+                2: 200,
+            },
+            2: {
+                101: 2,
+                102: 1,
+                200: 2,
+                202: {
+                    1: gid,
+                },
+            },
+            3: {
+                1: 2,
+            },
+        },
+        3: {
+            1: imgInfo,
+            2: {
+                2: {
+                    1: 0,
+                    3: 0,
+                },
+            },
+        },
+    });
+    try {
+        const rsp = await this.sendOidbSvcTrpcTcp("OidbSvcTrpcTcp.0x11c5_200", body);
+        const rkey = rsp[3][1];
+        if (!rkey)
+            throw new Error("rkey不存在");
+        return `https://${rsp[3][3][1]}${rsp[3][3][2]}${rkey}&spec=0`;
+    } catch (e) {
+        this.logger.warn("获取QQNT图片URL失败", e.message);
+        return null;
+    }
+}
+
 module.exports = {
     ImageBuilder, uploadImages, buildImageFileParam,
-    groupNTPicDown, offNTPicDown,
+    groupNTPicDown, offNTPicDown, checkImgUrl,
+    getGroupNTPicURL, getOffNTPicURL,
 };

package/lib/message/multi.js

@@ -334,6 +334,13 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                     for (let i of msg[3][1][2]) {
                         if (i[9]) {
                             elements.push(i);
+                            elements.push({
+                                37: {
+                                    19: {
+                                        15: 65536
+                                    }
+                                }
+                            });
                             break;
                         }
                     }
@@ -348,6 +355,13 @@ async function makeForwardMsg(iterable, dm = false, target = 0) {
                     1: fake.bubble_id
                 }
             });
+            elements.push({
+                37: {
+                    19: {
+                        15: 65536
+                    }
+                }
+            });
         }
         nodes.push({
             1: {

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, groupNTPicDown, offNTPicDown } = require("./image");
+const { buildImageFileParam, groupNTPicDown, offNTPicDown, checkImgUrl, getOffNTPicURL, getGroupNTPicURL } = require("./image");
 const { Gfs, getC2CFileUrl } = require("./file");
 const { getVideoUrl, getPttUrl } = require("./ptt");
 const { genC2CMessageId, genGroupMessageId, timestamp, parseFunString, code2uin, genRandom, unzip } = require("../common");
@@ -203,7 +203,7 @@ class Parser {
             break;
         case 3: //flash
             msg.type = "flash";
-            msg.data = await this.parseImgElem(elem);
+            msg.data = await this.parseImgElem(type, elem);
             brief = "[闪照]";
             break;
         case 0: //ptt
@@ -343,7 +343,7 @@ class Parser {
         case 4:
         case 8:
             msg.type = "image";
-            msg.data = await this.parseImgElem(elem);
+            msg.data = await this.parseImgElem(type, elem);
             brief = "[图片]";
             break;
         case 34: //sface
@@ -361,6 +361,21 @@ class Parser {
                 return;
             }
             break;
+        case 45: //markdown
+            msg.type = "markdown";
+            brief = String(elem[1]);
+            msg.data.markdown = brief;
+            break;
+        case 46: //markdown button
+            break;
+        case 48: //image of qqnt
+            const imgData = await this.parseNTImgElem(type, elem);
+            if (imgData) {
+                msg.type = "image";
+                msg.data = imgData;
+                brief = "[图片]";
+            }
+            break;
         default:
             return;
         }
@@ -450,8 +465,11 @@ class Parser {
                     } else if (elem[1] === 20) { //json only for mobileqq
                         await this.parseExclusiveElem(51, elem[2]);
                     } else if (elem[1] == 48) { //image prefix of qqnt
+                        await this.parsePartialElem(48, elem[2]);
                         if (elem[2] && elem[2][1] && elem[2][1][2] && elem[2][1][2][1] && elem[2][1][2][3])
                             this.imgprefix = "https://" + String(elem[2][1][2][3]) + String(elem[2][1][2][1]);
+                    } else if (elem[1] == 45) { //markdown
+                        await this.parsePartialElem(type, elem[2]);
                     }
                     break;
                 case 45: //reply
@@ -465,50 +483,115 @@ class Parser {
     }
 
     /**
-     * 解析图片
+     * 解析QQNT图片
      * @private
+     * @param {number} type 48|3
      * @param {import("../ref").Proto} elem 
      */
-    async parseImgElem(elem) {
+    async parseNTImgElem(type, elem) {
         const data = { };
-        if (elem[29] && elem[29][30] && String(elem[29][30]).startsWith("&rkey=")) {
-            //QQNT 私图
-            if (this.imgprefix) {
-                data.file = buildImageFileParam(elem[7].toHex(), elem[2], elem[9], elem[8], elem[5]);
-                data.url = this.imgprefix + String(elem[29][30]) + "&spec=0";
-                this.imgprefix = null;
-                return data;
+        if (!elem[2] || !elem[2][1]) return null;
+        const dm = !!elem[2][1][11];
+        const extra = dm ? elem[2][1][11] : elem[2][1][12];
+        if (!extra) return null;
+        const ntPath = String(extra[30] || "");
+
+        const imgInfo = elem[1][1];
+        const md5 = imgInfo[1][2]; //string, not buffer
+        const sha1 = imgInfo[1][3];
+        const fileName = imgInfo[1][4];
+        const size = imgInfo[1][1];
+        const width = imgInfo[1][6];
+        const height = imgInfo[1][7];
+        const imgType = imgInfo[1][5][2];
+
+        const fileid = imgInfo[2];
+        const storeId = imgInfo[3];
+        const time = imgInfo[4];
+
+        data.file = buildImageFileParam(md5.toString(), size, width, height, imgType);
+
+        if (ntPath) {
+            data.url = `https://${elem[1][2][3]}${ntPath}&spec=0`;
+        } else {
+            data.url = `https://gchat.qpic.cn/gchatpic_new/0/0-0-${md5.toUpperCase()}/0`;
+        }
+        if (timestamp() - time > 60 * 60 || !(await checkImgUrl(data.url))) {
+            // 图片地址失效，尝试发包获取
+            let newURL = null;
+            if (dm) { //私聊
+                newURL = await getOffNTPicURL.call(this.c, imgInfo, String(this.uid));
+            } else { //群聊
+                newURL = await getGroupNTPicURL.call(this.c, imgInfo, this.gid);
             }
-        } else if (elem[34] && elem[34][30] && String(elem[34][30]).startsWith("&rkey=")) {
-            //QQNT 群图
-            if (this.imgprefix) {
-                data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
-                data.url = this.imgprefix + String(elem[34][30]) + "&spec=0";
-                this.imgprefix = null;
-                return data;
+            if (newURL) {
+                data.url = newURL;
             }
         }
-        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[2]);
-        } else if (elem[7].toHex) { //私图
-            data.file = buildImageFileParam(elem[7].toHex(), elem[2], elem[9], elem[8], elem[5]);
-            if (elem[10]) {
-                if (elem[23])
-                    data.url = await groupNTPicDown.call(this.c, this.gid, elem[23], elem[7]);
-                else
-                    data.url = await offNTPicDown.call(this.c, this.uid, elem[10]);
+        return data;
+    }
+
+    /**
+     * 解析图片
+     * @private
+     * @param {number} type 4|8|3
+     * @param {import("../ref").Proto} elem 
+     */
+    async parseImgElem(type, elem) {
+        const data = { };
+        const dm = type === 3 ? (!!elem[1]) : (type === 4); //私图
+        const md5 = dm ? elem[7] : elem[13];
+        const fileName = dm ? elem[1] : elem[2];
+        const fileid = dm ? elem[3] : elem[7];
+        const fileResId = dm ? elem[10] : undefined;
+        const extra = dm ? elem[29] : elem[34];
+        const ntPath = extra ? String(extra[30]) : null;
+
+        const size = dm ? elem[2] : elem[25];
+        const width = dm ? elem[9] : elem[22];
+        const height = dm ? elem[8] : elem[23];
+        const imgType = dm ? elem[5] : elem[20];
+        data.file = buildImageFileParam(md5.toHex(), size, width, height, imgType);
+
+        if (this.imgprefix && ntPath && ntPath.startsWith("&rkey=")) {
+            data.url = this.imgprefix + String(ntPath) + "&spec=0";
+            this.imgprefix = null;
+            if (await checkImgUrl(data.url))
+                return data;
+        }
+
+        if (dm) { //私图
+            if (ntPath && ntPath.startsWith("/download") && ntPath.includes("rkey=")) {
+                data.url = "https://gchat.qpic.cn" + ntPath + "&spec=0";
+            } else if (elem[15]) {
+                data.url = "https://gchat.qpic.cn" + elem[15];
+            } else {
+                data.url = `https://gchat.qpic.cn/gchatpic_new/0/0-0-${md5.toHex().toUpperCase()}/0`
+            }
+            if (!(await checkImgUrl(data.url))) {
+                // 图片地址失效，尝试发包获取
+                if (elem[23]) { //QQNT 私聊合并转发到群聊图
+                    data.url = await groupNTPicDown.call(this.c, this.gid || 284840486, elem[23], md5);
+                } else { //纯私聊图片
+                    data.url = await offNTPicDown.call(this.c, this.uid, fileResId);
+                }
             }
-            else if (elem[15])
-                data.url = "https://c2cpicdw.qpic.cn" + elem[15];
         } else { //群图
-            data.file = buildImageFileParam(elem[13].toHex(), elem[25], elem[22], elem[23], elem[20]);
-            if (elem[16])
+            if (ntPath && ntPath.startsWith("/download") && ntPath.includes("rkey=")) {
+                data.url = "https://gchat.qpic.cn" + ntPath + "&spec=0";
+            } else 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[7], elem[13]);
+            } else {
+                data.url = `https://gchat.qpic.cn/gchatpic_new/0/0-0-${md5.toHex().toUpperCase()}/0`
+            }
+            if (!(await checkImgUrl(data.url))) {
+                // 图片地址失效，尝试发包获取
+                if (fileid) { //纯群聊图片
+                    data.url = await groupNTPicDown.call(this.c, this.gid || 284840486, fileid, md5);
+                } else { //QQNT 群聊合并转发到私聊图
+                    data.url = await offNTPicDown.call(this.c, this.uid, fileName);
+                }
+            }
         }
         return data;
     }

package/lib/message/ptt.js

@@ -286,6 +286,7 @@ async function getVideoUrl(elem) {
                     8: 3,
                     10: 0,
                     11: elem[18],
+                    12: 1,
                     14: 2,
                     15: 1,
                 },

package/lib/oicq.js

@@ -104,6 +104,7 @@ function pushReqListener(blob, seq) {
                 this.storage.ip = int32ip2str(v[2][0][2]);
             }
         }
+        this.saveStorageConfig();
     }
 }
 

package/lib/wtlogin/wt.js

@@ -47,6 +47,8 @@ class WtLogin {
     set nickname(val) { this.c.nickname = val; }
     set sex(val) { this.c.sex = val; }
     set age(val) { this.c.age = val; }
+    get uid() { return this.c.uid; }
+    set uid(val) { this.c.uid = val; }
 
     /**
      * @param {import("../ref").Client} c 

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.24.0",
-  "app_version": "1.24.0",
-  "upday": "2024/01/05",
+  "version": "1.24.2",
+  "app_version": "1.24.2",
+  "upday": "2024/04/22",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",