floating-live 0.8.7 → 0.10.0

package/README.md

@@ -7,6 +7,8 @@
 
 注意：当前项目未进入正式版本阶段，程序结构及导出数据结构可能随时改动，**非常不建议用于正式项目中**。
 
+GUI版本：[Minteea/floating-live-gui](https://github.com/Minteea/floating-live-gui)
+
 ## 使用方法
 ### npm安装
 ```
@@ -14,18 +16,18 @@ npm install floating-live
 ```
 ``` javascript
 // 导入FloatingLive
-const FloatingLive = require("floating-live")
+const { FloatingLive } = require("floating-live")
 // 导入bilibili房间生成插件
 const bilibili = require("floating-live/plugin/bilibili")   
 
 // 创建一个FloatingLive实例
 const live = new FloatingLive()
 // 注册插件
-live.registerPlugin("bilibili", bilibili)
+live.plugin.register("bilibili", bilibili)
 // 添加房间
-live.controller.addRoom({platform: "bilibili", id: 6})
+live.addRoom({platform: "bilibili", id: 6})
 // 打开
-live.controller.start()
+live.start()
 ```
 
 ### 拆包即用模式

package/index.d.ts

@@ -1,2 +1,7 @@
-import FloatingLiving from "./src";
-export = FloatingLiving;
+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/lib/LiveRoom";
+export * from "./src/lib/Reglist";

package/index.js

@@ -1,6 +1,25 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
-const src_1 = __importDefault(require("./src"));
-module.exports = src_1.default;
+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/Plugin"), exports);
+__exportStar(require("./src/types/room/PlatformInfo"), 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.8.7",
+  "version": "0.10.0",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",

package/plugin/acfun/acfunLive.d.ts

@@ -1,23 +1,34 @@
-/// <reference types="node" />
 import { MedalInfo, UserInfo } from "../../src/types/message/AttributeInfo";
-import LiveRoom from "../../src/types/room/LiveRoom";
 import AcClient from "acfun-live-danmaku/client";
-import { EventEmitter } from "events";
-import { LiveInfo } from "../../src/types/room/LiveInfo";
-import { MessageType } from "../../src/types/message/MessageData";
-declare class acfunLive extends EventEmitter implements LiveRoom {
+import { LiveRoom, RoomBaseInfo } from "../../src/lib/LiveRoom";
+declare type ZtLiveUserInfo = {
+    userIdentity: {
+        managerType?: number;
+    };
+    badge?: string;
+    nickname: string;
+    userId: string;
+    avatar: [
+        {
+            url: string;
+        }
+    ];
+};
+declare class acfunLive extends LiveRoom {
     /** 平台id */
     readonly platform: string;
     /** 房间id */
     readonly id: number;
     /** 直播信息 */
-    live: LiveInfo;
+    base: RoomBaseInfo;
     /** 主播信息 */
     anchor: UserInfo;
     /** 直播间弹幕api模块 */
     client: AcClient | null;
     /** 是否为打开状态 */
     opening: boolean;
+    /** 是否连接上服务器 */
+    connected: boolean;
     private wsInit;
     /** 直播间是否可用 */
     get available(): boolean;
@@ -30,47 +41,30 @@ declare class acfunLive extends EventEmitter implements LiveRoom {
     close(): void;
     destory(): void;
     /** 根据守护徽章字符串获取粉丝牌信息 */
-    getMedal(badge: string): MedalInfo | null;
+    getMedal(badge?: string): MedalInfo | null;
+    getUser(user: ZtLiveUserInfo): UserInfo;
     /** 文本信息(Comment) */
     msg_Comment(data: {
         sendTimeMs: string;
-        userInfo: {
-            userIdentity: any;
-            badge: string;
-            nickname: any;
-            userId: string;
-        };
+        userInfo: ZtLiveUserInfo;
         content: any;
     }): void;
     /** 礼物信息(Gift) */
     msg_Gift(data: {
         sendTimeMs: string;
-        user: {
-            userIdentity: any;
-            badge: string;
-            nickname: any;
-            userId: string;
-        };
+        user: ZtLiveUserInfo;
         giftName: any;
         giftId: string;
-        count: any;
+        count: number;
         value: string;
     }): void;
     /** 互动信息 */
     msg_Interact(data: {
         sendTimeMs: string;
-        userInfo: {
-            userIdentity: any;
-            badge: string;
-            nickname: any;
-            userId: string;
-        };
+        userInfo: ZtLiveUserInfo;
     }, type: "entry" | "like" | "follow" | "share" | "join"): void;
     msg_LiveClosed(): void;
     msg_LiveBanned(): void;
     msg_DisplayInfo(data: any): void;
-    emitMsg(data: MessageType): void;
-    emitOrigin(data: any): void;
-    emitChange(data: Partial<LiveInfo>): void;
 }
 export default acfunLive;

package/plugin/acfun/acfunLive.js

@@ -4,25 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const acfun_live_danmaku_1 = __importDefault(require("acfun-live-danmaku"));
-const events_1 = require("events");
 const axios_1 = __importDefault(require("axios"));
-class acfunLive extends events_1.EventEmitter {
+const LiveRoom_1 = require("../../src/lib/LiveRoom");
+class acfunLive extends LiveRoom_1.LiveRoom {
     constructor(id, open = false) {
         super();
         /** 平台id */
         this.platform = "acfun";
         /** 直播信息 */
-        this.live = {
+        this.base = {
             /** 直播标题 */
             title: "",
             /** 分区 */
             area: [],
             /** 封面 */
             cover: "",
-            /** 直播状态 */
-            status: "off",
-            /** 开始直播时间 */
-            start_time: 0
         };
         /** 主播信息 */
         this.anchor = { name: "", id: 0 };
@@ -30,6 +26,8 @@ class acfunLive extends events_1.EventEmitter {
         this.client = null;
         /** 是否为打开状态 */
         this.opening = false;
+        /** 是否连接上服务器 */
+        this.connected = false;
         this.wsInit = false;
         this.platform = "acfun";
         this.id = id; // 直播间号
@@ -49,10 +47,10 @@ class acfunLive extends events_1.EventEmitter {
         if (!this.client) {
             this.client = await (0, acfun_live_danmaku_1.default)(this.id) || null;
             if (this.client) {
-                this.live.status = "live";
-                this.live.start_time = this.client.liveStartTime;
-                this.live.title = this.client.caption; // bug
-                this.live.cover = `https://tx2.a.kwimgs.com/bs2/ztlc/cover_${this.client.liveId}_raw.jpg`;
+                this.status = "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`;
             }
             await axios_1.default
                 .get(`https://live.acfun.cn/rest/pc-direct/user/userInfo?userId=${this.id}`)
@@ -87,7 +85,7 @@ class acfunLive extends events_1.EventEmitter {
         let client = this.client;
         client.on("EnterRoomAck", () => {
             console.log("[acfun-live-danmaku] 已连接AcFun直播间");
-            this.live.status = "live";
+            this.status = "live";
         });
         client.on("RecentComment", (comments) => {
             //当前弹幕列表
@@ -131,20 +129,32 @@ class acfunLive extends events_1.EventEmitter {
             return null;
         }
     }
+    getUser(user) {
+        let identity = null;
+        if (user.userIdentity?.managerType == 1) {
+            identity = "admin";
+        }
+        else if (parseInt(user.userId) == this.anchor.id) {
+            identity = "anchor";
+        }
+        return {
+            name: user.nickname,
+            id: parseInt(user.userId),
+            medal: this.getMedal(user.badge),
+            avatar: user.avatar[0].url,
+            identity: identity
+        };
+    }
     /** 文本信息(Comment) */
     msg_Comment(data) {
         let danmaku = {
             platform: "acfun",
             room: this.id,
-            local_timestamp: new Date().valueOf(),
-            type: "text",
+            record_time: new Date().valueOf(),
+            type: "chat",
             info: {
-                text: data.content,
-                user: {
-                    name: data.userInfo.nickname,
-                    id: parseInt(data.userInfo.userId),
-                    medal: this.getMedal(data.userInfo.badge),
-                },
+                content: data.content,
+                user: this.getUser(data.userInfo),
                 timestamp: parseInt(data.sendTimeMs),
             },
         };
@@ -156,18 +166,14 @@ class acfunLive extends events_1.EventEmitter {
             platform: "acfun",
             room: this.id,
             type: "gift",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
-                user: {
-                    name: data.user.nickname,
-                    id: parseInt(data.user.userId),
-                    medal: this.getMedal(data.user.badge),
-                },
+                user: this.getUser(data.user),
                 gift: {
                     name: data.giftName,
                     id: parseInt(data.giftId),
                     num: data.count,
-                    currency: "coin",
+                    currency: data.giftId == "1" ? "banana" : "coin",
                     value: parseInt(data.value), // 总价值
                 },
                 timestamp: parseInt(data.sendTimeMs),
@@ -181,13 +187,9 @@ class acfunLive extends events_1.EventEmitter {
             platform: "acfun",
             room: this.id,
             type: type,
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
-                user: {
-                    name: data.userInfo.nickname,
-                    id: parseInt(data.userInfo.userId),
-                    medal: this.getMedal(data.userInfo.badge),
-                },
+                user: this.getUser(data.userInfo),
                 timestamp: parseInt(data.sendTimeMs),
             },
         };
@@ -198,13 +200,12 @@ class acfunLive extends events_1.EventEmitter {
             platform: "acfun",
             room: this.id,
             type: "live_end",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 status: "off"
             }
         };
         this.client = null;
-        this.emit("change", { status: "off" });
         this.emitMsg(off);
     }
     msg_LiveBanned() {
@@ -212,30 +213,16 @@ class acfunLive extends events_1.EventEmitter {
             platform: "acfun",
             room: this.id,
             type: "live_cut",
-            local_timestamp: new Date().valueOf(),
+            record_time: new Date().valueOf(),
             info: {
                 message: ""
             }
         };
         this.client = null;
-        this.emit("change", { status: "off" });
         this.emitMsg(cut);
     }
     msg_DisplayInfo(data) {
-        // this.toData(msg)
-    }
-    emitMsg(data) {
-        // 一般消息
-        this.emit("msg", data);
-    }
-    emitOrigin(data) {
-        // 源消息
-        this.emit("origin", data);
-    }
-    emitChange(data) {
-        this.live = Object.assign(this.live, data);
-        // 直播信息
-        this.emit("change", data);
+        // 
     }
 }
 exports.default = acfunLive;

package/plugin/acfun/index.d.ts

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

package/plugin/acfun/index.js

@@ -5,8 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const acfunLive_1 = __importDefault(require("./acfunLive"));
 module.exports = (ctx) => {
     ctx.helper.roomGenerator.register("acfun", (id, open) => {
-        let key = `acfun:${Number(id)}`;
-        let room = new acfunLive_1.default(Number(id), open);
-        return { key, room };
+        return new acfunLive_1.default(Number(id), open);
     });
 };

package/plugin/bilibili/bilibiliLive.d.ts

@@ -1,10 +1,7 @@
-/// <reference types="node" />
 import { UserInfo } from "../../src/types/message/AttributeInfo";
 import { KeepLiveWS } from "bilibili-live-ws";
-import { EventEmitter } from "events";
-import LiveRoom from "../../src/types/room/LiveRoom";
-import { LiveInfo } from "../../src/types/room/LiveInfo";
-declare class bilibiliLive extends EventEmitter implements LiveRoom {
+import { LiveRoom, RoomBaseInfo } from "../../src/lib/LiveRoom";
+declare class bilibiliLive extends LiveRoom {
     /** 平台id */
     readonly platform: string;
     /** 直播间号 */
@@ -12,16 +9,15 @@ declare class bilibiliLive extends EventEmitter implements LiveRoom {
     /** 直播间room_id */
     roomid: number;
     /** 直播信息 */
-    live: LiveInfo;
-    cover: string;
+    base: RoomBaseInfo;
+    /** 房间是否可用 */
+    available: boolean;
+    /** 是否连接上房间 */
+    connected: boolean;
     /** 主播信息 */
     anchor: UserInfo;
-    /** 直播间是否可用 */
-    available: boolean;
     /** 直播间弹幕api模块 */
     client: KeepLiveWS | null;
-    /** 是否为持续监听状态 */
-    opening: boolean;
     /** 断线重连间隔 */
     connectInterval: number;
     constructor(id: number, // 房间id
@@ -36,10 +32,6 @@ declare class bilibiliLive extends EventEmitter implements LiveRoom {
     /** 连接直播服务端 */
     createWS(): Promise<void>;
     close(): void;
-    destory(): void;
-    emitMsg(data: any): void;
-    emitOrigin(data: any): void;
-    emitChange(data: Partial<LiveInfo>): void;
     getDanmakuMode(n: number): string;
     /** 获取弹幕消息 */
     msg_DANMU_MSG(msg: any): void;