oicq-icalingua-plus-plus 1.24.76 → 1.25.0

package/lib/client-ext.js

@@ -71,9 +71,9 @@ Client.prototype.send = function (packet, timeout = 5, seq_id = this.seq_id) {
  * 除login包之外都是uni包，以0x0b开头
  * login包以0x0a开头
  */
-Client.prototype.writeUni = async function (cmd, body, seq = 0) {
+Client.prototype.writeUni = async function (cmd, body, seq = 0, options = {}) {
     ++this.stat.sent_pkt_cnt;
-    const packet = await this._buildUniPacket(cmd, body, seq);
+    const packet = await this._buildUniPacket(cmd, body, seq, options);
     this._socket.write(packet);
 };
 
@@ -122,7 +122,7 @@ Client.prototype.sendOidbSvcTrpcTcp = async function (cmd, body, useUid = false)
         4: body,
         12: 0,
     });
-    const options = useUid ? ["trace_parent", "nt_core"] : [];
+    const options = useUid ? { trace_parent: true, nt_core: true } : { };
     const seq = this.nextSeq();
     const packet = await this._buildUniPacket(cmd, body, seq, options);
     const payload = await this.send(packet, 5, seq);
@@ -136,9 +136,9 @@ Client.prototype.sendOidbSvcTrpcTcp = async function (cmd, body, useUid = false)
  * @param {string} cmd 
  * @param {Buffer} body 
  * @param {number} seq
- * @param {Array<string>} options
+ * @param {import("./ref").SsoOptions} options
  */
-Client.prototype._buildUniPacket = async function (cmd, body, seq = 0, options = []) {
+Client.prototype._buildUniPacket = async function (cmd, body, seq = 0, options = {}) {
     seq = seq ? seq : this.nextSeq();
     const startTime = Date.now();
     const reserveFields = await this.buildSSOReserveField(cmd, Buffer.from(body), seq, options);
@@ -243,8 +243,12 @@ Client.prototype.buildSyncCookie = function () {
 /**
  * 消息同步
  */
-Client.prototype.pbGetMsg = async function (force = false, flag = 0) {
+Client.prototype.pbGetMsg = async function (force = false, flag = 0, count = 10) {
     if (this.config.useNT && !force) return true;
+    if (count <= 0)  {
+        this.sync_cookie = null;
+        return true;
+    }
     if (!this.sync_cookie)
         this.sync_cookie = this.buildSyncCookie();
     let body = pb.encode({
@@ -361,12 +365,10 @@ Client.prototype.pbGetMsg = async function (force = false, flag = 0) {
         if (items.length) {
             this.writeUni("MessageSvc.PbDeleteMsg", pb.encode({ 1: items }));
         }
-        /*
         if (rsp[4] !== undefined && rsp[4] !== 2) {
             this.logger.debug("消息同步未完成，继续同步中，sync flag: " + rsp[4]);
-            return await this.pbGetMsg(force, rsp[4]);
+            return await this.pbGetMsg(force, rsp[4], count - 1);
         }
-        */
         return true;
     } catch (e) {
         this.logger.debug("getMsg发生错误。");
@@ -563,9 +565,9 @@ Client.prototype.refreshQSignToken = async function(retry = 0) {
  * @param {string} cmd
  * @param {Buffer} body
  * @param {number} seq_id
- * @param {Array<string>} options
+ * @param {import("./ref").SsoOptions} options
  */
-Client.prototype.buildSSOReserveField = async function(cmd, body, seq_id = this.seq_id, options = []) {
+Client.prototype.buildSSOReserveField = async function(cmd, body, seq_id = this.seq_id, options = {}) {
     const qimei = this.device.qimei36 || this.device.qimei16 || "";
     const reserveFields = {
         9: 1, //flag (uint32) 0b1: wifi 0b0: mobile 0b10: weak network
@@ -578,6 +580,7 @@ Client.prototype.buildSSOReserveField = async function(cmd, body, seq_id = this.
         19: 1, //network_type (uint32)
         20: 1, //ip_stack_type (uint32)
         21: 0, //message_type (uint32)
+        23: null, //trans_info (bytes)
         24: null, //sec_info (bytes)
         26: null, //nt_core_version (uint32)
         28: 3, //sso_ip_origin (uint32)
@@ -585,15 +588,21 @@ Client.prototype.buildSSOReserveField = async function(cmd, body, seq_id = this.
     if (this.needSignCmd.includes(cmd)) {
         reserveFields[24] = await this.getSign(cmd, body, seq_id);
     }
-    if (options.includes("trace_parent")) {
+    if (options.trace_parent) {
         reserveFields[15] = "00-00000000000000000000000000000000-0000000000000000-00";
         reserveFields[21] = 2;
+        if (typeof options.trace_parent === "string") {
+            reserveFields[15] = options.trace_parent;
+        }
     }
-    if (options.includes("nt_core")) { //此时数据包内需用uid取代uin
+    if (options.nt_core) { //此时数据包内需用uid取代uin
         reserveFields[16] = String(this.uid);
         reserveFields[21] |= 32;
         reserveFields[26] = 100;
     }
+    if (options.trans_info) {
+        reserveFields[23] = options.trans_info;
+    }
     return Buffer.from(pb.encode(reserveFields));
 }
 

package/lib/message/builder.js

@@ -278,6 +278,7 @@ class Builder {
                 text: text,
                 surpriseId: "",
                 ramdomType: 1,
+                chainCount: null,
                 businessType: 1,
             };
             if (cq.extra) {
@@ -295,13 +296,14 @@ class Builder {
                             2: lottieElem.lottieId, //QQ只靠小表情的faceId来展示对应lottie表情
                             3: lottieElem.faceId,
                             4: lottieElem.sourceType,
-                            5: lottieElem.lottieType, //展示形式，1:普通 2:有结果 3:龙年专用lottie表情
+                            5: lottieElem.lottieType, //展示形式，1:普通 2:有结果 3:接龙lottie表情
                             6: lottieElem.resultId, //有结果时的展示的结果动画id
                             7: lottieElem.text,
-                            8: lottieElem.surpriseId,
+                            8: lottieElem.surpriseId, //全屏动画id
                             9: lottieElem.ramdomType,
+                            10: lottieElem.chainCount, //接龙次数
                         },
-                        3: lottieElem.businessType //1:普通 2:服务器随机resultId 3:龙年专用lottie表情
+                        3: lottieElem.businessType //1:普通 2:服务器随机resultId 3:接龙lottie表情
                     }
                 },
                 {

package/lib/message/face.js

@@ -358,6 +358,10 @@ const map = {
     426: "/玩火",
     427: "/偷感",
     428: "/收到",
+    429: "/蛇年快乐",
+    430: "/蛇尾",
+    431: "/大蛇",
+    432: "灵蛇献瑞",
 };
 
 const FACE_OLD_BUF = Buffer.from([0x00, 0x01, 0x00, 0x04, 0x52, 0xCC, 0xF5, 0xD0]);

package/lib/oicq.js

@@ -233,8 +233,9 @@ Client.prototype._nt_hb_var = 0;
 Client.prototype._runCircleTask = async function () {
     if (this._var4++ > 10) {
         await this._wt.refreshD2();
-        if (this.apk.id != "com.tencent.qqlite")
-            this.setOnlineStatus(this.online_status);
+        if (!this.config.useNT) {
+            this.writeUni('StatSvc.SimpleGet', BUF0);
+        }
         this._var4 = 0;
     }
     for (let time of this.seq_cache.keys()) {
@@ -383,7 +384,7 @@ async function parseSSO(buf) {
     const seq = buf.readInt32BE(4);
     const retcode = buf.readInt32BE(8);
     if (retcode !== 0) {
-        const retmsg_len = buf.readInt32BE(12);
+        const retmsg_len = buf.readUInt32BE(12);
         const retmsg = String(buf.slice(16, 16 + retmsg_len - 4));
         const error = new Error("unsuccessful retcode: " + retcode + " retmsg: " + retmsg + " seq: " + seq);
         if (this.handlers.has(seq))
@@ -396,7 +397,7 @@ async function parseSSO(buf) {
 
     if (cmd === "Heartbeat.Alive") {
         return {
-            seq, cmd, payload: BUF0
+            seq, cmd, payload: BUF0, reserved: BUF0
         };
     }
 
@@ -404,6 +405,9 @@ async function parseSSO(buf) {
     len = buf.readUInt32BE(offset); // length of session_id
     offset += len;
     const flag = buf.readInt32BE(offset);
+    offset += 4;
+    len = buf.readUInt32BE(offset); // length of reserved
+    const reserved = buf.slice(offset + 4, offset + len);
     let payload;
     if (flag === 0) {
         payload = buf.slice(headlen + 4);
@@ -418,7 +422,7 @@ async function parseSSO(buf) {
         throw error;
     }
     return {
-        seq, cmd, payload
+        seq, cmd, payload, reserved
     };
 }
 

package/lib/ref.d.ts

@@ -151,6 +151,12 @@ export interface Storage {
     port: number,
 }
 
+export interface SsoOptions {
+    trace_parent?: boolean | string;
+    nt_core?: boolean;
+    trans_info?: Buffer;
+}
+
 //////////
 
 export class Client extends oicq.Client {
@@ -188,7 +194,7 @@ export class Client extends oicq.Client {
     handleSsoCallback(callbackList: Array<any>): Promise<void>;
     submitSsoCallback(cmd: string, callbackId: number, body: Buffer): Promise<void>;
     refreshQSignToken(): Promise<void>;
-    buildSSOReserveField(cmd: string, body: Buffer, seq?: number, options?: Array<string>): Promise<Buffer>;
+    buildSSOReserveField(cmd: string, body: Buffer, seq?: number, options?: SsoOptions): Promise<Buffer>;
 }
 
 export * from '../index';

package/lib/wtlogin/wt.js

@@ -417,9 +417,11 @@ class WtLogin {
         try {
             const blob = await this.c.send(pkt, undefined, seq);
             const rsp = jce.decode(blob);
-            const result = rsp[9] ? true : false;
-            if (!result && !logout)
+            const result = !rsp[2];
+            if (!result && !logout) {
+                this.logger.error(`上线失败：${rsp[3]}(${rsp[2]})`);
                 await this.deleteToken();
+            }
             return result;
         } catch {
             return false;
@@ -573,10 +575,9 @@ class WtLogin {
             "trpc.msg.register_proxy.RegisterProxy.SsoInfoSync",
             "trpc.qq_new_tech.status_svc.StatusService.UnRegister"
         ];
-        const options = [];
+        let options = { };
         if (ntRegCmds.includes(cmd)) {
-            options.push("nt_core");
-            options.push("trace_parent");
+            options = { nt_core: true, trace_parent: true };
         }
         const startTime = Date.now();
         let reserveFields = await this.c.buildSSOReserveField(cmd, Buffer.from(body), seq, options);

package/package.json

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