yz-yuki-plugin 2.0.9-2 → 2.0.9-4

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

@@ -174,7 +174,7 @@ class BiliRiskCookie {
         if (data?.code === 0) {
             if (data?.data?.code === 0) {
                 // 登录成功，获取 set-cookie header 并写入 Jar
-                const SESSDATA_expires = await this.getCookieExpiration(jar, 'SESSDATA', 'https://api.bilibili.com');
+                const SESSDATA_expires = await this.getCookieExpiration(jar, 'SESSDATA', 'https://passport.bilibili.com');
                 try {
                     if (SESSDATA_expires != null) {
                         const tempCookie = await this.getNewTempCk();
@@ -268,7 +268,7 @@ class BiliRiskCookie {
                 method: 'GET',
                 headers: lodash.merge(BiliApi.BIlIBILI_LOGIN_HEADERS, {
                     'User-agent': BiliApi.BILIBILI_HEADERS['User-Agent'],
-                    'Cookie': SESSDATA_str ? SESSDATA_str : ''
+                    'Cookie': SESSDATA_str ? `SESSDATA=${SESSDATA_str}` : ''
                 }),
                 redirect: 'follow'
             });
@@ -282,7 +282,7 @@ class BiliRiskCookie {
                 const current_exp = level_info?.current_exp;
                 const next_exp = level_info?.next_exp;
                 const ttl = SESSDATA_expires;
-                const LoginCookieTTLStr = ttl === -1 ? '永久' : ttl === -2 ? '-' : `${new Date(Date.now() + ttl).toLocaleString()}`;
+                const LoginCookieTTLStr = ttl === -1 ? '永久' : ttl === -2 ? '-' : `${new Date(ttl).toLocaleString()}`;
                 e.reply(`~B站账号已登陆~\n有效期至：${LoginCookieTTLStr}。\n昵称：${uname}\nuid：${mid}\n硬币：${money}\n经验等级：${current_level}\n当前经验值exp：${current_exp}\n下一等级所需exp：${next_exp}`);
                 return true;
             }
@@ -356,6 +356,7 @@ class BiliRiskCookie {
             const { code } = res;
             switch (code) {
                 case 0:
+                    await this.resetCookiesAndRedis();
                     e.reply('当前缓存的B站登录CK已在B站服务器退出登录~');
                     break;
                 case 2202:
@@ -562,18 +563,28 @@ class BiliRiskCookie {
                 continue; // 跳过无效的 Cookie
             if (typeof cookie.value === 'string' && cookie.value.toLowerCase() === 'deleted')
                 continue; // 跳过被删除的 Cookie
-            // 构造 Redis 键
-            const redisKey = `${this.prefix}:${cookie.domain}:${cookie.key}`;
-            let ttl = 0;
+            // 统一处理域名，确保大部分API接口都使用 .bilibili.com
+            let domain = cookie.domain ? cookie.domain : '.bilibili.com';
+            if (domain.startsWith('passport.bilibili.com')) {
+                domain = '.bilibili.com';
+            }
+            else if (!domain.startsWith('.')) {
+                domain = `.${domain}`;
+            }
+            const redisKey = `${this.prefix}:${domain}:${cookie.key}`;
             // 使用 cookie.TTL() 方法计算 TTL
+            let ttl = 0;
             const ttlInMs = cookie.TTL(); // TTL 返回的是毫秒值
-            if (ttlInMs > 0) {
+            if (ttlInMs && ttlInMs > 0 && isFinite(ttlInMs)) {
                 ttl = Math.floor(ttlInMs / 1000); // 转换为秒
             }
-            else if (ttlInMs === 0) {
+            else if (ttlInMs === 0 || !isFinite(ttlInMs)) {
                 // 如果 TTL 为 0，表示 Cookie 已过期，跳过存储
                 continue;
             }
+            else {
+                ttl = -1;
+            }
             // 构造元数据
             const meta = JSON.stringify({
                 path: cookie.path,
@@ -581,7 +592,7 @@ class BiliRiskCookie {
                 secure: !!cookie.secure
             });
             // 写入 Redis
-            if (ttl && ttl > 0) {
+            if ((ttl && ttl > 0) || ttl === -1) {
                 await Redis.set(redisKey, cookie.value, { EX: ttl }); // 设置键值对，并指定 TTL
                 await Redis.set(`${redisKey}:meta`, meta, { EX: ttl }); // 存储元数据，TTL 与主键一致
             }

package/lib/models/weibo/weibo.risk.cookie.js

@@ -541,10 +541,6 @@ class WeiboRiskCookie {
                     await Redis.set(redisKey, cookie.value, { EX: ttl });
                     await Redis.set(`${redisKey}:meta`, meta, { EX: ttl });
                 }
-                else {
-                    await Redis.set(redisKey, cookie.value, { EX: -1 });
-                    await Redis.set(`${redisKey}:meta`, meta, { EX: -1 });
-                }
             }
             catch (error) {
                 logger.warn('Failed to save cookie to Redis:', redisKey, error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.9-2",
+  "version": "2.0.9-4",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",