@floating-live/bilibili 0.17.0-alpha.2 → 0.17.0-alpha.4

package/LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

package/dist/decoder.d.ts

@@ -0,0 +1,3 @@
+import { bilibili } from "./proto";
+export declare const decode_INTERACT_WORD_V2: (pb: string) => bilibili.live.xuserreward.v1.InteractWord;
+export declare const decode_ONLINE_RANK_V3: (pb: string) => bilibili.live.rankdb.v1.GoldRankBroadcast;

package/dist/decoder.js

@@ -0,0 +1,17 @@
+import { bilibili } from "./proto";
+export const decode_INTERACT_WORD_V2 = (pb) => {
+    return bilibili.live.xuserreward.v1.InteractWord.decode(base64ToUint8Array(pb));
+};
+export const decode_ONLINE_RANK_V3 = (pb) => {
+    return bilibili.live.rankdb.v1.GoldRankBroadcast.decode(base64ToUint8Array(pb));
+};
+function base64ToUint8Array(base64String) {
+    let padding = "=".repeat((4 - (base64String.length % 4)) % 4);
+    let base64 = (base64String + padding).replace(/\-/g, "+").replace(/_/g, "/");
+    let rawData = atob(base64);
+    let outputArray = new Uint8Array(rawData.length);
+    for (var i = 0; i < rawData.length; ++i) {
+        outputArray[i] = rawData.charCodeAt(i);
+    }
+    return outputArray;
+}

package/dist/parser.d.ts

@@ -1,10 +1,10 @@
 import { LiveMessage, LiveRoomData } from "floating-live";
 import { BilibiliRoomData, RoomBaseInfo } from "./types.js";
 import { DataXliveGetInfoByRoom, MessageData } from "bilibili-live-danmaku";
-/** 转换bilibili直播弹幕为floating通用格式 */
+/** 转换bilibili直播弹幕为floalive通用格式 */
 export declare function parseMessage(data: MessageData.All, room?: BilibiliRoomData): LiveMessage.All | undefined;
-/** 转换bilibili直播间信息为floating通用格式 */
+/** 转换bilibili直播间信息为floalive通用格式 */
 export declare function parseGetInfoByRoom(data: DataXliveGetInfoByRoom): BilibiliRoomData;
-/** 转换bilibili直播间信息为floating通用格式 */
+/** 转换bilibili直播间信息为floalive通用格式 */
 export declare function parseRoomBaseInfo(data: RoomBaseInfo): BilibiliRoomData;
 export declare function mergeLiveRoomData<T extends LiveRoomData>(...list: Partial<T>[]): T;

package/dist/parser.js

@@ -1,6 +1,10 @@
 import { UserType, ImageSize, LiveRoomStatus, } from "floating-live";
+import { decode_INTERACT_WORD_V2 } from "./decoder.js";
 // utils
-const generateId = (m) => `${m.platform}:${m.roomId}-${m.type}:${m.userId}@${Date.now()}`;
+/** @deprecated Use generateIdByTimestamp or generateIdByValue instead */
+const generateId = (m) => `${m.platform}:${m.roomId}-${m.type}:${m.userId}~${Date.now()}`;
+const generateIdByTimestamp = (m) => `${m.platform}:${m.roomId}-${m.type}:${m.userId}@${m.timestamp}`;
+const generateIdByValue = (m, id) => `${m.platform}:${m.roomId}-${m.type}:${m.userId}@${id}`;
 // 获取当前时间戳，以替代无法从数据中获取时间戳的情况，精度为1s
 function getDateTimestamp() {
     return Math.floor(Date.now() / 1000) * 1000;
@@ -8,15 +12,16 @@ function getDateTimestamp() {
 const parsingFunction = {
     DANMU_MSG: (msg, room) => {
         const { info, msg_id } = msg;
-        let content = info[1];
-        let mode = info[0][1];
-        let color = info[0][3];
-        let uname = info[2][1];
-        let uid = info[2][0];
-        let timestamp = info[0][4];
-        let guard_level = info[7]; // 舰长级别
-        let extra = JSON.parse(info[0][15].extra);
-        let medal = info[3][0] != null
+        const content = info[1];
+        const mode = info[0][1];
+        const color = info[0][3];
+        const uname = info[2][1];
+        const uid = info[2][0];
+        const timestamp = info[0][4];
+        const guard_level = info[7]; // 舰长级别
+        const emote = info[0][12] ? info[0][13] : undefined;
+        const extra = JSON.parse(info[0][15].extra);
+        const medal = info[3]?.[0] != null
             ? {
                 level: info[3][0],
                 name: info[3][1],
@@ -50,17 +55,17 @@ const parsingFunction = {
             userId: uid,
             type: "comment",
             timestamp: timestamp,
-            id: msg_id,
-            info: {
+            id: "",
+            data: {
                 color: color,
                 mode: mode,
                 content: content,
-                image: info[0][12]
+                image: emote
                     ? {
                         name: content,
-                        id: info[0][13].emoticon_unique,
-                        url: info[0][13].url,
-                        size: info[0][13].width == info[0][13].height
+                        id: emote.emoticon_unique,
+                        url: emote.url,
+                        size: emote.width == emote.height
                             ? ImageSize.large
                             : ImageSize.small,
                     }
@@ -76,54 +81,12 @@ const parsingFunction = {
                 },
             },
         };
-        danmaku.id ?? (danmaku.id = generateId(danmaku));
+        danmaku.id = generateIdByTimestamp(danmaku);
         return danmaku;
     },
-    // /** @deprecated */
-    // INTERACT_WORD: (msg: MessageData.INTERACT_WORD, room) => {
-    //   const { data, msg_id, send_time } = msg;
-    //   let type: "entry" | "follow" | "share";
-    //   switch (data.msg_type) {
-    //     case 1:
-    //       type = "entry"; // 进入直播间
-    //       break;
-    //     case 2:
-    //       type = "follow"; // 关注直播间
-    //       break;
-    //     case 3:
-    //       type = "share"; // 分享直播间
-    //       break;
-    //     default:
-    //       return;
-    //   }
-    //   let interact: LiveMessage.Interact = {
-    //     platform: "bilibili",
-    //     roomId: room?.id || 0,
-    //     userId: data.uid,
-    //     type: type,
-    //     id: msg_id!,
-    //     timestamp: send_time || Math.floor(data.trigger_time / 1000000),
-    //     info: {
-    //       user: {
-    //         name: data.uname,
-    //         id: data.uid,
-    //         medal: data.fans_medal?.medal_level
-    //           ? {
-    //               level: data.fans_medal.medal_level,
-    //               name: data.fans_medal.medal_name,
-    //               id: data.fans_medal.target_id,
-    //               membership: data.fans_medal.guard_level,
-    //             }
-    //           : null,
-    //       },
-    //     },
-    //   };
-    //   interact.id ??= generateId(interact);
-    //   return interact;
-    // },
     INTERACT_WORD_V2: (msg, room) => {
-        const { decoded, msg_id, send_time } = msg;
-        const data = decoded;
+        const pb = msg.data.pb;
+        const data = decode_INTERACT_WORD_V2(pb);
         let type;
         switch (Number(data.msgType)) {
             case 1:
@@ -143,9 +106,9 @@ const parsingFunction = {
             roomId: room?.id || 0,
             userId: Number(data.uid),
             type: type,
-            id: msg_id,
-            timestamp: send_time || Math.floor(Number(data.triggerTime || 0) / 1000000),
-            info: {
+            id: "",
+            timestamp: Math.floor(Number(data.triggerTime || 0) / 1000000),
+            data: {
                 user: {
                     name: data.uname,
                     id: Number(data.uid),
@@ -161,19 +124,19 @@ const parsingFunction = {
                 },
             },
         };
-        interact.id ?? (interact.id = generateId(interact));
+        interact.id ?? (interact.id = generateIdByTimestamp(interact));
         return interact;
     },
     LIKE_INFO_V3_CLICK: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
         let like = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: data.uid,
             type: "like",
-            id: msg_id,
-            timestamp: send_time || getDateTimestamp(),
-            info: {
+            id: "",
+            timestamp: getDateTimestamp(),
+            data: {
                 user: {
                     name: data.uname,
                     id: data.uid,
@@ -193,36 +156,39 @@ const parsingFunction = {
         return like;
     },
     SEND_GIFT: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
+        const medal = data.medal_info;
         let gift = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: data.uid,
             type: "gift",
-            id: msg_id || data.combo_id,
-            timestamp: send_time || data.timestamp * 1000,
-            info: {
+            id: "",
+            timestamp: data.timestamp * 1000,
+            data: {
                 user: {
                     name: data.uname,
                     id: data.uid,
-                    medal: data.fans_medal && data.fans_medal.medal_level
+                    medal: medal && medal.medal_level
                         ? {
-                            level: data.fans_medal.medal_level,
-                            name: data.fans_medal.medal_name,
-                            id: data.fans_medal.target_id,
-                            membership: data.fans_medal.guard_level,
+                            level: medal.medal_level,
+                            name: medal.medal_name,
+                            id: medal.target_id,
+                            membership: medal.guard_level,
                         }
                         : null,
                     membership: data.guard_level,
                     avatar: data.face,
                 },
                 gift: {
+                    image: data.gift_info.img_basic,
                     name: data.giftName,
                     id: data.giftId,
                     num: data.num,
-                    value: data.coin_type == "gold" ? data.total_coin / 100 : data.total_coin,
+                    value: data.total_coin,
                     valueType: data.coin_type,
-                    valueName: data.coin_type == "gold" ? "电池" : "银瓜子",
+                    coins: data.coin_type == "gold" ? data.total_coin / 100 : data.total_coin,
+                    coinName: data.coin_type == "gold" ? "电池" : "银瓜子",
                     price: data.coin_type == "gold" ? data.total_coin / 1000 : 0,
                     currency: "CNY",
                     action: data.action,
@@ -230,20 +196,23 @@ const parsingFunction = {
                 },
             },
         };
-        gift.id ?? (gift.id = generateId(gift));
+        gift.id ?? (gift.id = generateIdByValue(gift, data.rnd));
         return gift;
     },
+    /** @deprecated Use USER_TOAST_MSG_V2 instead */
     USER_TOAST_MSG: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        return undefined;
+        const { data } = msg;
         let gift = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: data.uid,
             type: "membership",
-            id: msg_id,
-            timestamp: send_time || data.start_time * 1000,
-            info: {
+            id: "",
+            timestamp: data.start_time * 1000,
+            data: {
                 user: {
+                    // avatar: "",
                     name: data.username,
                     id: data.uid,
                 },
@@ -251,9 +220,10 @@ const parsingFunction = {
                     name: data.role_name,
                     id: data.gift_id,
                     num: data.num,
-                    value: data.price / 100,
+                    value: data.price,
                     valueType: "gold",
-                    valueName: "电池",
+                    coins: data.price / 100,
+                    coinName: "电池",
                     price: data.price / 1000,
                     currency: "CNY",
                     unit: data.unit == "年" ? "year" : data.unit == "天" ? "day" : "month",
@@ -269,51 +239,57 @@ const parsingFunction = {
         gift.id ?? (gift.id = generateId(gift));
         return gift;
     },
-    // /** @deprecated */
-    // GUARD_BUY: (msg: MessageData.GUARD_BUY, room) => {
-    //   const { data, msg_id, send_time } = msg;
-    //   let gift: LiveMessage.Membership = {
-    //     platform: "bilibili",
-    //     roomId: room?.id || 0,
-    //     userId: data.uid,
-    //     type: "membership",
-    //     id: msg_id!,
-    //     timestamp: send_time || data.start_time * 1000,
-    //     info: {
-    //       user: {
-    //         name: data.username,
-    //         id: data.uid,
-    //       },
-    //       gift: {
-    //         name: data.gift_name,
-    //         id: data.gift_id,
-    //         num: data.num,
-    //         value: data.price / 100,
-    //         valueType: "gold",
-    //         valueName: "电池",
-    //         price: data.price / 1000,
-    //         currency: "CNY",
-    //         unit: "month",
-    //       },
-    //       name: data.gift_name,
-    //       level: data.guard_level,
-    //       duration: data.num * 30 * 24 * 3600_000,
-    //     },
-    //   };
-    //   gift.id ??= generateId(gift);
-    //   return gift;
-    // },
+    USER_TOAST_MSG_V2: (msg, room) => {
+        const { data } = msg;
+        const user = data.sender_uinfo;
+        const num = data.pay_info.num;
+        let gift = {
+            platform: "bilibili",
+            roomId: room?.id || 0,
+            userId: user.uid,
+            type: "membership",
+            id: "",
+            timestamp: data.guard_info.start_time * 1000,
+            data: {
+                user: {
+                    // avatar: "",
+                    name: user.base.name,
+                    id: user.uid,
+                },
+                gift: {
+                    name: data.guard_info.role_name,
+                    id: data.gift_info.gift_id,
+                    num: num,
+                    value: data.pay_info.price,
+                    valueType: "gold",
+                    coins: data.pay_info.price / 100,
+                    coinName: "电池",
+                    price: data.pay_info.price / 1000,
+                    currency: "CNY",
+                    unit: data.pay_info.unit == "年" ? "year" : data.pay_info.unit == "天" ? "day" : "month",
+                },
+                name: data.guard_info.role_name,
+                level: data.guard_info.guard_level,
+                duration: num *
+                    (data.pay_info.unit == "年" ? 365 : data.pay_info.unit == "天" ? 1 : 30) *
+                    24 *
+                    3600000,
+            },
+        };
+        gift.id ?? (gift.id = generateIdByValue(gift, data.pay_info.payflow_id));
+        return gift;
+    },
     SUPER_CHAT_MESSAGE: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
         let sc = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: data.uid,
             type: "superchat",
-            id: msg_id,
-            timestamp: send_time || data.ts * 1000,
-            info: {
-                id: data.id,
+            id: "",
+            timestamp: data.ts * 1000,
+            data: {
+                token: data.token,
                 user: {
                     name: data.user_info.uname,
                     id: data.uid,
@@ -335,27 +311,28 @@ const parsingFunction = {
                     id: data.gift.gift_id,
                     name: data.gift.gift_name,
                     num: data.gift.num,
-                    value: data.price * 10,
+                    value: data.price * 1000,
                     valueType: "gold",
-                    valueName: "电池",
+                    coins: data.price * 10,
+                    coinName: "电池",
                     price: data.price,
                     currency: "CNY",
                 },
             },
         };
-        sc.id ?? (sc.id = generateId(sc));
+        sc.id ?? (sc.id = generateIdByValue(sc, data.token));
         return sc;
     },
     WATCHED_CHANGE: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
         const stats = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: 0,
             type: "live_stats",
-            id: msg_id,
-            timestamp: send_time || getDateTimestamp(),
-            info: {
+            id: "",
+            timestamp: getDateTimestamp(),
+            data: {
                 view: data.num,
             },
         };
@@ -363,23 +340,40 @@ const parsingFunction = {
         return stats;
     },
     LIKE_INFO_V3_UPDATE: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
         const stats = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: 0,
             type: "live_stats",
-            id: msg_id,
-            timestamp: send_time || getDateTimestamp(),
-            info: {
+            id: "",
+            timestamp: getDateTimestamp(),
+            data: {
                 like: data.click_count,
             },
         };
         stats.id ?? (stats.id = generateId(stats));
         return stats;
     },
+    ROOM_REAL_TIME_MESSAGE_UPDATE: (msg, room) => {
+        const { data } = msg;
+        const stats = {
+            platform: "bilibili",
+            roomId: room?.id || 0,
+            userId: 0,
+            type: "live_stats",
+            id: "",
+            timestamp: getDateTimestamp(),
+            data: {
+                fans: data.fans,
+                clubFans: data.fans_club
+            },
+        };
+        stats.id ?? (stats.id = generateId(stats));
+        return stats;
+    },
     ONLINE_RANK_COUNT: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
         if (data.online_count == null)
             return;
         const stats = {
@@ -387,9 +381,9 @@ const parsingFunction = {
             roomId: room?.id || 0,
             userId: 0,
             type: "live_stats",
-            id: msg_id,
-            timestamp: send_time || getDateTimestamp(),
-            info: {
+            id: "",
+            timestamp: getDateTimestamp(),
+            data: {
                 online: data.online_count,
             },
         };
@@ -397,15 +391,16 @@ const parsingFunction = {
         return stats;
     },
     ROOM_BLOCK_MSG: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
         const block = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: data.uid,
             type: "block",
-            id: msg_id,
-            timestamp: send_time || getDateTimestamp(),
-            info: {
+            id: "",
+            timestamp: getDateTimestamp(),
+            // expired: data.block_expired ? data.block_expired * 1000 : undefined,
+            data: {
                 user: {
                     id: data.uid,
                     name: data.uname,
@@ -419,7 +414,6 @@ const parsingFunction = {
         return block;
     },
     LIVE: (msg, room) => {
-        const { msg_id, send_time } = msg;
         // 直播间开播
         if (msg.live_time) {
             let live = {
@@ -427,59 +421,59 @@ const parsingFunction = {
                 roomId: room?.id || 0,
                 userId: 0,
                 type: "live_start",
-                id: msg_id,
-                timestamp: send_time || msg.live_time * 1000,
-                info: {
+                id: "",
+                timestamp: msg.live_time * 1000,
+                data: {
                     id: msg.live_key.toString(),
                 },
             };
-            live.id ?? (live.id = generateId(live));
+            live.id ?? (live.id = generateIdByValue(live, live.data.id));
             return live;
         }
     },
     CUT_OFF: (msg, room) => {
-        const { msg_id, send_time } = msg;
         // 直播间被切断
         let cut = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: 0,
             type: "live_cut",
-            id: msg_id,
-            timestamp: send_time || getDateTimestamp(),
-            info: {
+            id: "",
+            timestamp: getDateTimestamp(),
+            data: {
                 message: msg.msg,
+                status: LiveRoomStatus.off,
             },
         };
         cut.id ?? (cut.id = generateId(cut));
         return cut;
     },
     PREPARING: (msg, room) => {
-        const { msg_id, send_time } = msg;
+        const { send_time } = msg;
         let off = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: 0,
             type: "live_end",
-            id: msg_id,
+            id: "",
             timestamp: send_time || getDateTimestamp(),
-            info: {
+            data: {
                 status: msg.round ? LiveRoomStatus.round : LiveRoomStatus.off,
             },
         };
-        off.id ?? (off.id = generateId(off));
+        off.id ?? (off.id = generateIdByTimestamp(off));
         return off;
     },
     ROOM_CHANGE: (msg, room) => {
-        const { data, msg_id, send_time } = msg;
+        const { data } = msg;
         let change = {
             platform: "bilibili",
             roomId: room?.id || 0,
             userId: 0,
             type: "live_detail",
-            id: msg_id,
-            timestamp: send_time || getDateTimestamp(),
-            info: {
+            id: "",
+            timestamp: getDateTimestamp(),
+            data: {
                 title: data.title,
                 area: [data.parent_area_name, data.area_name],
             },
@@ -487,8 +481,8 @@ const parsingFunction = {
         change.id ?? (change.id = generateId(change));
         return change;
     },
-    // ANCHOR_LOT_START: (msg: MessageData.ANCHOR_LOT_START, room) => {
-    //   const { data, msg_id, send_time } = msg;
+    // ANCHOR_LOT_START: (msg: BilibiliInternal.WebSocket.Prod.ANCHOR_LOT_START, room) => {
+    //   const { data } = msg;
     //   let m: LiveMessage.Lottery = {
     //     platform: "bilibili",
     //     roomId: room?.id || 0,
@@ -496,7 +490,7 @@ const parsingFunction = {
     //     type: "lottery",
     //     timestamp: send_time || data.current_time * 1000,
     //     id: msg_id!,
-    //     info: {
+    //     data: {
     //       id: data.id,
     //       award: {
     //         name: data.award_name,
@@ -511,19 +505,21 @@ const parsingFunction = {
     //   return m;
     // },
 };
-/** 转换bilibili直播弹幕为floating通用格式 */
+/** 转换bilibili直播弹幕为floalive通用格式 */
 export function parseMessage(data, room) {
     return parsingFunction[data.cmd]?.(data, room);
 }
-/** 转换bilibili直播间信息为floating通用格式 */
+/** 转换bilibili直播间信息为floalive通用格式 */
 export function parseGetInfoByRoom(data) {
     const { room_info, anchor_info, like_info_v3, watched_show, } = data;
     return {
         platform: "bilibili",
+        service: "bilibili",
         id: room_info.room_id,
         roomId: room_info.room_id,
         shortId: room_info.short_id,
         key: `bilibili:${room_info.room_id}`,
+        pending: false,
         detail: {
             title: room_info.title,
             area: [room_info.parent_area_name, room_info.area_name],
@@ -550,18 +546,18 @@ export function parseGetInfoByRoom(data) {
         opened: false,
         connectionStatus: 0,
         valid: true,
-        service: "",
-        serviceId: "bilibili",
     };
 }
-/** 转换bilibili直播间信息为floating通用格式 */
+/** 转换bilibili直播间信息为floalive通用格式 */
 export function parseRoomBaseInfo(data) {
     return {
         platform: "bilibili",
+        service: "bilibili",
         id: data.room_id,
         roomId: data.room_id,
         shortId: data.short_id,
         key: `bilibili:${data.room_id}`,
+        pending: false,
         detail: {
             title: data.title,
             area: [data.parent_area_name, data.area_name],
@@ -584,8 +580,6 @@ export function parseRoomBaseInfo(data) {
         opened: false,
         connectionStatus: 0,
         valid: true,
-        service: "",
-        serviceId: "bilibili",
     };
 }
 export function mergeLiveRoomData(...list) {

package/dist/plugin.js

@@ -43,7 +43,7 @@ export class PluginBilibili extends BasePlugin {
                 ...options,
             });
         });
-        ctx.registerCommand("bilibili.room.data", async (e, id) => {
+        ctx.registerCommand("bilibili.room.info", async (e, id) => {
             return await fetchLiveRoomData(this.apiClient, parseInt(id.toString()));
         });
         ctx.registerCommand("bilibili.credentials.check", async (e, credentials) => {

package/dist/room.d.ts

@@ -1,5 +1,5 @@
 import { BilibiliRoomData, ConnectTokens } from "./types.js";
-import { LiveWS } from "bilibili-live-danmaku";
+import { LiveWS } from "@laplace.live/ws";
 import { UserInfo, LiveRoomStatsInfo, LiveRoomDetailInfo, LiveRoom } from "floating-live";
 /** 配置项 */
 export interface RoomOptions {
@@ -36,6 +36,8 @@ export declare class RoomBilibili extends LiveRoom implements BilibiliRoomData {
     #private;
     /** 平台id */
     readonly platform: string;
+    /** 服务id */
+    readonly service: string;
     /** 直播间号 */
     readonly id: number;
     /** 直播间room_id */

package/dist/room.js

@@ -10,9 +10,10 @@ var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (
     return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
 };
 var _RoomBilibili_tokens, _RoomBilibili_apiClient;
-import { LiveWS, parseLiveConfig } from "bilibili-live-danmaku";
+import { LiveWS } from "@laplace.live/ws";
 import { parseGetInfoByRoom, parseMessage, parseRoomBaseInfo } from "./parser.js";
 import { LiveConnectionStatus, LiveRoom, LiveRoomOpenStatus, } from "floating-live";
+import { parseLiveConfig } from "bilibili-live-danmaku";
 import { BilibiliApiClientEx } from "./utils/request.js";
 const symbolAbortController = Symbol("abortController");
 export class RoomBilibili extends LiveRoom {
@@ -28,6 +29,8 @@ export class RoomBilibili extends LiveRoom {
         super();
         /** 平台id */
         this.platform = "bilibili";
+        /** 服务id */
+        this.service = "bilibili";
         /** 直播间room_id */
         this.roomId = 0;
         /** 直播间短房号 */
@@ -272,6 +275,7 @@ export class RoomBilibili extends LiveRoom {
             uid: __classPrivateFieldGet(this, _RoomBilibili_tokens, "f")?.uid,
             buvid: __classPrivateFieldGet(this, _RoomBilibili_tokens, "f")?.buvid,
             key: __classPrivateFieldGet(this, _RoomBilibili_tokens, "f")?.key,
+            // decodeProtobuf: true,
         });
         const controller = new AbortController();
         const signal = controller.signal;
@@ -290,11 +294,11 @@ export class RoomBilibili extends LiveRoom {
                 this.safeReconnect();
             }
         }, { signal });
-        client.addEventListener("CONNECT_SUCCESS", () => {
+        client.addEventListener("live", () => {
             // 连接到直播间
             this.emitConnention(LiveConnectionStatus.entered);
         }, { signal });
-        client.addEventListener("MESSAGE", ({ data }) => {
+        client.addEventListener("msg", ({ data }) => {
             const m = parseMessage(data, this);
             m && this.emitMessage(m);
             this.emitRaw(data);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floating-live/bilibili",
-  "version": "0.17.0-alpha.2",
+  "version": "0.17.0-alpha.4",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,7 +20,9 @@
   },
   "dependencies": {
     "@floating-live/cookies": "^0.1.0",
-    "bilibili-live-danmaku": "^0.7.15",
+    "@laplace.live/internal": "^1.3.42",
+    "@laplace.live/ws": "^8.1.1",
+    "bilibili-live-danmaku": "^0.7.16",
     "md5": "^2.3.0"
   },
   "devDependencies": {
@@ -34,11 +36,11 @@
     "vite": "^8.0.11"
   },
   "peerDependencies": {
-    "floating-live": "0.17.0-alpha.5"
+    "floating-live": "0.17.0-alpha.15"
   },
   "files": [
     "dist",
     "plugin.json"
   ],
-  "gitHead": "f5691cd51e7dd93aebc1b5a1c499644ee21c80e2"
+  "gitHead": "2693172ffac76bae4a3ff6e6faa13b8324e71421"
 }

package/plugin.json

@@ -2,7 +2,7 @@
   "name": "bilibili",
   "role": "platform/bilibili",
   "author": "FloatingLive",
-  "version": "0.17.0-alpha.2",
+  "version": "0.17.0-alpha.4",
   "description": "Bilibili plugin for FloatingLive",
   "main": "plugin.js"
 }