@tiktool/live 1.2.0 → 1.4.0

package/dist/index.d.mts

@@ -56,6 +56,7 @@ interface BattleTeamUser {
 }
 interface BattleTeam {
     hostUserId: string;
+    hostUser?: TikTokUser;
     score: number;
     users: BattleTeamUser[];
 }
@@ -69,6 +70,7 @@ interface BattleEvent extends BaseEvent {
 interface BattleArmiesEvent extends BaseEvent {
     type: 'battleArmies';
     battleId: string;
+    status: number;
     teams: BattleTeam[];
 }
 interface SubscribeEvent extends BaseEvent {
@@ -173,6 +175,7 @@ declare class TikTokLive extends EventEmitter {
     private _connected;
     private _eventCount;
     private _roomId;
+    private _battleHosts;
     private readonly uniqueId;
     private readonly signServerUrl;
     private readonly apiKey;

package/dist/index.d.ts

@@ -56,6 +56,7 @@ interface BattleTeamUser {
 }
 interface BattleTeam {
     hostUserId: string;
+    hostUser?: TikTokUser;
     score: number;
     users: BattleTeamUser[];
 }
@@ -69,6 +70,7 @@ interface BattleEvent extends BaseEvent {
 interface BattleArmiesEvent extends BaseEvent {
     type: 'battleArmies';
     battleId: string;
+    status: number;
     teams: BattleTeam[];
 }
 interface SubscribeEvent extends BaseEvent {
@@ -173,6 +175,7 @@ declare class TikTokLive extends EventEmitter {
     private _connected;
     private _eventCount;
     private _roomId;
+    private _battleHosts;
     private readonly uniqueId;
     private readonly signServerUrl;
     private readonly apiKey;

package/dist/index.js

@@ -159,80 +159,147 @@ function buildAck(id) {
 function parseUser(data) {
   const f = decodeProto(data);
   const id = String(getInt(f, 1) || getStr(f, 1));
-  const nickname = getStr(f, 3) || getStr(f, 5);
-  const uniqueId = getStr(f, 38) || getStr(f, 4) || getStr(f, 2);
+  const nickname = getStr(f, 3) || getStr(f, 2);
+  const uniqueId = getStr(f, 38) || getStr(f, 4) || getStr(f, 2) || "";
   let profilePicture;
-  const avatarBuf = getBytes(f, 9);
+  const avatarBuf = getBytes(f, 9) || getBytes(f, 3);
   if (avatarBuf) {
     try {
       const avatarFields = decodeProto(avatarBuf);
-      const urlBuf = getBytes(avatarFields, 1);
-      if (urlBuf) profilePicture = urlBuf.toString("utf-8");
+      const urlBufs = getAllBytes(avatarFields, 1);
+      if (urlBufs.length > 0) profilePicture = urlBufs[0].toString("utf-8");
     } catch {
     }
   }
-  return { id, nickname, uniqueId: uniqueId || nickname || id, profilePicture };
+  const badges = [];
+  const badgeBuf = getBytes(f, 64);
+  if (badgeBuf) {
+    try {
+      const badgeFields = decodeProto(badgeBuf);
+      const badgeItems = getAllBytes(badgeFields, 21);
+      for (const bi of badgeItems) {
+        const bf = decodeProto(bi);
+        const name = getStr(bf, 3) || getStr(bf, 2);
+        if (name) badges.push(name);
+      }
+    } catch {
+    }
+  }
+  return {
+    id,
+    nickname,
+    uniqueId: uniqueId || nickname || id,
+    profilePicture,
+    badges: badges.length > 0 ? badges : void 0
+  };
 }
-function parseBattleTeam(teamBuf) {
-  const fields = decodeProto(teamBuf);
-  const hostUserId = String(getInt(fields, 1));
-  const score = getInt(fields, 2);
+function parseBattleTeamFromArmies(itemBuf) {
+  const f = decodeProto(itemBuf);
+  const hostUserId = String(getInt(f, 1));
+  let teamScore = 0;
   const users = [];
-  const userFields = getAllBytes(fields, 3);
-  for (const uf of userFields) {
+  const groups = getAllBytes(f, 2);
+  for (const gb of groups) {
     try {
-      const uFields = decodeProto(uf);
-      const userBuf = getBytes(uFields, 1);
-      const userScore = getInt(uFields, 2);
-      const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
-      users.push({ user, score: userScore });
+      const gf = decodeProto(gb);
+      const points = getInt(gf, 2);
+      teamScore += points;
+      const userBufs = getAllBytes(gf, 1);
+      for (const ub of userBufs) {
+        try {
+          const user = parseUser(ub);
+          users.push({ user, score: points });
+        } catch {
+        }
+      }
     } catch {
     }
   }
-  return { hostUserId, score, users };
+  return { hostUserId, score: teamScore, users };
 }
 function parseWebcastMessage(method, payload) {
   const f = decodeProto(payload);
-  const base = { timestamp: Date.now(), msgId: String(getInt(f, 1) || "") };
+  const base = { timestamp: Date.now(), msgId: "" };
+  const typeBuf = getBytes(f, 1);
+  if (typeBuf) {
+    try {
+      const tf = decodeProto(typeBuf);
+      const ts = getInt(tf, 4);
+      if (ts) base.timestamp = ts;
+    } catch {
+    }
+  }
   switch (method) {
+    // Proto: WebcastChatMessage { MessageType type=1, User user=2, string comment=3 }
     case "WebcastChatMessage": {
       const userBuf = getBytes(f, 2);
       const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
       return { ...base, type: "chat", user, comment: getStr(f, 3) };
     }
+    // Proto: WebcastMemberMessage { User user=2, WebcastMessageEvent event=1 }
     case "WebcastMemberMessage": {
       const userBuf = getBytes(f, 2);
       const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
-      return { ...base, type: "member", user, action: getInt(f, 1) };
+      let action = 1;
+      const eventBuf = getBytes(f, 1);
+      if (eventBuf) {
+        const ef = decodeProto(eventBuf);
+        const detailBuf = getBytes(ef, 8);
+        if (detailBuf) {
+          const df = decodeProto(detailBuf);
+          const label = getStr(df, 2);
+          if (label.includes("followed")) action = 2;
+          else if (label.includes("share")) action = 3;
+        }
+      }
+      return { ...base, type: "member", user, action };
     }
+    // Proto: WebcastLikeMessage { User user=5, WebcastMessageEvent event=1, int32 likeCount=2, int32 totalLikeCount=3 }
     case "WebcastLikeMessage": {
       const userBuf = getBytes(f, 5);
       const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
-      return { ...base, type: "like", user, likeCount: getInt(f, 1), totalLikes: getInt(f, 2) || getInt(f, 7) };
+      return {
+        ...base,
+        type: "like",
+        user,
+        likeCount: getInt(f, 2),
+        totalLikes: getInt(f, 3)
+      };
     }
+    // Proto: WebcastGiftMessage {
+    //   User user=7, int32 giftId=2, int32 repeatCount=5, int32 repeatEnd=9,
+    //   GiftDetails giftDetails=15, GiftExtra giftExtra=23
+    // }
+    // GiftDetails { GiftImage giftImage=1, string giftName=16, string describe=2,
+    //               int32 giftType=11, int32 diamondCount=12 }
+    // GiftExtra { uint64 timestamp=6, uint64 toUserId=8 }
     case "WebcastGiftMessage": {
       const userBuf = getBytes(f, 7);
       const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
-      const giftId = getInt(f, 1);
+      const giftId = getInt(f, 2);
       const repeatCount = getInt(f, 5);
       const repeatEnd = getInt(f, 9) === 1;
-      const giftType = getInt(f, 6);
-      const groupId = getStr(f, 11);
-      let giftName = "", diamondCount = 0;
-      const giftInfoBuf = getBytes(f, 15);
-      if (giftInfoBuf) {
-        const gf = decodeProto(giftInfoBuf);
-        giftName = getStr(gf, 1);
-        diamondCount = getInt(gf, 5) || getInt(gf, 2);
-      }
-      if (!giftName) {
-        const giftBuf3 = getBytes(f, 3);
-        if (giftBuf3) {
-          const gf3 = decodeProto(giftBuf3);
-          if (!giftName) giftName = getStr(gf3, 2);
-          if (!diamondCount) diamondCount = getInt(gf3, 5);
+      let giftName = "", diamondCount = 0, giftType = 0;
+      let giftImageUrl = "";
+      const detailsBuf = getBytes(f, 15);
+      if (detailsBuf) {
+        const df = decodeProto(detailsBuf);
+        giftName = getStr(df, 16) || getStr(df, 2);
+        diamondCount = getInt(df, 12);
+        giftType = getInt(df, 11);
+        const imgBuf = getBytes(df, 1);
+        if (imgBuf) {
+          const imgf = decodeProto(imgBuf);
+          giftImageUrl = getStr(imgf, 1);
         }
       }
+      let toUserId = "";
+      const extraBuf = getBytes(f, 23);
+      if (extraBuf) {
+        const ef = decodeProto(extraBuf);
+        toUserId = String(getInt(ef, 8));
+      }
+      const groupId = toUserId || getStr(f, 11);
       return {
         ...base,
         type: "gift",
@@ -247,46 +314,93 @@ function parseWebcastMessage(method, payload) {
         groupId
       };
     }
+    // Proto: WebcastSocialMessage { User user=2, WebcastMessageEvent event=1 }
     case "WebcastSocialMessage": {
       const userBuf = getBytes(f, 2);
       const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
-      const actionInt = getInt(f, 1);
-      const actionMap = { 1: "follow", 2: "share", 3: "like" };
-      return { ...base, type: "social", user, action: actionMap[actionInt] || `action_${actionInt}` };
+      let action = "follow";
+      const eventBuf = getBytes(f, 1);
+      if (eventBuf) {
+        const ef = decodeProto(eventBuf);
+        const detailBuf = getBytes(ef, 8);
+        if (detailBuf) {
+          const df = decodeProto(detailBuf);
+          const label = getStr(df, 2);
+          if (label.includes("share")) action = "share";
+          else if (label.includes("follow")) action = "follow";
+          const displayType = getStr(df, 1);
+          if (displayType === "pm_mt_msg_viewer_share") action = "share";
+        }
+      }
+      return { ...base, type: "social", user, action };
     }
-    case "WebcastRoomUserSeqMessage":
-      return {
-        ...base,
-        type: "roomUserSeq",
-        totalViewers: getInt(f, 1) || getInt(f, 3),
-        viewerCount: getInt(f, 2) || getInt(f, 4)
-      };
+    // Proto: WebcastRoomUserSeqMessage { int32 viewerCount=3 }
+    case "WebcastRoomUserSeqMessage": {
+      const viewerCount = getInt(f, 3) || getInt(f, 2);
+      const totalViewers = getInt(f, 1) || viewerCount;
+      return { ...base, type: "roomUserSeq", totalViewers, viewerCount };
+    }
+    // Proto: WebcastLinkMicBattle { repeated WebcastLinkMicBattleItems battleUsers=10 }
+    //   battleUsers → { battleGroup=2 → { LinkUser user=1 } }
     case "WebcastLinkMicBattle": {
-      const battleId = String(getInt(f, 1) || getStr(f, 1));
-      const status = getInt(f, 2);
+      const battleId = String(getInt(f, 1) || "");
+      const status = getInt(f, 2) || 1;
       const battleDuration = getInt(f, 3);
       const teams = [];
-      const teamBufs = getAllBytes(f, 7);
-      for (const tb of teamBufs) {
+      const battleUserBufs = getAllBytes(f, 10);
+      for (const bub of battleUserBufs) {
         try {
-          teams.push(parseBattleTeam(tb));
+          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 {
         }
       }
+      if (teams.length === 0) {
+        const teamBufs7 = getAllBytes(f, 7);
+        for (const tb of teamBufs7) {
+          try {
+            teams.push(parseBattleTeamFromArmies(tb));
+          } catch {
+          }
+        }
+      }
       return { ...base, type: "battle", battleId, status, battleDuration, teams };
     }
+    // Proto: WebcastLinkMicArmies { repeated battleItems=3, int32 battleStatus=7 }
+    //   battleItems → { hostUserId=1, repeated battleGroups=2 }
+    //     battleGroups → { repeated users=1, int32 points=2 }
     case "WebcastLinkMicArmies": {
-      const battleId = String(getInt(f, 1) || getStr(f, 1));
+      const battleId = String(getInt(f, 1) || "");
+      const battleStatus = getInt(f, 7);
       const teams = [];
-      const teamBufs = getAllBytes(f, 3);
-      for (const tb of teamBufs) {
+      const itemBufs = getAllBytes(f, 3);
+      for (const ib of itemBufs) {
         try {
-          teams.push(parseBattleTeam(tb));
+          teams.push(parseBattleTeamFromArmies(ib));
         } catch {
         }
       }
-      return { ...base, type: "battleArmies", battleId, teams };
+      return {
+        ...base,
+        type: "battleArmies",
+        battleId,
+        teams,
+        status: battleStatus
+      };
     }
+    // Proto: WebcastSubNotifyMessage { User user=2, ... subMonth=3 }
     case "WebcastSubNotifyMessage": {
       const userBuf = getBytes(f, 2);
       const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
@@ -312,10 +426,18 @@ function parseWebcastMessage(method, payload) {
       const envelopeId = String(getInt(f, 1) || getStr(f, 1));
       return { ...base, type: "envelope", envelopeId, diamondCount: getInt(f, 3) };
     }
+    // Proto: WebcastQuestionNewMessage { MessageType type=1, QuestionDetails questionDetails=2 }
+    //   QuestionDetails { string questionText=2, User user=5 }
     case "WebcastQuestionNewMessage": {
-      const userBuf = getBytes(f, 2);
-      const user = userBuf ? parseUser(userBuf) : { id: "0", nickname: "", uniqueId: "" };
-      return { ...base, type: "question", user, questionText: getStr(f, 3) || getStr(f, 4) };
+      let questionText = "", user = { id: "0", nickname: "", uniqueId: "" };
+      const detailBuf = getBytes(f, 2);
+      if (detailBuf) {
+        const df = decodeProto(detailBuf);
+        questionText = getStr(df, 2);
+        const userBuf = getBytes(df, 5);
+        if (userBuf) user = parseUser(userBuf);
+      }
+      return { ...base, type: "question", user, questionText };
     }
     case "WebcastRankUpdateMessage":
     case "WebcastHourlyRankMessage": {
@@ -335,14 +457,17 @@ function parseWebcastMessage(method, payload) {
       }
       return { ...base, type: "rankUpdate", rankType, rankList };
     }
+    // Proto: WebcastControlMessage { int32 action=2 }
     case "WebcastControlMessage":
       return { ...base, type: "control", action: getInt(f, 2) || getInt(f, 1) };
     case "WebcastRoomMessage":
     case "RoomMessage":
       return { ...base, type: "room", status: getInt(f, 2) };
+    // Proto: WebcastLiveIntroMessage { uint64 id=2, string description=4, User user=5 }
     case "WebcastLiveIntroMessage": {
-      const roomId = String(getInt(f, 1));
-      return { ...base, type: "liveIntro", roomId, title: getStr(f, 4) || getStr(f, 2) };
+      const roomId = String(getInt(f, 2));
+      const title = getStr(f, 4) || getStr(f, 2);
+      return { ...base, type: "liveIntro", roomId, title };
     }
     case "WebcastLinkMicMethod":
     case "WebcastLinkmicBattleTaskMessage": {
@@ -418,6 +543,8 @@ var TikTokLive = class extends import_events.EventEmitter {
   _connected = false;
   _eventCount = 0;
   _roomId = "";
+  // Cache host identities from battle events for enriching battleArmies
+  _battleHosts = /* @__PURE__ */ new Map();
   uniqueId;
   signServerUrl;
   apiKey;
@@ -615,6 +742,27 @@ var TikTokLive = class extends import_events.EventEmitter {
         const events = parseWebcastResponse(inner);
         for (const evt of events) {
           this._eventCount++;
+          if (evt.type === "battle") {
+            for (const team of evt.teams) {
+              const host = team.users.find((u) => u.user.id === team.hostUserId);
+              if (host) {
+                this._battleHosts.set(team.hostUserId, host.user);
+                team.hostUser = host.user;
+              }
+            }
+          }
+          if (evt.type === "battleArmies") {
+            for (const team of evt.teams) {
+              const host = team.users.find((u) => u.user.id === team.hostUserId);
+              if (host) {
+                team.hostUser = host.user;
+                this._battleHosts.set(team.hostUserId, host.user);
+              } else {
+                const cached = this._battleHosts.get(team.hostUserId);
+                if (cached) team.hostUser = cached;
+              }
+            }
+          }
           this.emit("event", evt);
           this.emit(evt.type, evt);
         }