yz-yuki-plugin 2.0.5-14 → 2.0.5-16

package/lib/models/bilibili/bilibili.main.models.js

@@ -124,26 +124,33 @@ async function pollLoginQRCode(e, qrcodeKey) {
 /**查看app扫码登陆获取的ck的有效状态*/
 async function checkBiliLogin(e) {
     const LoginCookie = await readLoginCookie();
-    const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
-        method: 'GET',
-        headers: lodash.merge(BiliApi.BIlIBILI_LOGIN_HEADERS, { 'User-agent': BiliApi.BILIBILI_HEADERS['User-Agent'] }, { Cookie: `${LoginCookie}` }),
-        redirect: 'follow'
-    });
-    const resData = await res.json();
-    Bot.logger?.debug(`B站验证登录状态:${JSON.stringify(resData)}`);
-    if (resData.code === 0) {
-        let uname = resData.data?.uname;
-        let mid = resData.data?.mid;
-        let money = resData.data?.money;
-        let level_info = resData.data?.level_info;
-        let current_level = level_info?.current_level;
-        let current_exp = level_info?.current_exp;
-        let next_exp = level_info?.next_exp;
-        e.reply(`~B站账号已登陆~\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`);
+    if (String(LoginCookie).trim().length < 10) {
+        e.reply('啊咧？B站登录CK呢？哦，没 #扫码B站登录# 或失效了啊，那没事了。');
+        return;
     }
     else {
-        // 处理其他情况
-        return;
+        const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
+            method: 'GET',
+            headers: lodash.merge(BiliApi.BIlIBILI_LOGIN_HEADERS, { 'User-agent': BiliApi.BILIBILI_HEADERS['User-Agent'] }, { Cookie: `${LoginCookie}` }),
+            redirect: 'follow'
+        });
+        const resData = await res.json();
+        Bot?.logger?.debug(`B站验证登录状态:${JSON.stringify(resData)}`);
+        if (resData.code === 0) {
+            let uname = resData.data?.uname;
+            let mid = resData.data?.mid;
+            let money = resData.data?.money;
+            let level_info = resData.data?.level_info;
+            let current_level = level_info?.current_level;
+            let current_exp = level_info?.current_exp;
+            let next_exp = level_info?.next_exp;
+            e.reply(`~B站账号已登陆~\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`);
+        }
+        else {
+            // 处理其他情况
+            e.reply('意外情况，未能成功获取登录ck的有效状态');
+            return;
+        }
     }
 }
 /**退出B站账号登录，将会删除redis缓存的LoginCK，并在服务器注销该登录 Token (SESSDATA)*/

package/lib/models/bilibili/bilibili.main.query.js

@@ -272,7 +272,7 @@ class BiliQuery {
         }
         catch (err) {
             logger?.error(`优纪插件：获取B站完整文章内容失败 [ ${postUrl} ] : ${err}`);
-            return null;
+            return { readInfo: null, articleType: null };
         }
     }
     /**解析旧版完整文章内容 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.5-14",
+  "version": "2.0.5-16",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -36,7 +36,7 @@
     "md5": "^2.3.0",
     "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
-    "puppeteer": "^23.6.0",
+    "puppeteer": "^23.8.0",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
@@ -63,12 +63,12 @@
     "json5": "^2.2.3",
     "jsxp": "^1.0.4",
     "lodash": "^4.17.21",
-    "lvyjs": "^0.1.1",
+    "lvyjs": "^0.1.4",
     "md5": "^2.3.0",
     "node-fetch": "^3.3.2",
     "postcss": "^8.4.47",
     "prettier": "^3.3.3",
-    "puppeteer": "^23.6.0",
+    "puppeteer": "^23.8.0",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",