koishi-plugin-bilibili-notify 1.3.6-beta.0 → 1.3.6-rc.0

package/lib/biliAPI.d.ts

@@ -17,11 +17,24 @@ declare class BiliAPI extends Service {
     loginInfoIsLoaded: boolean;
     constructor(ctx: Context, config: BiliAPI.Config);
     protected start(): void | Promise<void>;
+    getMixinKey: (orig: string) => string;
+    encWbi(params: {
+        [key: string]: string | number | object;
+    }, img_key: string, sub_key: string): string;
+    getWbi(params: {
+        [key: string]: string | number | object;
+    }): Promise<string>;
+    encrypt(text: string): string;
+    decrypt(text: string): string;
     getServerUTCTime(): Promise<number>;
     getTimeNow(): Promise<any>;
     getUserSpaceDynamic(mid: string): Promise<any>;
     getCookieInfo(refreshToken: string): Promise<any>;
     getUserInfo(mid: string): Promise<any>;
+    getWbiKeys(): Promise<{
+        img_key: any;
+        sub_key: any;
+    }>;
     getMyselfInfo(): Promise<any>;
     getLoginQRCode(): Promise<any>;
     getLoginStatus(qrcodeKey: string): Promise<any>;
@@ -44,6 +57,7 @@ declare class BiliAPI extends Service {
 declare namespace BiliAPI {
     interface Config {
         userAgent: string;
+        key: string;
     }
     const Config: Schema<Config>;
 }

package/lib/biliAPI.js

@@ -3,19 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/no-unsafe-function-type */
+/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-namespace */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const koishi_1 = require("koishi");
+const md5_1 = __importDefault(require("md5"));
+const crypto_1 = __importDefault(require("crypto"));
 const axios_1 = __importDefault(require("axios"));
 const tough_cookie_1 = require("tough-cookie");
 const axios_cookiejar_support_1 = require("axios-cookiejar-support");
 const jsdom_1 = require("jsdom");
 const luxon_1 = require("luxon");
+const mixinKeyEncTab = [
+    46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
+    33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
+    61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
+    36, 20, 34, 44, 52
+];
 // 在getUserInfo中检测到番剧出差的UID时，要传回的数据：
 const bangumiTripData = { "code": 0, "data": { "live_room": { "roomid": 931774 } } };
-// const GET_DYNAMIC_LIST = 'https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/all'
 const GET_USER_SPACE_DYNAMIC_LIST = 'https://api.bilibili.com/x/polymer/web-dynamic/v1/feed/space';
 const GET_COOKIES_INFO = 'https://passport.bilibili.com/x/passport-login/web/cookie/info';
 const GET_USER_INFO = 'https://api.bilibili.com/x/space/wbi/acc/info';
@@ -27,7 +33,7 @@ const GET_MASTER_INFO = 'https://api.live.bilibili.com/live_user/v1/Master/info'
 const GET_TIME_NOW = 'https://api.bilibili.com/x/report/click/now';
 const GET_SERVER_UTC_TIME = 'https://interface.bilibili.com/serverdate.js';
 class BiliAPI extends koishi_1.Service {
-    static inject = ['database', 'wbi', 'notifier'];
+    static inject = ['database', 'notifier'];
     jar;
     client;
     apiConfig;
@@ -44,12 +50,50 @@ class BiliAPI extends koishi_1.Service {
         this.createNewClient();
         // 从数据库加载cookies
         this.loadCookiesFromDatabase();
-        // 输出日志
-        // this.logger.info('工作中')
     }
-    /* protected stop(): void | Promise<void> {
-        this.logger.info('已停止工作')
-    } */
+    // WBI签名
+    // 对 imgKey 和 subKey 进行字符顺序打乱编码
+    getMixinKey = (orig) => mixinKeyEncTab
+        .map((n) => orig[n])
+        .join("")
+        .slice(0, 32);
+    // 为请求参数进行 wbi 签名
+    encWbi(params, img_key, sub_key) {
+        const mixin_key = this.getMixinKey(img_key + sub_key), curr_time = Math.round(Date.now() / 1000), chr_filter = /[!'()*]/g;
+        Object.assign(params, { wts: curr_time }); // 添加 wts 字段
+        // 按照 key 重排参数
+        const query = Object.keys(params)
+            .sort()
+            .map((key) => {
+            // 过滤 value 中的 "!'()*" 字符
+            const value = params[key].toString().replace(chr_filter, "");
+            return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+        })
+            .join("&");
+        const wbi_sign = (0, md5_1.default)(query + mixin_key); // 计算 w_rid
+        return query + "&w_rid=" + wbi_sign;
+    }
+    async getWbi(params) {
+        const web_keys = await this.getWbiKeys();
+        const img_key = web_keys.img_key, sub_key = web_keys.sub_key;
+        const query = this.encWbi(params, img_key, sub_key);
+        return query;
+    }
+    encrypt(text) {
+        const iv = crypto_1.default.randomBytes(16);
+        const cipher = crypto_1.default.createCipheriv('aes-256-cbc', Buffer.from(this.apiConfig.key), iv);
+        const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
+        return iv.toString('hex') + ':' + encrypted.toString('hex');
+    }
+    decrypt(text) {
+        const textParts = text.split(':');
+        const iv = Buffer.from(textParts.shift(), 'hex');
+        const encryptedText = Buffer.from(textParts.join(':'), 'hex');
+        const decipher = crypto_1.default.createDecipheriv('aes-256-cbc', Buffer.from(this.apiConfig.key), iv);
+        const decrypted = Buffer.concat([decipher.update(encryptedText), decipher.final()]);
+        return decrypted.toString();
+    }
+    // BA API
     async getServerUTCTime() {
         try {
             const { data } = await this.client.get(GET_SERVER_UTC_TIME);
@@ -102,7 +146,7 @@ class BiliAPI extends koishi_1.Service {
             return bangumiTripData;
         }
         try {
-            const wbi = await this.ctx.wbi.getWbi({ mid });
+            const wbi = await this.getWbi({ mid });
             const { data } = await this.client.get(`${GET_USER_INFO}?${wbi}`);
             return data;
         }
@@ -110,6 +154,15 @@ class BiliAPI extends koishi_1.Service {
             throw new Error('网络异常，本次请求失败！');
         }
     }
+    // 获取最新的 img_key 和 sub_key
+    async getWbiKeys() {
+        const { data } = await this.client.get('https://api.bilibili.com/x/web-interface/nav');
+        const { data: { wbi_img: { img_url, sub_url }, }, } = data;
+        return {
+            img_key: img_url.slice(img_url.lastIndexOf('/') + 1, img_url.lastIndexOf('.')),
+            sub_key: sub_url.slice(sub_url.lastIndexOf('/') + 1, sub_url.lastIndexOf('.'))
+        };
+    }
     async getMyselfInfo() {
         try {
             const { data } = await this.client.get(GET_MYSELF_INFO);
@@ -210,9 +263,9 @@ class BiliAPI extends koishi_1.Service {
         // 尝试解密
         try {
             // 解密数据
-            const decryptedCookies = this.ctx.wbi.decrypt(data.bili_cookies);
+            const decryptedCookies = this.decrypt(data.bili_cookies);
             // 解密refresh_token
-            const decryptedRefreshToken = this.ctx.wbi.decrypt(data.bili_refresh_token);
+            const decryptedRefreshToken = this.decrypt(data.bili_refresh_token);
             // 解析从数据库读到的cookies
             const cookies = JSON.parse(decryptedCookies);
             // 返回值
@@ -246,11 +299,18 @@ class BiliAPI extends koishi_1.Service {
             return;
         }
         // 定义CSRF Token
-        let csrf;
+        let csrf, expires, domain, path, secure, httpOnly, sameSite;
         cookies.forEach(cookieData => {
             // 获取key为bili_jct的值
-            if (cookieData.key === 'bili_jct')
+            if (cookieData.key === 'bili_jct') {
                 csrf = cookieData.value;
+                expires = new Date(cookieData.expires);
+                domain = cookieData.domain;
+                path = cookieData.path;
+                secure = cookieData.secure;
+                httpOnly = cookieData.httpOnly;
+                sameSite = cookieData.sameSite;
+            }
             // 创建一个完整的 Cookie 实例
             const cookie = new tough_cookie_1.Cookie({
                 key: cookieData.key,
@@ -264,6 +324,18 @@ class BiliAPI extends koishi_1.Service {
             });
             this.jar.setCookieSync(cookie, `http${cookie.secure ? 's' : ''}://${cookie.domain}${cookie.path}`, {});
         });
+        // 对于某些 IP 地址，需要在 Cookie 中提供任意非空的 buvid3 字段
+        const buvid3Cookie = new tough_cookie_1.Cookie({
+            key: 'buvid3',
+            value: 'some_non_empty_value', // 设置任意非空值
+            expires, // 设置过期时间
+            domain, // 设置域名
+            path, // 设置路径
+            secure, // 设置是否为安全 cookie
+            httpOnly, // 设置是否为 HttpOnly cookie
+            sameSite // 设置 SameSite 属性
+        });
+        this.jar.setCookieSync(buvid3Cookie, `http${buvid3Cookie.secure ? 's' : ''}://${buvid3Cookie.domain}${buvid3Cookie.path}`, {});
         // Login info is loaded
         this.loginInfoIsLoaded = true;
         // restart plugin check
@@ -325,7 +397,7 @@ class BiliAPI extends koishi_1.Service {
             // 如果请求失败，有可能是404，直接刷新cookie
         }
         // 定义Key
-        const publicKey = await crypto.subtle.importKey("jwk", {
+        const publicKey = await crypto_1.default.subtle.importKey("jwk", {
             kty: "RSA",
             n: "y4HdjgJHBlbaBN04VERG4qNBIFHP6a3GozCl75AihQloSWCXC5HDNgyinEnhaQ_4-gaMud_GF50elYXLlCToR9se9Z8z433U3KjM-3Yx7ptKkmQNAMggQwAVKgq3zYAoidNEWuxpkY_mAitTSRLnsJW-NCTa0bqBFF6Wm1MxgfE",
             e: "AQAB",
@@ -333,7 +405,7 @@ class BiliAPI extends koishi_1.Service {
         // 定义获取CorrespondPath方法
         async function getCorrespondPath(timestamp) {
             const data = new TextEncoder().encode(`refresh_${timestamp}`);
-            const encrypted = new Uint8Array(await crypto.subtle.encrypt({ name: "RSA-OAEP" }, publicKey, data));
+            const encrypted = new Uint8Array(await crypto_1.default.subtle.encrypt({ name: "RSA-OAEP" }, publicKey, data));
             return encrypted.reduce((str, c) => str + c.toString(16).padStart(2, "0"), "");
         }
         // 获取CorrespondPath
@@ -372,8 +444,8 @@ class BiliAPI extends koishi_1.Service {
             }
         }
         // 更新 新的cookies和refresh_token
-        const encryptedCookies = this.ctx.wbi.encrypt(this.getCookies());
-        const encryptedRefreshToken = this.ctx.wbi.encrypt(refreshData.data.refresh_token);
+        const encryptedCookies = this.encrypt(this.getCookies());
+        const encryptedRefreshToken = this.encrypt(refreshData.data.refresh_token);
         await this.ctx.database.upsert('loginBili', [{
                 id: 1,
                 bili_cookies: encryptedCookies,
@@ -407,7 +479,10 @@ class BiliAPI extends koishi_1.Service {
 }
 (function (BiliAPI) {
     BiliAPI.Config = koishi_1.Schema.object({
-        userAgent: koishi_1.Schema.string()
+        userAgent: koishi_1.Schema.string(),
+        key: koishi_1.Schema.string()
+            .pattern(/^[0-9a-f]{32}$/)
+            .required()
     });
 })(BiliAPI || (BiliAPI = {}));
 exports.default = BiliAPI;

package/lib/comRegister.js

@@ -4,8 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const jsx_runtime_1 = require("@satorijs/element/jsx-runtime");
-/* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable @typescript-eslint/no-unsafe-function-type */
+/* eslint-disable @typescript-eslint/ban-types */
 /* eslint-disable @typescript-eslint/no-namespace */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const koishi_1 = require("koishi");
@@ -19,7 +18,7 @@ var LiveType;
     LiveType[LiveType["LiveBroadcast"] = 2] = "LiveBroadcast";
 })(LiveType || (LiveType = {}));
 class ComRegister {
-    static inject = ['ba', 'gi', 'wbi', 'database', 'sm'];
+    static inject = ['ba', 'gi', 'database', 'sm'];
     logger;
     config;
     loginTimer;
@@ -47,12 +46,6 @@ class ComRegister {
     sendMsgFunc;
     constructor(ctx, config) {
         this.logger = ctx.logger('cr');
-        /* ctx.on('ready', () => {
-            this.logger.info('工作中');
-        })
-        ctx.on('dispose', () => {
-            this.logger.info('已停止工作');
-        }) */
         this.config = config;
         // 拿到各类机器人
         ctx.bots.forEach(bot => {
@@ -291,8 +284,8 @@ class ComRegister {
                         return await session.send('二维码已失效，请重新登录');
                     }
                     if (loginContent.data.code === 0) { // 登录成功
-                        const encryptedCookies = ctx.wbi.encrypt(ctx.ba.getCookies());
-                        const encryptedRefreshToken = ctx.wbi.encrypt(loginContent.data.refresh_token);
+                        const encryptedCookies = ctx.ba.encrypt(ctx.ba.getCookies());
+                        const encryptedRefreshToken = ctx.ba.encrypt(loginContent.data.refresh_token);
                         await ctx.database.upsert('loginBili', [{
                                 id: 1,
                                 bili_cookies: encryptedCookies,
@@ -434,7 +427,7 @@ class ComRegister {
                         msg = '用户不存在';
                         break;
                     case -352:
-                        msg = '请登录后再尝试订阅';
+                        msg = '风控校验失败';
                         break;
                     default:
                         msg = '未知错误，错误信息：' + content.message;

package/lib/index.d.ts

@@ -44,7 +44,7 @@ declare class ServerManager extends Service {
     dynamicLoopTime: number;
     constructor(ctx: Context);
     protected start(): void | Promise<void>;
-    registerPlugin: () => Promise<boolean>;
+    registerPlugin: () => boolean;
     disposePlugin: () => Promise<boolean>;
     restartPlugin: () => Promise<boolean>;
 }

package/lib/index.js

@@ -28,14 +28,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Config = exports.name = exports.inject = void 0;
 exports.apply = apply;
-/* eslint-disable @typescript-eslint/no-empty-object-type */
+/* eslint-disable @typescript-eslint/ban-types */
 const koishi_1 = require("koishi");
 // import plugins
 // import Authority from './authority'
 const comRegister_1 = __importDefault(require("./comRegister"));
 const Database = __importStar(require("./database"));
 // import Service
-const wbi_1 = __importDefault(require("./wbi"));
 const generateImg_1 = __importDefault(require("./generateImg"));
 const biliAPI_1 = __importDefault(require("./biliAPI"));
 exports.inject = ['puppeteer', 'database', 'notifier'];
@@ -246,17 +245,25 @@ class ServerManager extends koishi_1.Service {
                 break;
         }
         // 注册插件
-        this.registerPlugin();
+        if (this.registerPlugin()) {
+            this.logger.info('插件启动成功');
+        }
+        else {
+            this.logger.error('插件启动失败');
+        }
     }
-    registerPlugin = async () => {
+    registerPlugin = () => {
         // 如果已经有服务则返回false
         if (this.servers.length !== 0)
             return false;
-        await new Promise(resolve => {
-            // 注册插件
+        // 注册插件
+        try {
+            // BA = BiliAPI
             const ba = this.ctx.plugin(biliAPI_1.default, {
-                userAgent: globalConfig.userAgent
+                userAgent: globalConfig.userAgent,
+                key: globalConfig.key
             });
+            // GI = GenerateImg
             const gi = this.ctx.plugin(generateImg_1.default, {
                 renderType: this.renderType,
                 filter: globalConfig.filter,
@@ -267,7 +274,7 @@ class ServerManager extends koishi_1.Service {
                 enableLargeFont: globalConfig.enableLargeFont,
                 font: globalConfig.font
             });
-            const wbi = this.ctx.plugin(wbi_1.default, { key: globalConfig.key });
+            // CR = ComRegister
             const cr = this.ctx.plugin(comRegister_1.default, {
                 master: globalConfig.master,
                 unlockSubLimits: globalConfig.unlockSubLimits,
@@ -287,11 +294,12 @@ class ServerManager extends koishi_1.Service {
             // 添加服务
             this.servers.push(ba);
             this.servers.push(gi);
-            this.servers.push(wbi);
             this.servers.push(cr);
-            // 成功
-            resolve('ok');
-        });
+        }
+        catch (e) {
+            this.logger.error('插件注册失败', e);
+            return false;
+        }
         // 成功返回true 
         return true;
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.3.6-beta.0",
+  "version": "1.3.6-rc.0",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],

package/readme.md

@@ -173,6 +173,7 @@
 - ver 1.3.5 动态监测循环时间新增20分钟选项
 - ver 1.3.6-alpha.0 修复bug：无限重复的报错提示
 - ver 1.3.6-beta.0 取消出错自动重启插件功能
+- ver 1.3.6-rc.0 修复重启或更新后提示未登录或订阅时提示请登录后再订阅的问题
 
 ## 交流群
 

package/lib/wbi.d.ts

@@ -1,27 +0,0 @@
-import { Context, Schema, Service } from "koishi";
-declare module 'koishi' {
-    interface Context {
-        wbi: Wbi;
-    }
-}
-declare class Wbi extends Service {
-    wbiConfig: Wbi.Config;
-    mixinKeyEncTab: number[];
-    constructor(ctx: Context, config: Wbi.Config);
-    getMixinKey: (orig: any) => string;
-    encWbi(params: any, img_key: any, sub_key: any): string;
-    getWbiKeys(): Promise<{
-        img_key: any;
-        sub_key: any;
-    }>;
-    getWbi(params: any): Promise<string>;
-    encrypt(text: string): string;
-    decrypt(text: string): string;
-}
-declare namespace Wbi {
-    interface Config {
-        key: string;
-    }
-    const Config: Schema<Config>;
-}
-export default Wbi;

package/lib/wbi.js

@@ -1,90 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-/* eslint-disable @typescript-eslint/no-namespace */
-const koishi_1 = require("koishi");
-const md5_1 = __importDefault(require("md5"));
-const crypto_1 = __importDefault(require("crypto"));
-class Wbi extends koishi_1.Service {
-    wbiConfig;
-    mixinKeyEncTab = [
-        46, 47, 18, 2, 53, 8, 23, 32, 15, 50, 10, 31, 58, 3, 45, 35, 27, 43, 5, 49,
-        33, 9, 42, 19, 29, 28, 14, 39, 12, 38, 41, 13, 37, 48, 7, 16, 24, 55, 40,
-        61, 26, 17, 0, 1, 60, 51, 30, 4, 22, 25, 54, 21, 56, 59, 6, 63, 57, 62, 11,
-        36, 20, 34, 44, 52
-    ];
-    constructor(ctx, config) {
-        super(ctx, 'wbi');
-        this.wbiConfig = config;
-    }
-    /* protected start(): void | Promise<void> {
-        this.logger.info('工作中')
-    }
-
-    protected stop(): void | Promise<void> {
-        this.logger.info('已停止工作')
-    } */
-    // 对 imgKey 和 subKey 进行字符顺序打乱编码
-    getMixinKey = (orig) => this.mixinKeyEncTab.map(n => orig[n]).join('').slice(0, 32);
-    // 为请求参数进行 wbi 签名
-    encWbi(params, img_key, sub_key) {
-        const mixin_key = this.getMixinKey(img_key + sub_key), curr_time = Math.round(Date.now() / 1000), chr_filter = /[!'()*]/g;
-        Object.assign(params, { wts: curr_time }); // 添加 wts 字段
-        // 按照 key 重排参数
-        const query = Object
-            .keys(params)
-            .sort()
-            .map(key => {
-            // 过滤 value 中的 "!'()*" 字符
-            const value = params[key].toString().replace(chr_filter, '');
-            return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
-        })
-            .join('&');
-        const wbi_sign = (0, md5_1.default)(query + mixin_key); // 计算 w_rid
-        return query + '&w_rid=' + wbi_sign;
-    }
-    // 获取最新的 img_key 和 sub_key
-    async getWbiKeys() {
-        const res = await fetch('https://api.bilibili.com/x/web-interface/nav', {
-            headers: {
-                // SESSDATA 字段
-                Cookie: "SESSDATA=xxxxxx"
-            }
-        });
-        const { data: { wbi_img: { img_url, sub_url } } } = await res.json();
-        return {
-            img_key: img_url.slice(img_url.lastIndexOf('/') + 1, img_url.lastIndexOf('.')),
-            sub_key: sub_url.slice(sub_url.lastIndexOf('/') + 1, sub_url.lastIndexOf('.'))
-        };
-    }
-    async getWbi(params) {
-        const web_keys = await this.getWbiKeys();
-        const img_key = web_keys.img_key, sub_key = web_keys.sub_key;
-        const query = this.encWbi(params, img_key, sub_key);
-        return query;
-    }
-    encrypt(text) {
-        const iv = crypto_1.default.randomBytes(16);
-        const cipher = crypto_1.default.createCipheriv('aes-256-cbc', Buffer.from(this.wbiConfig.key), iv);
-        const encrypted = Buffer.concat([cipher.update(text), cipher.final()]);
-        return iv.toString('hex') + ':' + encrypted.toString('hex');
-    }
-    decrypt(text) {
-        const textParts = text.split(':');
-        const iv = Buffer.from(textParts.shift(), 'hex');
-        const encryptedText = Buffer.from(textParts.join(':'), 'hex');
-        const decipher = crypto_1.default.createDecipheriv('aes-256-cbc', Buffer.from(this.wbiConfig.key), iv);
-        const decrypted = Buffer.concat([decipher.update(encryptedText), decipher.final()]);
-        return decrypted.toString();
-    }
-}
-(function (Wbi) {
-    Wbi.Config = koishi_1.Schema.object({
-        key: koishi_1.Schema.string()
-            .pattern(/^[0-9a-f]{32}$/)
-            .required()
-    });
-})(Wbi || (Wbi = {}));
-exports.default = Wbi;