koishi-plugin-bilibili-notify 1.2.0-alpha.4 → 1.2.0-alpha.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/comRegister.js +4 -3
- package/lib/database.js +2 -2
- package/lib/generateImg.js +66 -44
- package/package.json +1 -1
- package/readme.md +1 -0
package/lib/comRegister.js
CHANGED
|
@@ -660,8 +660,9 @@ class ComRegister {
|
|
|
660
660
|
break;
|
|
661
661
|
}
|
|
662
662
|
catch (e) {
|
|
663
|
+
this.logger.error('dynamicDetect generateLiveImg() 推送卡片发送失败，原因：' + e.toString());
|
|
663
664
|
if (i === attempts - 1) { // 如果已经尝试了三次，那么抛出错误
|
|
664
|
-
|
|
665
|
+
return this.sendMsg(guildId, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
|
|
665
666
|
}
|
|
666
667
|
}
|
|
667
668
|
}
|
|
@@ -709,9 +710,9 @@ class ComRegister {
|
|
|
709
710
|
break;
|
|
710
711
|
}
|
|
711
712
|
catch (e) {
|
|
712
|
-
this.logger.error('liveDetect generateLiveImg()
|
|
713
|
+
this.logger.error('liveDetect generateLiveImg() 推送卡片发送失败，原因：' + e.toString());
|
|
713
714
|
if (i === attempts - 1) { // 已尝试三次
|
|
714
|
-
return this.sendMsg(guildId, bot, '
|
|
715
|
+
return this.sendMsg(guildId, bot, '插件可能出现某些未知错误，请尝试重启插件，如果仍然发生该错误，请带着日志向作者反馈');
|
|
715
716
|
}
|
|
716
717
|
}
|
|
717
718
|
}
|
package/lib/database.js
CHANGED
|
@@ -6,8 +6,8 @@ function apply(ctx) {
|
|
|
6
6
|
// 新增LoginBili表
|
|
7
7
|
ctx.model.extend('loginBili', {
|
|
8
8
|
id: 'unsigned',
|
|
9
|
-
bili_cookies: '
|
|
10
|
-
bili_refresh_token: '
|
|
9
|
+
bili_cookies: 'text',
|
|
10
|
+
bili_refresh_token: 'text'
|
|
11
11
|
});
|
|
12
12
|
// 新增Bilibili表
|
|
13
13
|
ctx.model.extend('bilibili', {
|
package/lib/generateImg.js
CHANGED
|
@@ -185,30 +185,41 @@ class GenerateImg extends koishi_1.Service {
|
|
|
185
185
|
</body>
|
|
186
186
|
</html>
|
|
187
187
|
`;
|
|
188
|
-
//
|
|
189
|
-
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
188
|
+
// 多次尝试生成图片
|
|
189
|
+
let attempts = 3;
|
|
190
|
+
for (let i = 0; i < attempts; i++) {
|
|
191
|
+
try {
|
|
192
|
+
// 判断渲染方式
|
|
193
|
+
if (this.giConfig.renderType) { // 为1则为真，进入page模式
|
|
194
|
+
const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
|
|
195
|
+
const page = await this.ctx.puppeteer.page();
|
|
196
|
+
await page.goto(htmlPath);
|
|
197
|
+
await page.setContent(html, { waitUntil: 'networkidle0' });
|
|
198
|
+
const elementHandle = await page.$('html');
|
|
199
|
+
const boundingBox = await elementHandle.boundingBox();
|
|
200
|
+
const buffer = await page.screenshot({
|
|
201
|
+
type: 'png',
|
|
202
|
+
clip: {
|
|
203
|
+
x: boundingBox.x,
|
|
204
|
+
y: boundingBox.y,
|
|
205
|
+
width: boundingBox.width,
|
|
206
|
+
height: boundingBox.height
|
|
207
|
+
}
|
|
208
|
+
});
|
|
209
|
+
await elementHandle.dispose();
|
|
210
|
+
await page.close();
|
|
211
|
+
return { buffer };
|
|
212
|
+
}
|
|
213
|
+
// 使用render模式渲染
|
|
214
|
+
const pic = await this.ctx.puppeteer.render(html);
|
|
215
|
+
return { pic };
|
|
216
|
+
}
|
|
217
|
+
catch (e) {
|
|
218
|
+
if (i === attempts - 1) { // 已尝试三次
|
|
219
|
+
throw new Error('生成图片失败！错误: ' + e.toString());
|
|
203
220
|
}
|
|
204
|
-
}
|
|
205
|
-
await elementHandle.dispose();
|
|
206
|
-
await page.close();
|
|
207
|
-
return { buffer };
|
|
221
|
+
}
|
|
208
222
|
}
|
|
209
|
-
// 使用render模式渲染
|
|
210
|
-
const pic = await this.ctx.puppeteer.render(html);
|
|
211
|
-
return { pic };
|
|
212
223
|
}
|
|
213
224
|
async generateDynamicImg(data) {
|
|
214
225
|
// module_author
|
|
@@ -1257,30 +1268,41 @@ class GenerateImg extends koishi_1.Service {
|
|
|
1257
1268
|
</body>
|
|
1258
1269
|
</html>
|
|
1259
1270
|
`;
|
|
1260
|
-
//
|
|
1261
|
-
|
|
1262
|
-
|
|
1263
|
-
|
|
1264
|
-
|
|
1265
|
-
|
|
1266
|
-
|
|
1267
|
-
|
|
1268
|
-
|
|
1269
|
-
|
|
1270
|
-
|
|
1271
|
-
|
|
1272
|
-
|
|
1273
|
-
|
|
1274
|
-
|
|
1271
|
+
// 多次尝试生成图片
|
|
1272
|
+
let attempts = 3;
|
|
1273
|
+
for (let i = 0; i < attempts; i++) {
|
|
1274
|
+
try {
|
|
1275
|
+
// 判断渲染方式
|
|
1276
|
+
if (this.giConfig.renderType) { // 为1则为真，进入page模式
|
|
1277
|
+
const htmlPath = 'file://' + __dirname.replaceAll('\\', '/') + '/page/0.html';
|
|
1278
|
+
const page = await this.ctx.puppeteer.page();
|
|
1279
|
+
await page.goto(htmlPath);
|
|
1280
|
+
await page.setContent(html, { waitUntil: 'networkidle0' });
|
|
1281
|
+
const elementHandle = await page.$('html');
|
|
1282
|
+
const boundingBox = await elementHandle.boundingBox();
|
|
1283
|
+
const buffer = await page.screenshot({
|
|
1284
|
+
type: 'png',
|
|
1285
|
+
clip: {
|
|
1286
|
+
x: boundingBox.x,
|
|
1287
|
+
y: boundingBox.y,
|
|
1288
|
+
width: boundingBox.width,
|
|
1289
|
+
height: boundingBox.height
|
|
1290
|
+
}
|
|
1291
|
+
});
|
|
1292
|
+
await elementHandle.dispose();
|
|
1293
|
+
await page.close();
|
|
1294
|
+
return { buffer, link };
|
|
1295
|
+
}
|
|
1296
|
+
// 使用render模式渲染
|
|
1297
|
+
const pic = await this.ctx.puppeteer.render(html);
|
|
1298
|
+
return { pic, link };
|
|
1299
|
+
}
|
|
1300
|
+
catch (e) {
|
|
1301
|
+
if (i === attempts - 1) { // 已尝试三次
|
|
1302
|
+
throw new Error('生成图片失败！错误: ' + e.toString());
|
|
1275
1303
|
}
|
|
1276
|
-
}
|
|
1277
|
-
await elementHandle.dispose();
|
|
1278
|
-
await page.close();
|
|
1279
|
-
return { buffer, link };
|
|
1304
|
+
}
|
|
1280
1305
|
}
|
|
1281
|
-
// 使用render模式渲染
|
|
1282
|
-
const pic = await this.ctx.puppeteer.render(html);
|
|
1283
|
-
return { pic, link };
|
|
1284
1306
|
}
|
|
1285
1307
|
async getLiveStatus(time, liveStatus) {
|
|
1286
1308
|
let titleStatus;
|
package/package.json
CHANGED