koishi-plugin-bilibili-notify 1.2.10 → 1.2.11-alpha.0

package/lib/biliAPI.d.ts

@@ -1,4 +1,4 @@
-import { Context, Service } from "koishi";
+import { Context, Schema, Service } from "koishi";
 import { CookieJar } from 'tough-cookie';
 import { Notifier } from "@koishijs/plugin-notifier";
 declare module 'koishi' {
@@ -10,11 +10,12 @@ declare class BiliAPI extends Service {
     static inject: string[];
     jar: CookieJar;
     client: any;
+    apiConfig: BiliAPI.Config;
     loginData: any;
     loginNotifier: Notifier;
     refreshCookieTimer: Function;
     loginInfoIsLoaded: boolean;
-    constructor(ctx: Context);
+    constructor(ctx: Context, config: BiliAPI.Config);
     protected start(): void | Promise<void>;
     protected stop(): void | Promise<void>;
     getServerUTCTime(): Promise<number>;
@@ -41,4 +42,10 @@ declare class BiliAPI extends Service {
     enableRefreshCookiesDetect(): void;
     checkIfTokenNeedRefresh(refreshToken: string, csrf: string, times?: number): Promise<void>;
 }
+declare namespace BiliAPI {
+    interface Config {
+        userAgent: string;
+    }
+    const Config: Schema<Config>;
+}
 export default BiliAPI;

package/lib/biliAPI.js

@@ -26,19 +26,20 @@ class BiliAPI extends koishi_1.Service {
     static inject = ['database', 'wbi', 'notifier'];
     jar;
     client;
+    apiConfig;
     loginData;
     loginNotifier;
     refreshCookieTimer;
     loginInfoIsLoaded = false;
-    constructor(ctx) {
+    constructor(ctx, config) {
         super(ctx, 'biliAPI');
+        this.apiConfig = config;
     }
     start() {
         // 创建新的http客户端(axios)
         this.createNewClient();
         // 从数据库加载cookies
         this.loadCookiesFromDatabase();
-        // logger
         // this.logger.info('工作中')
     }
     stop() {
@@ -167,7 +168,8 @@ class BiliAPI extends koishi_1.Service {
             jar: this.jar,
             headers: {
                 'Content-Type': 'application/json',
-                'User-Agent': this.getRandomUserAgent(),
+                'User-Agent': this.apiConfig.userAgent !== 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36' ?
+                    this.apiConfig.userAgent : this.getRandomUserAgent(),
                 'Origin': 'https://www.bilibili.com',
                 'Referer': 'https://www.bilibili.com/'
             }
@@ -389,4 +391,9 @@ class BiliAPI extends koishi_1.Service {
         // 没有问题，cookies已更新完成
     }
 }
+(function (BiliAPI) {
+    BiliAPI.Config = koishi_1.Schema.object({
+        userAgent: koishi_1.Schema.string()
+    });
+})(BiliAPI || (BiliAPI = {}));
 exports.default = BiliAPI;

package/lib/comRegister.d.ts

@@ -38,6 +38,7 @@ declare class ComRegister {
     checkIfLoginInfoIsLoaded(ctx: Context): Promise<unknown>;
     getSubFromDatabase(ctx: Context): Promise<void>;
     unsubSingle(ctx: Context, id: string, type: number): string;
+    unsubAll(ctx: Context, bot: Bot<Context>, uid: string): void;
     checkIfIsLogin(ctx: Context): Promise<boolean>;
 }
 declare namespace ComRegister {

package/lib/comRegister.js

@@ -794,9 +794,10 @@ class ComRegister {
                     default: await this.sendPrivateMsg(bot, '获取动态信息错误，错误码为：' + content.code + '，错误为：' + content.message); // 未知错误
                 }
                 // 取消订阅
-                this.unsubSingle(ctx, uid, 1); /* 1为取消动态订阅 */
+                this.unsubAll(ctx, bot, uid);
+                // this.unsubSingle(ctx, uid, 1) /* 1为取消动态订阅 */
                 // 发送取消订阅消息
-                await this.sendPrivateMsg(bot, `UID:${uid}，已取消订阅动态`);
+                // await this.sendPrivateMsg(bot, `UID:${uid}，已取消订阅动态`)
                 // 结束循环
                 return;
             }
@@ -1368,6 +1369,25 @@ class ComRegister {
             this.updateSubNotifier(ctx);
         }
     }
+    unsubAll(ctx, bot, uid) {
+        this.subManager.filter(sub => sub.uid === uid).map(async (sub, i) => {
+            // 取消全部订阅 执行dispose方法，销毁定时器
+            if (sub.dynamic)
+                this.subManager[i].dynamicDispose();
+            if (sub.live)
+                this.subManager[i].liveDispose();
+            // 从数据库中删除订阅
+            await ctx.database.remove('bilibili', { uid: this.subManager[i].uid });
+            // 将该订阅对象从订阅管理对象中移除
+            this.subManager.splice(i, 1);
+            // id--
+            this.num--;
+            // 发送成功通知
+            this.sendPrivateMsg(bot, `UID:${uid}，已取消订阅该用户`);
+            // 更新控制台提示
+            this.updateSubNotifier(ctx);
+        });
+    }
     async checkIfIsLogin(ctx) {
         if ((await ctx.database.get('loginBili', 1)).length !== 0) { // 数据库中有数据
             // 检查cookie中是否有值

package/lib/index.d.ts

@@ -13,6 +13,7 @@ export interface Config {
     basicSettings: {};
     unlockSubLimits: boolean;
     renderType: 'render' | 'page';
+    userAgent: string;
     dynamic: {};
     dynamicUrl: boolean;
     dynamicCheckNumber: number;

package/lib/index.js

@@ -76,6 +76,9 @@ exports.Config = koishi_1.Schema.object({
         .role('')
         .default('render')
         .description('渲染类型，默认为render模式，渲染速度更快，但会出现乱码问题，若出现乱码问题，请切换到page模式。若使用自定义字体，建议选择render模式'),
+    userAgent: koishi_1.Schema.string()
+        .default('Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36')
+        .description('设置请求头User-Agen，请求出现-352时可以尝试修改'),
     dynamic: koishi_1.Schema.object({}).description('动态推送设置'),
     dynamicUrl: koishi_1.Schema.boolean()
         .default(false)
@@ -172,7 +175,9 @@ class ServerManager extends koishi_1.Service {
         this.registerPlugin();
     }
     registerPlugin = () => {
-        const biliApi = this.ctx.plugin(biliAPI_1.default);
+        const biliApi = this.ctx.plugin(biliAPI_1.default, {
+            userAgent: globalConfig.userAgent
+        });
         const generateImg = this.ctx.plugin(generateImg_1.default, {
             renderType: this.renderType,
             filter: globalConfig.filter,

package/package.json

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

package/readme.md

@@ -144,6 +144,7 @@
 - ver 1.2.8 修复例如像UP主籽岷使用webp格式的头像，下播通知无法发出的bug
 - ver 1.2.9-alpha.0 bug测试版本，请跳过
 - ver 1.2.10 修复插件启动一段时间后一直报错的问题，更新了UA列表，新增了更多日志输出
+- ver 1.2.11-alpha.0 新增自定义UA的设置。动态推送出错时，现在会直接取消订阅该UP主而不是取消订阅动态
 
 ## 交流群