oicq-icalingua-plus-plus 1.24.74 → 1.24.76

package/lib/client-ext.js

@@ -648,9 +648,13 @@ Client.prototype.getSign = async function(cmd, body, seq_id = this.seq_id, retry
     if (data.data.requestCallback && data.data.requestCallback.length > 0) {
         // 成功上线register后再发送SSO包
         unsendSso.push.apply(unsendSso, data.data.requestCallback);
-        this.once("internal.registered", async () => {
-            await this.refreshQSignToken();
-        });
+        if (this.isOnline()) {
+            setTimeout(() => this.refreshQSignToken(), 100);
+        } else {
+            this.once("internal.registered", async () => {
+                await this.refreshQSignToken();
+            });
+        }
     }
     return Buffer.from(pb.encode({
         1: Buffer.from(data.data.sign, "hex"),

package/lib/oicq.js

@@ -386,8 +386,6 @@ async function parseSSO(buf) {
         const retmsg_len = buf.readInt32BE(12);
         const retmsg = String(buf.slice(16, 16 + retmsg_len - 4));
         const error = new Error("unsuccessful retcode: " + retcode + " retmsg: " + retmsg + " seq: " + seq);
-        if (retcode === -10008) // need A2 and D2
-            await this._wt.register();
         if (this.handlers.has(seq))
             this.handlers.get(seq)(null, error);
         throw error;

package/lib/wtlogin/login-qrcode.js

@@ -36,7 +36,7 @@ WtLogin.prototype._buildTransEmpPacket = async function (cmdid, head, body, seq
         .writeU8(3)
         .writeU16(0)
         .writeU16(50)
-        .writeU32(this.seq_id)
+        .writeU32(seq)
         .writeU64(0)
         .writeBytes(body)
         .writeU8(3)
@@ -82,7 +82,7 @@ WtLogin.prototype._buildTransEmpPacket = async function (cmdid, head, body, seq
             .writeBytes(tea.encrypt(
                 new Writer()
                 .writeWithLength(
-                    new Writer().writeU32(this.seq_id)
+                    new Writer().writeU32(seq)
                     .writeU32(this.apk.subid)
                     .writeU32(this.apk.subid)
                     .writeBytes(BUF_UNKNOWN)

package/lib/wtlogin/wt.js

@@ -370,8 +370,8 @@ class WtLogin {
             3: 53,
             4: timestamp(),
         });
-        const pkt = await this.c.sendUni("trpc.qq_new_tech.status_svc.StatusService.SsoHeartBeat", body);
-        return pkt;
+        const pkt = await this.c.sendUni("trpc.qq_new_tech.status_svc.StatusService.SsoHeartBeat", body).catch(NOOP);
+        return !!pkt && pkt.length > 0;
     }
 
     async syncTimeDiff() {

package/package.json

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