koishi-plugin-bilibili-notify 1.0.0-beta.1 → 1.0.0-rc.1

package/lib/biliAPI.js

@@ -222,10 +222,13 @@ class BiliAPI extends koishi_1.Service {
                 throw new Error('refresh_csrf 错误或 refresh_token 与 cookie 不匹配');
             }
         }
-        // 更新refresh_token
+        // 更新 新的cookies和refresh_token
+        const encryptedCookies = this.ctx.wbi.encrypt(this.ctx.biliAPI.getCookies());
+        const encryptedRefreshToken = this.ctx.wbi.encrypt(refreshData.data.refresh_token);
         await this.ctx.database.upsert('loginBili', [{
                 id: 1,
-                bili_refresh_token: refreshData.data.refresh_token
+                bili_cookies: encryptedCookies,
+                bili_refresh_token: encryptedRefreshToken
             }]);
         // Get new csrf from cookies
         let newCsrf;

package/lib/comRegister.d.ts

@@ -18,7 +18,7 @@ declare class ComRegister {
     qqguildBot: Bot<Context>;
     constructor(ctx: Context, config: ComRegister.Config);
     dynamicDetect(ctx: Context, bot: Bot<Context>, guildId: string, uid: string): () => Promise<void>;
-    liveDetect(ctx: Context, bot: Bot<Context>, guildId: string, roomId: string): () => Promise<false | void>;
+    liveDetect(ctx: Context, bot: Bot<Context>, guildId: string, roomId: string): () => Promise<void>;
     checkIfNeedSub(comNeed: boolean, subType: string, session: Session, data?: any): Promise<boolean>;
     getSubFromDatabase(ctx: Context): Promise<void>;
     unsubSingle(ctx: Context, id: string, type: number): string;

package/lib/comRegister.js

@@ -29,76 +29,85 @@ class ComRegister {
         this.qqBot = ctx.bots[ctx.bots.findIndex(bot => bot.platform === 'qq')];
         // 拿到QQ频道机器人
         this.qqguildBot = ctx.bots[ctx.bots.findIndex(bot => bot.platform === 'qqguild')];
+        // 从数据库获取订阅
         this.getSubFromDatabase(ctx);
-        ctx.command('test', { hidden: true, permissions: ['authority:5'] })
+        /* ctx.command('test', { hidden: true, permissions: ['authority:5'] })
             .subcommand('.cookies')
             .usage('测试指令，用于测试从数据库读取cookies')
             .action(async () => {
-            await ctx.biliAPI.loadCookiesFromDatabase();
-        });
+                await ctx.biliAPI.loadCookiesFromDatabase()
+            })
+
         ctx.command('test')
             .subcommand('.my')
             .usage('测试指令，用于测试获取自己信息')
             .example('test.my')
             .action(async () => {
-            const content = await ctx.biliAPI.getMyselfInfo();
-            console.log(content);
-        });
+                const content = await ctx.biliAPI.getMyselfInfo()
+                console.log(content);
+            })
+
         ctx.command('test')
             .subcommand('.user <mid:string>')
             .usage('测试指令，用于测试获取用户信息')
             .example('test.user 用户UID')
             .action(async (_, mid) => {
-            const content = await ctx.biliAPI.getUserInfo(mid);
-            console.log(content);
-        });
+                const content = await ctx.biliAPI.getUserInfo(mid)
+                console.log(content);
+            })
+
         ctx.command('test')
             .subcommand('.time')
             .usage('测试时间接口')
             .example('test.time')
             .action(async () => {
-            const content = await ctx.biliAPI.getTimeNow();
-            console.log(content);
-        });
+                const content = await ctx.biliAPI.getTimeNow()
+                console.log(content);
+            })
+
         ctx.command('test')
             .subcommand('.exist')
             .usage('测试写法')
             .example('test.exist')
             .action(async () => {
-            let num = 1;
-            console.log(num && `Hello World`);
-        });
+                let num = 1;
+                console.log(num && `Hello World`);
+            })
+
         ctx.command('test')
             .subcommand('.gimg <uid:string> <index:number>')
             .usage('测试图片生成')
             .example('test.gimg')
             .action(async (_, uid, index) => {
-            // 获取用户空间动态数据
-            const { data } = await ctx.biliAPI.getUserSpaceDynamic(uid);
-            const [pic] = await ctx.gimg.generateDynamicImg(data.items[index]);
-            return pic;
-        });
+                // 获取用户空间动态数据
+                const { data } = await ctx.biliAPI.getUserSpaceDynamic(uid)
+                const [pic] = await ctx.gimg.generateDynamicImg(data.items[index])
+                return pic
+            })
+
         ctx.command('test')
             .subcommand('.group')
             .usage('查看session groupId')
             .example('test group')
             .action(({ session }) => {
-            console.log(session.event.channel);
-        });
+                console.log(session.event.channel);
+            })
+
         ctx.command('test')
             .subcommand('.session')
             .usage('查看seesion')
             .example('test session')
             .action(({ session }) => {
-            console.log(session);
-        });
+                console.log(session);
+            })
+
         ctx.command('test')
             .subcommand('.dynamic <uid:string>')
             .usage('测试动态监测')
             .example('test dynamic uid')
             .action(({ session }, uid) => {
-            ctx.setInterval(this.test_dynamicDetect(ctx, session, uid), 30000);
-        });
+                ctx.setInterval(this.test_dynamicDetect(ctx, session, uid), 30000)
+            }) */
         ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] })
             .subcommand('.login', '登录B站之后才可以进行之后的操作')
             .usage('使用二维码登录，登录B站之后才可以进行之后的操作')
@@ -154,7 +163,7 @@ class ComRegister {
                     return await session.send('二维码已失效，请重新登录！');
                 }
                 if (loginContent.data.code === 0) { // 登录成功
-                    const encryptedCookies = ctx.wbi.encrypt(await ctx.biliAPI.getCookies());
+                    const encryptedCookies = ctx.wbi.encrypt(ctx.biliAPI.getCookies());
                     const encryptedRefreshToken = ctx.wbi.encrypt(loginContent.data.refresh_token);
                     await ctx.database.upsert('loginBili', [{
                             id: 1,
@@ -573,9 +582,12 @@ class ComRegister {
         let flag = true;
         return async () => {
             try {
+                // console.log('start before' + ' ' + flag);
                 // 如果flag为false则说明前面的代码还未执行完，则直接返回
                 if (!flag)
-                    return flag = false;
+                    return;
+                flag && (flag = false);
+                // console.log('start after' + ' ' + flag);
                 // 发送请求检测直播状态
                 let content;
                 try {
@@ -612,6 +624,8 @@ class ComRegister {
                     uData = userData;
                     // 判断直播状态
                     if (data.live_status === 1) { // 当前正在直播
+                        // 设置开播时间
+                        liveTime = data.live_time;
                         // 推送直播信息
                         await bot.sendMessage(guildId, await ctx
                             .gimg
@@ -660,7 +674,7 @@ class ComRegister {
                             if (this.config.pushTime > 0) {
                                 timer++;
                                 // 开始记录时间
-                                if (timer >= (12 * 30 * this.config.pushTime)) { // 到时间推送直播消息
+                                if (timer >= (6 * 60 * this.config.pushTime)) { // 到时间推送直播消息
                                     // 到时间重新计时
                                     timer = 0;
                                     // 发送状态信息
@@ -675,8 +689,10 @@ class ComRegister {
                 }
             }
             finally {
+                // console.log('end before' + ' ' + flag);
                 // 执行完方法体不论如何都把flag设置为true
                 flag = true;
+                // console.log('end after' + ' ' + flag);
             }
         };
     }
@@ -908,7 +924,7 @@ class ComRegister {
     ComRegister.Config = koishi_1.Schema.object({
         pushTime: koishi_1.Schema.number().required(),
         liveLoopTime: koishi_1.Schema.number().default(10),
-        dynamicLoopTime: koishi_1.Schema.number().default(30)
+        dynamicLoopTime: koishi_1.Schema.number().default(60)
     });
 })(ComRegister || (ComRegister = {}));
 exports.default = ComRegister;

package/lib/index.js

@@ -42,11 +42,10 @@ exports.name = 'bilibili-notify';
 exports.Config = koishi_1.Schema.object({
     pushTime: koishi_1.Schema.number()
         .min(0)
-        .max(24)
-        .step(1)
-        .role('slider')
+        .max(12)
+        .step(0.5)
         .default(1)
-        .description('设定隔多长时间推送一次直播状态，单位为半小时，默认为半小时'),
+        .description('设定隔多长时间推送一次直播状态，单位为小时，默认为一小时'),
     cardColorStart: koishi_1.Schema.string()
         .pattern(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/)
         .default('#F38AB5')

package/package.json

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