floating-live 0.10.1 → 0.11.0

package/index.d.ts

@@ -1,7 +1,7 @@
 export { FloatingLive } from "./src";
 export * from "./src/types/message/AttributeInfo";
 export * from "./src/types/message/MessageData";
-export * from "./src/types/plugin/Plugin";
-export * from "./src/types/room/PlatformInfo";
+export * from "./src/types/plugin";
+export * from "./src/types/room";
 export * from "./src/lib/LiveRoom";
 export * from "./src/lib/Reglist";

package/index.js

@@ -19,7 +19,7 @@ var src_1 = require("./src");
 Object.defineProperty(exports, "FloatingLive", { enumerable: true, get: function () { return src_1.FloatingLive; } });
 __exportStar(require("./src/types/message/AttributeInfo"), exports);
 __exportStar(require("./src/types/message/MessageData"), exports);
-__exportStar(require("./src/types/plugin/Plugin"), exports);
-__exportStar(require("./src/types/room/PlatformInfo"), exports);
+__exportStar(require("./src/types/plugin"), exports);
+__exportStar(require("./src/types/room"), exports);
 __exportStar(require("./src/lib/LiveRoom"), exports);
 __exportStar(require("./src/lib/Reglist"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.10.1",
+  "version": "0.11.0",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "acfun-live-danmaku": "^0.6.1",
-    "axios": "^1.2.3",
+    "axios": "^1.4.0",
     "bilibili-live-ws": "^6.0.3",
     "fs-extra": "^11.1.0"
   },

package/plugin/acfun/acfunLive.d.ts

@@ -1,6 +1,6 @@
 import { MedalInfo, UserInfo } from "../../src/types/message/AttributeInfo";
 import AcClient from "acfun-live-danmaku/client";
-import { LiveRoom, RoomBaseInfo } from "../../src/lib/LiveRoom";
+import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../../src/lib/LiveRoom";
 declare type ZtLiveUserInfo = {
     userIdentity: {
         managerType?: number;
@@ -19,8 +19,10 @@ declare class acfunLive extends LiveRoom {
     readonly platform: string;
     /** 房间id */
     readonly id: number;
-    /** 直播信息 */
-    base: RoomBaseInfo;
+    /** 直播展示信息 */
+    view: RoomViewInfo;
+    /** 直播数据信息 */
+    stats: RoomStatsInfo;
     /** 主播信息 */
     anchor: UserInfo;
     /** 直播间弹幕api模块 */
@@ -38,6 +40,7 @@ declare class acfunLive extends LiveRoom {
     open(): Promise<void>;
     /** 初始化直播服务端监听 */
     private initWS;
+    /** 关闭直播间监听 */
     close(): void;
     destory(): void;
     /** 根据守护徽章字符串获取粉丝牌信息 */

package/plugin/acfun/acfunLive.js

@@ -4,15 +4,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const acfun_live_danmaku_1 = __importDefault(require("acfun-live-danmaku"));
-const axios_1 = __importDefault(require("axios"));
 const LiveRoom_1 = require("../../src/lib/LiveRoom");
+const enum_1 = require("../../src/enum");
+// 获取当前时间戳，以替代无法从数据中获取时间戳的情况，精度为1s
+function getDateTimestamp() {
+    return Math.floor(Date.now() / 1000) * 1000;
+}
+function stringToNumber(num) {
+    if (num.slice(-1) == "万") {
+        return Math.round(parseFloat(num) * 10000);
+    }
+    else {
+        return parseFloat(num);
+    }
+}
 class acfunLive extends LiveRoom_1.LiveRoom {
     constructor(id, open = false) {
         super();
         /** 平台id */
         this.platform = "acfun";
-        /** 直播信息 */
-        this.base = {
+        /** 直播展示信息 */
+        this.view = {
             /** 直播标题 */
             title: "",
             /** 分区 */
@@ -20,6 +32,13 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             /** 封面 */
             cover: "",
         };
+        /** 直播数据信息 */
+        this.stats = {
+            /** 点赞数 */
+            like: 0,
+            /** 在线观看数 */
+            online: 0,
+        };
         /** 主播信息 */
         this.anchor = { name: "", id: 0 };
         /** 直播间弹幕api模块 */
@@ -46,22 +65,24 @@ class acfunLive extends LiveRoom_1.LiveRoom {
         if (!this.client) {
             this.client = await (0, acfun_live_danmaku_1.default)(this.id) || null;
             if (this.client) {
-                this.status = "live";
+                this.status = enum_1.RoomStatus.live;
                 this.timestamp = this.client.liveStartTime;
-                this.base.title = this.client.caption; // bug
-                this.base.cover = `https://tx2.a.kwimgs.com/bs2/ztlc/cover_${this.client.liveId}_raw.jpg`;
+                this.view.title = this.client.caption; // bug
+                this.view.cover = `https://tx2.a.kwimgs.com/bs2/ztlc/cover_${this.client.liveId}_raw.jpg`;
             }
-            await axios_1.default
-                .get(`https://live.acfun.cn/rest/pc-direct/user/userInfo?userId=${this.id}`)
+            await fetch(`https://live.acfun.cn/rest/pc-direct/user/userInfo?userId=${this.id}`, {
+                method: "GET"
+            })
+                .then((response) => response.json())
                 .then((res) => {
-                let profile = res.data.profile;
-                this.anchor.avatar = profile.headUrl;
-                this.anchor.name = profile.name;
+                let { headUrl, name } = res.profile;
+                this.anchor.avatar = headUrl;
+                this.anchor.name = name;
+                this.emit("info");
             })
                 .catch((error) => {
                 console.error(error);
             });
-            this.emit("info");
         }
         // 暂不能在连接房间后更新信息
     }
@@ -84,7 +105,7 @@ class acfunLive extends LiveRoom_1.LiveRoom {
         let client = this.client;
         client.on("EnterRoomAck", () => {
             console.log("[acfun-live-danmaku] 已连接AcFun直播间");
-            this.status = "live";
+            this.status = enum_1.RoomStatus.live;
         });
         client.on("RecentComment", (comments) => {
             //当前弹幕列表
@@ -96,12 +117,13 @@ class acfunLive extends LiveRoom_1.LiveRoom {
         client.on("Gift", (gift) => { this.msg_Gift(gift); });
         client.on("UserEnterRoom", (entry) => { this.msg_Interact(entry, "entry"); });
         client.on("Like", (like) => { this.msg_Interact(like, "like"); });
-        client.on("JoinClub", (join) => { this.msg_Interact(join, "join"); });
+        // client.on("JoinClub", (join: any) => { this.msg_Interact(join, "join"); });
         client.on("DisplayInfo", (info) => { this.msg_DisplayInfo(info); });
         client.on("LiveClosed", (end) => { this.msg_LiveClosed(); });
         client.on("LiveBanned", (end) => { this.msg_LiveBanned(); });
         this.wsInit = true;
     }
+    /** 关闭直播间监听 */
     close() {
         if (!this.opening)
             return;
@@ -131,17 +153,17 @@ class acfunLive extends LiveRoom_1.LiveRoom {
     getUser(user) {
         let identity = null;
         if (user.userIdentity?.managerType == 1) {
-            identity = "admin";
+            identity = enum_1.UserAdmin.admin;
         }
         else if (parseInt(user.userId) == this.anchor.id) {
-            identity = "anchor";
+            identity = enum_1.UserAdmin.anchor;
         }
         return {
             name: user.nickname,
             id: parseInt(user.userId),
             medal: this.getMedal(user.badge),
             avatar: user.avatar[0].url,
-            identity: identity
+            admin: identity
         };
     }
     /** 文本信息(Comment) */
@@ -149,12 +171,11 @@ class acfunLive extends LiveRoom_1.LiveRoom {
         let danmaku = {
             platform: "acfun",
             room: this.id,
-            record_time: new Date().valueOf(),
+            timestamp: parseInt(data.sendTimeMs),
             type: "chat",
             info: {
                 content: data.content,
                 user: this.getUser(data.userInfo),
-                timestamp: parseInt(data.sendTimeMs),
             },
         };
         this.emitMsg(danmaku);
@@ -165,7 +186,7 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             platform: "acfun",
             room: this.id,
             type: "gift",
-            record_time: new Date().valueOf(),
+            timestamp: parseInt(data.sendTimeMs),
             info: {
                 user: this.getUser(data.user),
                 gift: {
@@ -175,7 +196,6 @@ class acfunLive extends LiveRoom_1.LiveRoom {
                     currency: data.giftId == "1" ? "banana" : "coin",
                     value: parseInt(data.value), // 总价值
                 },
-                timestamp: parseInt(data.sendTimeMs),
             },
         };
         this.emitMsg(gift);
@@ -186,10 +206,9 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             platform: "acfun",
             room: this.id,
             type: type,
-            record_time: new Date().valueOf(),
+            timestamp: parseInt(data.sendTimeMs),
             info: {
                 user: this.getUser(data.userInfo),
-                timestamp: parseInt(data.sendTimeMs),
             },
         };
         this.emitMsg(like);
@@ -199,9 +218,9 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             platform: "acfun",
             room: this.id,
             type: "live_end",
-            record_time: new Date().valueOf(),
+            timestamp: getDateTimestamp(),
             info: {
-                status: "off"
+                status: enum_1.RoomStatus.off
             }
         };
         this.client = null;
@@ -212,7 +231,7 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             platform: "acfun",
             room: this.id,
             type: "live_cut",
-            record_time: new Date().valueOf(),
+            timestamp: getDateTimestamp(),
             info: {
                 message: ""
             }
@@ -221,7 +240,17 @@ class acfunLive extends LiveRoom_1.LiveRoom {
         this.emitMsg(cut);
     }
     msg_DisplayInfo(data) {
-        // 
+        let stats = {
+            platform: "acfun",
+            room: this.id,
+            type: "live_stats",
+            timestamp: getDateTimestamp(),
+            info: {
+                like: stringToNumber(data.likeCount),
+                online: stringToNumber(data.watchingCount),
+            }
+        };
+        this.emitMsg(stats);
     }
 }
 exports.default = acfunLive;

package/plugin/acfun/index.d.ts

@@ -1,3 +1,5 @@
 import { FloatingLive } from "../../src/index";
-declare const _default: (ctx: FloatingLive) => void;
+declare const _default: () => {
+    register: (ctx: FloatingLive) => void;
+};
 export = _default;

package/plugin/acfun/index.js

@@ -3,8 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const acfunLive_1 = __importDefault(require("./acfunLive"));
-module.exports = (ctx) => {
-    ctx.helper.roomGenerator.register("acfun", (id, open) => {
-        return new acfunLive_1.default(Number(id), open);
-    });
+module.exports = () => {
+    return {
+        register: (ctx) => {
+            ctx.helper.roomGenerator.register("acfun", (id, open) => {
+                return new acfunLive_1.default(Number(id), open);
+            });
+        }
+    };
 };

package/plugin/bilibili/bilibiliLive.d.ts

@@ -1,6 +1,6 @@
 import { UserInfo } from "../../src/types/message/AttributeInfo";
 import { KeepLiveWS } from "bilibili-live-ws";
-import { LiveRoom, RoomBaseInfo } from "../../src/lib/LiveRoom";
+import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../../src/lib/LiveRoom";
 declare class bilibiliLive extends LiveRoom {
     /** 平台id */
     readonly platform: string;
@@ -8,8 +8,9 @@ declare class bilibiliLive extends LiveRoom {
     readonly id: number;
     /** 直播间room_id */
     roomid: number;
-    /** 直播信息 */
-    base: RoomBaseInfo;
+    /** 展示信息 */
+    view: RoomViewInfo;
+    stats: RoomStatsInfo;
     /** 房间是否可用 */
     available: boolean;
     /** 是否连接上房间 */
@@ -26,13 +27,13 @@ declare class bilibiliLive extends LiveRoom {
         connectInterval: number;
     });
     /** 获取房间信息 */
-    getInfo(): Promise<void>;
+    getInfo(refresh?: boolean): Promise<void>;
     /** 开启直播间监听 */
     open(): Promise<void>;
     /** 连接直播服务端 */
     createWS(): Promise<void>;
+    /** 关闭直播间监听 */
     close(): void;
-    getDanmakuMode(n: number): string;
     /** 获取弹幕消息 */
     msg_DANMU_MSG(msg: any): void;
     /** 获取互动消息 */
@@ -43,6 +44,10 @@ declare class bilibiliLive extends LiveRoom {
     msg_GUARD_BUY(msg: any): void;
     /** 获取醒目留言消息 */
     msg_SUPER_CHAT_MESSAGE(msg: any): void;
+    /** 观看数变化 */
+    msg_WATCHED_CHANGE(msg: any): void;
+    /** 点赞数变化 */
+    msg_LIKE_INFO_V3_UPDATE(msg: any): void;
     msg_ROOM_BLOCK_MSG(msg: any): void;
     msg_LIVE(msg: any): void;
     msg_CUT_OFF(msg: any): void;