@tiktool/live 2.7.0 → 2.8.0

package/dist/index.js

@@ -264,10 +264,11 @@ function parseBattleTeamFromArmies(itemBuf) {
       const points = getInt(gf, 2);
       teamScore += points;
       const userBufs = getAllBytes(gf, 1);
+      const individualScore = userBufs.length === 1 ? points : -1;
       for (const ub of userBufs) {
         try {
           const user = parseUser(ub);
-          users.push({ user, score: points });
+          users.push({ user, score: individualScore });
         } catch {
         }
       }
@@ -431,27 +432,41 @@ function parseWebcastMessage(method, payload) {
     // Proto: WebcastLinkMicBattle { repeated WebcastLinkMicBattleItems battleUsers=10 }
     //   battleUsers → { battleGroup=2 → { LinkUser user=1 } }
     case "WebcastLinkMicBattle": {
-      const battleId = String(getInt(f, 1) || "");
-      const status = getInt(f, 2) || 1;
+      const battleId = String(getInt(f, 4) || getInt(f, 1) || "");
+      let status = getInt(f, 7);
+      if (!status) {
+        const fallback = getInt(f, 2);
+        status = fallback > 0 && fallback < 100 ? fallback : 1;
+      }
       const battleDuration = getInt(f, 3);
       const teams = [];
-      const battleUserBufs = getAllBytes(f, 10);
-      for (const bub of battleUserBufs) {
+      const hostBufs = getAllBytes(f, 14);
+      for (const hb of hostBufs) {
         try {
-          const bf = decodeProto(bub);
-          const groupBuf = getBytes(bf, 2);
-          if (groupBuf) {
-            const gf = decodeProto(groupBuf);
-            const linkUserBuf = getBytes(gf, 1);
-            if (linkUserBuf) {
-              const user = parseUser(linkUserBuf);
-              teams.push({
-                hostUserId: user.id,
-                score: 0,
-                users: [{ user, score: 0 }]
-              });
+          const hf = decodeProto(hb);
+          const hostUserId = String(getInt(hf, 1) || "");
+          const teamTotalScore = getInt(hf, 3);
+          const users = [];
+          const containerBuf = getBytes(hf, 4);
+          if (containerBuf) {
+            const cf = decodeProto(containerBuf);
+            const userBufs = getAllBytes(cf, 1);
+            for (const ub of userBufs) {
+              try {
+                const uf = decodeProto(ub);
+                users.push({
+                  user: {
+                    id: String(getInt(uf, 1) || ""),
+                    nickname: getStr(uf, 3) || "",
+                    uniqueId: getStr(uf, 3) || ""
+                  },
+                  score: getInt(uf, 2)
+                });
+              } catch {
+              }
             }
           }
+          teams.push({ hostUserId, score: teamTotalScore, users });
         } catch {
         }
       }
@@ -464,15 +479,42 @@ function parseWebcastMessage(method, payload) {
           }
         }
       }
+      if (teams.length === 0) {
+        const battleUserBufs = getAllBytes(f, 10);
+        for (const bub of battleUserBufs) {
+          try {
+            const bf = decodeProto(bub);
+            const groupBuf = getBytes(bf, 2);
+            if (groupBuf) {
+              const gf = decodeProto(groupBuf);
+              const linkUserBuf = getBytes(gf, 1);
+              if (linkUserBuf) {
+                const user = parseUser(linkUserBuf);
+                teams.push({
+                  hostUserId: user.id,
+                  score: 0,
+                  users: [{ user, score: 0 }]
+                });
+              }
+            }
+          } catch {
+          }
+        }
+      }
       return { ...base, type: "battle", battleId, status, battleDuration, teams };
     }
-    // Proto: WebcastLinkMicArmies { msg_header=1, session_id=2, repeated battleItems=3, status=7,
-    //   battle_config=18 { session_id=1, start_time_ms=2, duration_s=3 }, battle_id=17 }
-    //   battleItems → { hostUserId=1, repeated battleGroups=2 }
-    //     battleGroups → { repeated users=1, int32 points=2 }
+    // Proto: WebcastLinkMicArmies { msg_header=1, matchId=2, session_id=4, startedAtMs=5,
+    //   serverTsMs=6, repeated battleItems=3, status=7, sessionTag=17,
+    //   battle_config=18 { session_id=1, start_time_ms=2, duration_s=3 },
+    //   repeated hosts=14 { hostUserId=1, teamTotalScore=3, teamIdx=5,
+    //     userContainer=4 { repeated users=1 { userId=1, score=2, nickname=3 } } }
     case "WebcastLinkMicArmies": {
-      const battleId = getStr(f, 17) || String(getInt(f, 2) || "");
+      const sessionTag = getStr(f, 17);
+      const matchId = getIntStr(f, 2);
+      const sessionId = getIntStr(f, 4);
+      const battleId = sessionTag || matchId;
       const battleStatus = getInt(f, 7);
+      const serverTsMs = getInt(f, 6);
       const teams = [];
       const itemBufs = getAllBytes(f, 3);
       for (const ib of itemBufs) {
@@ -492,11 +534,47 @@ function parseWebcastMessage(method, payload) {
         } catch {
         }
       }
+      let secsRemaining = 0;
+      if (battleStartMs > 0 && battleDurationSeconds > 0 && serverTsMs > 0) {
+        secsRemaining = Math.max(0, battleDurationSeconds - Math.floor((serverTsMs - battleStartMs) / 1e3));
+      }
+      let endTimeMs = 0;
       let timeLeftSeconds = 0;
       if (battleStartMs > 0 && battleDurationSeconds > 0) {
+        endTimeMs = battleStartMs + battleDurationSeconds * 1e3;
         const elapsedMs = Date.now() - battleStartMs;
         timeLeftSeconds = Math.max(0, battleDurationSeconds - Math.floor(elapsedMs / 1e3));
       }
+      const hosts = [];
+      const hostBufs = getAllBytes(f, 14);
+      for (const hb of hostBufs) {
+        try {
+          const hf = decodeProto(hb);
+          const hostUserId = getIntStr(hf, 1);
+          const teamTotalScore = getInt(hf, 3);
+          const teamIdx = getInt(hf, 5);
+          const contributors = [];
+          const containerBuf = getBytes(hf, 4);
+          if (containerBuf) {
+            const cf = decodeProto(containerBuf);
+            const userBufs = getAllBytes(cf, 1);
+            for (const ub of userBufs) {
+              try {
+                const uf = decodeProto(ub);
+                contributors.push({
+                  userId: getIntStr(uf, 1),
+                  score: getInt(uf, 2),
+                  nickname: getStr(uf, 3) || ""
+                });
+              } catch {
+              }
+            }
+            contributors.sort((a, b) => b.score - a.score);
+          }
+          hosts.push({ hostUserId, teamTotalScore, teamIdx, contributors });
+        } catch {
+        }
+      }
       return {
         ...base,
         type: "battleArmies",
@@ -505,7 +583,163 @@ function parseWebcastMessage(method, payload) {
         status: battleStatus,
         battleStartMs,
         battleDurationSeconds,
-        timeLeftSeconds
+        timeLeftSeconds,
+        endTimeMs,
+        matchId,
+        sessionId,
+        serverTsMs,
+        sessionTag,
+        durationSec: battleDurationSeconds,
+        secsRemaining,
+        hosts
+      };
+    }
+    // Proto: WebcastLinkMicBattleItemCard
+    //   #2 battleId
+    //   #3 cardType (2=gloves/crit, 3=mist, 4=match_guide, 10=x2?, 11=x3, ...)
+    //   #5/#6/#7/#14 inner (location varies with cardType — scan numerically):
+    //     #1.{
+    //       #1 effectKey
+    //       #2 icon block { #1 repeated CDN urls, #2 iconKey, #5 accentColor }
+    //       #3 activatedAtSec (unix seconds)
+    //       #4 sender block: #1 sub { #1 userId, #2 nickname, #3 avatar block, #4 uniqueId }
+    //       #5 durationSec
+    //       #8 senderUserId (new boosters)
+    //       #11 endsAtSec
+    //       #12 senderUserId (old gloves/mist)
+    //     }
+    //     #3 comment template msg → #2 commentText
+    case "WebcastLinkMicBattleItemCard": {
+      const battleId = getIntStr(f, 2);
+      const cardType = getInt(f, 3);
+      let inner = null;
+      for (const fn of [5, 6, 7, 14, 15, 16, 8, 9, 10, 11, 12, 13]) {
+        const buf = getBytes(f, fn);
+        if (buf) {
+          inner = decodeProto(buf);
+          break;
+        }
+      }
+      let effectKey = "";
+      let effect = "unknown";
+      let multiplier = 0;
+      let activatedAtSec = 0;
+      let durationSec = 0;
+      let endsAtSec = 0;
+      let senderUserId = "";
+      let senderNickname = "";
+      let senderUniqueId = "";
+      let senderAvatarUrl = "";
+      let commentTemplate = "";
+      let iconUrl = "";
+      let iconKey = "";
+      let accentColor = "";
+      if (inner) {
+        let nameBuf = getBytes(inner, 1);
+        let nf = nameBuf ? decodeProto(nameBuf) : [];
+        let probedKey = nf.length ? getStr(nf, 1) || "" : "";
+        if (!probedKey) {
+          const altBuf = getBytes(inner, 3);
+          if (altBuf) {
+            const altFields = decodeProto(altBuf);
+            const altKey = getStr(altFields, 1) || "";
+            if (altKey) {
+              nameBuf = altBuf;
+              nf = altFields;
+              probedKey = altKey;
+            }
+          }
+        }
+        if (nameBuf && nf.length) {
+          effectKey = probedKey;
+          if (effectKey === "pm_mt_boost_crit_name") effect = "hammer";
+          else if (effectKey === "pm_mt_boost_glove_name" || effectKey === "pm_mt_boost_gloves_name") effect = "gloves";
+          else if (effectKey === "pm_mt_boost_mist_name") effect = "mist";
+          else if (effectKey === "pm_mt_match_guide_gotPowerUps") effect = "match_guide";
+          else if (effectKey.includes("userSentBooster_no2") || effectKey.includes("gotPowerUp_panel_no2")) {
+            effect = "booster_x2";
+            multiplier = 2;
+          } else if (effectKey.includes("userSentBooster_no3") || effectKey.includes("gotPowerUp_panel_no3")) {
+            effect = "booster_x3";
+            multiplier = 3;
+          } else if (effectKey.includes("thunder")) effect = "thunder";
+          else if (effectKey.includes("extra_time") || effectKey.includes("extra_round")) effect = "extra_time";
+          else if (effectKey) effect = effectKey;
+          activatedAtSec = getInt(nf, 3);
+          durationSec = getInt(nf, 5);
+          endsAtSec = getInt(nf, 11) || getInt(nf, 7);
+          senderUserId = getIntStr(nf, 12);
+          if (senderUserId === "0") senderUserId = getIntStr(nf, 8);
+          if (senderUserId === "0") senderUserId = getStr(nf, 13) || getStr(nf, 9) || "";
+          const iconBuf = getBytes(nf, 2);
+          if (iconBuf) {
+            const icf = decodeProto(iconBuf);
+            const urlBufs = getAllBytes(icf, 1);
+            for (const ub of urlBufs) {
+              const candidate = ub.toString("utf-8");
+              if (candidate.includes("://")) {
+                iconUrl = candidate;
+                break;
+              }
+            }
+            iconKey = getStr(icf, 2) || "";
+            accentColor = getStr(icf, 5) || "";
+          }
+          const senderOuter = getBytes(nf, 4);
+          if (senderOuter) {
+            const sf = decodeProto(senderOuter);
+            const sub = getBytes(sf, 1);
+            if (sub) {
+              const su = decodeProto(sub);
+              const nickBuf = getBytes(su, 2);
+              if (nickBuf) {
+                try {
+                  senderNickname = nickBuf.toString("utf-8");
+                } catch {
+                }
+              }
+              senderUniqueId = getStr(su, 4) || "";
+              if (!senderUserId || senderUserId === "0") senderUserId = getIntStr(su, 1);
+              const avBuf = getBytes(su, 3);
+              if (avBuf) {
+                const af = decodeProto(avBuf);
+                const urlBufs = getAllBytes(af, 1);
+                for (const ub of urlBufs) {
+                  const candidate = ub.toString("utf-8");
+                  if (candidate.includes("://")) {
+                    senderAvatarUrl = candidate;
+                    break;
+                  }
+                }
+              }
+            }
+          }
+        }
+        const commentBuf = getBytes(inner, 3);
+        if (commentBuf) {
+          const cf = decodeProto(commentBuf);
+          commentTemplate = getStr(cf, 2) || "";
+        }
+      }
+      return {
+        ...base,
+        type: "battleItemCard",
+        battleId,
+        cardType,
+        effect,
+        effectKey,
+        multiplier,
+        senderUserId,
+        senderNickname,
+        senderUniqueId,
+        senderAvatarUrl,
+        activatedAtSec,
+        durationSec,
+        endsAtSec,
+        commentTemplate,
+        iconUrl,
+        iconKey,
+        accentColor
       };
     }
     // Proto: WebcastSubNotifyMessage { User user=2, ... subMonth=3 }
@@ -687,24 +921,37 @@ var TikTokLive = class _TikTokLive extends import_events.EventEmitter {
     let ttwid = this._presetSessionId;
     let roomId = this._presetRoomId;
     let clusterRegion = "";
+    let preSignedUrl = "";
+    let preSignedCookies = "";
+    let preSignedUA = "";
     if (roomId && ttwid) {
+      console.log(`[TikTokLive] Using preset roomId=${roomId} + sessionId (skip TikTok fetch)`);
     } else if (roomId && !ttwid) {
+      console.log(`[TikTokLive] Have roomId=${roomId}, fetching ttwid from sign server...`);
       try {
         const credResp = await fetch(`${this.signServerUrl}/webcast/ws_credentials`, {
           method: "POST",
           headers: { "Content-Type": "application/json", "x-api-key": this.apiKey },
           body: JSON.stringify({ unique_id: this.uniqueId, room_id: roomId })
         });
+        console.log(`[TikTokLive] ws_credentials response: ${credResp.status}`);
         if (credResp.ok) {
           const credData = await credResp.json();
-          if (credData.data?.cookies) {
-            const m = credData.data.cookies.match(/ttwid=([^;]+)/);
-            if (m) ttwid = m[1];
+          if (credData.status_code === 0 && credData.data?.signed_url) {
+            preSignedUrl = credData.data.signed_url;
+            preSignedCookies = credData.data.cookies || "";
+            preSignedUA = credData.data.user_agent || DEFAULT_UA;
+            ttwid = "__presigned__";
+            console.log(`[TikTokLive] \xE2\u0153\u2026 Got pre-signed URL from sign server`);
+          } else {
+            console.log(`[TikTokLive] \xE2\u0161\xA0\xEF\xB8\x8F ws_credentials bad response: ${JSON.stringify(credData).substring(0, 120)}`);
           }
         }
-      } catch {
+      } catch (e) {
+        console.log(`[TikTokLive] \xE2\x9D\u0152 ws_credentials failed: ${e.message}`);
       }
       if (!ttwid) {
+        console.log(`[TikTokLive] Fallback: direct TikTok fetch for ttwid...`);
         try {
           const resp = await httpGet(`https://www.tiktok.com/@${this.uniqueId}/live`, {
             "User-Agent": DEFAULT_UA,
@@ -716,35 +963,93 @@ var TikTokLive = class _TikTokLive extends import_events.EventEmitter {
               break;
             }
           }
-        } catch {
+          console.log(`[TikTokLive] Direct fetch ttwid: ${ttwid ? "\xE2\u0153\u2026" : "\xE2\x9D\u0152 none"}`);
+        } catch (e) {
+          console.log(`[TikTokLive] \xE2\x9D\u0152 Direct TikTok fetch failed: ${e.message}`);
         }
       }
     } else {
-      const resp = await httpGet(`https://www.tiktok.com/@${this.uniqueId}/live`, {
-        "User-Agent": DEFAULT_UA,
-        "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
-        "Accept-Encoding": "gzip, deflate, br",
-        "Accept-Language": "en-US,en;q=0.9"
-      });
-      for (const sc of [resp.headers["set-cookie"] || []].flat()) {
-        if (typeof sc === "string" && sc.startsWith("ttwid=")) {
-          ttwid = sc.split(";")[0].split("=").slice(1).join("=");
-          break;
+      console.log(`[TikTokLive] No presets for @${this.uniqueId}. Resolving via sign server (${this.signServerUrl})...`);
+      try {
+        const roomResp = await fetch(`${this.signServerUrl}/webcast/room_id`, {
+          method: "POST",
+          headers: { "Content-Type": "application/json", "x-api-key": this.apiKey },
+          body: JSON.stringify({ unique_id: this.uniqueId })
+        });
+        console.log(`[TikTokLive] room_id response: ${roomResp.status}`);
+        if (roomResp.ok) {
+          const roomData = await roomResp.json();
+          if (roomData.status_code === 0 && roomData.data?.room_id) {
+            roomId = roomData.data.room_id;
+            console.log(`[TikTokLive] \xE2\u0153\u2026 Got roomId from sign server: ${roomId}`);
+          } else {
+            console.log(`[TikTokLive] \xE2\u0161\xA0\xEF\xB8\x8F room_id response: ${JSON.stringify(roomData).substring(0, 120)}`);
+          }
         }
+      } catch (e) {
+        console.log(`[TikTokLive] \xE2\x9D\u0152 room_id request failed: ${e.message}`);
       }
-      const html = resp.body.toString();
-      const sigiMatch = html.match(/id="SIGI_STATE"[^>]*>([^<]+)/);
-      if (sigiMatch) {
+      if (roomId) {
         try {
-          const json = JSON.parse(sigiMatch[1]);
-          const jsonStr = JSON.stringify(json);
-          const m = jsonStr.match(/"roomId"\s*:\s*"(\d+)"/);
-          if (m) roomId = m[1];
-        } catch {
+          const credResp = await fetch(`${this.signServerUrl}/webcast/ws_credentials`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json", "x-api-key": this.apiKey },
+            body: JSON.stringify({ unique_id: this.uniqueId, room_id: roomId })
+          });
+          console.log(`[TikTokLive] ws_credentials response: ${credResp.status}`);
+          if (credResp.ok) {
+            const credData = await credResp.json();
+            if (credData.data?.cookies) {
+              const m = credData.data.cookies.match(/ttwid=([^;]+)/);
+              if (m) {
+                ttwid = m[1];
+                console.log(`[TikTokLive] \xE2\u0153\u2026 Got ttwid from sign server`);
+              } else console.log(`[TikTokLive] \xE2\u0161\xA0\xEF\xB8\x8F No ttwid in cookies: ${credData.data.cookies.substring(0, 60)}`);
+            } else {
+              console.log(`[TikTokLive] \xE2\u0161\xA0\xEF\xB8\x8F No cookies in ws_credentials: ${JSON.stringify(credData).substring(0, 120)}`);
+            }
+          }
+        } catch (e) {
+          console.log(`[TikTokLive] \xE2\x9D\u0152 ws_credentials failed: ${e.message}`);
+        }
+      }
+      if (!roomId || !ttwid) {
+        console.log(`[TikTokLive] Fallback: direct TikTok fetch (roomId=${roomId || "none"}, ttwid=${ttwid ? "yes" : "none"})...`);
+        try {
+          const resp = await httpGet(`https://www.tiktok.com/@${this.uniqueId}/live`, {
+            "User-Agent": DEFAULT_UA,
+            "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8",
+            "Accept-Encoding": "gzip, deflate, br",
+            "Accept-Language": "en-US,en;q=0.9"
+          });
+          if (!ttwid) {
+            for (const sc of [resp.headers["set-cookie"] || []].flat()) {
+              if (typeof sc === "string" && sc.startsWith("ttwid=")) {
+                ttwid = sc.split(";")[0].split("=").slice(1).join("=");
+                break;
+              }
+            }
+          }
+          if (!roomId) {
+            const html = resp.body.toString();
+            const sigiMatch = html.match(/id="SIGI_STATE"[^>]*>([^<]+)/);
+            if (sigiMatch) {
+              try {
+                const json = JSON.parse(sigiMatch[1]);
+                const jsonStr = JSON.stringify(json);
+                const m = jsonStr.match(/"roomId"\s*:\s*"(\d+)"/);
+                if (m) roomId = m[1];
+              } catch {
+              }
+            }
+            const crMatch = html.match(/"clusterRegion"\s*:\s*"([^"]+)"/);
+            clusterRegion = crMatch ? crMatch[1] : "";
+          }
+          console.log(`[TikTokLive] Direct fetch result: roomId=${roomId || "none"}, ttwid=${ttwid ? "yes" : "none"}`);
+        } catch (e) {
+          console.log(`[TikTokLive] \xE2\x9D\u0152 Direct TikTok fetch failed: ${e.message}`);
         }
       }
-      const crMatch = html.match(/"clusterRegion"\s*:\s*"([^"]+)"/);
-      clusterRegion = crMatch ? crMatch[1] : "";
     }
     if (!ttwid) throw new Error("Failed to obtain session cookie");
     if (!roomId) throw new Error(`User @${this.uniqueId} is not currently live`);
@@ -802,12 +1107,11 @@ var TikTokLive = class _TikTokLive extends import_events.EventEmitter {
       wsUrl = rawWsUrl.replace(/^https:\/\//, "wss://");
     }
     return new Promise((resolve, reject) => {
-      this.ws = new import_ws.default(wsUrl, {
-        headers: {
-          "User-Agent": DEFAULT_UA,
-          "Cookie": `ttwid=${ttwid}`,
-          "Origin": "https://www.tiktok.com"
-        }
+      const finalWsUrl = preSignedUrl ? preSignedUrl.replace(/^https:\/\//, "wss://") : wsUrl;
+      const finalHeaders = preSignedUrl ? { "User-Agent": preSignedUA, "Cookie": preSignedCookies, "Origin": "https://www.tiktok.com" } : { "User-Agent": DEFAULT_UA, "Cookie": `ttwid=${ttwid}`, "Origin": "https://www.tiktok.com" };
+      console.log(`[TikTokLive] Connecting WS: ${preSignedUrl ? "pre-signed URL" : "self-built URL"}`);
+      this.ws = new import_ws.default(finalWsUrl, {
+        headers: finalHeaders
       });
       this.ws.on("open", () => {
         this._connected = true;
@@ -829,18 +1133,21 @@ var TikTokLive = class _TikTokLive extends import_events.EventEmitter {
         this.handleFrame(Buffer.from(rawData));
       });
       this.ws.on("close", (code, reason) => {
+        const wasConnected = this._connected;
         this._connected = false;
         this.stopHeartbeat();
         const reasonStr = reason?.toString() || "";
         this.emit("disconnected", code, reasonStr);
-        if (!this.intentionalClose && this.autoReconnect && this.reconnectAttempts < this.maxReconnectAttempts) {
+        if (wasConnected && !this.intentionalClose && this.autoReconnect && this.reconnectAttempts < this.maxReconnectAttempts) {
           this.reconnectAttempts++;
           const delay = Math.min(1e3 * Math.pow(2, this.reconnectAttempts - 1), 3e4);
           setTimeout(() => this.connect().catch((e) => this.emit("error", e)), delay);
         }
       });
       this.ws.on("error", (err) => {
-        this.emit("error", err);
+        if (this._connected) {
+          this.emit("error", err);
+        }
         if (!this._connected) reject(err);
       });
     });
@@ -857,7 +1164,7 @@ var TikTokLive = class _TikTokLive extends import_events.EventEmitter {
   }
   /**
    * Fully destroy the client, releasing all resources and listeners.
-   * After calling destroy(), the instance cannot be reused — create a new one.
+   * After calling destroy(), the instance cannot be reused — create a new one.
    */
   destroy() {
     this.disconnect();
@@ -882,7 +1189,7 @@ var TikTokLive = class _TikTokLive extends import_events.EventEmitter {
   /**
    * Get live stream video URLs for a TikTok user.
    * Returns FLV & HLS URLs segmented by quality (FULL_HD1, HD1, SD1, SD2).
-   * This is a standalone method — no WebSocket connection required.
+   * This is a standalone method — no WebSocket connection required.
    * 
    * @example
    * ```ts