floating-live 0.12.0 → 0.13.0

package/README.md

@@ -23,11 +23,10 @@ const bilibili = require("floating-live/plugin/bilibili")
 // 创建一个FloatingLive实例
 const live = new FloatingLive()
 // 注册插件
-live.plugin.register("bilibili", bilibili)
-// 添加房间
-live.addRoom({platform: "bilibili", id: 6})
-// 打开
-live.start()
+live.plugin.register(bilibili)
+
+// 添加房间并自动打开
+live.rooms.add("bilibili", 6, true)
 ```
 
 ### 拆包即用模式
@@ -59,6 +58,6 @@ live.start()
   即可接收来自平台的直播弹幕。
 
 ## 感谢
-### 开源库
-* [simon300000/bilibili-live-ws](https://github.com/simon300000/bilibili-live-ws/)：与bilibili直播建立Websocket连接并解码数据包
-* [ACFUN-FOSS/ac-danmu](https://github.com/ACFUN-FOSS/ac-danmu.js)：与AcFun直播建立Websocket连接并解码数据包
+### 使用开源库
+* [simon300000/bilibili-live-ws](https://github.com/simon300000/bilibili-live-ws/)
+* [ACFUN-FOSS/ac-danmu](https://github.com/ACFUN-FOSS/ac-danmu.js)

package/index.d.ts

@@ -1,6 +1,6 @@
 export { FloatingLive } from "./src";
 export * from "./src/types";
 export * from "./src/enum";
-export * from "./src/lib/LiveRoom";
-export * from "./src/lib/Reglist";
-export * from "./src/tool";
+export * from "./src/abstract/LiveRoom";
+export * from "./src/abstract/Reglist";
+export * from "./src/utils";

package/index.js

@@ -19,6 +19,6 @@ var src_1 = require("./src");
 Object.defineProperty(exports, "FloatingLive", { enumerable: true, get: function () { return src_1.FloatingLive; } });
 __exportStar(require("./src/types"), exports);
 __exportStar(require("./src/enum"), exports);
-__exportStar(require("./src/lib/LiveRoom"), exports);
-__exportStar(require("./src/lib/Reglist"), exports);
-__exportStar(require("./src/tool"), exports);
+__exportStar(require("./src/abstract/LiveRoom"), exports);
+__exportStar(require("./src/abstract/Reglist"), exports);
+__exportStar(require("./src/utils"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",
@@ -15,10 +15,12 @@
     "prepare": "npm run build"
   },
   "dependencies": {
+    "@types/qrcode": "^1.5.2",
     "acfun-live-danmaku": "^0.6.1",
     "axios": "^1.4.0",
     "bilibili-live-ws": "^6.3.1",
-    "fs-extra": "^11.1.0"
+    "fs-extra": "^11.1.0",
+    "qrcode": "^1.5.3"
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",

package/plugin/acfun/acfunLive.d.ts

@@ -1,4 +1,4 @@
-import { RoomDetail } from './../../src/lib/LiveRoom';
+import { RoomDetail } from "../..";
 import { MedalInfo, UserInfo } from "../..";
 import AcClient from "acfun-live-danmaku/client";
 import { LiveRoom, RoomStatsInfo } from "../..";
@@ -29,7 +29,7 @@ declare class acfunLive extends LiveRoom {
     /** 直播间弹幕api模块 */
     client: AcClient | null;
     /** 是否为打开状态 */
-    opening: boolean;
+    opened: boolean;
     /** 是否连接上服务器 */
     connected: boolean;
     private wsInit;
@@ -43,7 +43,7 @@ declare class acfunLive extends LiveRoom {
     private initWS;
     /** 关闭直播间监听 */
     close(): void;
-    destory(): void;
+    destroy(): void;
     /** 根据守护徽章字符串获取粉丝牌信息 */
     getMedal(badge?: string): MedalInfo | null;
     getUser(user: ZtLiveUserInfo): UserInfo;

package/plugin/acfun/acfunLive.js

@@ -44,7 +44,7 @@ class acfunLive extends __1.LiveRoom {
         /** 直播间弹幕api模块 */
         this.client = null;
         /** 是否为打开状态 */
-        this.opening = false;
+        this.opened = false;
         /** 是否连接上服务器 */
         this.connected = false;
         this.wsInit = false;
@@ -87,13 +87,13 @@ class acfunLive extends __1.LiveRoom {
     }
     /** 开启直播间监听 */
     async open() {
-        if (this.opening || !this.available)
+        if (this.opened || !this.available)
             return;
         if (!this.wsInit) {
             this.initWS();
         }
         //启动websocket连接
-        this.opening = true;
+        this.opened = true;
         this.client.wsStart();
         this.emit("open");
     }
@@ -137,13 +137,13 @@ class acfunLive extends __1.LiveRoom {
     }
     /** 关闭直播间监听 */
     close() {
-        if (!this.opening)
+        if (!this.opened)
             return;
-        this.opening = false;
+        this.opened = false;
         this.client?.wsClose();
         this.emit("close");
     }
-    destory() {
+    destroy() {
         this.close();
         this.removeAllListeners();
     }
@@ -162,19 +162,19 @@ class acfunLive extends __1.LiveRoom {
         }
     }
     getUser(user) {
-        let identity = null;
+        let identity = 0;
         if (user.userIdentity?.managerType == 1) {
-            identity = __2.UserAdmin.admin;
+            identity = __2.UserType.admin;
         }
         else if (parseInt(user.userId) == this.anchor.id) {
-            identity = __2.UserAdmin.anchor;
+            identity = __2.UserType.anchor;
         }
         return {
             name: user.nickname,
             id: parseInt(user.userId),
             medal: this.getMedal(user.badge),
             avatar: user.avatar[0].url,
-            admin: identity,
+            type: identity,
         };
     }
     /** 文本信息(Comment) */

package/plugin/acfun/index.d.ts

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

package/plugin/acfun/index.js

@@ -5,10 +5,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 const acfunLive_1 = __importDefault(require("./acfunLive"));
 module.exports = () => {
     return {
+        name: "acfun",
         register: (ctx) => {
-            ctx.helper.roomGenerator.register("acfun", (id, open) => {
+            ctx.rooms.generator.register("acfun", (id, open) => {
                 return new acfunLive_1.default(Number(id), open);
             });
-        }
+        },
     };
 };

package/plugin/bilibili/index.d.ts

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

package/plugin/bilibili/index.js

@@ -2,13 +2,26 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-const bilibiliLive_1 = __importDefault(require("./bilibiliLive"));
+const room_1 = __importDefault(require("./room"));
+const authConfig = {
+    warn: "由于b站弹幕接口限制，在未登录账号的情况下，返回的弹幕用户名会变为星号且无法获取到uid。\n详见(github:simon300000/bilibili-live-ws#397)[https://github.com/simon300000/bilibili-live-ws/issues/397]",
+    auth: {
+        placeholder: "此处粘贴cookie",
+        info: "请在登录后的b站页面中获取cookie并粘贴在输入框内，至少包含SESSDATA字段。",
+    },
+    qrcode: {
+        generate: () => { },
+    },
+    // verify: { name: "key", type: "string" },
+};
 module.exports = () => {
     return {
+        name: "bilibili",
         register: (ctx) => {
-            ctx.helper.roomGenerator.register("bilibili", (id, open) => {
-                return new bilibiliLive_1.default(Number(id), open);
+            ctx.rooms.generator.register("bilibili", (id, open, config) => {
+                return new room_1.default(Number(id), open, config);
             });
-        }
+            ctx.auth;
+        },
     };
 };

package/plugin/bilibili/parser.d.ts

@@ -0,0 +1,6 @@
+import { Message } from "../../src/types";
+import { RoomInfo } from "./../../src/types/room";
+import { RawInfo, RawMessage } from "./types";
+/** 转换bilibili直播弹幕为floating通用格式 */
+export declare function parseMessage(data: RawMessage.All, room?: RoomInfo): Message.All | undefined;
+export declare function parseInfo(data: RawInfo): RoomInfo;