yz-yuki-plugin 1.0.1 → 1.0.2

package/.puppeteerrc.cjs

@@ -0,0 +1,4 @@
+/**
+ * @type {import("puppeteer").Configuration}
+ */
+module.exports = require('react-puppeteer/.puppeteerrc')

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.2
+* 新增支持获取完整文章动态内容
+* 修复宫格样式
+
 # 1.0.1
 * 修复了一些bug
 * 优化了一些功能

package/defaultConfig/bilibili/config.yaml

@@ -34,8 +34,8 @@ banWords:
 # 设置B站动态消息模式 0 文字模式 1 图片模式
 pushMsgMode: 1
 
-# 是否启用九宫格样式，1 启用，0 不启用。此为最高优先级，若启用九宫格样式，则分片截图模式设置推送每条动态的全部完整内容将无效
+# 是否启用九宫格样式：默认 1 启用，0 不启用。此为最高优先级，九宫格为动态模式，特定大小/长宽比的图片资源将会动态启用九宫格/四宫格/无宫格样式。
 boxGrid: 1
 
-# B站图片动态推送是否启用分页截图模式： 0 不启用，动态内容过长时候将只推送最前部分 1 启用，将会推送每条动态的全部内容
+# B站动态卡片分页截图模式：默认 1 启用 0 不启用。启用，将会推送每条动态的全部内容；不启用，动态内容过长时候将只推送7500px长度的动态卡片，需关闭宫格模式。
 isSplit: 1

package/defaultConfig/weibo/config.yaml

@@ -31,11 +31,11 @@ banWords:
   - 关键词1
   - 关键词2
 
-# 设置B站动态消息模式 0 文字模式 1 图片模式
+# 设置微博动态消息模式 0 文字模式 1 图片模式
 pushMsgMode: 1
 
-# 是否启用九宫格样式，1 启用，0 不启用。此为最高优先级，若启用九宫格样式，则分片截图模式设置推送每条动态的全部完整内容将无效
+# 是否启用九宫格样式：默认 1 启用，0 不启用。此为最高优先级，九宫格为动态模式，特定大小/长宽比的图片资源将会动态启用九宫格/四宫格/无宫格样式。
 boxGrid: 1
 
-# 微博图片动态推送是否启用分页截图模式： 0 不启用，动态内容过长时候将只推送最前部分 1 启用，将会推送每条动态的全部内容
+# 微博动态卡片分页截图模式：默认 1 启用 0 不启用。启用，将会推送每条动态的全部内容；不启用，动态内容过长时候将只推送7500px长度的动态卡片，需关闭宫格模式。
 isSplit: 1

package/lib/components/dynamic/Content.js

@@ -10,6 +10,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') });
     function getBoxGridStyle(pics) {
         if (!Array.isArray(pics) || pics.length === 0) {
             return null;
@@ -62,8 +64,6 @@ const Content = ({ data }) => {
         return null;
     }
     const boxGrid = data.boxGrid && (data.pics && getBoxGridStyle(data.pics));
-    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 contentCss = React.createElement("link", { rel: "stylesheet", href: require('./../../../resources/css/dynamic/Content.css') });
     switch (data.type) {
         case 'DYNAMIC_TYPE_LIVE_RCMD':

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

@@ -44,6 +44,25 @@ class BiliApi {
         'Sec-Fetch-User': '?1',
         'TE': 'trailers',
     };
+    static BILIBILI_ARTICLE_HEADERS = {
+        'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/png,image/svg+xml,*/*;q=0.8',
+        'Accept-Language': 'zh-CN,zh;q=0.8,zh-TW;q=0.7,zh-HK;q=0.5,en-US;q=0.3,en;q=0.2',
+        'Accept-Encoding': 'gzip, deflate, br',
+        'Content-type': 'text/html; charset=utf-8',
+        Cookie: '',
+        'pragma': "no-cache",
+        "Cache-control": "no-cache",
+        'DNT': '1',
+        'Sec-GPC': '1',
+        'sec-ch-ua-mobile': '?0',
+        'Sec-Fetch-Dest': 'document',
+        'Sec-Fetch-Mode': 'navigate',
+        'Sec-Fetch-Site': 'same-site',
+        'Sec-Fetch-User': '?1',
+        'TE': 'trailers',
+        "Upgrade-Insecure-Requests": '1',
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0'
+    };
 }
 
 export { BiliApi };

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

@@ -1,8 +1,12 @@
 import moment from 'moment';
 import { Bot, Segment } from 'yunzai';
+import { readSyncCookie } from './bilibili.models.js';
+import { BiliApi } from './bilibili.api.js';
+import axios from 'axios';
+import lodash from 'lodash';
 
 class BiliQuery {
-    static formatDynamicData(data) {
+    static async formatDynamicData(data) {
         const BiliDrawDynamicLinkUrl = "https://m.bilibili.com/dynamic/";
         let desc, pics = [], majorType;
         let formatData = { data: {} };
@@ -71,8 +75,19 @@ class BiliQuery {
                     pics = desc?.pics;
                     pics = pics.map((item) => { return { url: item?.url, width: item?.width, height: item?.height }; }) || [];
                     formatData.data.title = desc?.title;
-                    formatData.data.pics = pics;
-                    formatData.data.content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text) || "";
+                    if ((desc?.summary?.text)?.length >= 480) {
+                        const readInfo = await this.getFullArticleContent(this.formatUrl(desc?.jump_url));
+                        formatData.data.content = this.praseFullArticleContent(readInfo?.content);
+                        formatData.data.pics = [];
+                        if ((formatData.data.content) === null) {
+                            formatData.data.content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text) || "";
+                            formatData.data.pics = pics;
+                        }
+                    }
+                    else {
+                        formatData.data.content = this.parseRichTextNodes(desc?.summary?.rich_text_nodes || desc?.summary?.text) || "";
+                        formatData.data.pics = pics;
+                    }
                 }
                 else {
                     desc = data?.modules?.module_dynamic?.major?.article || {};
@@ -158,6 +173,35 @@ class BiliQuery {
             return nodes;
         }
     };
+    static async getFullArticleContent(postUrl) {
+        const Cookie = await readSyncCookie();
+        try {
+            const response = await axios.get(postUrl, {
+                headers: lodash.merge(BiliApi.BILIBILI_ARTICLE_HEADERS, { "Cookie": `${Cookie}`, "Host": "www.bilibili.com" }),
+                responseType: 'text'
+            });
+            const text = response.data;
+            const match = text.match(/"readInfo":([\s\S]+?),"readViewInfo":/);
+            if (match) {
+                const full_json_text = match[1];
+                const readInfo = JSON.parse(full_json_text);
+                return readInfo;
+            }
+        }
+        catch (err) {
+            logger?.error(`优纪插件：获取B站完整文章内容失败 [ ${postUrl} ] : ${err}`);
+            return null;
+        }
+    }
+    static praseFullArticleContent(content) {
+        content = content.replace(/\n/g, '<br>');
+        const imgTagRegex = /<img[^>]*data-src="([^"]*)"[^>]*>/g;
+        content = content.replace(imgTagRegex, (match, p1) => {
+            const newSrc = this.formatUrl(p1);
+            return match.replace('data-src', 'src').replace(p1, newSrc);
+        });
+        return content;
+    }
     static formatUrl(url) {
         return 0 == url.indexOf('//') ? `https:${url}` : url;
     }

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

@@ -94,7 +94,7 @@ class BiliTask {
                 if (!author?.pub_ts)
                     continue;
                 if (Number(now - author.pub_ts) > interval) {
-                    logger.info(`超过间隔时间，跳过该up [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
+                    logger.info(`超过间隔，跳过  [ ${author?.name} : ${author?.mid} ] ${author?.pub_time} 的动态`);
                     continue;
                 }
                 if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !biliConfigData.pushTransmit)

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

@@ -53,7 +53,7 @@ class WeiboTask {
                 if (!raw_post?.mblog?.created_at)
                     continue;
                 if (Number(now - (WeiboQuery.getDynamicCreatetDate(raw_post) / 1000)) > interval) {
-                    logger.info(`超过间隔时间，跳过该博主 [ ${user?.screen_name} : ${user?.id} ] ${raw_post?.mblog?.created_at} 的动态`);
+                    logger.info(`超过间隔，跳过   [ ${user?.screen_name} : ${user?.id} ] ${raw_post?.mblog?.created_at} 的动态`);
                     continue;
                 }
                 if (dynamicItem.type === "DYNAMIC_TYPE_FORWARD" && !weiboConfigData.pushTransmit)

package/lib/types/models/bilibili/bilibili.api.d.ts

@@ -44,4 +44,23 @@ export declare class BiliApi {
         'Sec-Fetch-User': string;
         TE: string;
     };
+    static BILIBILI_ARTICLE_HEADERS: {
+        Accept: string;
+        'Accept-Language': string;
+        'Accept-Encoding': string;
+        'Content-type': string;
+        Cookie: string;
+        pragma: string;
+        "Cache-control": string;
+        DNT: string;
+        'Sec-GPC': string;
+        'sec-ch-ua-mobile': string;
+        'Sec-Fetch-Dest': string;
+        'Sec-Fetch-Mode': string;
+        'Sec-Fetch-Site': string;
+        'Sec-Fetch-User': string;
+        TE: string;
+        "Upgrade-Insecure-Requests": string;
+        'User-Agent': string;
+    };
 }

package/lib/types/models/bilibili/bilibili.query.d.ts

@@ -1,11 +1,13 @@
 export declare class BiliQuery {
-    static formatDynamicData(data: any): {
+    static formatDynamicData(data: any): Promise<{
         uid: any;
         data: {
             [key: string]: any;
         };
-    };
+    }>;
     static parseRichTextNodes: (nodes: any[] | string | any) => any;
+    static getFullArticleContent(postUrl: string): Promise<any>;
+    static praseFullArticleContent(content: string): string;
     static formatUrl(url: string): string;
     static formatTextDynamicData(upName: string, data: any, isForward: boolean, setData: any): Promise<any>;
     static dynamicContentLimit(content: string, setData: any): string;

package/lib/utils/puppeteer.render.js

@@ -22,7 +22,7 @@ class YukiPuppeteerRender extends Puppeteer {
             if (Options?.header) {
                 await page.setExtraHTTPHeaders(Options.header);
             }
-            await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: 'networkidle2' });
+            await page.goto(`file://${htmlPath}`, { timeout: Options?.timeout ?? 120000, waitUntil: ["load", "networkidle2"] });
             const body = await page.$(Options?.tab ?? 'body');
             if (!body)
                 return false;

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
   "license": "MIT",
   "main": "main.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/snowtafir/yuki-plugin.git"
+  },
   "scripts": {
     "app": "npm run css && node --no-warnings=ExperimentalWarning --loader ts-node/esm src/main.js",
     "dev": "npm run css && nodemon",
@@ -70,7 +74,6 @@
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.1.1",
     "rollup-plugin-ignore": "^1.0.10",
-    "rollup-plugin-terser": "^7.0.2",
     "tailwindcss": "^3.4.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5",
@@ -85,7 +88,8 @@
     "CHANGELOG.md",
     "README.md",
     "package.json",
-    "LICENSE"
+    "LICENSE",
+    ".puppeteerrc.cjs"
   ],
   "types": "lib/types",
   "exports": {

package/resources/css/dynamic/Content.css

@@ -5,6 +5,10 @@
   font-style: normal;
 }
 
+.content-text-title {
+  margin-top: 10px;
+}
+
 .content {
   font-size: 20px;
   color: #333;