yz-yuki-plugin 2.0.4-7 → 2.0.4-8

package/CHANGELOG.md

@@ -1,4 +1,5 @@
 # 2.0.4
+* 增加splitHeight配置项，其他优化
 * 优化B站风控相关，新增bili_tiket参数
 * fix Repeated Instantiation Puppeteer
 * 优化获取B站登录ck

package/defaultConfig/bilibili/config.yaml

@@ -37,5 +37,11 @@ pushMsgMode: 1
 # 是否启用九宫格样式：默认 1 启用，0 不启用。此为最高优先级，九宫格为动态模式，特定大小/长宽比的图片资源将会动态启用九宫格/四宫格/无宫格样式。
 boxGrid: 1
 
-# B站动态卡片分页截图模式：默认 1 启用 0 不启用。启用，将会推送每条动态的全部内容；不启用，动态内容过长时候将只推送7500px长度的动态卡片，需关闭宫格模式。
+# B站动态卡片分片截图模式：默认 1 启用 0 不启用。启用，将会推送每条动态的全部内容；不启用，动态内容过长时候将只推送noSplitHeight长度的动态卡片，需关闭宫格模式。
 isSplit: 1
+
+# 动态卡片非分片模式下的截图高度，默认7500px（仅填数字，无需填入单位），请勿设置过大或过小。关闭分片截图时生效。
+noSplitHeight: 7500
+
+# 动态卡片分页截图高度，默认8000px（仅填数字，无需填入单位），请勿设置过大或过小。启用分片截图时生效。
+splitHeight: 8000

package/defaultConfig/weibo/config.yaml

@@ -37,5 +37,11 @@ pushMsgMode: 1
 # 是否启用九宫格样式：默认 1 启用，0 不启用。此为最高优先级，九宫格为动态模式，特定大小/长宽比的图片资源将会动态启用九宫格/四宫格/无宫格样式。
 boxGrid: 1
 
-# 微博动态卡片分页截图模式：默认 1 启用 0 不启用。启用，将会推送每条动态的全部内容；不启用，动态内容过长时候将只推送7500px长度的动态卡片，需关闭宫格模式。
+# 微博动态卡片分片截图模式：默认 1 启用 0 不启用。启用，将会推送每条动态的全部内容；不启用，动态内容过长时候将只推送noSplitHeight长度的动态卡片，需关闭宫格模式。
 isSplit: 1
+
+# 动态卡片非分片模式下的截图高度，默认7500px（仅填数字，无需填入单位），请勿设置过大或过小。关闭分片截图时生效。
+noSplitHeight: 7500
+
+# 动态卡片分页截图高度，默认8000px（仅填数字，无需填入单位），请勿设置过大或过小。启用分片截图时生效。
+splitHeight: 8000

package/lib/components/dynamic/Account.js

@@ -1,13 +1,13 @@
 import React from 'react';
 import LogoText from './LogoText.js';
-import { _paths } from '../../utils/paths.js';
-import path from 'path';
+import { createRequire } from '../../utils/paths.js';
 
 // Account
 // up账户组件
-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 require = createRequire(import.meta.url);
+const Bilibililogo = require('./../../../resources/img/icon/dynamic/bilibili.svg');
+const Weibilogo = require('./../../../resources/img/icon/dynamic/weibo.svg');
+const AccountCss = require('./../../../resources/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,

package/lib/components/dynamic/Content.js

@@ -1,11 +1,11 @@
 import React from 'react';
-import { _paths } from '../../utils/paths.js';
-import path from 'path';
+import { createRequire } from '../../utils/paths.js';
 
 // DynamicContent.tsx
-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 require = createRequire(import.meta.url);
+const ContentBoxGrid4Css = require('./../../resources/css/dynamic/Content.box.grid.4.css');
+const ContentBoxGrid9Css = require('./../../resources/css/dynamic/Content.box.grid.9.css');
+const ContentCss = require('./../../resources/css/dynamic/Content.css');
 const Content = ({ data }) => {
     const picItems = data.pics && (React.createElement("div", { className: 'pic-content' }, data.pics.map((item, index) => {
         if (item) {

package/lib/components/dynamic/Footer.js

@@ -1,15 +1,16 @@
 import React from 'react';
 import { ConfigController, BOT_NAME } from 'yunzai';
 import Config from '../../utils/config.js';
-import { _paths } from '../../utils/paths.js';
 import path from 'path';
+import { _paths, createRequire } from '../../utils/paths.js';
 
 // Footer.tsx
+const require = createRequire(import.meta.url);
 const botVersion = ConfigController.package?.version;
 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 bilibililogo = require('./../../../resources/img/icon/dynamic/bilibili.svg');
+const weibilogo = require('./../../../resources/img/icon/dynamic/weibo.svg');
+const FooterCss = require('./../../../resources/css/dynamic/Footer.css');
 const Footer = ({ data }) => {
     return (React.createElement(React.Fragment, null,
         React.createElement("link", { rel: "stylesheet", href: FooterCss }),

package/lib/components/dynamic/ForwardContent.js

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

package/lib/components/dynamic/LogoText.js

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

package/lib/components/dynamic/MainPage.js

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

package/lib/components/help/Help.js

@@ -1,14 +1,15 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config.js';
-import { _paths } from '../../utils/paths.js';
 import path from 'path';
+import { _paths, createRequire } from '../../utils/paths.js';
 
 //help.tsx
+const require = createRequire(import.meta.url);
 const botVersion = ConfigController.package?.version;
 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`);
+const HelpCss = require('./../../../resources/css/help/help.css');
+const iconPath = (iconName) => require(`./../../../resources/img/icon/puplic/${iconName}.png`);
 function App({ data }) {
     return (React.createElement(React.Fragment, null,
         React.createElement("link", { rel: "stylesheet", href: HelpCss }),

package/lib/components/loginQrcode/Page.js

@@ -1,9 +1,9 @@
 import React from 'react';
-import { _paths } from '../../utils/paths.js';
-import path from 'path';
+import { createRequire } from '../../utils/paths.js';
 
 // QrcodeLoginPage.tsx
-const LoginQrcodeCss = path.join(_paths.pluginResources, 'css/loginQrcode/Page.css');
+const require = createRequire(import.meta.url);
+const LoginQrcodeCss = require('./../../../resources/css/loginQrcode/Page.css');
 function App({ data }) {
     return (React.createElement(React.Fragment, null,
         React.createElement("link", { rel: "stylesheet", href: LoginQrcodeCss }),

package/lib/components/version/Version.js

@@ -1,12 +1,13 @@
 import React from 'react';
 import { BOT_NAME, ConfigController } from 'yunzai';
 import Config from '../../utils/config.js';
-import { _paths } from '../../utils/paths.js';
 import path from 'path';
+import { _paths, createRequire } from '../../utils/paths.js';
 
+const require = createRequire(import.meta.url);
 const botVersion = ConfigController.package?.version;
 const yukiPluginVersion = Config.getPackageJsonKey('version', path.join(_paths.pluginPath, 'package.json'));
-const VersionCss = path.join(_paths.pluginResources, 'css/version/version.css');
+const VersionCss = require('./../../../resources/css/version/version.css');
 function App({ data }) {
     return (React.createElement(React.Fragment, null,
         React.createElement("link", { rel: "stylesheet", href: VersionCss }),

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

@@ -178,7 +178,8 @@ class BiliTask {
             }
             let boxGrid = !!biliConfigData.boxGrid === false ? false : true; // 是否启用九宫格样式，默认为 true
             let isSplit = !!biliConfigData.isSplit === false ? false : true; // 是否启用分片截图，默认为 true
-            let style = isSplit ? '' : '.unfold { height: 7500px; }'; // 不启用分片截图模式的样式
+            let style = isSplit ? '' : `.unfold { max-height: ${biliConfigData?.noSplitHeight ?? 7500}px; }`; // 不启用分片截图模式的样式
+            let splitHeight = biliConfigData?.splitHeight ?? 8000; // 分片截图高度，默认 8000, 单位 px，启用分片截图时生效
             const urlQrcodeData = await QRCode.toDataURL(extentData?.url);
             let renderData = this.buildRenderData(extentData, urlQrcodeData, boxGrid);
             const ScreenshotOptionsData = {
@@ -191,6 +192,7 @@ class BiliTask {
                     quality: 98,
                 },
                 saveHtmlfile: false,
+                pageSplitHeight: splitHeight,
             };
             let imgs = await this.renderDynamicCard(uid, renderData, ScreenshotOptionsData);
             if (!imgs)

package/lib/models/weibo/weibo.task.js

@@ -143,7 +143,8 @@ class WeiboTask {
             }
             let boxGrid = !!weiboConfigData.boxGrid === false ? false : true; // 是否启用九宫格样式，默认为 true
             let isSplit = !!weiboConfigData.isSplit === false ? false : true; // 是否启用分片截图，默认为 true
-            let style = isSplit ? '' : '.unfold { height: 7500px; }'; // 不启用分片截图模式的样式
+            let style = isSplit ? '' : `.unfold { max-height: ${weiboConfigData?.noSplitHeight ?? 7500}px; }`; // 不启用分片截图模式的样式
+            let splitHeight = weiboConfigData?.splitHeight ?? 8000; // 分片截图高度，默认 8000, 单位 px，启用分片截图时生效
             const extentData = { ...data };
             const urlQrcodeData = await QRCode.toDataURL(extentData?.url);
             let renderData = this.buildRenderData(extentData, urlQrcodeData, boxGrid);
@@ -157,6 +158,7 @@ class WeiboTask {
                     quality: 98,
                 },
                 saveHtmlfile: false,
+                pageSplitHeight: splitHeight,
             };
             let imgs = await this.renderDynamicCard(uid, renderData, ScreenshotOptionsData);
             if (!imgs)

package/lib/utils/paths.d.ts

@@ -8,3 +8,15 @@ export declare const _paths: {
     pluginResources: string;
     pluginName: string;
 };
+/**
+ * 使用import.meta.url得到require
+ * @param basePath
+ * @returns
+ * 这并不是
+ * ***
+ * import { createRequire } from "module"
+ * ***
+ * 原型为
+ * new URL(path, import.meta.url).href
+ */
+export declare const createRequire: (basePath: string) => (path: string) => string;

package/lib/utils/paths.js

@@ -14,5 +14,26 @@ const _paths = {
     pluginResources: join(pluginPath, 'resources'), // yuki-plugin资源目录
     pluginName, // 插件所在文件夹名称
 };
+/**
+ * 使用import.meta.url得到require
+ * @param basePath
+ * @returns
+ * 这并不是
+ * ***
+ * import { createRequire } from "module"
+ * ***
+ * 原型为
+ * new URL(path, import.meta.url).href
+ */
+const createRequire = (basePath) => {
+    return (path) => {
+        if (process.platform === 'linux' || process.platform === 'android' || process.platform === 'darwin') {
+            return new URL(path, basePath).href.replace(/^file:\/\//, '');
+        }
+        else {
+            return new URL(path, basePath).href.replace(/^file:\/\/\//, ''); // windows
+        }
+    };
+};
 
-export { _paths, pluginName };
+export { _paths, createRequire, pluginName };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.4-7",
+  "version": "2.0.4-8",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",