yz-yuki-plugin 1.0.3-rc.2 → 1.0.3-rc.4

package/README.md

@@ -15,11 +15,22 @@
 
 ##### ```Yunzai-Next：```
 
-1. yunzai-next npm包 方式 安装插件：
+1. 方式1： yunzai-next npm包 安装插件：
 >```
 > yarn add yz-yuki-plugin -W
 >```
-接着修改 `yunzaijs/yunzai.config.js`：
+接着修改 `yunzaijs/yunzai.config.js`，按版本选择修改方式：
+
+Yunzai-Next v4.1.28+及以上版本：
+```js
+import { defineConfig } from 'yunzai'
+export default defineConfig({
+  applications: ['yz-system', 'yz-yuki-plugin'], //该行添加 'yz-yuki-plugin'
+  middlewares: ['yz-mw-runtime', 'yunzai-mys/mw']
+})
+```
+
+旧版本：
 ```js
 import yuki from 'yz-yuki-plugin' //新增该行
 export default defineConfig({
@@ -28,7 +39,7 @@ export default defineConfig({
 })
 ```
 
-2. 旧的方式安装：
+2. 方式2（V3的方式）：
 >gitee仓库：
 >```
 >git clone --branch main https://gitee.com/snowtafir/yuki-plugin.git ./plugins/yuki-plugin
@@ -52,6 +63,8 @@ export default defineConfig({
 
 #### 2. 安装依赖
 * Yunzai-Next:
+
+方式2（V3的方式）安装则需要执行：
 ```
 yarn install
 ```

package/lib/apps/bilibili.js

@@ -32,7 +32,7 @@ message.use(async (e) => {
         e.reply("未取得bot主人身份，无权限添加B站动态订阅");
     }
     else {
-        const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim();
+        const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(订阅|添加|add|ADD)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim().replace(/^(uid|UID)?(:|：)?/g, '');
         if (!uid) {
             e.reply(`请在指令末尾指定订阅的B站up主的UID！`);
             return true;
@@ -92,7 +92,7 @@ message.use(async (e) => {
         e.reply("未取得bot主人身份，无权限删除B站动态订阅");
     }
     else {
-        const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim();
+        const uid = e.msg.replace(/^(#|\/)(yuki|优纪)?(取消|删除|del|DEL)(b站|B站|bili|bilibili|哔哩|哔哩哔哩)推送\s*(视频\s*|图文\s*|文章\s*|转发\s*|直播\s*)*/g, "").trim().replace(/^(uid|UID)?(:|：)?/g, '');
         if (!uid) {
             e.reply(`请在指令末尾指定订阅的B站up主的UID！`);
             return;
@@ -297,7 +297,7 @@ message.use(async (e) => {
             DYNAMIC_TYPE_LIVE_RCMD: "直播",
         };
         if (subData.group && Object.keys(subData.group).length > 0) {
-            messages.push("------群组B站订阅------");
+            messages.push("------群组B站订阅------\n");
             Object.keys(subData.group).forEach((groupId) => {
                 messages.push(`群组ID：${groupId}：`);
                 subData.group[groupId].forEach((item) => {
@@ -314,7 +314,7 @@ message.use(async (e) => {
             });
         }
         if (subData.private && Object.keys(subData.private).length > 0) {
-            messages.push("------私聊B站订阅------");
+            messages.push("\n------私聊B站订阅------");
             Object.keys(subData.private).forEach((userId) => {
                 messages.push(`用户ID：${userId}：`);
                 subData.private[userId].forEach((item) => {

package/lib/models/bilibili/bilibili.models.js

@@ -28,6 +28,7 @@ async function applyLoginQRCode(e) {
         };
         const ScreenshotOptionsData = {
             saveHtmlfile: false,
+            modelName: "bili-login"
         };
         const qrCodeImage = await Image.renderPage("bili-login", "LoginQrcodePage", LoginPropsData, ScreenshotOptionsData);
         let qrcodeImg;
@@ -39,6 +40,8 @@ async function applyLoginQRCode(e) {
         msg.push(Segment.image(qrcodeImg[0]));
         e.reply('请在3分钟内扫码以完成B站登陆绑定');
         e.reply(msg);
+        logger.info(`优纪插件: 如果发送二维码图片消息失败可复制如下URL, 使用在线或本地二维码生成工具生成二维码并扫码`);
+        logger.info(`优纪插件: 哔哩登陆二维码URL: ${qrcodeUrl}`);
         return qrcodeKey;
     }
     else {

package/lib/utils/puppeteer.render.js

@@ -23,10 +23,10 @@ class YukiPuppeteerRender extends Puppeteer {
                 await page.setExtraHTTPHeaders(Options.header);
             }
             await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: ["load", "networkidle0"] });
-            const body = await page.$(Options?.tab ?? 'body');
-            if (!body)
+            const element = await page.$(Options?.tab ?? 'body');
+            if (!element)
                 return false;
-            const boundingBox = await body.boundingBox();
+            const boundingBox = await element.boundingBox();
             const num = Options?.isSplit ? Math.ceil(boundingBox.height / pageHeight) : 1;
             pageHeight = Math.round(boundingBox.height / num);
             await page.setViewport({
@@ -71,7 +71,7 @@ class YukiPuppeteerRender extends Puppeteer {
                         height: Math.min(pageHeight, boundingBox.height - pageHeight * (i - 1)),
                     },
                 };
-                buff = await page.screenshot(screenshotOptions).catch(err => {
+                buff = await element.screenshot(screenshotOptions).catch(err => {
                     logger.error('[puppeteer]', 'screenshot', err);
                     return false;
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "1.0.3-rc.2",
+  "version": "1.0.3-rc.4",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -32,7 +32,7 @@
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.2",
+    "react-puppeteer": "1.0.3",
     "redis": "^4.7.0",
     "yaml": "^2.5.0",
     "yarn": "^1.19.1"
@@ -67,7 +67,7 @@
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.2",
+    "react-puppeteer": "1.0.3",
     "redis": "^4.7.0",
     "rollup": "^4.20.0",
     "rollup-plugin-auto-external": "^2.0.0",

package/resources/css/loginQrcode/Page.css

@@ -8,6 +8,7 @@
 body {
   width: 563px !important;
   font-family: "OPSans", Arial, sans-serif;
+  margin: auto;
 }
 
 .container {