yz-yuki-plugin 2.0.6-7 → 2.0.6-8

package/lib/models/bilibili/bilibili.risk.w_webid.js

@@ -7,7 +7,8 @@ import { readSyncCookie, cookieWithBiliTicket } from './bilibili.main.models.js'
 async function getWebId(uid) {
     const w_webid_key = 'Yz:yuki:bili:w_webid';
     const w_webid = await Redis.get(w_webid_key);
-    if (w_webid) {
+    const keyTTL = await Redis.ttl(w_webid_key);
+    if (w_webid && keyTTL < 259200) {
         return String(w_webid);
     }
     else {
@@ -28,8 +29,10 @@ async function getWebId(uid) {
             const decoded__RENDER_DATA__JsonString = decodeURIComponent(__RENDER_DATA__[1]);
             const accessIdRegex = /"access_id":"(.*?)"/;
             const access_id = decoded__RENDER_DATA__JsonString.match(accessIdRegex);
-            if (access_id && access_id[1]) {
-                await Redis.set(w_webid_key, access_id[1], { EX: 43197 * 1000 });
+            const ExpirationTimeRegex = /document.getElementById\("__RENDER_DATA__"\).*?setTimeout\(function\(\)\s*{window.location.reload\(true\);},\s*(\d+)\s*\*\s*(\d+)\);<\/script>/;
+            const ExpirationTime = htmlContent.match(ExpirationTimeRegex);
+            if (access_id && access_id[1] && ExpirationTime && ExpirationTime[1]) {
+                await Redis.set(w_webid_key, access_id[1], { EX: Number(ExpirationTime[1]) });
                 return String(access_id[1]);
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.6-7",
+  "version": "2.0.6-8",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -107,6 +107,6 @@
     "registry": "https://registry.npmjs.org"
   },
   "engines": {
-    "node": ">=16.14.0"
+    "node": ">=20"
   }
 }