floating-live 0.14.11 → 0.15.0-beta.1

package/README.md

@@ -1,6 +1,8 @@
 # Floating Live
 一个用于处理和保存直播弹幕的Node.js小工具，开箱即用。
 
+本体无弹幕获取功能，需要配合[floating-live-danmaku](https://github.com/Minteea/floating-live-danmaku)中的弹幕获取插件使用。
+
 目前支持bilibili和AcFun的直播弹幕，不同平台的弹幕会转换为同一种格式便于保存。
 
 项目仍在开发中，功能尚未完善，目前除了记录保存直播弹幕外暂时没有别的用处啦，敬请期待。
@@ -18,7 +20,7 @@ npm install floating-live
 // 导入FloatingLive
 const { FloatingLive } = require("floating-live")
 // 导入bilibili房间生成插件
-const bilibili = require("floating-live/plugin/bilibili")   
+const bilibili = require("@floating-live/bilibili/plugin")   
 
 // 创建一个FloatingLive实例
 const live = new FloatingLive()
@@ -28,36 +30,3 @@ live.plugin.register(bilibili)
 // 添加房间并自动打开
 live.room.add("bilibili", 6, true)
 ```
-
-### 拆包即用模式
-* 下载并安装 `Node.js` ，建议下载最新LTS版本（如果已经安装可跳过这一步）。
-* 下载该项目的zip压缩包，解压，并在项目根目录下新建一个名为 `save` 的文件夹。
-* 在项目根目录的控制台输入下列命令，安装所有依赖包。
-  ```
-  npm install
-  ```
-#### 运行Demo文件
-* 打开demo/demo.ts
-  ``` typescript
-  // ...
-  const config = {
-    rooms: [
-      {
-        platform: "bilibili", // 直播平台
-        id: 2064239,          // 直播间号
-      },
-    ],
-  };
-  // ...
-  ```
-* 根据需要修改直播平台和直播间号，目前支持的 `platform` 值有：`acfun`、`bilibili`(注意是小写)，也可以通过自定义插件添加直播平台
-* 在项目根目录的控制台输入下列命令：
-  ```
-  npm run test
-  ```
-  即可接收来自平台的直播弹幕。
-
-## 感谢
-### 使用开源库
-* [simon300000/bilibili-live-ws](https://github.com/simon300000/bilibili-live-ws/)
-* [ACFUN-FOSS/ac-danmu](https://github.com/ACFUN-FOSS/ac-danmu.js)

package/{src/abstract → dist/core}/LiveRoom.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { EventEmitter } from "events";
-import { RoomStatus } from "../enum";
+import { RoomStatus } from "../enums";
 import { RoomDetail, RoomInfo, RoomStatsInfo } from "../types";
 import { Message, UserInfo } from "../types/message";
 export declare abstract class LiveRoom extends EventEmitter implements RoomInfo {
@@ -33,8 +33,6 @@ export declare abstract class LiveRoom extends EventEmitter implements RoomInfo
     abstract close(): void;
     /** 从服务器获取信息 */
     abstract getInfo(): Promise<void>;
-    /** 设置用户凭据 */
-    setAuth?(auth: string): void;
     /** 销毁事件 */
     protected onDestory?(): void;
     /** 销毁 */

package/{src/abstract → dist/core}/LiveRoom.js

@@ -2,12 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LiveRoom = void 0;
 const events_1 = require("events");
-const enum_1 = require("../enum");
+const enums_1 = require("../enums");
 class LiveRoom extends events_1.EventEmitter {
     constructor() {
         super();
         /** 直播状态 */
-        this.status = enum_1.RoomStatus.off;
+        this.status = enums_1.RoomStatus.off;
         /** 时间戳 */
         this.timestamp = 0;
         /** 房间是否打开 */
@@ -25,9 +25,9 @@ class LiveRoom extends events_1.EventEmitter {
         // 直播结束消息 => 先发送消息再更改状态
         switch (msg.type) {
             case "live_start":
-                this.status = enum_1.RoomStatus.live;
+                this.status = enums_1.RoomStatus.live;
                 this.timestamp = msg.timestamp;
-                this.emit("status", enum_1.RoomStatus.live, {
+                this.emit("status", enums_1.RoomStatus.live, {
                     timestamp: msg.timestamp,
                     id: msg.info.id,
                 });
@@ -43,9 +43,9 @@ class LiveRoom extends events_1.EventEmitter {
             case "live_end":
             case "live_cut":
                 this.emit("msg", msg);
-                this.status = msg.status || enum_1.RoomStatus.off;
+                this.status = msg.status || enums_1.RoomStatus.off;
                 this.timestamp = msg.timestamp;
-                this.emit("status", msg.status || enum_1.RoomStatus.off, {
+                this.emit("status", msg.status || enums_1.RoomStatus.off, {
                     timestamp: msg.timestamp,
                 });
                 return;

package/{src/abstract → dist/core}/Reglist.d.ts

@@ -1,4 +1,4 @@
-import { FloatingLive } from "..";
+import { FloatingLive } from "../live";
 /** 插件可注册对象模块 */
 export declare class Reglist<T> {
     /** 功能列表 */

package/dist/core/index.d.ts

@@ -0,0 +1,2 @@
+export * from "./LiveRoom";
+export * from "./Reglist";

package/dist/core/index.js

@@ -0,0 +1,18 @@
+"use strict";
+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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./LiveRoom"), exports);
+__exportStar(require("./Reglist"), exports);

package/dist/index.d.ts

@@ -0,0 +1,6 @@
+export { FloatingLive } from "./live";
+export * from "./types";
+export * from "./enums";
+export * from "./core/LiveRoom";
+export * from "./core/Reglist";
+export * from "./utils";

package/{index.js → dist/index.js}

@@ -15,10 +15,10 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 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"), exports);
-__exportStar(require("./src/enum"), exports);
-__exportStar(require("./src/abstract/LiveRoom"), exports);
-__exportStar(require("./src/abstract/Reglist"), exports);
-__exportStar(require("./src/utils"), exports);
+var live_1 = require("./live");
+Object.defineProperty(exports, "FloatingLive", { enumerable: true, get: function () { return live_1.FloatingLive; } });
+__exportStar(require("./types"), exports);
+__exportStar(require("./enums"), exports);
+__exportStar(require("./core/LiveRoom"), exports);
+__exportStar(require("./core/Reglist"), exports);
+__exportStar(require("./utils"), exports);

package/{src/index.d.ts → dist/live.d.ts}

@@ -2,7 +2,6 @@
 import { EventEmitter } from "events";
 import { ModPlugin } from "./module/ModPlugin";
 import { ModRoom } from "./module/ModRoom";
-import { ModAuth } from "./module/ModAuth";
 import { ModMessage } from "./module/ModMessage";
 import { ModState } from "./module/ModState";
 import ModCommand from "./module/ModCommand";
@@ -11,8 +10,6 @@ export declare class FloatingLive extends EventEmitter {
     room: ModRoom;
     /** 消息处理模块 */
     message: ModMessage;
-    /** 用户登录凭据模块 */
-    auth: ModAuth;
     /** 插件处理模块 */
     plugin: ModPlugin<this>;
     /** 命令模块 */

package/{src/index.js → dist/live.js}

@@ -7,7 +7,6 @@ exports.FloatingLive = void 0;
 const events_1 = require("events");
 const ModPlugin_1 = require("./module/ModPlugin");
 const ModRoom_1 = require("./module/ModRoom");
-const ModAuth_1 = require("./module/ModAuth");
 const ModMessage_1 = require("./module/ModMessage");
 const ModState_1 = require("./module/ModState");
 const ModCommand_1 = __importDefault(require("./module/ModCommand"));
@@ -21,7 +20,6 @@ class FloatingLive extends events_1.EventEmitter {
         this.plugin = new ModPlugin_1.ModPlugin(this);
         this.room = new ModRoom_1.ModRoom(this);
         this.message = new ModMessage_1.ModMessage(this);
-        this.auth = new ModAuth_1.ModAuth(this);
         this.init();
     }
     /** 初始化 */

package/{src → dist}/module/ModCommand.d.ts

@@ -1,5 +1,5 @@
-import { FloatingLive } from "..";
-import { Reglist } from "../abstract/Reglist";
+import { FloatingLive } from "../live";
+import { Reglist } from "../core/Reglist";
 export default class ModCommand extends Reglist<(...args: any[]) => any> {
     constructor(main: FloatingLive);
     /** 批量注册命令 */

package/{src → dist}/module/ModCommand.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Reglist_1 = require("../abstract/Reglist");
+const Reglist_1 = require("../core/Reglist");
 class ModCommand extends Reglist_1.Reglist {
     constructor(main) {
         super(main, "command");

package/{src → dist}/module/ModMessage.d.ts

@@ -1,6 +1,6 @@
 import { Message } from "../types/message";
-import { FloatingLive } from "..";
-import { Reglist } from "../abstract/Reglist";
+import { FloatingLive } from "../live";
+import { Reglist } from "../core/Reglist";
 export declare class ModMessage {
     main: FloatingLive;
     handler: Reglist<(msg: Message.All) => void>;

package/{src → dist}/module/ModMessage.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModMessage = void 0;
-const Reglist_1 = require("../abstract/Reglist");
+const Reglist_1 = require("../core/Reglist");
 class ModMessage {
     constructor(main) {
         this.main = main;

package/{src → dist}/module/ModPlugin.d.ts

@@ -1,4 +1,4 @@
-import { FloatingLive } from "..";
+import { FloatingLive } from "../live";
 import { FloatingLivePlugin } from "../types/plugin";
 export declare class ModPlugin<T extends FloatingLive> {
     private current;

package/{src → dist}/module/ModRoom.d.ts

@@ -1,6 +1,6 @@
-import { Reglist } from "../abstract/Reglist";
-import { LiveRoom } from "../abstract/LiveRoom";
-import { FloatingLive } from "..";
+import { Reglist } from "../core/Reglist";
+import { LiveRoom } from "../core/LiveRoom";
+import { FloatingLive } from "../live";
 import { RoomInfo } from "../types";
 /** 直播间监听实例控制器 */
 export declare class ModRoom {
@@ -10,8 +10,6 @@ export declare class ModRoom {
     private configs;
     generator: Reglist<(id: string | number, open?: boolean, config?: object) => LiveRoom>;
     constructor(main: FloatingLive);
-    /** 设置登录凭据 */
-    setAuth(platform: string, auth: string): void;
     /** 设置房间配置 */
     setConfig(platform: string, config: any): void;
     /** 生成房间 */

package/{src → dist}/module/ModRoom.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModRoom = void 0;
-const Reglist_1 = require("../abstract/Reglist");
+const Reglist_1 = require("../core/Reglist");
 /** 直播间监听实例控制器 */
 class ModRoom {
     constructor(main) {
@@ -35,15 +35,6 @@ class ModRoom {
             },
         });
     }
-    /** 设置登录凭据 */
-    setAuth(platform, auth) {
-        this.auths.set(platform, auth);
-        this.roomMap.forEach((room) => {
-            if (room.platform == platform) {
-                room.setAuth?.(auth);
-            }
-        });
-    }
     /** 设置房间配置 */
     setConfig(platform, config) {
         this.configs.set(platform, config);

package/{src → dist}/module/ModState.d.ts

@@ -1,5 +1,5 @@
-import { FloatingLive } from "..";
-import { Reglist } from "../abstract/Reglist";
+import { FloatingLive } from "../live";
+import { Reglist } from "../core/Reglist";
 export declare class ModState extends Reglist<() => object> {
     constructor(main: FloatingLive);
     generate(): Record<string, any>;

package/{src → dist}/module/ModState.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModState = void 0;
-const Reglist_1 = require("../abstract/Reglist");
+const Reglist_1 = require("../core/Reglist");
 class ModState extends Reglist_1.Reglist {
     constructor(main) {
         super(main, "state");

package/{src → dist}/types/index.d.ts

@@ -1,4 +1,3 @@
 export * from "./message";
 export * from "./plugin";
 export * from "./room";
-export * from "./auth";

package/{src → dist}/types/index.js

@@ -17,4 +17,3 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./message"), exports);
 __exportStar(require("./plugin"), exports);
 __exportStar(require("./room"), exports);
-__exportStar(require("./auth"), exports);

package/{src → dist}/types/message.d.ts

@@ -1,5 +1,5 @@
-import { ImageSize, UserType } from "../enum";
-import { DanmakuMode, RoomStatus } from "../enum";
+import { ImageSize, UserType } from "../enums";
+import { DanmakuMode, RoomStatus } from "../enums";
 import { RoomDetail, RoomStatsInfo } from "./room";
 export declare namespace Message {
     interface Base {

package/{src → dist}/types/plugin.d.ts

@@ -1,4 +1,4 @@
-import { FloatingLive } from "..";
+import { FloatingLive } from "../live";
 /** 插件模块, 加载时调用 */
 export declare type FloatingLivePlugin<C extends object = object, E extends object | void = object | void> = () => {
     /** 插件名称 */

package/{src → dist}/types/room.d.ts

@@ -1,4 +1,4 @@
-import { RoomStatus } from "../enum";
+import { RoomStatus } from "../enums";
 import { UserInfo } from "./message";
 export interface RoomInfo {
     /** 平台id */

package/package.json

@@ -1,33 +1,47 @@
 {
   "name": "floating-live",
-  "version": "0.14.11",
+  "version": "0.15.0-beta.1",
   "type": "commonjs",
-  "main": "index.js",
-  "types": "index.d.ts",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
   "author": "Minteea",
   "license": "GPLv3",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "require": "./dist/index.js"
+    },
+    "./core": {
+      "types": "./dist/core/index.d.ts",
+      "require": "./dist/core/index.js"
+    },
+    "./types": {
+      "types": "./dist/types/index.d.ts",
+      "require": "./dist/types/index.js"
+    },
+    "./enums": {
+      "types": "./dist/enums.d.ts",
+      "require": "./dist/enums.js"
+    },
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "require": "./dist/utils.js"
+    }
+  },
   "scripts": {
     "tsc": "tsc -b",
-    "clear": "rimraf index.js index.d.ts src/**/*.js src/**/*.d.ts plugin/**/*.js plugin/**/*.d.ts",
+    "clear": "rimraf dist",
     "test": "npm run clear && ts-node demo/demo.ts",
     "build-test": "npm run build && node demo/demo.js",
     "build": "npm run clear && npm run tsc",
     "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",
-    "qrcode": "^1.5.3"
-  },
   "devDependencies": {
-    "@types/fs-extra": "^9.0.13",
-    "@types/websocket": "^1.0.5",
-    "@types/ws": "^8.5.3",
     "rimraf": "^3.0.2",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.4"
+  },
+  "peerDependencies": {
+    "events": "^3.3.0"
   }
 }

package/index.d.ts

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

package/plugin/acfun/acfunLive.d.ts

@@ -1,74 +0,0 @@
-import { RoomDetail } from "../..";
-import { MedalInfo, UserInfo } from "../..";
-import AcClient from "acfun-live-danmaku/client";
-import { LiveRoom, RoomStatsInfo } from "../..";
-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;
-    /** 直播展示信息 */
-    detail: RoomDetail;
-    /** 直播数据信息 */
-    stats: RoomStatsInfo;
-    /** 主播信息 */
-    anchor: UserInfo;
-    /** 直播间弹幕api模块 */
-    client: AcClient | null;
-    /** 是否为打开状态 */
-    opened: boolean;
-    /** 是否连接上服务器 */
-    connected: boolean;
-    private wsInit;
-    /** 直播间是否可用 */
-    get available(): boolean;
-    constructor(id: number, open?: boolean);
-    getInfo(): Promise<void>;
-    /** 开启直播间监听 */
-    open(): Promise<void>;
-    /** 初始化直播服务端监听 */
-    private initWS;
-    /** 关闭直播间监听 */
-    close(): void;
-    destroy(): void;
-    /** 根据守护徽章字符串获取粉丝牌信息 */
-    getMedal(badge?: string): MedalInfo | null;
-    getUser(user: ZtLiveUserInfo): UserInfo;
-    /** 文本信息(Comment) */
-    msg_Comment(data: {
-        sendTimeMs: string;
-        userInfo: ZtLiveUserInfo;
-        content: any;
-    }): void;
-    /** 礼物信息(Gift) */
-    msg_Gift(data: {
-        sendTimeMs: string;
-        user: ZtLiveUserInfo;
-        giftName: any;
-        giftId: string;
-        count: number;
-        value: string;
-    }): void;
-    /** 互动信息 */
-    msg_Interact(data: {
-        sendTimeMs: string;
-        userInfo: ZtLiveUserInfo;
-    }, type: "entry" | "like" | "follow" | "share" | "join"): void;
-    msg_LiveClosed(): void;
-    msg_LiveBanned(): void;
-    msg_DisplayInfo(data: any): void;
-}
-export default acfunLive;