oicq-icalingua-plus-plus 1.26.7 → 1.26.9

package/index.d.ts

@@ -1240,7 +1240,9 @@ export class Client extends EventEmitter {
 
     //----------以下为隐藏方法，可用于扩展协议----------\\
     /** 发送一个未加密的uni包 */
-    sendUni(cmd: string, body: Uint8Array): Promise<Buffer>;
+    sendUni(cmd: string, body: Uint8Array, timeout?: number, options?: SsoOptions): Promise<Buffer>;
+    /** 写入一个未加密的uni包 */
+    writeUni(cmd: string, body: Buffer, seq?: number, options?: SsoOptions): Promise<void>;
     /** 发送一个未加密的oidb包 */
     sendOidb(cmd: string, body: Uint8Array): Promise<Buffer>;
     /** 发送一个未加密的OidbSvcTrpcTcp包 */

package/lib/algo/jce/jce.js

@@ -1,5 +1,5 @@
 "use strict";
-const Readable = require("stream").Readable;
+const Reader = require("../reader");
 class JceError extends Error { }
 const BUF0 = Buffer.alloc(0);
 
@@ -36,7 +36,7 @@ let _encoding = "utf8";
 class Struct extends null { }
 
 /**
- * @param {Readable} stream 
+ * @param {Reader} stream 
  */
 function readHead(stream) {
     const head = stream.read(1).readUInt8();
@@ -49,7 +49,7 @@ function readHead(stream) {
 }
 
 /**
- * @param {Readable} stream 
+ * @param {Reader} stream 
  * @param {number} type UInt8 0~13
  */
 function readBody(stream, type) {
@@ -108,7 +108,7 @@ function readBody(stream, type) {
 }
 
 /**
- * @param {Readable} stream 
+ * @param {Reader} stream 
  */
 function readStruct(stream) {
     const struct = Object.create(Struct.prototype);
@@ -123,7 +123,7 @@ function readStruct(stream) {
 }
 
 /**
- * @param {Readable} stream 
+ * @param {Reader} stream 
  */
 function readElement(stream) {
     const head = readHead(stream);
@@ -286,7 +286,7 @@ function setEncoding(encoding = "utf8") {
  * @returns {{[k: number]: any}} 
  */
 function decode(blob) {
-    const stream = Readable.from(blob, {objectMode: false});
+    const stream = new Reader(blob);
     stream.read(0);
     const result = Object.create(null);
     while(stream.readableLength) {

package/lib/algo/reader.js

@@ -0,0 +1,81 @@
+class Reader {
+    /**
+     * @param {Buffer | ArrayBuffer | Uint8Array} data
+     */
+    constructor(data) {
+        if (data instanceof Buffer) {
+            this._buf = data;
+        } else {
+            this._buf = Buffer.from(data);
+        }
+        this._offset = 0;
+    }
+
+    get readableLength() {
+        return Math.max(0, this._buf.length - this._offset);
+    }
+
+    read(n) {
+        if (arguments.length === 0) {
+            n = this.readableLength;
+        }
+        if (typeof n !== "number") {
+            throw new TypeError("n must be a number");
+        }
+        if (n <= 0 || this.readableLength === 0) {
+            return null;
+        }
+
+        const r = this._buf.subarray(this._offset, this._offset + n);
+        this._offset += n;
+        return r;
+    }
+
+    readU8() {
+        const value = this._buf.readUInt8(this._offset);
+        this._offset += 1;
+        return value;
+    }
+
+    readU16() {
+        const value = this._buf.readUInt16BE(this._offset);
+        this._offset += 2;
+        return value;
+    }
+
+    readU32() {
+        const value = this._buf.readUInt32BE(this._offset);
+        this._offset += 4;
+        return value;
+    }
+
+    read32() {
+        const value = this._buf.readInt32BE(this._offset);
+        this._offset += 4;
+        return value;
+    }
+
+    readU64() {
+        const value = this._buf.readBigUInt64BE(this._offset);
+        this._offset += 8;
+        return value;
+    }
+
+    readBytes(length) {
+        const value = Buffer.from(this._buf.slice(this._offset, this._offset + length));
+        this._offset += length;
+        return value;
+    }
+
+    readWithLength() {
+        const length = this.readU32() - 4;
+        return this.readBytes(length);
+    }
+
+    readTlv() {
+        const length = this.readU16();
+        return this.readBytes(length);
+    }
+}
+
+module.exports = Reader;

package/lib/client-ext.js

@@ -68,9 +68,9 @@ Client.prototype.writeUni = async function (cmd, body, seq = 0, options = {}) {
 /**
  * 发送一个uni包并返回响应包
  */
-Client.prototype.sendUni = async function (cmd, body, timeout = 5) {
+Client.prototype.sendUni = async function (cmd, body, timeout = 5, options = {}) {
     const seq = this.nextSeq();
-    const packet = await this._buildUniPacket(cmd, body, seq);
+    const packet = await this._buildUniPacket(cmd, body, seq, options);
     return this.send(packet, timeout, seq);
 };
 
@@ -232,7 +232,7 @@ Client.prototype.buildSyncCookie = function () {
  * 消息同步
  */
 Client.prototype.pbGetMsg = async function (force = false, flag = 0, count = 10) {
-    if (this.config.useNT && !force) return true;
+    if (this.config.useNT) return true;
     if (count <= 0)  {
         this.sync_cookie = null;
         return true;

package/lib/message/multi.js

@@ -14,6 +14,7 @@ const deflate = util.promisify(zlib.deflate);
 const { getC2CMsgs, getGroupMsgs } = require("./history");
 const http = require("http");
 const https = require("https");
+const { sleep } = require("../qsign-api");
 const BUF1 = Buffer.from([1]);
 
 function buildTextElem(str) {
@@ -193,8 +194,9 @@ async function _downloadMultiMsgNt(resid, bu) {
  * @param {boolean} dm
  * @param {number} target
  * @param {boolean} nt
+ * @param {number} retry
  */
-async function makeForwardMsg(iterable, dm = false, target = 0, nt = true) {
+async function makeForwardMsg(iterable, dm = false, target = 0, nt = true, retry = 0) {
 
     if (typeof iterable[Symbol.iterator] !== "function")
         iterable = [iterable];
@@ -520,6 +522,11 @@ async function makeForwardMsg(iterable, dm = false, target = 0, nt = true) {
             this.logger.warn("failed to upload forward msg with NT protocol, try old protocol -> " + e.message);
             return makeForwardMsg.call(this, iterable, dm, target, false);
         }
+        if (retry < 3) {
+            this.logger.warn("failed to upload forward msg, retry -> " + e.message);
+            await sleep(1000);
+            return makeForwardMsg.call(this, iterable, dm, target, nt, retry + 1);
+        }
         throw new Error("failed to upload forward msg -> " + e.message);
     }
     

package/lib/oicq.js

@@ -10,6 +10,7 @@ const { Client, STATUS_ONLINE, STATUS_OFFLINE, STATUS_PENDING } = require("./cli
 const tea = require("./algo/tea");
 const pb = require("./algo/pb");
 const jce = require("./algo/jce");
+const Reader = require("./algo/reader");
 const { timestamp, BUF0, BUF16, unzip, log } = require("./common");
 const push = require("./onlinepush");
 const sysmsg = require("./core/sysmsg");
@@ -388,20 +389,19 @@ function pushDomainListener() {
  * @param {Buffer} buf 
  */
 async function parseSSO(buf) {
+    const stream = new Reader(buf);
+    const header = new Reader(stream.readWithLength());
     const headlen = buf.readInt32BE();
-    const seq = buf.readInt32BE(4);
-    const retcode = buf.readInt32BE(8);
+    const seq = header.read(4).readInt32BE();
+    const retcode = header.read(4).readInt32BE();
+    const retmsg = String(header.readWithLength());
     if (retcode !== 0) {
-        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))
             this.handlers.get(seq)(null, error);
         throw error;
     }
-    let offset = buf.readUInt32BE(12) + 12;
-    let len = buf.readUInt32BE(offset); // length of cmd
-    const cmd = String(buf.slice(offset + 4, offset + len));
+    const cmd = String(header.readWithLength());
 
     if (cmd === "Heartbeat.Alive") {
         return {
@@ -409,13 +409,9 @@ async function parseSSO(buf) {
         };
     }
 
-    offset += len;
-    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);
+    const session_id = header.readWithLength();
+    const flag = header.read(4).readInt32BE();
+    const reserved = header.readWithLength();
     let payload;
     if (flag === 0) {
         payload = buf.slice(headlen + 4);
@@ -502,7 +498,7 @@ async function packetListener(pkt) {
         if (this.handlers.has(sso.seq))
             return this.handlers.get(sso.seq)(sso.payload);
         if (Reflect.has(listeners, sso.cmd))
-            listeners[sso.cmd].call(this, sso.payload, sso.seq);
+            listeners[sso.cmd].call(this, sso.payload, sso.seq, sso);
         this.emit("internal.sso", sso);
     } catch (e) {
         ++this.stat.sso_error;

package/lib/onlinepush.js

@@ -7,7 +7,7 @@ const pb = require("./algo/pb");
 const jce = require("./algo/jce");
 const sysmsg = require("./core/sysmsg");
 const { parseC2CMsg ,parseGroupMsg, parseDiscussMsg } = require("./message/parser");
-const { genC2CMessageId, genGroupMessageId, log, uin2code } = require("./common");
+const { genC2CMessageId, genGroupMessageId, log, uin2code, BUF0 } = require("./common");
 const { updateFL, uid2uin } = require("./core/friendlist");
 
 /**
@@ -766,7 +766,7 @@ function rebuildFragments(msg) {
 /**
  * @this {import("./ref").Client}
  */
-async function NTMsgListener(blob, seq) {
+async function NTMsgListener(blob, seq, sso) {
     const o = pb.decode(blob);
     const type = o[1][2] ? o[1][2][1] : 114514;
     //this.logger.debug("NT message type", type);
@@ -800,8 +800,46 @@ async function NTMsgListener(blob, seq) {
             }
             break;
         case 33: //群员入群
+            const group_id = uin2code(o[1][1][1]);
+            const msg = o[1][3][2];
+            const user_uid = String(msg[3]);
+            const user_id = await uid2uin.call(this, user_uid);
+            let nickname = "";
+            const ginfo = (await this.getGroupInfo(group_id)).data;
+            if (!ginfo) return;
+            if (user_id === this.uin) {
+                nickname = this.nickname;
+                this.logger.info(`更新了群列表，新增了群：${group_id}`);
+            } else {
+                ginfo.member_count++;
+                ginfo.last_join_time = timestamp();
+                const info = await this.getGroupMemberInfo(group_id, user_id);
+                nickname = info.data.nickname || info.data.card || "";
+                try {
+                    if (this.gml.get(group_id).size)
+                        ginfo.member_count = this.gml.get(group_id).size;
+                } catch { }
+                this.logger.info(`${user_id}(${nickname}) 加入了群 ${group_id}`);
+            }
+            this.getGroupMemberList(group_id, true);
+            this.em("notice.group.increase", {
+                group_id, user_id, nickname
+            });
+            break;
         case 38: //建群
         case 85: //群申请被同意
+            const group_id = uin2code(o[1][1][1]);
+            const user_id = this.uin;
+            const nickname = this.nickname;
+            const ginfo = (await this.getGroupInfo(group_id)).data;
+            if (!ginfo) return;
+            if (user_id === this.uin) {
+                this.logger.info(`更新了群列表，新增了群：${group_id}`);
+                this.getGroupMemberList(group_id);
+            }
+            this.em("notice.group.increase", {
+                group_id, user_id, nickname
+            });
             break;
         case 141: //陌生人
         case 166: //好友
@@ -845,11 +883,6 @@ async function NTMsgListener(blob, seq) {
             } catch (e) {
                 this.logger.debug(e);
             }
-            if (o[4]) {
-                this.writeUni("trpc.msg.olpush.OlPushService.SsoPushAck", pb.encode({
-                    1: o[4],
-                }));
-            }
             break;
         case 732: //push732
             try {
@@ -864,11 +897,6 @@ async function NTMsgListener(blob, seq) {
             } catch (e) {
                 this.logger.debug(e);
             }
-            if (o[4]) {
-                this.writeUni("trpc.msg.olpush.OlPushService.SsoPushAck", pb.encode({
-                    1: o[4],
-                }));
-            }
             break;
         case 114514: // 1919810
             // 部分消息没有content
@@ -877,6 +905,20 @@ async function NTMsgListener(blob, seq) {
             this.logger.warn("Unknown NT message type", type);
             break;
     }
+    if (o[4]) {
+        let trans_info = BUF0;
+        try {
+            const trans_info = pb.decode(sso.reserved)[23] || BUF0;
+        } catch (e) {
+            this.logger.debug(e);
+        }
+        this.writeUni("trpc.msg.olpush.OlPushService.SsoPushAck", pb.encode({
+            1: o[4],
+        }), undefined, {
+            trans_info: trans_info,
+            nt_core: true,
+        });
+    }
 }
 
 /**

package/lib/ref.d.ts

@@ -183,7 +183,8 @@ export class Client extends oicq.Client {
 
     nextSeq(): number;
     send(): Promise<Buffer>;
-    writeUni(cmd: string, body: Buffer, seq?: number): Promise<void>;
+    sendUni(cmd: string, body: Uint8Array, timeout?: number, options?: SsoOptions): Promise<Buffer>;
+    writeUni(cmd: string, body: Buffer, seq?: number, options?: SsoOptions): Promise<void>;
     msgExists(from: number, type: number, seq: number, time: number): boolean;
     buildSyncCookie(): Buffer;
     parseEventType(name: string): oicq.CommonEventData;

package/lib/wtlogin/login-password.js

@@ -16,7 +16,7 @@ const Writer = require("./writer");
 const { md5, NOOP, timestamp, BUF0 } = require("../common");
 const tea = require("../algo/tea");
 const Ecdh = require("./ecdh");
-const Readable = require("stream").Readable;
+const Reader = require("../algo/reader");
 const { getQIMEI } = require("../qimei");
 
 WtLogin.prototype.passwordLogin = async function () {
@@ -66,15 +66,15 @@ WtLogin.prototype.passwordLogin = async function () {
             this.logger.warn("你的登录缓存有缺失或者是旧版创建的，将使用旧版刷新包。");
         }
         const token = await fs.promises.readFile(path.join(this.dir, "token"));
-        const stream = Readable.from(token, { objectMode: false });
-        const d2key = stream.read(stream.read(2).readUInt16BE());
-        const d2 = stream.read(stream.read(2).readUInt16BE());
-        const ticket = stream.read(stream.read(2).readUInt16BE());
-        const sig = stream.read(stream.read(2).readUInt16BE());
-        const srm = stream.read(stream.read(2).readUInt16BE());
-        const tgt = stream.read(stream.read(2).readUInt16BE());
-        this.sig.device_token = stream.read(stream.read(2).readUInt16BE());
-        this.sig._ksid = stream.read(stream.read(2).readUInt16BE()) || BUF0;
+        const stream = new Reader(token);
+        const d2key = stream.readTlv();
+        const d2 = stream.readTlv();
+        const ticket = stream.readTlv();
+        const sig = stream.readTlv();
+        const srm = stream.readTlv();
+        const tgt = stream.readTlv();
+        this.sig.device_token = stream.readTlv();
+        this.sig._ksid = stream.readTlv() || BUF0;
         if (d2key.length && d2.length && ticket.length && sig.length && srm.length && tgt.length) {
             this.sig.d2 = d2;
             this.sig.d2key = d2key;
@@ -364,9 +364,9 @@ WtLogin.prototype.refreshD2 = async function (forceEmp11 = false) {
     try {
         let payload = await this.c.send(pkt, undefined, seq);
         payload = tea.decrypt(payload.slice(16, payload.length - 1), this.ecdh.share_key);
-        const stream = Readable.from(payload, { objectMode: false });
+        const stream = new Reader(payload);
         stream.read(2);
-        const type = stream.read(1).readUInt8();
+        const type = stream.readU8();
         stream.read(2);
         const t = readTlv(stream);
         if (type === 0)
@@ -495,9 +495,9 @@ WtLogin.prototype.refreshD2WithT10C = async function () {
     try {
         let payload = await this.c.send(pkt, undefined, seq);
         payload = tea.decrypt(payload.slice(16, payload.length - 1), this.ecdh.share_key);
-        const stream = Readable.from(payload, { objectMode: false });
+        const stream = new Reader(payload);
         stream.read(2);
-        const type = stream.read(1).readUInt8();
+        const type = stream.readU8();
         stream.read(2);
         const t = readTlv(stream);
         if (type === 0)

package/lib/wtlogin/login-qrcode.js

@@ -9,7 +9,7 @@
 "use strict";
 const fs = require("fs");
 const path = require("path");
-const Readable = require("stream").Readable;
+const Reader = require("../algo/reader");
 const jsqr = require("jsqr");
 const { PNG } = require("pngjs");
 const qrt = require("qrcode-terminal");
@@ -127,7 +127,7 @@ WtLogin.prototype.fetchQrcode = async function () {
     try {
         let payload = await this.c.send(pkt, undefined, seq);
         payload = tea.decrypt(payload.slice(16, -1), this.ecdh.share_key);
-        const stream = Readable.from(payload, { objectMode: false });
+        const stream = new Reader(payload);
         stream.read(54);
         const retcode = stream.read(1)[0];
         const sig = stream.read(stream.read(2).readUInt16BE());
@@ -177,7 +177,7 @@ WtLogin.prototype.qrcodeLogin = async function () {
     try {
         let payload = await this.c.send(pkt, undefined, seq);
         payload = tea.decrypt(payload.slice(16, -1), this.ecdh.share_key);
-        const stream = Readable.from(payload, { objectMode: false });
+        const stream = new Reader(payload);
         stream.read(48);
         let len = stream.read(2).readUInt16BE();
         if (len > 0) {

package/lib/wtlogin/wt.js

@@ -2,7 +2,7 @@
 const fs = require("fs");
 const path = require("path");
 const { randomBytes, createHash } = require("crypto");
-const Readable = require("stream").Readable;
+const Reader = require("../algo/reader");
 const tea = require("../algo/tea");
 const jce = require("../algo/jce");
 const pb = require("../algo/pb");
@@ -84,7 +84,7 @@ class WtLogin {
      * @param {Buffer} data 
      */
     decodeT119(data, token = false) {
-        const reader = Readable.from(tea.decrypt(data, this.device.tgtgt), { objectMode: false });
+        const reader = new Reader(tea.decrypt(data, this.device.tgtgt), { objectMode: false });
         reader.read(2);
         const t = readTlv(reader);
         this.readT106(t[0x106]);
@@ -170,7 +170,7 @@ class WtLogin {
     }
     readT11A(data) {
         if (!data) return;
-        const stream = Readable.from(data, { objectMode: false });
+        const stream = new Reader(data, { objectMode: false });
         stream.read(2);
         this.age = stream.read(1).readUInt8();
         this.sex = ["unknown", "male", "female"][stream.read(1).readUInt8()];
@@ -179,7 +179,7 @@ class WtLogin {
     }
     readT512(data) {
         if (!data) return;
-        const stream = Readable.from(data, { objectMode: false });
+        const stream = new Reader(data);
         let len = stream.read(2).readUInt16BE();
         while (len-- > 0) {
             const domain = String(stream.read(stream.read(2).readUInt16BE()));
@@ -191,7 +191,7 @@ class WtLogin {
 
     calcPoW(data) {
         if (!data || data.length === 0) return Buffer.alloc(0);
-        const stream = Readable.from(data, { objectMode: false });
+        const stream = new Reader(data);
         const version = stream.read(1).readUInt8();
         const typ = stream.read(1).readUInt8();
         const hashType = stream.read(1).readUInt8();
@@ -262,7 +262,7 @@ class WtLogin {
 
     _decodeLoginResponse(payload) {
         payload = tea.decrypt(payload.slice(16, payload.length - 1), this.ecdh.share_key);
-        const stream = Readable.from(payload, { objectMode: false });
+        const stream = new Reader(payload);
         stream.read(2);
         const type = stream.read(1).readUInt8();
         stream.read(2);
@@ -287,7 +287,7 @@ class WtLogin {
         if (this.token_flag) {
             this.logger.mark("token失效，重新login..");
             if (t[0x146]) {
-                const stream = Readable.from(t[0x146], { objectMode: false });
+                const stream = new Reader(t[0x146]);
                 const version = stream.read(4);
                 const title = stream.read(stream.read(2).readUInt16BE()).toString();
                 const content = stream.read(stream.read(2).readUInt16BE()).toString();
@@ -333,7 +333,7 @@ class WtLogin {
         }
 
         if (t[0x149]) {
-            const stream = Readable.from(t[0x149], { objectMode: false });
+            const stream = new Reader(t[0x149]);
             stream.read(2);
             const title = stream.read(stream.read(2).readUInt16BE()).toString();
             const content = stream.read(stream.read(2).readUInt16BE()).toString();
@@ -343,7 +343,7 @@ class WtLogin {
         }
     
         if (t[0x146]) {
-            const stream = Readable.from(t[0x146], { objectMode: false });
+            const stream = new Reader(t[0x146]);
             const version = stream.read(4);
             const title = stream.read(stream.read(2).readUInt16BE()).toString();
             const content = stream.read(stream.read(2).readUInt16BE()).toString();
@@ -437,7 +437,7 @@ class WtLogin {
         const seq = this.c.nextSeq();
         if (logout) {
             const payload = pb.encode({
-                1: 0,
+                1: 0, // reg type
                 2: {
                     1: d.brand + '-' + d.model,
                     2: d.device,
@@ -453,7 +453,8 @@ class WtLogin {
                 const rsp = pb.decode(blob);
                 const result = rsp[7] ? String(rsp[7][2]) === 'unregister success' : false;
                 return result;
-            } catch {
+            } catch (e) {
+                this.logger.error(`下线异常：${e.message}`);
                 return false;
             }
         }
@@ -484,9 +485,9 @@ class WtLogin {
             },
             9: {
                 1: d.guid.toString("hex"),
-                2: 0,
-                3: String(this.apk.version.split(".")[3]),
-                4: 0,
+                2: 0, // kickPc
+                3: String(this.apk.version.split(".")[3] || "14110"), // buildVer
+                4: 0, // first
                 5: 2052,
                 6: {
                     1: d.brand + '-' + d.model,
@@ -496,8 +497,8 @@ class WtLogin {
                     5: `${d.product}-user ${d.version.release} ${d.display} ${d.version.incremental} release-keys`
                 },
                 7: 0,
-                8: 5,
-                9: 1,
+                8: 6, // vendor type
+                9: 1, // reg type
                 10: {
                     1: 1,
                     2: 1,
@@ -519,10 +520,13 @@ class WtLogin {
             const blob = await this.c.send(pkt, undefined, seq);
             const rsp = pb.decode(blob);
             const result = rsp[7] ? String(rsp[7][2]) === 'register success' : false;
-            if (!result)
+            if (!result) {
+                this.logger.error(`上线失败：${rsp[7] ? String(rsp[7][2]) : "未知错误"}`);
                 await this.deleteToken();
+            }
             return result;
-        } catch {
+        } catch (e) {
+            this.logger.error(`上线异常：${e.message}`);
             return false;
         }
     }
@@ -682,7 +686,7 @@ class WtLogin {
         try {
             let payload = await this.c.sendUni("wtlogin.exchange_emp", pkt);
             payload = tea.decrypt(payload.slice(16, payload.length - 1), this.sig.ticket_key);
-            const stream = Readable.from(payload, { objectMode: false });
+            const stream = new Reader(payload);
             stream.read(5);
             const t = readTlv(stream);
             if (t[0x119])
@@ -697,7 +701,7 @@ class WtLogin {
 }
 
 /**
- * @param {Readable} stream 
+ * @param {Reader} stream 
  * @returns {{[k: number]: Buffer}}
  */
 function readTlv(stream) {

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "oicq-icalingua-plus-plus",
   "app_name": "oicq-icalingua-plus-plus",
-  "version": "1.26.7",
-  "app_version": "1.26.7",
-  "upday": "2026/07/18",
+  "version": "1.26.9",
+  "app_version": "1.26.9",
+  "upday": "2026/07/19",
   "protocol_version": "v11",
   "description": "oicq(https://github.com/takayama-lily/oicq) v1 for Icalingua++",
   "main": "index.js",