yz-yuki-plugin 2.0.4-8 → 2.0.5-0

package/lib/utils/puppeteer.render.js

@@ -30,30 +30,26 @@ class YukiPuppeteerRender {
         try {
             const browser = this.puppeteerInstance.browser;
             const page = await browser?.newPage().catch(err => {
-                logger.error(err);
+                console.error(err);
             });
             if (!page)
                 return false;
-            await page.setViewport({
-                width: Options?.pageWidth ?? 900,
-                height: 7500
-            });
             // 设置请求 Header
             if (Options?.header) {
                 await page.setExtraHTTPHeaders(Options.header);
             }
-            await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: ["load", "networkidle0"] });
+            await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: ['load', 'networkidle0'] });
             const element = await page.$(Options?.tab ?? 'body');
             if (!element)
                 return false;
+            // 根据 style 的值来修改 CSS 样式
+            if (Options?.addStyle) {
+                await page.addStyleTag({ content: Options.addStyle });
+            }
             const boundingBox = await element.boundingBox(); // 获取内容区域的边界框信息
             const num = Options?.isSplit ? Math.ceil(boundingBox.height / pageHeight) : 1; // 根据是否需要分片，计算分片数量，默认为 1
             pageHeight = Math.round(boundingBox.height / num); //动态调整分片高度，防止过短影响观感。
             await page.setViewport({ width: boundingBox.width + 50, height: pageHeight + 100 });
-            // 根据 style 的值来修改 CSS 样式
-            if (Options?.addStyle) {
-                await page.addStyleTag({ content: Options.addStyle, });
-            }
             // 禁止 GIF 动图播放
             await page.addStyleTag({ content: `img[src$=".gif"] {animation-play-state: paused !important;}` });
             // 是否保存 html 文件
@@ -65,13 +61,15 @@ class YukiPuppeteerRender {
                 }
                 fs__default.writeFileSync(`${Dir}${Date.now()}.html`, htmlContent);
             }
-            logger.info('[puppeteer] success');
+            console.info('[puppeteer] success');
             let start = Date.now();
             const ret = new Array();
             for (let i = 1; i <= num; i++) {
                 if (i > 1) {
-                    await page.evaluate(pageHeight => { window.scrollBy(0, pageHeight); }, pageHeight); // 在页面上下文中执行滚动操作
-                    await new Promise((resolve) => setTimeout(resolve, 500)); // 等待一段时间，确保页面加载完成
+                    await page.evaluate(pageHeight => {
+                        window.scrollBy(0, pageHeight);
+                    }, pageHeight); // 在页面上下文中执行滚动操作
+                    await new Promise(resolve => setTimeout(resolve, 500)); // 等待一段时间，确保页面加载完成
                 }
                 let renderOptions = Options?.SOptions ?? { type: 'png' };
                 const screenshotOptions = {
@@ -80,34 +78,34 @@ class YukiPuppeteerRender {
                         x: 0,
                         y: pageHeight * (i - 1), // 根据分片序号计算截图区域的起始位置
                         width: Math.round(boundingBox.width), // 截图区域的宽度与内容区域宽度一致
-                        height: Math.min(pageHeight, boundingBox.height - pageHeight * (i - 1)), // 截图区域的高度取决于内容区域剩余的高度或者默认的分片高度
-                    },
+                        height: Math.min(pageHeight, boundingBox.height - pageHeight * (i - 1)) // 截图区域的高度取决于内容区域剩余的高度或者默认的分片高度
+                    }
                 };
                 const buff = await element.screenshot(screenshotOptions).catch(err => {
-                    logger.error('[puppeteer]', 'screenshot', err);
+                    console.error('[puppeteer]', 'screenshot', err);
                     return false;
                 }); // 对指定区域进行截图
                 if (buff !== false) {
                     const imgBuff = !Buffer.isBuffer(buff) ? Buffer.from(buff) : buff;
                     /** 计算图片大小 */
-                    const kb = (imgBuff?.length / 1024).toFixed(2) + "kb"; // 计算图片大小
-                    logger.mark(`[图片生成][${name}][${i}次] ${kb} ${logger.green(`${Date.now() - start}ms`)}`); // 记录日志
+                    const kb = (imgBuff?.length / 1024).toFixed(2) + 'kb'; // 计算图片大小
+                    console.warn(`[图片生成][${name}][${i}次] ${kb} ${`${Date.now() - start}ms`}`); // 记录日志
                     ret.push(imgBuff); // 将截图结果添加到数组中
                 }
                 else {
-                    logger.error(`[puppeteer]`, '截图失败');
+                    console.error(`[puppeteer]`, '截图失败');
                 }
             }
             if (ret.length === 0 || !ret[0]) {
-                logger.error(`[图片生成][${name}] 图片生成为空`);
+                console.error(`[图片生成][${name}] 图片生成为空`);
                 return false;
             }
             // 关闭页面
-            await page.close().catch(err => logger.error(err));
+            await page.close().catch(err => console.error(err));
             return { img: ret }; // 返回图像数组
         }
         catch (err) {
-            logger.error('[puppeteer] newPage', err);
+            console.error('[puppeteer] newPage', err);
             return false;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.4-8",
+  "version": "2.0.5-0",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -13,12 +13,14 @@
   "scripts": {
     "app": "npx tsx src/main.ts",
     "img-dev": "npx tsx watch --clear-screen=false routes.server.ts",
+    "render-test": "npx tsx ./render.test.ts",
     "build": "npm run css-m && rollup  --config rollup.config.js",
     "css-app": "tailwindcss -i ./src/input.css -o ./public/output.css",
     "css-dev": "tailwindcss -i ./src/input.css -o ./public/output.css --watch",
     "css-m": "tailwindcss -i ./src/input.css -o ./public/output.css -m",
     "format": "prettier --write .",
-    "check-format": "git diff --exit-code"
+    "check-format": "git diff --exit-code",
+    "prepare": "husky"
   },
   "dependencies": {
     "axios": "^1.7.7",
@@ -27,6 +29,7 @@
     "debug": "^4.3.6",
     "jsdom": "^24.1.1",
     "json5": "^2.2.3",
+    "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
@@ -66,11 +69,12 @@
     "axios": "^1.7.7",
     "babel-plugin-module-resolver": "^5.0.2",
     "chokidar": "^3.6.0",
+    "husky": "^9.1.6",
     "jsdom": "^24.1.1",
     "json5": "^2.2.3",
+    "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "node-fetch": "^3.3.2",
-    "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
     "puppeteer": "^23.3.1",
     "qrcode": "^1.5.4",
@@ -117,4 +121,4 @@
   "engines": {
     "node": ">=16.14.0"
   }
-}
+}

package/resources/css/dynamic/Account.css

@@ -65,4 +65,4 @@
 
 .weibo-logo {
   max-width: 55px;
-}
+}

package/resources/css/dynamic/Content.box.grid.4.css

@@ -1,4 +1,4 @@
 /*自适应四宫格控制*/
 .pic-item {
-    flex: 1 0 calc(50% - 10px);
-}
+  flex: 1 0 calc(50% - 10px);
+}

package/resources/css/dynamic/Content.box.grid.9.css

@@ -1,4 +1,4 @@
 /*自适应九宫格控制*/
 .pic-item {
-    flex: 1 0 calc(33.3333% - 10px);
-}
+  flex: 1 0 calc(33.3333% - 10px);
+}

package/resources/css/dynamic/Content.css

@@ -77,4 +77,4 @@
   /* 根据你的SVG图标大小调整 */
   background-image: url('./../../img/icon/dynamic/bili-rich-text-module-goods-taobao.svg');
   /* 引入SVG图标 */
-}
+}

package/resources/css/dynamic/Footer.css

@@ -33,4 +33,4 @@
 .weibo-logo-0 {
   margin-left: 15px;
   margin-bottom: 10px;
-}
+}

package/resources/css/dynamic/ForwardContent.css

@@ -8,4 +8,4 @@
 .url-icon img {
   left: 10px;
   position: absolute;
-}
+}

package/resources/css/dynamic/LogoText.css

@@ -1,7 +1,7 @@
 .bilibili-logo-text {
   margin-left: 40px;
   margin-top: 2px;
-  color: #FB7299;
+  color: #fb7299;
   font-size: 18px;
   font-weight: bold;
 }
@@ -12,4 +12,4 @@
   color: rgba(232 146 20);
   font-size: 18px;
   font-weight: bold;
-}
+}

package/resources/css/dynamic/MainPage.css

@@ -19,14 +19,14 @@ body::-webkit-scrollbar {
 }
 
 @font-face {
-  font-family: "OPSans";
-  src: url("./../../fonts/OPSans.woff2");
+  font-family: 'OPSans';
+  src: url('./../../fonts/OPSans.woff2');
   font-weight: normal;
   font-style: normal;
 }
 
 body {
-  font-family: "OPSans", Arial, sans-serif;
+  font-family: 'OPSans', Arial, sans-serif;
   background-color: #f9f9f9;
   margin: 0;
   padding: 0;
@@ -37,7 +37,6 @@ body {
   width: 100%;
 }
 
-
 .outside-border {
   /*限制页面内收缩*/
   width: 100%;
@@ -90,4 +89,4 @@ body {
   box-sizing: border-box;
   /**禁止选中文本*/
   user-select: none;
-}
+}

package/resources/css/help/help.css

@@ -19,8 +19,8 @@ body::-webkit-scrollbar {
 }
 
 @font-face {
-  font-family: "OPSans";
-  src: url("./../../fonts/OPSans.woff2");
+  font-family: 'OPSans';
+  src: url('./../../fonts/OPSans.woff2');
   font-weight: normal;
   font-style: normal;
 }
@@ -33,7 +33,7 @@ body::-webkit-scrollbar {
 }
 
 body {
-  font-family: "OPSans";
+  font-family: 'OPSans';
   font-size: 16px;
   color: #1e1f20;
   transform: scale(1.5);
@@ -41,7 +41,6 @@ body {
   width: 788px;
 }
 
-
 .container {
   width: 788px;
   padding: 15px 15px 15px 15px;
@@ -50,12 +49,14 @@ body {
 }
 
 .head_box {
-  font-family: "OPSans";
+  font-family: 'OPSans';
   border-radius: 10px;
   padding: 10px 20px;
   position: relative;
   color: #ff69b4;
-  box-shadow: 0 0 1px 0 #ccc, 2px 2px 4px 0 rgb(238 160 236 / 80%);
+  box-shadow:
+    0 0 1px 0 #ccc,
+    2px 2px 4px 0 rgb(238 160 236 / 80%);
   border: 0.5px solid #ff69b4;
   backdrop-filter: blur(10px);
 }
@@ -87,7 +88,9 @@ body {
   padding: 20px 0px 5px 0px;
   background: transparent;
   background-color: rgba(255 241 255 / 35%);
-  box-shadow: 0 0 1px 0 #ccc, 2px 2px 4px 0 rgb(238 160 236 / 80%);
+  box-shadow:
+    0 0 1px 0 #ccc,
+    2px 2px 4px 0 rgb(238 160 236 / 80%);
   border: 0.5px solid #ff69b4;
   position: relative;
 }
@@ -98,7 +101,9 @@ body {
   left: -8px;
   background-color: rgb(187 187 187 / 0%);
   backdrop-filter: blur(15px);
-  box-shadow: 0 0 1px 0 #ccc, 2px 2px 4px 0 rgba(225 166 231 / 80%);
+  box-shadow:
+    0 0 1px 0 #ccc,
+    2px 2px 4px 0 rgba(225 166 231 / 80%);
   color: #ff004c;
   font-size: 14px;
   padding: 3px 10px;
@@ -142,7 +147,9 @@ body {
   align-items: center;
   color: #151215;
   background: transparent;
-  box-shadow: 0 0 1px 0 #ccc, 2px 2px 4px 0 rgb(255 213 254 / 80%);
+  box-shadow:
+    0 0 1px 0 #ccc,
+    2px 2px 4px 0 rgb(255 213 254 / 80%);
   padding: 8px 6px 8px 6px;
   border-radius: 8px;
   margin: 0 0px 10px 10px;
@@ -178,5 +185,5 @@ body {
   text-align: center;
   font-size: 14px;
   color: rgb(0, 0, 0);
-  font-family: "OPSans";
-}
+  font-family: 'OPSans';
+}

package/resources/css/loginQrcode/Page.css

@@ -1,16 +1,16 @@
 @font-face {
-  font-family: "OPSans";
-  src: url("./../../fonts/OPSans.woff2");
+  font-family: 'OPSans';
+  src: url('./../../fonts/OPSans.woff2');
   font-weight: normal;
   font-style: normal;
 }
 
 body {
   width: 463px !important;
-  font-family: "OPSans";
+  font-family: 'OPSans';
 }
 
-.main-container{
+.main-container {
   width: 463px;
 }
 
@@ -18,12 +18,8 @@ body {
   width: 380px;
   max-height: 40rem;
   margin: auto;
-  font-size: 1.125rem
-    /* 18px */
-  ;
-  line-height: 1.75rem
-    /* 28px */
-  ;
+  font-size: 1.125rem /* 18px */;
+  line-height: 1.75rem /* 28px */;
   padding: 20px;
   background-color: #fff;
   box-shadow: 0px 1px 9px 12px rgb(246 140 224 / 20%);
@@ -64,4 +60,4 @@ body {
   margin-left: 2.8rem;
   border-radius: 8px;
   border: 1.5px dashed #fb8bc3;
-}
+}

package/resources/css/version/version.css

@@ -19,8 +19,8 @@ body::-webkit-scrollbar {
 }
 
 @font-face {
-  font-family: "OPSans";
-  src: url("./../../fonts/OPSans.woff2");
+  font-family: 'OPSans';
+  src: url('./../../fonts/OPSans.woff2');
   font-weight: normal;
   font-style: normal;
 }
@@ -34,7 +34,7 @@ body::-webkit-scrollbar {
 
 body {
   font-size: 16px;
-  font-family: "OPSans", Arial, sans-serif;
+  font-family: 'OPSans', Arial, sans-serif;
   transform: scale(1.5);
   transform-origin: 0 0;
   color: white;
@@ -52,7 +52,9 @@ body {
   background: transparent;
   margin: 5px 10px 8px 10px;
   position: relative;
-  box-shadow: 0 0 0.5px 0 #ffd1f8, 2px 2px 4px 0 rgb(238 160 236 / 80%);
+  box-shadow:
+    0 0 0.5px 0 #ffd1f8,
+    2px 2px 4px 0 rgb(238 160 236 / 80%);
   border: 0.5px solid #ff69b4;
   overflow: hidden;
   color: #fff;
@@ -78,7 +80,7 @@ body {
   padding: 10px 15px;
   font-size: 12px;
   font-weight: normal;
-  font-family: "OPSans";
+  font-family: 'OPSans';
   background: transparent;
   color: rgba(0, 0, 0);
 }
@@ -113,4 +115,4 @@ body {
   font-size: 14px;
   color: rgb(15, 15, 15);
   font-family: 'OPSans';
-}
+}