@tiktool/live 2.5.2 → 2.6.1

package/dist/index.mjs

@@ -246,10 +246,24 @@ function parseUser(data) {
     }
   }
   const badges = [];
-  const badgeBuf = getBytes(f, 64);
-  if (badgeBuf) {
+  let payGrade;
+  const badgeBufs = getAllBytes(f, 64);
+  for (const badgeBuf of badgeBufs) {
     try {
       const badgeFields = decodeProto(badgeBuf);
+      const badgeCategory = getInt(badgeFields, 2);
+      const badgeSubCat = getInt(badgeFields, 3);
+      if (badgeCategory === 20 && badgeSubCat === 8 && !payGrade) {
+        const privBuf = getBytes(badgeFields, 12);
+        if (privBuf) {
+          const privFields = decodeProto(privBuf);
+          const levelStr = getStr(privFields, 5);
+          if (levelStr) {
+            const level = parseInt(levelStr, 10);
+            if (level > 0) payGrade = level;
+          }
+        }
+      }
       const badgeItems = getAllBytes(badgeFields, 21);
       for (const bi of badgeItems) {
         const bf = decodeProto(bi);
@@ -264,7 +278,8 @@ function parseUser(data) {
     nickname,
     uniqueId: uniqueId || nickname || id,
     profilePictureUrl: profilePicture,
-    badges: badges.length > 0 ? badges : void 0
+    badges: badges.length > 0 ? badges : void 0,
+    payGrade
   };
 }
 function parseBattleTeamFromArmies(itemBuf) {
@@ -514,9 +529,27 @@ function parseWebcastMessage(method, payload) {
       return { ...base, type: "battle", battleId, status, battleDuration, teams, battleSettings };
     }
     case "WebcastLinkMicArmies": {
-      const battleId = getIntStr(f, 1) || "";
+      const battleId = getIntStr(f, 2) || getIntStr(f, 1) || "";
       const battleStatus = getInt(f, 7);
       const teams = [];
+      let battleSettings;
+      const settingsBuf18 = getBytes(f, 18);
+      if (settingsBuf18) {
+        try {
+          const sf = decodeProto(settingsBuf18);
+          const startTimeMs = getInt(sf, 2);
+          const duration = getInt(sf, 3);
+          const endTimeMs = getInt(sf, 10);
+          battleSettings = {
+            startTimeMs: startTimeMs || void 0,
+            duration: duration || void 0,
+            endTimeMs: endTimeMs || void 0
+          };
+        } catch {
+        }
+      }
+      const scoreUpdateTime = getInt(f, 5);
+      const giftSentTime = getInt(f, 6);
       const itemBufs = getAllBytes(f, 3);
       for (const ib of itemBufs) {
         try {
@@ -529,7 +562,10 @@ function parseWebcastMessage(method, payload) {
         type: "battleArmies",
         battleId,
         teams,
-        status: battleStatus
+        status: battleStatus,
+        battleSettings,
+        scoreUpdateTime,
+        giftSentTime
       };
     }
     case "WebcastSubNotifyMessage": {
@@ -828,6 +864,8 @@ var TikTokLive = class extends EventEmitter {
   _sessionId;
   _ttTargetIdc;
   proxyAgent;
+  _presetRoomId;
+  _presetTtwid;
   constructor(options) {
     super();
     this.uniqueId = options.uniqueId.replace(/^@/, "");
@@ -843,45 +881,51 @@ var TikTokLive = class extends EventEmitter {
     if (options.agent) {
       this.proxyAgent = options.agent;
     }
+    this._presetRoomId = options.roomId;
+    this._presetTtwid = options.ttwid;
   }
   async connect() {
     this.intentionalClose = false;
-    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"
-    }, this.proxyAgent);
-    let 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 (!ttwid) throw new Error("Failed to obtain session cookie");
-    const html = resp.body.toString();
-    let roomId = "";
+    let ttwid = this._presetTtwid || "";
+    let roomId = this._presetRoomId || "";
     let ownerUserId = "";
-    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];
-        const ownerUser = json?.LiveRoom?.liveRoomUserInfo?.user;
-        if (ownerUser?.id) {
-          ownerUserId = String(ownerUser.id);
+    let clusterRegion = "";
+    if (!roomId || !ttwid) {
+      const targetUrl = `https://www.tiktok.com/@${this.uniqueId}/live`;
+      const resp = await httpGet(targetUrl, {
+        "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"
+      }, this.proxyAgent);
+      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 (!ttwid) throw new Error("Failed to obtain session cookie");
+      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];
+          const ownerUser = json?.LiveRoom?.liveRoomUserInfo?.user;
+          if (ownerUser?.id) {
+            ownerUserId = String(ownerUser.id);
+          }
+        } catch {
         }
-      } catch {
       }
+      if (!roomId) throw new Error(`User @${this.uniqueId} is not currently live`);
+      const crMatch = html.match(/"clusterRegion"\s*:\s*"([^"]+)"/);
+      clusterRegion = crMatch ? crMatch[1] : "";
     }
-    if (!roomId) throw new Error(`User @${this.uniqueId} is not currently live`);
     this._roomId = roomId;
     this._ownerUserId = ownerUserId;
-    const crMatch = html.match(/"clusterRegion"\s*:\s*"([^"]+)"/);
-    const clusterRegion = crMatch ? crMatch[1] : "";
     const wsHost = getWsHost(clusterRegion);
     const wsParams = new URLSearchParams({
       version_code: "270000",
@@ -935,9 +979,10 @@ var TikTokLive = class extends EventEmitter {
       wsUrl = rawWsUrl.replace(/^https:\/\//, "wss://");
     }
     return new Promise((resolve, reject) => {
-      let cookieHeader = `ttwid=${ttwid}`;
+      let cookieHeader = ttwid ? `ttwid=${ttwid}` : "";
       if (this._sessionId) {
-        cookieHeader += `; sessionid=${this._sessionId}; sessionid_ss=${this._sessionId}; sid_tt=${this._sessionId}`;
+        const sessionCookies = `sessionid=${this._sessionId}; sessionid_ss=${this._sessionId}; sid_tt=${this._sessionId}`;
+        cookieHeader = cookieHeader ? `${cookieHeader}; ${sessionCookies}` : sessionCookies;
         if (this._ttTargetIdc) {
           cookieHeader += `; tt-target-idc=${this._ttTargetIdc}`;
         }