@tiktool/live 2.7.0 → 2.7.1

package/dist/index.d.mts

@@ -83,8 +83,10 @@ interface BattleArmiesEvent extends BaseEvent {
     battleStartMs: number;
     /** Total battle duration in seconds (from f18.f3, typically 300) */
     battleDurationSeconds: number;
-    /** Seconds remaining in the battle, computed as max(0, duration - elapsed) */
+    /** Seconds remaining in the battle, computed as max(0, duration - elapsed). Note: uses VPS clock, may be off by up to 30s */
     timeLeftSeconds: number;
+    /** Battle end timestamp in milliseconds (battleStartMs + duration*1000). Use for clock-independent timer: Math.max(0, (endTimeMs - Date.now()) / 1000) */
+    endTimeMs: number;
 }
 interface SubscribeEvent extends BaseEvent {
     type: 'subscribe';

package/dist/index.d.ts

@@ -83,8 +83,10 @@ interface BattleArmiesEvent extends BaseEvent {
     battleStartMs: number;
     /** Total battle duration in seconds (from f18.f3, typically 300) */
     battleDurationSeconds: number;
-    /** Seconds remaining in the battle, computed as max(0, duration - elapsed) */
+    /** Seconds remaining in the battle, computed as max(0, duration - elapsed). Note: uses VPS clock, may be off by up to 30s */
     timeLeftSeconds: number;
+    /** Battle end timestamp in milliseconds (battleStartMs + duration*1000). Use for clock-independent timer: Math.max(0, (endTimeMs - Date.now()) / 1000) */
+    endTimeMs: number;
 }
 interface SubscribeEvent extends BaseEvent {
     type: 'subscribe';

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 {
         }
       }
@@ -492,8 +493,10 @@ function parseWebcastMessage(method, payload) {
         } catch {
         }
       }
+      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));
       }
@@ -505,7 +508,8 @@ function parseWebcastMessage(method, payload) {
         status: battleStatus,
         battleStartMs,
         battleDurationSeconds,
-        timeLeftSeconds
+        timeLeftSeconds,
+        endTimeMs
       };
     }
     // Proto: WebcastSubNotifyMessage { User user=2, ... subMonth=3 }
@@ -687,24 +691,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] \u2705 Got pre-signed URL from sign server`);
+          } else {
+            console.log(`[TikTokLive] \u26A0\uFE0F ws_credentials bad response: ${JSON.stringify(credData).substring(0, 120)}`);
           }
         }
-      } catch {
+      } catch (e) {
+        console.log(`[TikTokLive] \u274C 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 +733,93 @@ var TikTokLive = class _TikTokLive extends import_events.EventEmitter {
               break;
             }
           }
-        } catch {
+          console.log(`[TikTokLive] Direct fetch ttwid: ${ttwid ? "\u2705" : "\u274C none"}`);
+        } catch (e) {
+          console.log(`[TikTokLive] \u274C 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] \u2705 Got roomId from sign server: ${roomId}`);
+          } else {
+            console.log(`[TikTokLive] \u26A0\uFE0F room_id response: ${JSON.stringify(roomData).substring(0, 120)}`);
+          }
         }
+      } catch (e) {
+        console.log(`[TikTokLive] \u274C 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] \u2705 Got ttwid from sign server`);
+              } else console.log(`[TikTokLive] \u26A0\uFE0F No ttwid in cookies: ${credData.data.cookies.substring(0, 60)}`);
+            } else {
+              console.log(`[TikTokLive] \u26A0\uFE0F No cookies in ws_credentials: ${JSON.stringify(credData).substring(0, 120)}`);
+            }
+          }
+        } catch (e) {
+          console.log(`[TikTokLive] \u274C 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] \u274C 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 +877,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;