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

package/lib/comRegister.d.ts

@@ -18,11 +18,12 @@ 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;
     checkIfIsLogin(ctx: Context): Promise<boolean>;
+    test_dynamicDetect(ctx: Context, session: Session, uid: string): () => Promise<void>;
 }
 declare namespace ComRegister {
     interface Config {

package/lib/comRegister.js

@@ -72,7 +72,7 @@ class ComRegister {
             .subcommand('.gimg <uid:string> <index:number>')
             .usage('测试图片生成')
             .example('test.gimg')
-            .action(async ({ session }, uid, index) => {
+            .action(async (_, uid, index) => {
             // 获取用户空间动态数据
             const { data } = await ctx.biliAPI.getUserSpaceDynamic(uid);
             const [pic] = await ctx.gimg.generateDynamicImg(data.items[index]);
@@ -92,6 +92,13 @@ class ComRegister {
             .action(({ 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.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] })
             .subcommand('.login', '登录B站之后才可以进行之后的操作')
             .usage('使用二维码登录，登录B站之后才可以进行之后的操作')
@@ -539,8 +546,19 @@ class ComRegister {
                         case 1: timePoint = items[num].modules.module_author.pub_ts;
                     }
                     // 推送该条动态
-                    const [pic] = await ctx.gimg.generateDynamicImg(items[num]);
-                    await bot.sendMessage(guildId, pic);
+                    let attempts = 3;
+                    for (let i = 0; i < attempts; i++) {
+                        try {
+                            const [pic] = await ctx.gimg.generateDynamicImg(items[num]);
+                            await bot.sendMessage(guildId, pic);
+                            break; // 如果成功，那么跳出循环
+                        }
+                        catch (e) {
+                            if (i === attempts - 1) { // 如果已经尝试了三次，那么抛出错误
+                                throw e;
+                            }
+                        }
+                    }
                 }
             }
         };
@@ -555,9 +573,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 {
@@ -657,8 +678,10 @@ class ComRegister {
                 }
             }
             finally {
+                // console.log('end before' + ' ' + flag);
                 // 执行完方法体不论如何都把flag设置为true
                 flag = true;
+                // console.log('end after' + ' ' + flag);
             }
         };
     }
@@ -815,12 +838,82 @@ class ComRegister {
         }
         return false;
     }
+    test_dynamicDetect(ctx, session, uid) {
+        let firstSubscription = true;
+        let timePoint;
+        // Test code
+        let timer = 0;
+        return async () => {
+            // Test code
+            console.log('timer:' + timer++);
+            console.log('firstSubscription:' + firstSubscription);
+            console.log(`timePoint: ${timePoint}`);
+            console.log(`timePoint: ${ctx.gimg.unixTimestampToString(timePoint)}`);
+            // 第一次订阅判断
+            if (firstSubscription) {
+                // 设置第一次的时间点
+                timePoint = Math.floor(Date.now() / 1000);
+                // 设置第一次为false
+                firstSubscription = false;
+                return;
+            }
+            // 获取用户空间动态数据
+            let content;
+            try {
+                content = await ctx.biliAPI.getUserSpaceDynamic(uid);
+            }
+            catch (e) {
+                return this.logger.error('dynamicDetect getUserSpaceDynamic() 网络请求失败');
+            }
+            // 判断是否出现其他问题
+            if (content.code !== 0) {
+                switch (content.code) {
+                    case -101: { // 账号未登录
+                        await session.send('账号未登录，请登录后重新订阅动态');
+                    }
+                    default: { // 未知错误
+                        await session.send('未知错误，请重新订阅动态');
+                    }
+                }
+                // 取消订阅
+                this.unsubSingle(ctx, uid, 1); /* 1为取消动态订阅 */
+                return;
+            }
+            // 获取数据内容
+            const items = content.data.items;
+            // 发送请求 只查看前五条数据
+            for (let num = 4; num >= 0; num--) {
+                // 没有动态内容则直接跳过
+                if (!items[num])
+                    continue;
+                // Test code
+                console.log(`items[${num}].modules.module_author.pub_ts: ${ctx.gimg.unixTimestampToString(items[num].modules.module_author.pub_ts)}`);
+                // 寻找发布时间比时间点时间更晚的动态
+                if (items[num].modules.module_author.pub_ts > timePoint) {
+                    // 如果这是遍历的最后一条，将时间点设置为这条动态的发布时间
+                    /*  if (num === 1) timePoint = items[num].modules.module_author.pub_ts
+                    if (num === 0) {
+                        timePoint = items[num].modules.module_author.pub_ts
+                     } */
+                    switch (num) {
+                        // 如果是置顶动态，则跳过
+                        case 0: if (items[num].modules.module_tag)
+                            continue;
+                        case 1: timePoint = items[num].modules.module_author.pub_ts;
+                    }
+                    // 推送该条动态
+                    const [pic] = await ctx.gimg.generateDynamicImg(items[num]);
+                    await session.send(pic);
+                }
+            }
+        };
+    }
 }
 (function (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/package.json

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