@floating-live/bilibili 0.16.3 → 0.16.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@floating-live/bilibili",
-  "version": "0.16.3",
+  "version": "0.16.5",
   "type": "module",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   "scripts": {
     "check": "tsc --noEmit",
     "clear": "rimraf **/*.js **/*.d.ts --glob",
-    "build": "npm run clear && tsc --build && tsc-alias",
+    "build": "npm run clear && npm run check &&  tsc --build && tsc-alias",
     "prepack": "npm run build",
     "postpack": "npm run clear"
   },
@@ -18,7 +18,7 @@
   },
   "dependencies": {
     "@floating-live/cookies": "^0.1.0",
-    "bilibili-live-danmaku": "^0.7.4",
+    "bilibili-live-danmaku": "^0.7.6",
     "md5": "^2.3.0"
   },
   "devDependencies": {
@@ -33,5 +33,5 @@
   "peerDependencies": {
     "floating-live": "^0.16.0"
   },
-  "gitHead": "56257dea4b9e0667030da99d4d06f11742064a3b"
+  "gitHead": "597bd2f8bbf24e5895d5f54d26cb9220a93711a3"
 }

package/plugin.d.ts

@@ -4,6 +4,7 @@ interface BilibiliLoginInfo {
     credentials: string;
     isLogin: boolean;
     user: UserInfo | null;
+    refreshed: boolean;
 }
 declare module "floating-live" {
     interface AppCommandMap {

package/plugin.js

@@ -57,23 +57,33 @@ export class PluginBilibili extends BasePlugin {
             return await fetchLiveRoomData(this.apiClient, parseInt(id.toString()));
         });
         ctx.registerCommand("bilibili.credentials.check", async (e, credentials) => {
+            let refreshed = true;
             const apiClient = new BilibiliApiClientEx({
                 cookie: credentials,
                 userAgent: this.apiClient.userAgent,
                 fetch: this.apiClient.fetch,
             });
+            // 如buvid3缺失，则初始化cookie
+            if (!apiClient.cookies.has("buvid3")) {
+                await apiClient.initCookie();
+            }
             try {
                 // 检测cookie是否需要更新
                 const { refresh, timestamp } = (await apiClient.xpassportCookieInfo())
                     .data;
                 if (refresh) {
                     const refresh_token = apiClient.cookies.get("refresh_token");
-                    // 更新cookie
-                    const { refresh_token: new_refresh_token } = await apiClient.refreshCookie({
-                        timestamp,
-                        refresh_token,
-                    });
-                    apiClient.cookies.set("refresh_token", new_refresh_token);
+                    if (refresh_token) {
+                        // 如果存在refresh_token字段，则刷新cookie，否则将检查结果标记为未刷新
+                        const { refresh_token: new_refresh_token } = await apiClient.refreshCookie({
+                            timestamp,
+                            refresh_token,
+                        });
+                        apiClient.cookies.set("refresh_token", new_refresh_token);
+                    }
+                    else {
+                        refreshed = false;
+                    }
                 }
                 // 检测登录状态
                 const data = (await apiClient.xapiNav()).data;
@@ -85,15 +95,18 @@ export class PluginBilibili extends BasePlugin {
                         name: data.uname,
                         avatar: data.face,
                     },
+                    refreshed,
                 };
             }
             catch (e) {
                 if (e.ok && e.code == -101) {
+                    // 用户未登录
                     return {
                         credentials,
                         data: {},
                         isLogin: false,
                         user: null,
+                        refreshed,
                     };
                 }
                 else {

package/room.js

@@ -157,9 +157,9 @@ export class RoomBilibili extends LiveRoom {
     /** 设置登录凭据 */
     async setCredentials(credentials, updateTokens = true) {
         __classPrivateFieldGet(this, _RoomBilibili_apiClient, "f").setCookie(credentials);
-        // 在没有buvid3的情况下，访问bilibili主页，获得buvid3
+        // 在没有buvid3的情况下，初始化必要cookie
         if (!__classPrivateFieldGet(this, _RoomBilibili_apiClient, "f").cookies.has("buvid3")) {
-            __classPrivateFieldGet(this, _RoomBilibili_apiClient, "f").wwwBilibili();
+            await __classPrivateFieldGet(this, _RoomBilibili_apiClient, "f").initCookie();
         }
         if (updateTokens)
             this.updateTokens();
@@ -242,12 +242,10 @@ export class RoomBilibili extends LiveRoom {
             buvid: __classPrivateFieldGet(this, _RoomBilibili_tokens, "f")?.buvid,
             key: __classPrivateFieldGet(this, _RoomBilibili_tokens, "f")?.key,
         });
-        console.log(__classPrivateFieldGet(this, _RoomBilibili_tokens, "f"));
         const controller = new AbortController();
         const signal = controller.signal;
         client[symbolAbortController] = controller;
         this.lastConnectionTime = Date.now();
-        console.log(client.ws.url);
         client.addEventListener("open", () => {
             // 连接到服务器
             this.opened && this.emitConnention(LiveConnectionStatus.connected);

package/utils/request.js

@@ -36,7 +36,7 @@ export class BilibiliApiClientEx extends BilibiliApiClient {
         url.searchParams.set("refresh_csrf", params.refresh_csrf);
         url.searchParams.set("source", params.source || "main_web");
         url.searchParams.set("refresh_token", params.refresh_token);
-        const res = await this.request(url);
+        const res = await this.request(url, { method: "POST" });
         const data = unwrapRequestData(res);
         this.cookies.setFromHeaders(res.headers);
         return data;
@@ -45,7 +45,7 @@ export class BilibiliApiClientEx extends BilibiliApiClient {
         const url = new URL("https://passport.bilibili.com/x/passport-login/web/confirm/refresh");
         url.searchParams.set("csrf", params.csrf);
         url.searchParams.set("refresh_token", params.refresh_token);
-        const res = await this.request(url);
+        const res = await this.request(url, { method: "POST" });
         return unwrapRequestData(res);
     }
     async refreshCookie({ timestamp, refresh_token, }) {