floating-live 0.11.0 → 0.11.2

package/index.d.ts

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

package/index.js

@@ -17,9 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FloatingLive = void 0;
 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"), exports);
-__exportStar(require("./src/types/room"), exports);
+__exportStar(require("./src/types"), exports);
+__exportStar(require("./src/enum"), 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.11.0",
+  "version": "0.11.2",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",

package/plugin/acfun/acfunLive.d.ts

@@ -1,6 +1,6 @@
-import { MedalInfo, UserInfo } from "../../src/types/message/AttributeInfo";
+import { MedalInfo, UserInfo } from "../..";
 import AcClient from "acfun-live-danmaku/client";
-import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../../src/lib/LiveRoom";
+import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../..";
 declare type ZtLiveUserInfo = {
     userIdentity: {
         managerType?: number;

package/plugin/acfun/acfunLive.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const acfun_live_danmaku_1 = __importDefault(require("acfun-live-danmaku"));
-const LiveRoom_1 = require("../../src/lib/LiveRoom");
-const enum_1 = require("../../src/enum");
+const __1 = require("../..");
+const __2 = require("../..");
 // 获取当前时间戳，以替代无法从数据中获取时间戳的情况，精度为1s
 function getDateTimestamp() {
     return Math.floor(Date.now() / 1000) * 1000;
@@ -18,7 +18,7 @@ function stringToNumber(num) {
         return parseFloat(num);
     }
 }
-class acfunLive extends LiveRoom_1.LiveRoom {
+class acfunLive extends __1.LiveRoom {
     constructor(id, open = false) {
         super();
         /** 平台id */
@@ -65,7 +65,7 @@ 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 = enum_1.RoomStatus.live;
+                this.status = __2.RoomStatus.live;
                 this.timestamp = this.client.liveStartTime;
                 this.view.title = this.client.caption; // bug
                 this.view.cover = `https://tx2.a.kwimgs.com/bs2/ztlc/cover_${this.client.liveId}_raw.jpg`;
@@ -105,7 +105,7 @@ class acfunLive extends LiveRoom_1.LiveRoom {
         let client = this.client;
         client.on("EnterRoomAck", () => {
             console.log("[acfun-live-danmaku] 已连接AcFun直播间");
-            this.status = enum_1.RoomStatus.live;
+            this.status = __2.RoomStatus.live;
         });
         client.on("RecentComment", (comments) => {
             //当前弹幕列表
@@ -153,10 +153,10 @@ class acfunLive extends LiveRoom_1.LiveRoom {
     getUser(user) {
         let identity = null;
         if (user.userIdentity?.managerType == 1) {
-            identity = enum_1.UserAdmin.admin;
+            identity = __2.UserAdmin.admin;
         }
         else if (parseInt(user.userId) == this.anchor.id) {
-            identity = enum_1.UserAdmin.anchor;
+            identity = __2.UserAdmin.anchor;
         }
         return {
             name: user.nickname,
@@ -220,7 +220,7 @@ class acfunLive extends LiveRoom_1.LiveRoom {
             type: "live_end",
             timestamp: getDateTimestamp(),
             info: {
-                status: enum_1.RoomStatus.off
+                status: __2.RoomStatus.off
             }
         };
         this.client = null;

package/plugin/bilibili/bilibiliLive.d.ts

@@ -1,6 +1,6 @@
-import { UserInfo } from "../../src/types/message/AttributeInfo";
+import { UserInfo } from "../..";
 import { KeepLiveWS } from "bilibili-live-ws";
-import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../../src/lib/LiveRoom";
+import { LiveRoom, RoomStatsInfo, RoomViewInfo } from "../..";
 declare class bilibiliLive extends LiveRoom {
     /** 平台id */
     readonly platform: string;

package/plugin/bilibili/bilibiliLive.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const enum_1 = require("./../../src/enum");
+const __1 = require("../..");
 const bilibili_live_ws_1 = require("bilibili-live-ws");
-const LiveRoom_1 = require("../../src/lib/LiveRoom");
+const __2 = require("../..");
 // utils
 // 获取当前时间戳，以替代无法从数据中获取时间戳的情况，精度为1s
 function getDateTimestamp() {
     return Math.floor(Date.now() / 1000) * 1000;
 }
-class bilibiliLive extends LiveRoom_1.LiveRoom {
+class bilibiliLive extends __2.LiveRoom {
     constructor(id, // 房间id
     open = false, // 生成房间后是否打开
     config) {
@@ -56,13 +56,15 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
         }) // 获取直播间信息
             .then((response) => response.json())
             .then((res) => {
-            const { room_info, anchor_info } = res.data;
+            const { room_info, anchor_info, like_info_v3, watched_show } = res.data;
             this.roomid = room_info.room_id;
-            this.status = room_info.live_status == 1 ? enum_1.RoomStatus.live : enum_1.RoomStatus.off;
-            this.timestamp = this.status == enum_1.RoomStatus.live ? room_info.live_start_time * 1000 : refresh ? Date.now() : this.timestamp;
+            this.status = room_info.live_status == 1 ? __1.RoomStatus.live : __1.RoomStatus.off;
+            this.timestamp = this.status == __1.RoomStatus.live ? room_info.live_start_time * 1000 : refresh ? Date.now() : this.timestamp;
             this.view.title = room_info.title;
             this.view.area = [room_info.parent_area_name, room_info.area_name];
             this.view.cover = room_info.cover;
+            this.stats.watch = watched_show.num;
+            this.stats.like = like_info_v3.total_likes;
             this.anchor.id = room_info.uid;
             this.anchor.name = anchor_info.base_info.uname;
             this.anchor.avatar = anchor_info.base_info.face;
@@ -163,10 +165,10 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
             }
         }
         if (msg.info[2][2]) {
-            identity = enum_1.UserAdmin.admin;
+            identity = __1.UserAdmin.admin;
         }
         else if (uid == this.anchor.id) {
-            identity = enum_1.UserAdmin.anchor;
+            identity = __1.UserAdmin.anchor;
         }
         let danmaku = {
             platform: "bilibili",
@@ -181,7 +183,7 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
                     name: content,
                     id: msg.info[0][13].emoticon_unique,
                     url: msg.info[0][13].url,
-                    size: msg.info[0][13].width == msg.info[0][13].height ? enum_1.ImageSize.large : enum_1.ImageSize.small,
+                    size: msg.info[0][13].width == msg.info[0][13].height ? __1.ImageSize.large : __1.ImageSize.small,
                 } : undefined,
                 emoticon: emoticon,
                 user: {
@@ -372,7 +374,7 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
                     name: data.uname
                 },
                 operator: {
-                    admin: data.operator == 2 ? enum_1.UserAdmin.anchor : enum_1.UserAdmin.admin
+                    admin: data.operator == 2 ? __1.UserAdmin.anchor : __1.UserAdmin.admin
                 }
             },
         };
@@ -413,7 +415,7 @@ class bilibiliLive extends LiveRoom_1.LiveRoom {
             type: "live_end",
             timestamp: getDateTimestamp(),
             info: {
-                status: msg.round ? enum_1.RoomStatus.round : enum_1.RoomStatus.off
+                status: msg.round ? __1.RoomStatus.round : __1.RoomStatus.off
             }
         };
         this.emitMsg(off);

package/plugin/bilibili/index.d.ts

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

package/plugin/chatPrint/chatPrint.d.ts

@@ -1,6 +1,6 @@
 import { FloatingLive } from "../..";
-import { UserInfo } from "../../src/types/message/AttributeInfo";
-import { MessageData } from "../../src/types/message/MessageData";
+import { UserInfo } from "../..";
+import { MessageData } from "../..";
 export declare class chatPrint {
     /** 主模块 */
     main: FloatingLive;

package/plugin/chatPrint/chatPrint.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.chatPrint = void 0;
-const enum_1 = require("../../src/enum");
+const __1 = require("../..");
 class chatPrint {
     constructor(main) {
         this.main = main;
@@ -15,7 +15,7 @@ class chatPrint {
         let name = `${"\x1b[33m"}${user.name}`; // 用户名
         let medal = user.medal ? `${"\x1b[32m"}[${user.medal.name}(${user.medal.level})] ` : ""; // 粉丝牌
         let membership = user.membership ? `${"\x1b[36m"}[${this.getPriviliegeName(message.platform, user.membership)}]` : ""; // 特权粉丝
-        let admin = user.admin ? `${"\x1b[95m"}[${{ [enum_1.UserAdmin.admin]: "房管", [enum_1.UserAdmin.anchor]: "主播" }[user.admin]}]` : ""; // 房管
+        let admin = user.admin ? `${"\x1b[95m"}[${{ [__1.UserAdmin.admin]: "房管", [__1.UserAdmin.anchor]: "主播" }[user.admin]}]` : ""; // 房管
         return `${medal}${membership}${admin}${name}${"\x1b[0m"}`; //[粉丝牌(等级)] [特权][房管]用户名
     }
     /** 获取特权粉丝名称 */
@@ -81,7 +81,7 @@ class chatPrint {
             }
             case "block": {
                 let user = this.getUserInfo(message);
-                let operator = message.info.operator.admin ? { [enum_1.UserAdmin.admin]: "房管", [enum_1.UserAdmin.anchor]: "主播" }[message.info.operator.admin] : "管理员";
+                let operator = message.info.operator.admin ? { [__1.UserAdmin.admin]: "房管", [__1.UserAdmin.anchor]: "主播" }[message.info.operator.admin] : "管理员";
                 console.log(`${user} 已被${operator}禁言`);
                 break;
             }

package/plugin/chatPrint/index.d.ts

@@ -1,4 +1,4 @@
-import { FloatingLive } from "../../src";
+import { FloatingLive } from "../..";
 import { chatPrint } from "./chatPrint";
 declare const _default: () => {
     register: (ctx: FloatingLive) => chatPrint;

package/plugin/consoleEvent/index.d.ts

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

package/plugin/msgSave/index.d.ts

@@ -1,5 +1,5 @@
-import { FloatingLive } from "../../src";
-import MsgSave from "../msgSave/msgSave";
+import { FloatingLive } from "../..";
+import MsgSave from "./msgSave";
 export declare const messageSave: () => {
     register: (ctx: FloatingLive) => MsgSave;
 };

package/plugin/msgSave/index.js

@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.messageSaveOrigin = exports.messageSave = void 0;
-const msgSave_1 = __importDefault(require("../msgSave/msgSave"));
+const msgSave_1 = __importDefault(require("./msgSave"));
 const messageSave = () => {
     return {
         register: (ctx) => {

package/plugin/msgSave/msgSave.d.ts

@@ -1,4 +1,4 @@
-import { RoomStatus } from './../../src/enum';
+import { RoomStatus } from '../..';
 import { FloatingLive } from "../..";
 interface SaveInfoConfig {
     platform: string;

package/plugin/msgSave/msgSave.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const enum_1 = require("./../../src/enum");
+const __1 = require("../..");
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 function getTimeStr(timestamp) {
@@ -14,7 +14,7 @@ function getTimeStr(timestamp) {
  * S=直播开始 L=直播中 E=直播结束 O=未开播
  */
 function getRecordStatus(status, statusChanged) {
-    if (status == enum_1.RoomStatus.live) {
+    if (status == __1.RoomStatus.live) {
         /** 已开播 */
         return statusChanged ? "S" : "L";
     }
@@ -110,7 +110,7 @@ class MsgSave {
     }
     /** 创建保存信息，用于记录信息可能不存在的情况 */
     createSaveInfo({ platform, room }) {
-        const { status, timestamp } = this.main.room.get(`${platform}:${room}`)?.info || { status: enum_1.RoomStatus.off, timestamp: 0 };
+        const { status, timestamp } = this.main.room.get(`${platform}:${room}`)?.info || { status: __1.RoomStatus.off, timestamp: 0 };
         const saveInfoConfig = {
             platform,
             room, status,

package/src/lib/LiveRoom.js

@@ -35,6 +35,7 @@ class LiveRoom extends events_1.EventEmitter {
                 break;
             case "live_stats":
                 this.stats = Object.assign(this.stats, msg.info);
+                this.emit("stats", msg.info);
                 break;
             case "live_end":
             case "live_cut":