floating-live 0.14.10 → 0.15.0-beta.0

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 {

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 → dist}/module/ModAuth.d.ts

@@ -1,5 +1,5 @@
-import { Reglist } from "../abstract/Reglist";
-import { FloatingLive } from "..";
+import { Reglist } from "../core/Reglist";
+import { FloatingLive } from "../live";
 import { AuthOptions } from "../types/auth";
 export declare class ModAuth {
     options: Reglist<AuthOptions>;

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

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

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 {

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) {

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/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,14 +1,32 @@
 {
   "name": "floating-live",
-  "version": "0.14.10",
+  "version": "0.15.0-beta.0",
   "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/enum.d.ts",
+      "require": "./dist/enum.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",
@@ -29,5 +47,8 @@
     "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;

package/plugin/acfun/acfunLive.js

@@ -1,279 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const acfun_live_danmaku_1 = __importDefault(require("acfun-live-danmaku"));
-const __1 = require("../..");
-const __2 = require("../..");
-// 获取当前时间戳，以替代无法从数据中获取时间戳的情况，精度为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 __1.LiveRoom {
-    constructor(id, open = false) {
-        super();
-        /** 平台id */
-        this.platform = "acfun";
-        /** 直播展示信息 */
-        this.detail = {
-            /** 直播标题 */
-            title: "",
-            /** 分区 */
-            area: [],
-            /** 封面 */
-            cover: "",
-        };
-        /** 直播数据信息 */
-        this.stats = {
-            /** 点赞数 */
-            like: 0,
-            /** 在线观看数 */
-            online: 0,
-        };
-        /** 主播信息 */
-        this.anchor = { name: "", id: 0 };
-        /** 直播间弹幕api模块 */
-        this.client = null;
-        /** 是否为打开状态 */
-        this.opened = false;
-        /** 是否连接上服务器 */
-        this.connected = false;
-        this.wsInit = false;
-        this.platform = "acfun";
-        this.id = id; // 直播间号
-        this.anchor.id = id; // 主播uid
-        this.getInfo().then(() => {
-            if (open)
-                this.open();
-        });
-    }
-    /** 直播间是否可用 */
-    get available() {
-        return Boolean(this.client);
-    }
-    async getInfo() {
-        if (!this.client) {
-            this.client = (await (0, acfun_live_danmaku_1.default)(this.id)) || null;
-            if (this.client) {
-                this.status = __2.RoomStatus.live;
-                this.timestamp = this.client.liveStartTime;
-                this.detail.title = this.client.caption; // bug
-                this.detail.cover = `https://tx2.a.kwimgs.com/bs2/ztlc/cover_${this.client.liveId}_raw.jpg`;
-            }
-            await fetch(`https://live.acfun.cn/rest/pc-direct/user/userInfo?userId=${this.id}`, {
-                method: "GET",
-            })
-                .then((response) => response.json())
-                .then((res) => {
-                let { headUrl, name } = res.profile;
-                this.anchor.avatar = headUrl;
-                this.anchor.name = name;
-                this.emit("info", this.info);
-            })
-                .catch((error) => {
-                this.emit("info_error", error);
-            });
-        }
-        // 暂不能在连接房间后更新信息
-    }
-    /** 开启直播间监听 */
-    async open() {
-        if (this.opened || !this.available)
-            return;
-        if (!this.wsInit) {
-            this.initWS();
-        }
-        //启动websocket连接
-        this.opened = true;
-        this.client.wsStart();
-        this.emit("open");
-    }
-    /** 初始化直播服务端监听 */
-    async initWS() {
-        if (!this.client)
-            return;
-        let client = this.client;
-        client.on("EnterRoomAck", () => {
-            console.log("[acfun-live-danmaku] 已连接AcFun直播间");
-            this.status = __2.RoomStatus.live;
-        });
-        client.on("RecentComment", (comments) => {
-            //当前弹幕列表
-        });
-        client.on("Comment", (danmaku) => {
-            //收到的弹幕
-            this.msg_Comment(danmaku);
-        });
-        client.on("Gift", (msg) => {
-            this.msg_Gift(msg);
-        });
-        client.on("UserEnterRoom", (msg) => {
-            this.msg_Interact(msg, "entry");
-        });
-        client.on("Like", (msg) => {
-            this.msg_Interact(msg, "like");
-        });
-        // client.on("UserFollowAuthor", (join: any) => { this.msg_Interact(msg, "follow"); });
-        // client.on("JoinClub", (msg: any) => { this.msg_Interact(msg, "join"); });
-        client.on("DisplayInfo", (msg) => {
-            this.msg_DisplayInfo(msg);
-        });
-        client.on("LiveClosed", (msg) => {
-            this.msg_LiveClosed();
-        });
-        client.on("LiveBanned", (msg) => {
-            this.msg_LiveBanned();
-        });
-        this.wsInit = true;
-    }
-    /** 关闭直播间监听 */
-    close() {
-        if (!this.opened)
-            return;
-        this.opened = false;
-        this.client?.wsClose();
-        this.emit("close");
-    }
-    destroy() {
-        this.close();
-        this.removeAllListeners();
-    }
-    /** 根据守护徽章字符串获取粉丝牌信息 */
-    getMedal(badge) {
-        if (badge) {
-            let medalInfo = JSON.parse(badge).medalInfo;
-            return {
-                name: medalInfo.clubName,
-                id: medalInfo.uperId,
-                level: medalInfo.level,
-            };
-        }
-        else {
-            return null;
-        }
-    }
-    getUser(user) {
-        let identity = 0;
-        if (user.userIdentity?.managerType == 1) {
-            identity = __2.UserType.admin;
-        }
-        else if (parseInt(user.userId) == this.anchor.id) {
-            identity = __2.UserType.anchor;
-        }
-        return {
-            name: user.nickname,
-            id: parseInt(user.userId),
-            medal: this.getMedal(user.badge),
-            avatar: user.avatar[0].url,
-            type: identity,
-        };
-    }
-    /** 文本信息(Comment) */
-    msg_Comment(data) {
-        const userInfo = this.getUser(data.userInfo);
-        let m = {
-            platform: "acfun",
-            room: this.id,
-            id: `${userInfo.id}-${data.sendTimeMs}`,
-            timestamp: parseInt(data.sendTimeMs),
-            type: "chat",
-            info: {
-                content: data.content,
-                user: userInfo,
-            },
-        };
-        this.emitMsg(m);
-    }
-    /** 礼物信息(Gift) */
-    msg_Gift(data) {
-        const userInfo = this.getUser(data.user);
-        let m = {
-            platform: "acfun",
-            room: this.id,
-            type: "gift",
-            id: `${userInfo.id}-${data.sendTimeMs}`,
-            timestamp: parseInt(data.sendTimeMs),
-            info: {
-                user: userInfo,
-                gift: {
-                    name: data.giftName,
-                    id: parseInt(data.giftId),
-                    num: data.count,
-                    currency: data.giftId == "1" ? "banana" : "coin",
-                    value: parseInt(data.value), // 总价值
-                },
-            },
-        };
-        this.emitMsg(m);
-    }
-    /** 互动信息 */
-    msg_Interact(data, type) {
-        const userInfo = this.getUser(data.userInfo);
-        let m = {
-            platform: "acfun",
-            room: this.id,
-            type: type,
-            id: `${userInfo.id}-${data.sendTimeMs}`,
-            timestamp: parseInt(data.sendTimeMs),
-            info: {
-                user: userInfo,
-            },
-        };
-        this.emitMsg(m);
-    }
-    msg_LiveClosed() {
-        const timestamp = getDateTimestamp();
-        let m = {
-            platform: "acfun",
-            room: this.id,
-            type: "live_end",
-            id: `${timestamp}`,
-            timestamp: timestamp,
-            info: {
-                status: __2.RoomStatus.off,
-            },
-        };
-        this.client = null;
-        this.emitMsg(m);
-    }
-    msg_LiveBanned() {
-        const timestamp = getDateTimestamp();
-        let m = {
-            platform: "acfun",
-            room: this.id,
-            type: "live_cut",
-            id: `${timestamp}`,
-            timestamp: timestamp,
-            info: {
-                message: "",
-            },
-        };
-        this.client = null;
-        this.emitMsg(m);
-    }
-    msg_DisplayInfo(data) {
-        const timestamp = getDateTimestamp();
-        let m = {
-            platform: "acfun",
-            room: this.id,
-            type: "live_stats",
-            id: `${timestamp}`,
-            timestamp: timestamp,
-            info: {
-                like: stringToNumber(data.likeCount),
-                online: stringToNumber(data.watchingCount),
-            },
-        };
-        this.emitMsg(m);
-    }
-}
-exports.default = acfunLive;

package/plugin/acfun/index.d.ts

@@ -1,3 +0,0 @@
-import { FloatingLivePlugin } from "../../src/types";
-declare const acfun: FloatingLivePlugin;
-export = acfun;

package/plugin/acfun/index.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-const acfunLive_1 = __importDefault(require("./acfunLive"));
-const acfun = () => {
-    return {
-        name: "acfun",
-        register: (ctx) => {
-            ctx.room.generator.register("acfun", (id, open) => {
-                return new acfunLive_1.default(Number(id), open);
-            });
-        },
-    };
-};
-module.exports = acfun;