koishi-plugin-bilibili-notify 0.1.3 → 1.0.0-alpha.0

package/lib/authority.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 class Authority {
     constructor(ctx) {
         // 授予权限
-        ctx.permissions.provide('qqguild.admin', async (name, session) => {
-            return session.event.user.id === '12814193631283946447';
-        });
+        /* ctx.permissions.provide('telegram:admin', async (name, session) => {
+            console.log(session);
+            return session.telegram?.sender?.role === 'admin'
+        }) */
     }
 }
 exports.default = Authority;

package/lib/biliAPI.d.ts

@@ -22,7 +22,7 @@ declare class BiliAPI extends Service {
     getLiveRoomInfo(roomId: string): Promise<any>;
     getMasterInfo(mid: string): Promise<any>;
     createNewClient(): void;
-    getCookies(): Promise<string>;
+    getCookies(): string;
     loadCookiesFromDatabase(): Promise<void>;
     checkIfTokenNeedRefresh(refreshToken: string, csrf: string, times?: number): Promise<void>;
 }

package/lib/biliAPI.js

@@ -121,7 +121,7 @@ class BiliAPI extends koishi_1.Service {
         this.jar = new tough_cookie_1.CookieJar();
         this.client = (0, axios_cookiejar_support_1.wrapper)(axios_1.default.create({ jar: this.jar, headers: { 'Content-Type': 'application/json' } }));
     }
-    async getCookies() {
+    getCookies() {
         let cookies;
         this.jar.store.getAllCookies((err, c) => {
             if (err)
@@ -194,7 +194,8 @@ class BiliAPI extends koishi_1.Service {
             const encrypted = new Uint8Array(await crypto.subtle.encrypt({ name: "RSA-OAEP" }, publicKey, data));
             return encrypted.reduce((str, c) => str + c.toString(16).padStart(2, "0"), "");
         }
-        const correspondPath = await getCorrespondPath(Date.now());
+        const correspondPath = await getCorrespondPath(data.timestamp);
+        // 获取refresh_csrf
         const { data: refreshCsrfHtml } = await this.client.get(`https://www.bilibili.com/correspond/1/${correspondPath}`);
         // 创建一个虚拟的DOM元素
         const { document } = new jsdom_1.JSDOM(refreshCsrfHtml).window;
@@ -212,8 +213,14 @@ class BiliAPI extends koishi_1.Service {
         switch (refreshData.code) {
             // 账号未登录
             case -101: return this.createNewClient();
-            case -111: throw new Error('csrf 校验失败');
-            case 86095: throw new Error('refresh_csrf 错误或 refresh_token 与 cookie 不匹配');
+            case -111: {
+                await this.ctx.database.remove('loginBili', [1]);
+                throw new Error('csrf 校验失败');
+            }
+            case 86095: {
+                await this.ctx.database.remove('loginBili', [1]);
+                throw new Error('refresh_csrf 错误或 refresh_token 与 cookie 不匹配');
+            }
         }
         // 更新refresh_token
         await this.ctx.database.upsert('loginBili', [{

package/lib/comRegister.d.ts

@@ -18,10 +18,11 @@ 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<void>;
+    liveDetect(ctx: Context, bot: Bot<Context>, guildId: string, roomId: string): () => Promise<false | 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>;
 }
 declare namespace ComRegister {
     interface Config {

package/lib/comRegister.js

@@ -30,7 +30,7 @@ class ComRegister {
         // 拿到QQ频道机器人
         this.qqguildBot = ctx.bots[ctx.bots.findIndex(bot => bot.platform === 'qqguild')];
         this.getSubFromDatabase(ctx);
-        ctx.command('test')
+        ctx.command('test', { hidden: true, permissions: ['authority:5'] })
             .subcommand('.cookies')
             .usage('测试指令，用于测试从数据库读取cookies')
             .action(async () => {
@@ -69,7 +69,7 @@ class ComRegister {
             console.log(num && `Hello World`);
         });
         ctx.command('test')
-            .subcommand('.gimg <uid:string> <index:number>', '生成图片', { permissions: ['qqguild.admin'] })
+            .subcommand('.gimg <uid:string> <index:number>')
             .usage('测试图片生成')
             .example('test.gimg')
             .action(async ({ session }, uid, index) => {
@@ -78,13 +78,6 @@ class ComRegister {
             const [pic] = await ctx.gimg.generateDynamicImg(data.items[index]);
             return pic;
         });
-        ctx.command('test')
-            .subcommand('.subm')
-            .usage('查看订阅对象状态')
-            .example('test subm')
-            .action(() => {
-            console.log(this.subManager);
-        });
         ctx.command('test')
             .subcommand('.group')
             .usage('查看session groupId')
@@ -99,7 +92,7 @@ class ComRegister {
             .action(({ session }) => {
             console.log(session);
         });
-        ctx.command('bili', 'bili-notify插件相关指令')
+        ctx.command('bili', 'bili-notify插件相关指令', { permissions: ['authority:3'] })
             .subcommand('.login', '登录B站之后才可以进行之后的操作')
             .usage('使用二维码登录，登录B站之后才可以进行之后的操作')
             .example('bili login')
@@ -161,13 +154,20 @@ class ComRegister {
                             bili_cookies: encryptedCookies,
                             bili_refresh_token: encryptedRefreshToken
                         }]);
+                    // 销毁定时器
                     dispose();
-                    return await session.send('登录成功！');
+                    // 发送成功登录推送
+                    await session.send('登录成功！');
+                    // 订阅之前的订阅
+                    await this.getSubFromDatabase(ctx);
+                    // 调用bili show指令
+                    await session.execute('bili show');
+                    return;
                 }
             }, 1000);
         });
         ctx.command('bili')
-            .subcommand('.unsub <uid:string> 取消订阅')
+            .subcommand('.unsub <uid:string>', '取消订阅UP主动态、直播或全部')
             .usage('取消订阅，加-l为取消直播订阅，加-d为取消动态订阅，什么都不加则为全部取消')
             .option('live', '-l')
             .option('dynamic', '-d')
@@ -212,7 +212,7 @@ class ComRegister {
             !exist && session.send('未订阅该用户，无需取消订阅');
         });
         ctx.command('bili')
-            .subcommand('.show')
+            .subcommand('.show', '展示订阅对象')
             .usage('展示订阅对象')
             .example('bili show')
             .action(async ({ session }) => {
@@ -224,13 +224,18 @@ class ComRegister {
             table && session.send(table);
         });
         ctx.command('bili')
-            .subcommand('.sub <mid:string> [guildId:string]')
+            .subcommand('.sub <mid:string> [guildId:string]', '订阅用户动态和直播通知')
             .option('live', '-l')
             .option('dynamic', '-d')
-            .usage('订阅用户动态和直播通知，若需要订阅直播请加上-l，需要订阅动态则加上-d。若没有加任何参数，之后会向你单独询问，<>中为必选参数，[]中为可选参数，目标群号若不填，则默认为当前群聊')
+            .usage('订阅用户动态和直播通知，若需要订阅直播请加上-l，需要订阅动态则加上-d。若没有加任何参数，之后会向你单独询问，尖括号中为必选参数，中括号为可选参数，目标群号若不填，则默认为当前群聊')
             .example('bili sub 用户uid 目标QQ群号(暂不支持) -l -d')
             .action(async ({ session, options }, mid, guildId) => {
             this.logger.info('调用bili.sub指令');
+            // 检查是否登录
+            if (!(await this.checkIfIsLogin(ctx))) {
+                // 未登录直接返回
+                return '请使用指令bili login登录后再进行订阅操作';
+            }
             // 如果订阅人数超过三个则直接返回
             if (this.num >= 3)
                 return '目前最多只能订阅三个人';
@@ -354,7 +359,7 @@ class ComRegister {
             }
         });
         ctx.command('bili')
-            .subcommand('.dynamic <uid:string> <guildId:string>')
+            .subcommand('.dynamic <uid:string> <guildId:string>', '订阅用户动态推送', { hidden: true })
             .option('bot', '-b <type:string>')
             .usage('订阅用户动态推送')
             .example('bili dynamic 1')
@@ -391,7 +396,7 @@ class ComRegister {
             this.subManager[index].dynamicDispose = dispose;
         });
         ctx.command('bili')
-            .subcommand('.live <roomId:string> <guildId:string>')
+            .subcommand('.live <roomId:string> <guildId:string>', '订阅主播开播通知', { hidden: true })
             .option('bot', '-b <type:string>')
             .usage('订阅主播开播通知')
             .example('bili live 732')
@@ -426,7 +431,7 @@ class ComRegister {
             this.subManager[index].liveDispose = dispose;
         });
         ctx.command('bili')
-            .subcommand('.status <roomId:string>')
+            .subcommand('.status <roomId:string>', '查询主播当前直播状态', { hidden: true })
             .usage('查询主播当前直播状态')
             .example('bili status 732')
             .action(async ({ session }, roomId) => {
@@ -539,7 +544,7 @@ class ComRegister {
             try {
                 // 如果flag为false则说明前面的代码还未执行完，则直接返回
                 if (!flag)
-                    return;
+                    return flag = false;
                 // 发送请求检测直播状态
                 let content;
                 try {
@@ -679,6 +684,9 @@ class ComRegister {
         }
     }
     async getSubFromDatabase(ctx) {
+        if (!(await this.checkIfIsLogin(ctx))) { // 如果未登录，则直接返回
+            return;
+        }
         // 从数据库中获取数据
         const subData = await ctx.database.get('bilibili', { id: { $gt: 0 } });
         // 设定订阅数量
@@ -784,6 +792,15 @@ class ComRegister {
             }
         }
     }
+    async checkIfIsLogin(ctx) {
+        if ((await ctx.database.get('loginBili', 1)).length !== 0) { // 数据库中有数据
+            // 检查cookie中是否有值
+            if (ctx.biliAPI.getCookies() !== '[]') { // 有值说明已登录
+                return true;
+            }
+        }
+        return false;
+    }
 }
 (function (ComRegister) {
     ComRegister.Config = koishi_1.Schema.object({

package/lib/index.js

@@ -31,7 +31,7 @@ const koishi_1 = require("koishi");
 // import crypto
 const crypto_1 = __importDefault(require("crypto"));
 // import plugins
-const authority_1 = __importDefault(require("./authority"));
+// import Authority from './authority'
 const comRegister_1 = __importDefault(require("./comRegister"));
 const Database = __importStar(require("./database"));
 // import Service
@@ -69,7 +69,7 @@ function apply(ctx, config) {
     ctx.plugin(generateImg_1.default, { cardColorStart: config.cardColorStart, cardColorEnd: config.cardColorEnd });
     ctx.plugin(biliAPI_1.default);
     // load plugin
-    ctx.plugin(authority_1.default);
+    // ctx.plugin(Authority)
     ctx.plugin(comRegister_1.default, { pushTime: config.pushTime });
     // 当用户输入“恶魔兔，启动！”时，执行 help 指令
     ctx.middleware((session, next) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "0.1.3",
+  "version": "1.0.0-alpha.0",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -12,6 +12,10 @@
     "dist"
   ],
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Akokk0/koishi-plugin-bilibili-notify"
+  },
   "scripts": {},
   "keywords": [
     "chatbot",