floating-live 0.14.9 → 0.14.11

package/package.json

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

package/plugin/bilibili/index.js

@@ -29,7 +29,7 @@ const bilibili = () => {
                     ctx.auth.set("bilibili", `SESSDATA=${SESSDATA}`);
                     ctx.emit("auth:update", "bilibili", DedeUserID);
                 }
-                return code;
+                return [code, auth];
             });
         },
     };

package/plugin/bilibili/utils.d.ts

@@ -1,3 +1,4 @@
+export declare function getCookie(headers: Headers): string;
 export declare function parseCookieString(str: string): Record<string, string>;
 /** 获取登录用户的uid */
 export declare function getLoginUid(cookie?: string): Promise<any>;
@@ -13,4 +14,4 @@ export declare function generateLoginQRcode(): Promise<{
 /** 在终端打印登录二维码 */
 export declare function printQRcode(url: string): void;
 /** 检测登录二维码 */
-export declare function checkLoginQRcode(key: string): Promise<(string | number | null)[]>;
+export declare function checkLoginQRcode(key: string): Promise<(string | number)[]>;

package/plugin/bilibili/utils.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkLoginQRcode = exports.printQRcode = exports.generateLoginQRcode = exports.getKey = exports.getBuvid = exports.getLoginUid = exports.parseCookieString = void 0;
+exports.checkLoginQRcode = exports.printQRcode = exports.generateLoginQRcode = exports.getKey = exports.getBuvid = exports.getLoginUid = exports.parseCookieString = exports.getCookie = void 0;
 const qrcode_1 = __importDefault(require("qrcode"));
 const USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 Edg/117.0.2045.36";
 /** API-当前登录用户信息 */
@@ -12,6 +12,18 @@ const UID_INIT_URL = "https://api.bilibili.com/x/web-interface/nav";
 const BUVID_INIT_URL = "https://data.bilibili.com/v/";
 const ROOM_INIT_URL = "https://api.live.bilibili.com/xlive/web-room/v1/index/getInfoByRoom";
 const DANMAKU_SERVER_CONF_URL = "https://api.live.bilibili.com/xlive/web-room/v1/index/getDanmuInfo";
+function getCookie(headers) {
+    const cookies = [];
+    headers.forEach((val, key) => {
+        if (key == "set-cookie") {
+            const [c] = val.split(";");
+            cookies.push(c);
+        }
+    });
+    const cookie = cookies.join("; ");
+    return cookie;
+}
+exports.getCookie = getCookie;
 function parseCookieString(str) {
     const cookie = {};
     str.split(";").forEach((item) => {
@@ -54,7 +66,7 @@ async function getBuvid(cookie = "") {
             "User-Agent": USER_AGENT,
         },
     });
-    const resCookie = res.headers.get("set-cookie");
+    const resCookie = getCookie(res.headers);
     if (!resCookie)
         return;
     return parseCookieString(resCookie)["buvid2"];
@@ -108,8 +120,8 @@ async function checkLoginQRcode(key) {
         return [2];
     }
     else if (code == 0) {
-        // 登录成功
-        const cookie = res.headers.get("set-cookie");
+        const cookie = getCookie(res.headers);
+        console.log(cookie);
         return [0, cookie];
     }
     else if (code == 86038) {