koishi-plugin-bilibili-notify 1.2.0-alpha.3 → 1.2.0-alpha.5

package/lib/biliAPI.d.ts

@@ -28,6 +28,7 @@ declare class BiliAPI extends Service {
     getMasterInfo(mid: string): Promise<any>;
     disposeNotifier(): void;
     createNewClient(): void;
+    getTimeOfUTC8(): number;
     getCookies(): string;
     getLoginInfoFromDB(): Promise<{
         cookies: any;

package/lib/biliAPI.js

@@ -8,6 +8,7 @@ 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 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';
@@ -193,6 +194,9 @@ class BiliAPI extends koishi_1.Service {
             }
         }));
     }
+    getTimeOfUTC8() {
+        return Math.floor(luxon_1.DateTime.now().setZone('UTC+8').toSeconds());
+    }
     getCookies() {
         let cookies;
         cookies = JSON.stringify(this.jar.serializeSync().cookies);

package/lib/comRegister.js

@@ -588,7 +588,7 @@ class ComRegister {
             // 第一次订阅判断
             if (firstSubscription) {
                 // 设置第一次的时间点
-                timePoint = await ctx.biliAPI.getServerUTCTime();
+                timePoint = ctx.biliAPI.getTimeOfUTC8();
                 // 设置第一次为false
                 firstSubscription = false;
                 return;
@@ -660,8 +660,9 @@ class ComRegister {
                             break;
                         }
                         catch (e) {
+                            this.logger.error('dynamicDetect generateLiveImg() 推送卡片发送失败，原因：' + e.toString());
                             if (i === attempts - 1) { // 如果已经尝试了三次，那么抛出错误
-                                throw e;
+                                return this.sendMsg(guildId, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
                             }
                         }
                     }
@@ -709,9 +710,9 @@ class ComRegister {
                     break;
                 }
                 catch (e) {
-                    this.logger.error('liveDetect generateLiveImg() 推送卡片发送失败');
+                    this.logger.error('liveDetect generateLiveImg() 推送卡片发送失败，原因：' + e.toString());
                     if (i === attempts - 1) { // 已尝试三次
-                        return this.sendMsg(guildId, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然会发生该错误，请向作者反馈');
+                        return this.sendMsg(guildId, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
                     }
                 }
             }

package/lib/database.js

@@ -6,8 +6,8 @@ function apply(ctx) {
     // 新增LoginBili表
     ctx.model.extend('loginBili', {
         id: 'unsigned',
-        bili_cookies: 'string',
-        bili_refresh_token: 'string'
+        bili_cookies: 'text',
+        bili_refresh_token: 'text'
     });
     // 新增Bilibili表
     ctx.model.extend('bilibili', {

package/lib/generateImg.d.ts

@@ -7,7 +7,7 @@ declare module 'koishi' {
 }
 declare class GenerateImg extends Service {
     static inject: string[];
-    config: GenerateImg.Config;
+    giConfig: GenerateImg.Config;
     constructor(ctx: Context, config: GenerateImg.Config);
     protected start(): void | Promise<void>;
     generateLiveImg(data: any, userData: any, liveStatus: number): Promise<{

package/lib/generateImg.js

@@ -38,10 +38,10 @@ const ADDITIONAL_TYPE_UGC = 'ADDITIONAL_TYPE_UGC' */
 const ADDITIONAL_TYPE_RESERVE = 'ADDITIONAL_TYPE_RESERVE';
 class GenerateImg extends koishi_1.Service {
     static inject = ['puppeteer', 'biliAPI'];
-    config;
+    giConfig;
     constructor(ctx, config) {
         super(ctx, 'gimg');
-        this.config = config;
+        this.giConfig = config;
     }
     start() {
         // this.logger.info('GenerateImg已被注册到Context中');
@@ -65,7 +65,7 @@ class GenerateImg extends koishi_1.Service {
                     * {
                         margin: 0;
                         padding: 0;
-                        font-family: "${this.config.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                        font-family: "${this.giConfig.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
                     }
 
                     html {
@@ -76,7 +76,7 @@ class GenerateImg extends koishi_1.Service {
                     .background {
                         width: 770px;
                         height: auto;
-                        background: linear-gradient(to right bottom, ${this.config.cardColorStart}, ${this.config.cardColorEnd});
+                        background: linear-gradient(to right bottom, ${this.giConfig.cardColorStart}, ${this.giConfig.cardColorEnd});
                         overflow: hidden;
                     }
 
@@ -91,7 +91,7 @@ class GenerateImg extends koishi_1.Service {
                     }
 
                     .base-plate {
-                        ${this.config.removeBorder ? `
+                        ${this.giConfig.removeBorder ? `
                         width: 740px;
                         ` : `
                         width: 704px;
@@ -185,30 +185,41 @@ class GenerateImg extends koishi_1.Service {
             </body>
             </html>
         `;
-        // 判断渲染方式
-        if (this.config.renderType) { // 为1则为真，进入page模式
-            const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
-            const page = await this.ctx.puppeteer.page();
-            await page.goto(htmlPath);
-            await page.setContent(html, { waitUntil: 'networkidle0' });
-            const elementHandle = await page.$('html');
-            const boundingBox = await elementHandle.boundingBox();
-            const buffer = await page.screenshot({
-                type: 'png',
-                clip: {
-                    x: boundingBox.x,
-                    y: boundingBox.y,
-                    width: boundingBox.width,
-                    height: boundingBox.height
+        // 多次尝试生成图片
+        let attempts = 3;
+        for (let i = 0; i < attempts; i++) {
+            try {
+                // 判断渲染方式
+                if (this.giConfig.renderType) { // 为1则为真，进入page模式
+                    const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
+                    const page = await this.ctx.puppeteer.page();
+                    await page.goto(htmlPath);
+                    await page.setContent(html, { waitUntil: 'networkidle0' });
+                    const elementHandle = await page.$('html');
+                    const boundingBox = await elementHandle.boundingBox();
+                    const buffer = await page.screenshot({
+                        type: 'png',
+                        clip: {
+                            x: boundingBox.x,
+                            y: boundingBox.y,
+                            width: boundingBox.width,
+                            height: boundingBox.height
+                        }
+                    });
+                    await elementHandle.dispose();
+                    await page.close();
+                    return { buffer };
+                }
+                // 使用render模式渲染
+                const pic = await this.ctx.puppeteer.render(html);
+                return { pic };
+            }
+            catch (e) {
+                if (i === attempts - 1) { // 已尝试三次
+                    throw new Error('生成图片失败！错误: ' + e.toString());
                 }
-            });
-            await elementHandle.dispose();
-            await page.close();
-            return { buffer };
+            }
         }
-        // 使用render模式渲染
-        const pic = await this.ctx.puppeteer.render(html);
-        return { pic };
     }
     async generateDynamicImg(data) {
         // module_author
@@ -251,14 +262,14 @@ class GenerateImg extends koishi_1.Service {
                         }
                     }, '');
                     // 关键字和正则屏蔽
-                    if (this.config.filter.enable) { // 开启关键字和正则屏蔽
-                        if (this.config.filter.regex) { // 正则屏蔽
-                            const reg = new RegExp(this.config.filter.regex);
+                    if (this.giConfig.filter.enable) { // 开启关键字和正则屏蔽
+                        if (this.giConfig.filter.regex) { // 正则屏蔽
+                            const reg = new RegExp(this.giConfig.filter.regex);
                             if (reg.test(richText))
                                 throw new Error('出现关键词，屏蔽该动态');
                         }
-                        if (this.config.filter.keywords.length !== 0 &&
-                            this.config.filter.keywords
+                        if (this.giConfig.filter.keywords.length !== 0 &&
+                            this.giConfig.filter.keywords
                                 .some(keyword => richText.includes(keyword))) {
                             throw new Error('出现关键词，屏蔽该动态');
                         }
@@ -517,7 +528,7 @@ class GenerateImg extends koishi_1.Service {
         const fontURL = (0, url_1.pathToFileURL)((0, path_1.resolve)(__dirname, 'font/HYZhengYuan-75W.ttf'));
         // 判断是否开启大字体模式
         let style;
-        if (this.config.enableLargeFont) {
+        if (this.giConfig.enableLargeFont) {
             style = `
             @font-face {
                 font-family: "Custom Font";
@@ -528,7 +539,7 @@ class GenerateImg extends koishi_1.Service {
                 margin: 0;
                 padding: 0;
                 box-sizing: border-box;
-                font-family: "${this.config.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                font-family: "${this.giConfig.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
     
             html {
@@ -539,7 +550,7 @@ class GenerateImg extends koishi_1.Service {
             .background {
                 width: 770px;
                 height: auto;
-                background: linear-gradient(to right bottom, ${this.config.cardColorStart}, ${this.config.cardColorEnd});
+                background: linear-gradient(to right bottom, ${this.giConfig.cardColorStart}, ${this.giConfig.cardColorEnd});
                 overflow: hidden;
             }
     
@@ -554,7 +565,7 @@ class GenerateImg extends koishi_1.Service {
             }
     
             .base-plate {
-                ${this.config.removeBorder ? `
+                ${this.giConfig.removeBorder ? `
                 width: 740px;
                 ` : `
                 width: 704px;
@@ -858,7 +869,7 @@ class GenerateImg extends koishi_1.Service {
             * {
                 margin: 0;
                 padding: 0;
-                font-family: "${this.config.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
+                font-family: "${this.giConfig.font}", "Custom Font", "Microsoft YaHei", "Source Han Sans", "Noto Sans CJK", sans-serif;
             }
     
             html {
@@ -869,7 +880,7 @@ class GenerateImg extends koishi_1.Service {
             .background {
                 width: 770px;
                 height: auto;
-                background: linear-gradient(to right bottom, ${this.config.cardColorStart}, ${this.config.cardColorEnd});
+                background: linear-gradient(to right bottom, ${this.giConfig.cardColorStart}, ${this.giConfig.cardColorEnd});
                 overflow: hidden;
             }
     
@@ -1257,30 +1268,41 @@ class GenerateImg extends koishi_1.Service {
             </body>
             </html>
         `;
-        // 判断渲染方式
-        if (this.config.renderType) { // 为1则为真，进入page模式
-            const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
-            const page = await this.ctx.puppeteer.page();
-            await page.goto(htmlPath);
-            await page.setContent(html, { waitUntil: 'networkidle0' });
-            const elementHandle = await page.$('html');
-            const boundingBox = await elementHandle.boundingBox();
-            const buffer = await page.screenshot({
-                type: 'png',
-                clip: {
-                    x: boundingBox.x,
-                    y: boundingBox.y,
-                    width: boundingBox.width,
-                    height: boundingBox.height
+        // 多次尝试生成图片
+        let attempts = 3;
+        for (let i = 0; i < attempts; i++) {
+            try {
+                // 判断渲染方式
+                if (this.giConfig.renderType) { // 为1则为真，进入page模式
+                    const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
+                    const page = await this.ctx.puppeteer.page();
+                    await page.goto(htmlPath);
+                    await page.setContent(html, { waitUntil: 'networkidle0' });
+                    const elementHandle = await page.$('html');
+                    const boundingBox = await elementHandle.boundingBox();
+                    const buffer = await page.screenshot({
+                        type: 'png',
+                        clip: {
+                            x: boundingBox.x,
+                            y: boundingBox.y,
+                            width: boundingBox.width,
+                            height: boundingBox.height
+                        }
+                    });
+                    await elementHandle.dispose();
+                    await page.close();
+                    return { buffer, link };
+                }
+                // 使用render模式渲染
+                const pic = await this.ctx.puppeteer.render(html);
+                return { pic, link };
+            }
+            catch (e) {
+                if (i === attempts - 1) { // 已尝试三次
+                    throw new Error('生成图片失败！错误: ' + e.toString());
                 }
-            });
-            await elementHandle.dispose();
-            await page.close();
-            return { buffer, link };
+            }
         }
-        // 使用render模式渲染
-        const pic = await this.ctx.puppeteer.render(html);
-        return { pic, link };
     }
     async getLiveStatus(time, liveStatus) {
         let titleStatus;
@@ -1314,7 +1336,7 @@ class GenerateImg extends koishi_1.Service {
         // 获取Unix时间戳（以毫秒为单位）
         const unixTime = date.getTime() / 1000;
         // 获取当前Unix时间戳
-        const now = await this.ctx.biliAPI.getServerUTCTime();
+        const now = this.ctx.biliAPI.getTimeOfUTC8();
         // 计算时间差（以秒为单位）
         const differenceInSeconds = Math.floor(now - unixTime);
         // 获取yyyy:MM:dd HH:mm:ss

package/lib/wbi.d.ts

@@ -5,7 +5,7 @@ declare module 'koishi' {
     }
 }
 declare class Wbi extends Service {
-    config: Wbi.Config;
+    wbiConfig: Wbi.Config;
     mixinKeyEncTab: number[];
     constructor(ctx: Context, config: Wbi.Config);
     protected start(): void | Promise<void>;

package/lib/wbi.js

@@ -7,7 +7,7 @@ const koishi_1 = require("koishi");
 const md5_1 = __importDefault(require("md5"));
 const crypto_1 = __importDefault(require("crypto"));
 class Wbi extends koishi_1.Service {
-    config;
+    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,
@@ -16,7 +16,7 @@ class Wbi extends koishi_1.Service {
     ];
     constructor(ctx, config) {
         super(ctx, 'wbi');
-        this.config = config;
+        this.wbiConfig = config;
     }
     start() {
         // this.logger.info('wbi已被注册到Context中')
@@ -62,7 +62,7 @@ class Wbi extends koishi_1.Service {
     }
     encrypt(text, secretKey) {
         const iv = crypto_1.default.randomBytes(16);
-        const cipher = crypto_1.default.createCipheriv('aes-256-cbc', Buffer.from(this.config.key), iv);
+        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');
     }
@@ -70,7 +70,7 @@ class Wbi extends koishi_1.Service {
         let textParts = text.split(':');
         let iv = Buffer.from(textParts.shift(), 'hex');
         let encryptedText = Buffer.from(textParts.join(':'), 'hex');
-        let decipher = crypto_1.default.createDecipheriv('aes-256-cbc', Buffer.from(this.config.key), iv);
+        let decipher = crypto_1.default.createDecipheriv('aes-256-cbc', Buffer.from(this.wbiConfig.key), iv);
         let decrypted = Buffer.concat([decipher.update(encryptedText), decipher.final()]);
         return decrypted.toString();
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-bilibili-notify",
   "description": "Koishi bilibili notify plugin",
-  "version": "1.2.0-alpha.3",
+  "version": "1.2.0-alpha.5",
   "contributors": [
     "Akokko <admin@akokko.com>"
   ],
@@ -24,21 +24,23 @@
     "bilibili"
   ],
   "peerDependencies": {
-    "koishi": "^4.16.8"
+    "koishi": "^4.17.1"
   },
   "dependencies": {
     "axios": "^1.6.7",
     "axios-cookiejar-support": "^5.0.0",
     "jsdom": "^24.0.0",
+    "luxon": "^3.4.4",
     "md5": "^2.3.0",
     "qrcode": "^1.5.3",
     "tough-cookie": "^4.1.3"
   },
   "devDependencies": {
+    "@types/luxon": "^3",
     "@types/md5": "^2",
     "@types/qrcode": "^1",
     "@types/tough-cookie": "^4",
-    "koishi-plugin-puppeteer": "^3.7.3"
+    "koishi-plugin-puppeteer": "^3.8.2"
   },
   "koishi": {
     "service": {

package/readme.md

@@ -104,6 +104,8 @@
 - ver 1.2.0-alpha.1 对推送进行了改进：在开启直播开播艾特全体成员的情况下，发送图片后才会艾特全体成员
 - ver 1.2.0-alpha.2 支持QQ群多群推送(实验性)，修复了一些bug
 - ver 1.2.0-alpha.3 修复了指定QQ群订阅时的一个bug
+- ver 1.2.0-alpha.4 对时间获取进行了优化，能够适应不同环境下的时间获取，修复了一些bug
+- ver 1.2.0-alpha.5 修复了与PostgreSQL不兼容的问题，优化了图片推送，增强了推送容错
 
 ## 感谢