oicq-icalingua-plus-plus 1.24.39 → 1.24.41

package/lib/message/builder.js

@@ -172,8 +172,9 @@ class Builder {
      * @private
      * @param {string} text 
      * @param {Buffer} attr6 
+     * @param {Buffer} extra12
      */
-    buildTextElem(text, attr6 = null) {
+    buildTextElem(text, attr6 = null, extra12 = null) {
         text = String(text);
         let n = 0;
         while (n < text.length) {
@@ -198,7 +199,8 @@ class Builder {
             this.elems.push({
                 1: {
                     1: chunk,
-                    3: attr6
+                    3: attr6,
+                    12: extra12,
                 }
             });
         }
@@ -231,7 +233,21 @@ class Builder {
         const buf = Buffer.allocUnsafe(6);
         buf.writeUInt8(display.length), buf.writeUInt8(flag, 1), buf.writeUInt32BE(q, 2);
         const attr6 = Buffer.concat([AT_BUF, buf, BUF2]);
-        this.buildTextElem(display, attr6);
+        let uid = String(q);
+        try {
+            if (qq !== "all") {
+                const member = this.c.gml.get(this.target).get(q);
+                uid = member.uid || uid;
+            }
+        } catch (e) { }
+        const extra12 = {
+            3: flag === 1 ? 1 : 2,
+            4: q,
+            5: 0,
+            9: uid,
+            11: 0,
+        };
+        this.buildTextElem(display, attr6, extra12);
     }
 
     /**

package/lib/oicq.js

@@ -14,7 +14,7 @@ const { timestamp, BUF0, BUF16, unzip, log } = require("./common");
 const push = require("./onlinepush");
 const sysmsg = require("./core/sysmsg");
 const { initFL, initGL } = require("./core/friendlist");
-const { int32ip2str, getUploadChannel } = require("./service");
+const { int32ip2str, getUploadChannel, checkIPConnectivity } = require("./service");
 
 /**
  * @this {Client}
@@ -102,6 +102,11 @@ function pushReqListener(blob, seq) {
             if (v[1] === 10) {
                 this.storage.port = v[2][0][3];
                 this.storage.ip = int32ip2str(v[2][0][2]);
+                checkIPConnectivity(this.storage.ip, this.storage.port).then((res) => {
+                    if (res) return;
+                    this.logger.warn("上传通道IP不可用，将使用通用域名");
+                    this.storage.ip = "v6.htdata.qq.com";
+                });
             }
         }
         this.saveStorageConfig();
@@ -170,7 +175,6 @@ function msfOfflineListener(blob) {
  * @this {Client}
  */
 function kickoffListener(data) {
-    this._wt.deleteToken();
     this.status = STATUS_PENDING;
     this._stopHeartbeat();
     this.logger.warn(data.info);
@@ -191,6 +195,7 @@ function kickoffListener(data) {
         this.logger.mark("3秒后重新连接..");
         setTimeout(this.login.bind(this), 3000);
     }
+    if (sub_type !== "kickoff") this._wt.deleteToken();
     this.em("system.offline." + sub_type, { message: data.info });
 }
 
@@ -209,6 +214,7 @@ Client.prototype._register = async function () {
 };
 
 Client.prototype._var4 = 0;
+Client.prototype._nt_hb_var = 0;
 Client.prototype._runCircleTask = async function () {
     if (this._var4++ > 10) {
         await this._wt.refreshD2();
@@ -235,13 +241,22 @@ Client.prototype._startHeartbeat = function () {
         }
         this._wt.syncTimeDiff();
         this._wt.heartbeat();
-        if (this.config.useNT) this._wt.ssoHeartbeat();
+        if (this.config.useNT) {
+            if (this._nt_hb_var++ >= 5) {
+                this._nt_hb_var = 0;
+                this._wt.ssoHeartbeat();
+            }
+        }
         if (timestamp() - this.sig.qsign_token_time >= (60 * 60)) {
             this.sig.qsign_token_time = timestamp();
             this.refreshQSignToken();
         }
         if (!this.storage.port) {
-            await getUploadChannel.call(this);
+            try {
+                await getUploadChannel.call(this);
+            } catch {
+                this.logger.warn("getUploadChannel failed");
+            }
         }
     }, 30000);
 };
@@ -397,6 +412,7 @@ const listeners = {
     "MessageSvc.PushReaded": pushReadedListener,
     //"StatSvc.MsfConnProbe": function(){this._wt.ssoHeartbeat()},
     "trpc.msg.olpush.OlPushService.MsgPush": push.NTMsgListener,
+    //"trpc.msg.register_proxy.RegisterProxy.InfoSyncPush": push.infoSyncPushListener,
 };
 
 // MessageSvc.RequestPushStatus 其他PC端login

package/lib/onlinepush.js

@@ -839,7 +839,6 @@ async function NTMsgListener(blob, seq) {
             break;
         // WIP: NT的系统消息
     }
-
 }
 
 /**
@@ -882,6 +881,133 @@ function c2cNTMsgConverter(msg) {
         3: body,
     };
 }
+
+/**
+ * @this {import("./ref").Client}
+ */
+async function infoSyncPushListener(blob, seq) {
+    const o = pb.decode(blob);
+    const type = o[3];
+    switch (type) {
+        case 2:
+            try {
+                const group_message_sync = o[7]; //群消息
+                if (group_message_sync && group_message_sync[3]) {
+                    const groups = Array.isArray(group_message_sync[3]) ? group_message_sync[3] : [group_message_sync[3]];
+                    for (let group of groups) {
+                        const group_id = group[3];
+                        const from_seq = group[4];
+                        const to_seq = group[5];
+                        const msgs = Array.isArray(group[6]) ? group[6] : [group[6]];
+                        for (let i = msgs.length - 1; i >= 0; i--) {
+                            const msg = msgs[i];
+                            await NTMsgSync.call(this, Buffer.from(pb.encode({ 1: msg })), seq);
+                        }
+                    }
+                }
+                const olpush_sync = o[8]; //push732 push528 私聊消息
+                if (olpush_sync && olpush_sync[4]) {
+                    const olpushs_groups = Array.isArray(olpush_sync[4]) ? olpush_sync[4] : [olpush_sync[4]];
+                    for (let groups of olpushs_groups) {
+                        const olpushs = Array.isArray(groups[8]) ? groups[8] : [groups[8]];
+                        for (let i = olpushs.length - 1; i >= 0; i--) {
+                            const olpush = olpushs[i];
+                            await NTMsgSync.call(this, Buffer.from(pb.encode({ 1: olpush })), seq);
+                        }
+                    }
+                }
+                const guild_sync = o[9]; //频道，用不上
+            } catch (e) {
+                this.logger.warn("NT同步消息失败");
+                this.logger.debug(e);
+            }
+            break;
+        case 5:
+            //群消息列表同步
+            try {
+                const list = Array.isArray(o[6]) ? o[6] : [o[6]];
+                const chats = [];
+                for (let chat of list) {
+                    chats.push({
+                        group_id: chat[1],
+                        group_name: String(chat[9]),
+                        unread_count: chat[2] - chat[3] - 1,
+                        last_seq: chat[2],
+                        last_unread_seq: chat[3],
+                    })
+                }
+                this.em("new_tech_sync.group_list", chats);
+            } catch (e) {
+                this.logger.warn("群消息列表同步失败");
+                this.logger.debug(e);
+            }
+            break;
+        default:
+            break;
+    }
+}
+
+/**
+ * @this {import("./ref").Client}
+ */
+async function NTMsgSync(blob, seq) {
+    const o = pb.decode(blob);
+    const type = o[1][2][1];
+    this.logger.debug("NT message type", type);
+    switch (type) {
+        case 82: //群聊消息
+            try {
+                const msg = groupNTMsgConverter.call(this, o);
+                //生成消息id
+                const head = msg[1], content = msg[2], body = msg[3];
+                if (head[9][2] === 127) return;
+                const user_id = head[1], time = head[6], seq = head[5];
+                const group_id = head[9][1], random = body[1][1][3];
+                const message_id = genGroupMessageId(group_id, user_id, seq, random, time, content[1]);
+                //懒得搞分片消息了
+                //解析消息
+                const data = await parseGroupMsg.call(this, msg, true);
+                if (data && data.raw_message) {
+                    if (data.user_id === this.uin && this.config.ignore_self)
+                        return;
+                    data.reply = (message, auto_escape = false) => this.sendGroupMsg(data.group_id, message, auto_escape);
+                    data.message_id = message_id;
+                    const sender = data.sender;
+                    this.logger.info(`nt sync message: [Group: ${data.group_name}(${data.group_id}), Member: ${sender.card ? sender.card : sender.nickname}(${data.user_id})] ` + data.raw_message);
+                    this.em("new_tech_sync.group." + data.sub_type, data);
+                }
+            } catch (e) {
+                // this.logger.debug(e);
+            }
+            break;
+        case 141: //陌生人
+        case 166: //好友
+        case 167: //单向好友
+        case 208: //好友语音
+        case 529: //离线文件
+            try {
+                const msg = c2cNTMsgConverter.call(this, o);
+                const data = await parseC2CMsg.call(this, msg, true);
+                if (data.user_id === this.uin) {
+                    data.user_id = msg[1][2];
+                    this.em("new_tech_sync.private." + data.sub_type, data);
+                } else {
+                    if (data && data.raw_message) {
+                        data.reply = (message, auto_escape = false) => this.sendPrivateMsg(data.user_id, message, auto_escape);
+                        this.logger.info(`nt sync message: [Private: ${data.user_id}(${data.sub_type})] ` + data.raw_message);
+                        this.em("new_tech_sync.private." + data.sub_type, data);
+                    }
+                }
+            } catch (e) {
+                this.logger.debug(e);
+            }
+            break;
+        default:
+            break;
+    }
+}
+
 module.exports = {
-    onlinePushListener, onlinePushTransListener, c2cMsgSyncListener, groupMsgListener, discussMsgListener, NTMsgListener
+    onlinePushListener, onlinePushTransListener, c2cMsgSyncListener, groupMsgListener, discussMsgListener,
+    NTMsgListener, infoSyncPushListener
 };

package/lib/qimei.js

@@ -17,6 +17,22 @@ LQ+FLkpncClKVIrBwv6PHyUvuCb0rIarmgDnzkfQAqVufEtR64iazGDKatvJ9y6B
 9NMbHddGSAUmRTCrHQIDAQAB
 -----END PUBLIC KEY-----`;
 
+class SeededRandom {
+    constructor(seed) {
+        this.seed = seed;
+        this.state = md5(seed.toString()).toString("hex");
+    }
+
+    next() {
+        this.state = md5(this.state + secret).toString("hex");
+        return parseInt(this.state.substring(0, 8), 16) / 0xffffffff;
+    }
+
+    nextInt(min, max) {
+        return Math.floor(this.next() * (max - min + 1)) + min;
+    }
+}
+
 function dateFormat(fmt = "YYYY-mm-dd HH:MM:SS", date = new Date()) {
     let ret;
     const opt = {
@@ -43,10 +59,9 @@ function dateFormat(fmt = "YYYY-mm-dd HH:MM:SS", date = new Date()) {
  * @returns 
  */
 function genRandomPayloadByDevice(info, apk, platform) {
+    const seededRandom = new SeededRandom(info.android_id);
     const rangeRand = (max = 1, min = 0) => {
-        if (max < min) [max, min] = [min, max]
-        const diff = max - min
-        return Math.floor(Math.random() * diff) + min
+        return seededRandom.nextInt(min, max);
     };
     const reserved = {
         "harmony": "0",
@@ -67,10 +82,10 @@ function genRandomPayloadByDevice(info, apk, platform) {
         "kernel": info.proc_version
     };
     let beaconId = "";
-    const timestamp = Date.now();
-    const mtime1 = new Date(info.mtime);
+    const timestamp = info.mtime || apk.buildtime * 1000 + rangeRand(10 * 24 * 60 * 60 * 1000, 0);
+    const mtime1 = new Date(timestamp);
     const mtimeStr1 = dateFormat("YYYY-mm-ddHHMMSS", mtime1) + "." + info.imei.slice(2, 11);
-    const mtime2 = new Date(info.mtime - parseInt(info.imei.slice(2, 4)));
+    const mtime2 = new Date(timestamp - parseInt(info.imei.slice(2, 4)));
     const mtimeStr2 = dateFormat("YYYY-mm-ddHHMMSS", mtime2) + "." + info.imei.slice(5, 14);
     for (let i = 1; i <= 40; i++) {
         if ([1, 13, 14, 17, 18, 21, 33, 34, 37, 38].includes(i)) {

package/lib/service.js

@@ -354,10 +354,47 @@ async function getUploadChannel() {
     const rsp = pb.decode(blob)[1281];
     this.storage.sig_session = rsp[1].toBuffer();
     this.storage.session_key = rsp[2].toBuffer();
-    this.storage.ip = int32ip2str(rsp[3][2][0][2]);
-    this.storage.port = rsp[3][2][0][3];
+    const server = Array.isArray(rsp[3][2]) ? rsp[3][2][0] : rsp[3][2];
+    this.storage.ip = int32ip2str(server[2]);
+    this.storage.port = server[3];
+    if (!(await checkIPConnectivity(this.storage.ip, this.storage.port))) {
+        this.logger.warn("上传通道IP不可用，将使用通用域名");
+        this.storage.ip = "v6.htdata.qq.com";
+    }
+}
+
+/**
+ * 检查IP地址是否连通
+ * @param {string} ip - 要检查的IP地址
+ * @param {number} port - 要检查的端口号
+ * @param {number} timeout - 超时时间，单位毫秒
+ * @returns {Promise<boolean>}
+ */
+function checkIPConnectivity(ip, port, timeout = 5000) {
+    return new Promise((resolve) => {
+        const socket = new net.Socket();
+
+        socket.setTimeout(timeout);
+
+        socket.on('connect', () => {
+            socket.destroy();
+            resolve(true);
+        });
+
+        socket.on('timeout', () => {
+            socket.destroy();
+            resolve(false);
+        });
+
+        socket.on('error', () => {
+            socket.destroy();
+            resolve(false);
+        });
+
+        socket.connect(port, ip);
+    });
 }
 
 module.exports = {
-    downloadFromWeb, highwayUploadStream, int32ip2str, highwayHttpUpload, MAX_UPLOAD_SIZE, getUploadChannel,
+    downloadFromWeb, highwayUploadStream, int32ip2str, highwayHttpUpload, MAX_UPLOAD_SIZE, getUploadChannel, checkIPConnectivity
 };

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.24.39",
-  "app_version": "1.24.39",
-  "upday": "2024/08/07",
+  "version": "1.24.41",
+  "app_version": "1.24.41",
+  "upday": "2024/08/09",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",