floating-live 0.14.5 → 0.14.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "floating-live",
-  "version": "0.14.5",
+  "version": "0.14.7",
   "type": "commonjs",
   "main": "index.js",
   "types": "index.d.ts",

package/plugin/acfun/index.d.ts

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

package/plugin/acfun/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const acfunLive_1 = __importDefault(require("./acfunLive"));
-module.exports = () => {
+const acfun = () => {
     return {
         name: "acfun",
         register: (ctx) => {
@@ -13,3 +13,4 @@ module.exports = () => {
         },
     };
 };
+module.exports = acfun;

package/plugin/bilibili/index.d.ts

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

package/plugin/bilibili/index.js

@@ -3,18 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 const room_1 = __importDefault(require("./room"));
-const authConfig = {
-    info: "由于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 = () => {
+const utils_1 = require("./utils");
+const bilibili = () => {
     return {
         name: "bilibili",
         register: (ctx) => {
@@ -22,6 +12,34 @@ module.exports = () => {
                 return new room_1.default(Number(id), open, config);
             });
             ctx.auth.options.register("bilibili", authConfig);
+            ctx.command.register("auth.bilibili", async (auth) => {
+                const uid = await (0, utils_1.getLoginUid)(auth);
+                ctx.auth.account["bilibili"] = uid;
+                ctx.auth.set("bilibili", auth);
+                ctx.emit("auth:update", "bilibili", uid);
+            });
+            ctx.command.register("auth.bilibili.qrcode.get", () => {
+                return (0, utils_1.generateLoginQRcode)();
+            });
+            ctx.command.register("auth.bilibili.qrcode.check", async (key) => {
+                const [code, auth] = await (0, utils_1.checkLoginQRcode)(key);
+                if (auth) {
+                    const { SESSDATA, DedeUserID } = (0, utils_1.parseCookieString)(auth);
+                    ctx.auth.account["bilibili"] = DedeUserID;
+                    ctx.auth.set("bilibili", `SESSDATA=${SESSDATA}`);
+                    ctx.emit("auth:update", "bilibili", DedeUserID);
+                }
+                return code;
+            });
         },
     };
 };
+const authConfig = {
+    auth: {
+        type: "cookie",
+    },
+    qrcode: {
+        type: "url",
+    },
+};
+module.exports = bilibili;

package/plugin/bilibili/utils.d.ts

@@ -13,4 +13,4 @@ export declare function generateLoginQRcode(): Promise<{
 /** 在终端打印登录二维码 */
 export declare function printQRcode(url: string): void;
 /** 检测登录二维码 */
-export declare function checkLoginQRcode(key: string): Promise<unknown>;
+export declare function checkLoginQRcode(key: string): Promise<(string | number | null)[]>;

package/plugin/bilibili/utils.js

@@ -92,49 +92,34 @@ function printQRcode(url) {
 }
 exports.printQRcode = printQRcode;
 /** 检测登录二维码 */
-function checkLoginQRcode(key) {
-    return new Promise((resolve, reject) => {
-        let timer = 0;
-        const pollFuction = async () => {
-            clearTimeout(timer);
-            const res = await fetch(`https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${key}`, {
-                headers: {
-                    "User-Agent": USER_AGENT,
-                },
-            });
-            const { code, message } = (await res.json()).data;
-            if (code == 86101) {
-                console.log("未扫码");
-                timer = setTimeout(pollFuction, 1000);
-            }
-            else if (code == 86090) {
-                console.log("等待确认");
-                timer = setTimeout(pollFuction, 1000);
-            }
-            else if (code == 0) {
-                console.log("登录成功");
-                const a = res.headers.get("set-cookie");
-                resolve(a);
-            }
-            else if (code == 86038) {
-                console.log("二维码失效");
-                resolve("");
-            }
-            else {
-                console.log(`${code} ${message}`);
-                resolve("");
-            }
-        };
-        timer = setTimeout(pollFuction, 1000);
-    });
-}
-exports.checkLoginQRcode = checkLoginQRcode;
-/** 轮询登录二维码 */
-async function pollLoginQRCode(key) {
+async function checkLoginQRcode(key) {
     const res = await fetch(`https://passport.bilibili.com/x/passport-login/web/qrcode/poll?qrcode_key=${key}`, {
         headers: {
             "User-Agent": USER_AGENT,
         },
     });
-    return;
+    const { code, message } = (await res.json()).data;
+    if (code == 86101) {
+        // 未扫码
+        return [1];
+    }
+    else if (code == 86090) {
+        // 等待确认
+        return [2];
+    }
+    else if (code == 0) {
+        // 登录成功
+        const cookie = res.headers.get("set-cookie");
+        return [0, cookie];
+    }
+    else if (code == 86038) {
+        // 二维码失效
+        return [-1];
+    }
+    else {
+        // 其他错误
+        console.log(`${code} ${message}`);
+        throw message;
+    }
 }
+exports.checkLoginQRcode = checkLoginQRcode;

package/src/abstract/Reglist.d.ts

@@ -16,6 +16,8 @@ export declare class Reglist<T> {
     getName(): string;
     /** 根据id获取注册对象 */
     get(id: string): T | undefined;
+    /** 检查注册对象是否存在 */
+    has(id: string): boolean;
     /** 获取注册对象列表 */
     getList(): T[];
     /** 遍历 */

package/src/abstract/Reglist.js

@@ -45,6 +45,10 @@ class Reglist {
     get(id) {
         return this.list.get(id);
     }
+    /** 检查注册对象是否存在 */
+    has(id) {
+        return this.list.has(id);
+    }
     /** 获取注册对象列表 */
     getList() {
         return [...this.list.values()];

package/src/module/ModAuth.d.ts

@@ -1,7 +1,9 @@
 import { Reglist } from "../abstract/Reglist";
 import { FloatingLive } from "..";
+import { AuthOptions } from "../types/auth";
 export declare class ModAuth {
-    options: Reglist<object>;
+    options: Reglist<AuthOptions>;
+    account: Record<string, string | number>;
     main: FloatingLive;
     constructor(main: FloatingLive);
     set(name: string, auth: string): void;

package/src/module/ModAuth.js

@@ -4,6 +4,7 @@ exports.ModAuth = void 0;
 const Reglist_1 = require("../abstract/Reglist");
 class ModAuth {
     constructor(main) {
+        this.account = {};
         this.options = new Reglist_1.Reglist(main, "auth.options");
         this.main = main;
         this.main.state.register("auth", () => {
@@ -17,7 +18,12 @@ class ModAuth {
         });
         this.main.command.batchRegister({
             auth: (platform, auth) => {
-                this.set(platform, auth);
+                if (this.main.command.has(`auth.${platform}`)) {
+                    this.main.command.execute(`auth.${platform}`, auth);
+                }
+                else {
+                    this.set(platform, auth);
+                }
             },
         });
     }

package/src/module/ModPlugin.d.ts

@@ -14,7 +14,7 @@ export declare class ModPlugin<T extends FloatingLive> {
     /** 访问插件操作对象 */
     access(name: string): object | undefined;
     /** 注册插件 */
-    register(pluginFunc: FloatingLivePlugin<T>, pluginConfig?: object): object | undefined;
+    register<C extends object, E extends void | object>(pluginFunc: FloatingLivePlugin<C, E>, pluginConfig?: C): {} | undefined;
     /** 移除插件 */
     unregister(name: string): void;
 }

package/src/types/auth.d.ts

@@ -0,0 +1,19 @@
+export interface AuthOptions {
+    /** 直接输入凭证 */
+    auth: {
+        /** 凭证类型 */
+        type: string;
+    };
+    /** 二维码登录 */
+    qrcode?: {
+        /** 二维码类型 */
+        type: "url" | "base64";
+    };
+    /** 验证码登录 */
+    verify?: {
+        /** 验证码发送等待间隔(秒) */
+        wait: number;
+        /** 第三方验证接口 */
+        captcha?: string;
+    };
+}

package/src/types/auth.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/src/types/index.d.ts

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

package/src/types/index.js

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

package/src/types/plugin.d.ts

@@ -1,8 +1,8 @@
 import { FloatingLive } from "..";
 /** 插件模块, 加载时调用 */
-export declare type FloatingLivePlugin<T extends FloatingLive> = () => {
+export declare type FloatingLivePlugin<C extends object = object, E extends object | void = object | void> = () => {
     /** 插件名称 */
     name: string;
-    register: (ctx: T, config?: object) => object | void;
-    destroy?: (ctx: T) => void;
+    register: (ctx: FloatingLive, config?: C) => E;
+    destroy?: (ctx: FloatingLive) => void;
 };

package/src/types/room.d.ts

@@ -27,16 +27,16 @@ export interface RoomInfo {
     connected: boolean;
 }
 /** 房间展示信息 */
-export declare type RoomDetail = {
+export interface RoomDetail {
     /** 直播标题 */
     title?: string;
     /** 分区 */
     area?: string[];
     /** 封面 */
     cover?: string;
-};
+}
 /** 房间统计数据信息 */
-export declare type RoomStatsInfo = {
+export interface RoomStatsInfo {
     /** 点赞数 */
     like?: number;
     /** 观看数 */
@@ -45,7 +45,7 @@ export declare type RoomStatsInfo = {
     online?: number;
     /** 人气值 */
     popularity?: number;
-};
+}
 export interface PlatformInfo {
     /** 平台名称 */
     name: string;
@@ -67,20 +67,19 @@ export interface PlatformInfo {
         /** 粉丝vip名称 */
         name: string;
         /** 粉丝vip等级名称 */
-        level?: string;
+        level?: string[];
     };
     /** 礼物信息 */
     gift: {
-        /** 货币 */
-        currency: Array<{
-            /** 货币id */
-            id: string;
-            /** 货币名称 */
-            name: string;
-            /** 1货币面值等值value (1面值/1数值) */
-            face: number;
-            /** 1人民币等值value (1.00CNY/1数值) (若为0则为免费货币) */
-            cny?: number;
-        }>;
+        action: string;
     };
+    /** 货币信息 */
+    currency: Record<string, {
+        /** 货币名称 */
+        name: string;
+        /** 1货币面值等值value (1面值/1数值) */
+        face: number;
+        /** 1人民币等值value (1.00CNY/1数值) (若为0则为免费货币) */
+        cny?: number;
+    }>;
 }