yz-yuki-plugin 2.0.3-5 → 2.0.3-7

package/CHANGELOG.md

@@ -1,4 +1,5 @@
 # 2.0.3
+* 优化截图、静态资源引入方式
 * 优化获取完整文章动态
 * fix addBiliSub
 * 优化提示信息

package/lib/components/dynamic/Account.js

@@ -1,16 +1,17 @@
 import React from 'react';
 import LogoText from './LogoText.js';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 // Account
 // up账户组件
-const require = createRequire(import.meta.url);
-const bilibililogo = require('./../../../resources/img/icon/dynamic/bilibili.svg');
-const weibilogo = require('./../../../resources/img/icon/dynamic/weibo.svg');
+const Bilibililogo = path.join(_paths.pluginResources, 'img/icon/dynamic/bilibili.svg');
+const Weibilogo = path.join(_paths.pluginResources, 'img/icon/dynamic/weibo.svg');
+const AccountCss = path.join(_paths.pluginResources, 'css/dynamic/Account.css');
 const Account = ({ data }) => {
     const renderLogo = (logoSrc, className) => (React.createElement("img", { src: logoSrc, className: className, alt: "logo" }));
     return (React.createElement(React.Fragment, null,
-        React.createElement("link", { rel: "stylesheet", href: require("./../../../resources/css/dynamic/Account.css") }),
+        React.createElement("link", { rel: "stylesheet", href: AccountCss }),
         React.createElement("div", { className: "account" },
             React.createElement("div", { className: "avatar-container" },
                 React.createElement("img", { src: data.face, alt: "\u5934\u50CF", className: "avatar" }),
@@ -19,8 +20,8 @@ const Account = ({ data }) => {
                     React.createElement("div", { className: "nickname" }, data.name || ""),
                     React.createElement("div", { className: "timestamp" }, data.pubTs || ""))),
             React.createElement("div", { className: "logo-container" },
-                data.appName === 'bilibili' && renderLogo(bilibililogo, 'bilibili-logo'),
-                data.appName === 'weibo' && renderLogo(weibilogo, 'weibo-logo'),
+                data.appName === 'bilibili' && renderLogo(Bilibililogo, 'bilibili-logo'),
+                data.appName === 'weibo' && renderLogo(Weibilogo, 'weibo-logo'),
                 React.createElement(LogoText, { data: data })))));
 };
 var Account$1 = Account;

package/lib/components/dynamic/Content.js

@@ -1,8 +1,11 @@
 import React from 'react';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 // DynamicContent.tsx
-const require = createRequire(import.meta.url);
+const ContentBoxGrid4Css = path.join(_paths.pluginResources, 'css/dynamic/Content.box.grid.4.css');
+const ContentBoxGrid9Css = path.join(_paths.pluginResources, 'css/dynamic/Content.box.grid.9.css');
+const ContentCss = path.join(_paths.pluginResources, 'css/dynamic/Content.css');
 const Content = ({ data }) => {
     const picItems = data.pics && (React.createElement("div", { className: 'pic-content' }, data.pics.map((item, index) => {
         if (item) {
@@ -11,8 +14,8 @@ const Content = ({ data }) => {
         }
         return null;
     })));
-    const boxGrid_4 = React.createElement("link", { key: "0", rel: "stylesheet", href: require('./../../../resources/css/dynamic/Content.box.grid.4.css') });
-    const boxGrid_9 = React.createElement("link", { key: "0", rel: "stylesheet", href: require('./../../../resources/css/dynamic/Content.box.grid.9.css') });
+    const boxGrid_4 = React.createElement("link", { key: "0", rel: "stylesheet", href: ContentBoxGrid4Css });
+    const boxGrid_9 = React.createElement("link", { key: "0", rel: "stylesheet", href: ContentBoxGrid9Css });
     /**动态宫格样式 */
     function getBoxGridStyle(pics) {
         if (!Array.isArray(pics) || pics.length === 0) {
@@ -66,7 +69,7 @@ const Content = ({ data }) => {
         return null;
     }
     const boxGrid = data.boxGrid && (data.pics && getBoxGridStyle(data.pics));
-    const contentCss = React.createElement("link", { rel: "stylesheet", href: require('./../../../resources/css/dynamic/Content.css') });
+    const contentCss = React.createElement("link", { rel: "stylesheet", href: ContentCss });
     switch (data.type) {
         case 'DYNAMIC_TYPE_LIVE_RCMD':
             return (React.createElement(React.Fragment, null,

package/lib/components/dynamic/Footer.js

@@ -1,16 +1,18 @@
 import React from 'react';
 import { ConfigController, BOT_NAME } from 'yunzai';
 import Config from '../../utils/config.js';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 // Footer.tsx
 const botVersion = ConfigController.package?.version;
-const require = createRequire(import.meta.url);
-const bilibililogo = require('./../../../resources/img/icon/dynamic/bilibili.svg');
-const weibilogo = require('./../../../resources/img/icon/dynamic/weibo.svg');
+const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
+const bilibililogo = path.join(_paths.pluginResources, 'img/icon/dynamic/bilibili.svg');
+const weibilogo = path.join(_paths.pluginResources, 'img/icon/dynamic/weibo.svg');
+const FooterCss = path.join(_paths.pluginResources, 'css/dynamic/Footer.css');
 const Footer = ({ data }) => {
     return (React.createElement(React.Fragment, null,
-        React.createElement("link", { rel: "stylesheet", href: require('./../../../resources/css/dynamic/Footer.css') }),
+        React.createElement("link", { rel: "stylesheet", href: FooterCss }),
         React.createElement("div", { className: "footer" },
             React.createElement("div", { className: "footer-text-container" },
                 data.appName === 'bilibili' && (React.createElement("svg", { className: 'w-32 h-10 bili-logo-0', style: { width: '8rem', height: '2.5rem' } },
@@ -29,7 +31,7 @@ const Footer = ({ data }) => {
                     " & ",
                     React.createElement("span", { className: "yuki-plugin-text-title" }, "yuki-plugin"),
                     "-v",
-                    React.createElement("span", { className: "italic" }, `${Config.getLatestVersion()}`))),
+                    React.createElement("span", { className: "italic" }, yukiPluginVersion))),
             React.createElement("img", { src: data.urlImgData, alt: "\u4E8C\u7EF4\u7801", className: "qr-code" }))));
 };
 var Footer$1 = Footer;

package/lib/components/dynamic/ForwardContent.js

@@ -1,13 +1,14 @@
 import React from 'react';
 import Account from './Account.js';
 import Content from './Content.js';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 // ForwardContent
 // 转发动态内容组件
-const require = createRequire(import.meta.url);
+const ForwardContentCss = path.join(_paths.pluginResources, 'css/dynamic/ForwardContent.css');
 const ForwardContent = ({ data }) => (React.createElement(React.Fragment, null,
-    React.createElement("link", { rel: "stylesheet", href: require("./../../../resources/css/dynamic/ForwardContent.css") }),
+    React.createElement("link", { rel: "stylesheet", href: ForwardContentCss }),
     React.createElement("div", { className: "orig" },
         React.createElement("div", { className: "orig-container", id: "orig-container" },
             React.createElement(Account, { data: data }),

package/lib/components/dynamic/LogoText.js

@@ -1,11 +1,12 @@
 import React from 'react';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 // LogoText
 // Logo 文本组件
-const require = createRequire(import.meta.url);
+const LogoTextCss = path.join(_paths.pluginResources, 'css/dynamic/LogoText.css');
 const LogoText = ({ data }) => (React.createElement(React.Fragment, null,
-    React.createElement("link", { rel: "stylesheet", href: require('./../../../resources/css/dynamic/LogoText.css') }),
+    React.createElement("link", { rel: "stylesheet", href: LogoTextCss }),
     data.appName === 'bilibili' && (React.createElement("div", { className: "bilibili-logo-text" }, data.category)),
     data.appName === 'weibo' && (React.createElement("div", { className: "weibo-logo-text" }, data.category))));
 

package/lib/components/dynamic/MainPage.js

@@ -3,13 +3,14 @@ import Account from './Account.js';
 import Content from './Content.js';
 import ForwardContent from './ForwardContent.js';
 import Footer from './Footer.js';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 // MainPage.tsx
-const require = createRequire(import.meta.url);
+const MainPageCss = path.join(_paths.pluginResources, 'css/dynamic/MainPage.css');
 function App({ data }) {
     return (React.createElement(React.Fragment, null,
-        React.createElement("link", { rel: "stylesheet", href: `${require('./../../../resources/css/dynamic/MainPage.css')}` }),
+        React.createElement("link", { rel: "stylesheet", href: MainPageCss }),
         React.createElement("div", { className: "outside-border" },
             React.createElement("div", { className: "container" },
                 React.createElement(Account, { data: data }),

package/lib/components/help/Help.js

@@ -1,24 +1,27 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config.js';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 //help.tsx
 const botVersion = ConfigController.package?.version;
-const require = createRequire(import.meta.url);
+const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
+const HelpCss = path.join(_paths.pluginResources, 'css/help/help.css');
+const iconPath = (iconName) => path.join(_paths.pluginResources, `img/icon/puplic/${iconName}.png`);
 function App({ data }) {
     return (React.createElement(React.Fragment, null,
-        React.createElement("link", { rel: "stylesheet", href: require('./../../../resources/css/help/help.css') }),
+        React.createElement("link", { rel: "stylesheet", href: HelpCss }),
         React.createElement("div", { className: "container", id: "container" },
             React.createElement("div", { className: "head_box" },
                 React.createElement("div", { className: "id_text" }, "Yuki-Plugin"),
                 React.createElement("h2", { className: "day_text" },
                     "\u4F7F\u7528\u8BF4\u660E-v",
-                    Config.getLatestVersion())),
+                    yukiPluginVersion)),
             data.map((val, index) => (React.createElement("div", { className: "data_box", key: index },
                 React.createElement("div", { className: "tab_lable" }, val.group),
                 React.createElement("div", { className: "list" }, val.list.map((item, itemIndex) => (React.createElement("div", { className: "item", key: itemIndex },
-                    React.createElement("img", { className: "icon", src: require(`./../../../resources/img/icon/puplic/${item.icon}.png`), alt: item.title }),
+                    React.createElement("img", { className: "icon", src: iconPath(item.icon), alt: item.title }),
                     React.createElement("div", { className: "title" },
                         React.createElement("div", { className: "text" }, item.title),
                         React.createElement("div", { className: "dec" }, item.desc))))))))),
@@ -28,7 +31,7 @@ function App({ data }) {
                 " & ",
                 React.createElement("span", { className: "yuki-plugin-text-title" }, "yuki-plugin"),
                 "-v",
-                React.createElement("span", { className: "italic" }, `${Config.getLatestVersion()}`)))));
+                React.createElement("span", { className: "italic" }, yukiPluginVersion)))));
 }
 
 export { App as default };

package/lib/components/loginQrcode/Page.js

@@ -1,11 +1,12 @@
 import React from 'react';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 // QrcodeLoginPage.tsx
-const require = createRequire(import.meta.url);
+const LoginQrcodeCss = path.join(_paths.pluginResources, 'css/loginQrcode/Page.css');
 function App({ data }) {
     return (React.createElement(React.Fragment, null,
-        React.createElement("link", { rel: "stylesheet", href: require("./../../../resources/css/loginQrcode/Page.css") }),
+        React.createElement("link", { rel: "stylesheet", href: LoginQrcodeCss }),
         React.createElement("div", { className: 'container w-96 max-h-96 m-auto text-lg p-5' },
             React.createElement("div", { className: "txt-0 text-center mt-3 mb-3 p-1 text-blue-500" },
                 "Created By yuki-plugin",

package/lib/components/version/Version.js

@@ -1,13 +1,15 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config.js';
-import { createRequire } from 'react-puppeteer';
+import { _paths } from '../../utils/paths.js';
+import path from 'path';
 
 const botVersion = ConfigController.package?.version;
-const require = createRequire(import.meta.url);
+const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
+const VersionCss = path.join(_paths.pluginResources, 'css/version/version.css');
 function App({ data }) {
     return (React.createElement(React.Fragment, null,
-        React.createElement("link", { rel: "stylesheet", href: require("./../../../resources/css/version/version.css") }),
+        React.createElement("link", { rel: "stylesheet", href: VersionCss }),
         React.createElement("div", { className: "container", id: "container" },
             data.map((item, idx) => (React.createElement("div", { key: idx, className: "version-card" },
                 React.createElement("div", { className: "title" },
@@ -21,7 +23,7 @@ function App({ data }) {
                 " & ",
                 React.createElement("span", { className: "yuki-plugin-text-title" }, "yuki-plugin"),
                 "-v",
-                React.createElement("span", { className: "italic" }, `${Config.getLatestVersion()}`)))));
+                React.createElement("span", { className: "italic" }, yukiPluginVersion)))));
 }
 
 export { App as default };

package/lib/index.js

@@ -1,10 +1,13 @@
 import chalk from 'chalk';
 import { applicationOptions, setBotTask, useEvent } from 'yunzai';
 import Config from './utils/config.js';
+import path from 'path';
+import { _paths } from './utils/paths.js';
 import * as index$1 from './apps/index.js';
 import { BiliTask } from './models/bilibili/bilibili.task.js';
 import { WeiboTask } from './models/weibo/weibo.task.js';
 
+const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
 let biliConfigData = Config.getConfigData("config", "bilibili", "config");
 let weiboConfigData = Config.getConfigData("config", "weibo", "config");
 /** B站动态任务 函数 */
@@ -35,7 +38,7 @@ var index = () => {
                 }
             }
             logger.info(chalk.rgb(0, 190, 255)(`-----------------------------------------`));
-            logger.info(chalk.rgb(255, 225, 255)(`优纪插件 ${Config.getLatestVersion()} 初始化~`));
+            logger.info(chalk.rgb(255, 225, 255)(`优纪插件 ${yukiPluginVersion} 初始化~`));
             logger.info(chalk.rgb(255, 245, 255)(`作者：snowtafir`));
             logger.info(chalk.rgb(255, 225, 255)(`仓库地址：`));
             logger.info(chalk.rgb(255, 245, 255)(`https://github.com/snowtafir/yuki-plugin`));

package/lib/utils/config.d.ts

@@ -3,7 +3,6 @@ import chokidar from "chokidar";
  * Config 类用于管理配置文件的读取和监听
  */
 declare class Config {
-    readonly packageJsonPath: string;
     readonly defaultConfigPath: string;
     readonly userConfigPath: string;
     defaultConfig: Record<string, any>;
@@ -64,8 +63,11 @@ declare class Config {
      * @param value 配置项的值
      */
     updateConfigItem(appDir: string, functionName: string, key: string, value: any): void;
-    /** 读取package.json文件，获取最新版本号*/
-    getLatestVersion(): string | null;
+    /** 读取package.json文件，获取指定key的值
+     * @param keyName 要获取的key名称
+     * @param path package.json文件路径
+    */
+    getPackageJsonKey(keyName: string, path: string): string | null;
 }
 declare const _default: Config;
 export default _default;

package/lib/utils/config.js

@@ -9,14 +9,12 @@ import { _paths } from './paths.js';
  * Config 类用于管理配置文件的读取和监听
  */
 class Config {
-    packageJsonPath;
     defaultConfigPath;
     userConfigPath;
     defaultConfig;
     userConfig;
     watcher;
     constructor() {
-        this.packageJsonPath = path.join(_paths.pluginPath, 'package.json');
         /** 默认设置 */
         this.defaultConfigPath = path.join(_paths.pluginPath, 'defaultConfig');
         this.defaultConfig = {};
@@ -160,15 +158,24 @@ class Config {
         config[key] = value; // 更新配置项
         this.saveConfig("config", appDir, functionName, config); // 保存更新后的配置
     }
-    /** 读取package.json文件，获取最新版本号*/
-    getLatestVersion() {
-        const content = fs.readFileSync(this.packageJsonPath, 'utf-8');
-        const packageJson = JSON.parse(content);
-        const match = packageJson.version;
-        if (match) {
-            return match;
+    /** 读取package.json文件，获取指定key的值
+     * @param keyName 要获取的key名称
+     * @param path package.json文件路径
+    */
+    getPackageJsonKey(keyName, path) {
+        try {
+            const content = fs.readFileSync(path, 'utf-8');
+            const packageJson = JSON.parse(content);
+            const match = packageJson[keyName];
+            if (match) {
+                return match;
+            }
+            else {
+                return null;
+            }
         }
-        else {
+        catch (error) {
+            logger.error(`getPackageJsonKey error: ${error}`);
             return null;
         }
     }

package/lib/utils/image.d.ts

@@ -1,8 +1,9 @@
 import { Picture, ComponentCreateOpsionType } from 'react-puppeteer';
 import { ScreenshotOptions } from '@/utils/puppeteer.render';
 export declare class Image extends Picture {
+    private yukiPuppeteerRender;
     /**
-     * 初始化运行Puppeteer
+     * 整合截图方法
      */
     constructor();
     /**

package/lib/utils/image.js

@@ -1,21 +1,21 @@
 import React from 'react';
-import { Component, Picture, Puppeteer } from 'react-puppeteer';
+import { Picture } from 'react-puppeteer';
 import { YukiPuppeteerRender } from './puppeteer.render.js';
 import * as index from '../components/index.js';
 
-// 初始化 组件渲染对象
-const com = new Component();
-const yukiPuppeteerRender = new YukiPuppeteerRender();
 class Image extends Picture {
+    yukiPuppeteerRender;
     /**
-     * 初始化运行Puppeteer
+     * 整合截图方法
      */
     constructor() {
         // 继承实例
         super();
-        // start
-        this.Pup = new Puppeteer();
+        // 组件渲染对象
+        this.Com;
+        // start puppeteer
         this.Pup.start();
+        this.yukiPuppeteerRender = new YukiPuppeteerRender(this.Pup);
     }
     /**
    * @param uid 唯一标识符
@@ -27,7 +27,7 @@ class Image extends Picture {
    */
     async renderPage(uid, page, props = {}, ScreenshotOptions, ComponentCreateOpsion) {
         const Page = index[page];
-        return yukiPuppeteerRender.yukiScreenshot(com.compile({
+        return this.yukiPuppeteerRender.yukiScreenshot(this.Com.compile({
             join_dir: page,
             html_name: `${uid}.html`,
             html_body: React.createElement(Page, { ...props }),

package/lib/utils/puppeteer.render.d.ts

@@ -16,7 +16,9 @@ export type ScreenshotOptions = {
     modelName?: string;
     saveHtmlfile?: boolean;
 };
-export declare class YukiPuppeteerRender extends Puppeteer {
+export declare class YukiPuppeteerRender {
+    private puppeteerInstance;
+    constructor(puppeteerInstance: Puppeteer);
     /**
      * 截图并返回buffer
      * @param htmlPath 绝对路径

package/lib/utils/puppeteer.render.js

@@ -1,10 +1,12 @@
-import { Puppeteer } from 'react-puppeteer';
 import fs__default from 'fs';
 import path from 'path';
 import { _paths } from './paths.js';
 
-// 该文件是 yuki-plugin 插件的截图类，继承了 Puppeteer 类，重写了 screenshot 方法，实现了截图的额外功能。
-class YukiPuppeteerRender extends Puppeteer {
+class YukiPuppeteerRender {
+    puppeteerInstance;
+    constructor(puppeteerInstance) {
+        this.puppeteerInstance = puppeteerInstance;
+    }
     /**
      * 截图并返回buffer
      * @param htmlPath 绝对路径
@@ -21,12 +23,13 @@ class YukiPuppeteerRender extends Puppeteer {
      * @returns {false | {img: buffer[]}}
      */
     async yukiScreenshot(htmlPath, Options) {
-        if (!(await this.isStart()))
+        if (!(await this.puppeteerInstance.isStart()))
             return false;
         let name = Options?.modelName ?? 'yuki-plugin';
         let pageHeight = Options?.pageSplitHeight ?? 8000; // 分割图片高度，默认 8000
         try {
-            const page = await this.browser?.newPage().catch(err => {
+            const browser = this.puppeteerInstance.browser;
+            const page = await browser?.newPage().catch(err => {
                 logger.error(err);
             });
             if (!page)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.3-5",
+  "version": "2.0.3-7",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -30,13 +30,13 @@
     "md5": "^2.3.0",
     "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
-    "puppeteer": "^22.15.0",
+    "puppeteer": "^23.3.0",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "^1.0.3",
+    "react-puppeteer": "^1.0.7-rc.0",
     "redis": "^4.7.0",
-    "yaml": "^2.5.0",
+    "yaml": "^2.5.1",
     "yarn": "^1.19.1"
   },
   "devDependencies": {
@@ -72,11 +72,11 @@
     "node-fetch": "^3.3.2",
     "nodemon": "^3.1.4",
     "prettier": "^3.3.3",
-    "puppeteer": "^22.15.0",
+    "puppeteer": "^23.3.0",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "1.0.3",
+    "react-puppeteer": "^1.0.7-rc.0",
     "redis": "^4.7.0",
     "rollup": "^4.20.0",
     "rollup-plugin-auto-external": "^2.0.0",
@@ -87,8 +87,8 @@
     "ts-node": "^10.9.2",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",
-    "yunzai": "^1.1.3",
-    "yunzai-mys": "^1.0.5"
+    "yunzai": "^1.1.4",
+    "yunzai-mys": "^1.0.6"
   },
   "files": [
     "public",

package/resources/css/loginQrcode/Page.css

@@ -6,13 +6,16 @@
 }
 
 body {
-  width: 563px !important;
-  font-family: "OPSans", Arial, sans-serif;
-  margin: auto;
+  width: 463px !important;
+  font-family: "OPSans";
+}
+
+.main-container{
+  width: 463px;
 }
 
 .container {
-  width: 24rem;
+  width: 380px;
   max-height: 40rem;
   margin: auto;
   font-size: 1.125rem