yz-yuki-plugin 2.0.5-1 → 2.0.5-3

package/.puppeteerrc.cjs

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

package/README.md

@@ -11,12 +11,12 @@
 # 🌰一、安装插件
 
 ## 选择安装方式
-按照网络情况以及使用的bot框架是`Yunzai-Next`还是`Yunzai-V3`，选择对应的安装方式。
+按照网络情况以及使用的bot框架是`Yunzaijs`还是`Yunzai-V3`，选择对应的安装方式。
 
-### ***（一）Yunzai-Next***
+### ***（一）YunzaiJS***
 > 选择其中一种方式安装插件：
 
-1. npm包安装到`yunzai-next/node_modules`的方式，仅Yunzai-Next支持：
+1. npm包安装到`yunzaijs/node_modules`的方式，仅Yunzai-Next支持：
 ```
  yarn add yz-yuki-plugin -W
 ```
@@ -25,26 +25,26 @@
 
 * 方式1（推荐）：
 
-手动新建 `yunzai-next/yunzai.config.json` 文件，输入如下内容，`applications`字段添加的 `"yz-yuki-plugin"`即为启用本插件：
+手动新建 `yunzaijs/yunzai.config.json` 文件，输入如下内容，`applications`字段添加的 `"yz-yuki-plugin"`即为启用本插件：
 
 ```json
 {
-  "applications": ["yz-system", "yz-yuki-plugin"],
-  "middlewares": ["yunzai-mys/runtime", "yunzai-mys/mw"]
+  "applications": ["@yunzaijs/system", "yz-yuki-plugin"],
+  "middlewares": ["@yunzaijs/mys/message", "@yunzaijs/mys/runtime"]
 }
 ```
 * 方式2：
 
-修改 `yunzai-next/yunzai.config.js`：
+修改 `yunzaijs/yunzai.config.js`：
 ```js
-import { defineConfig } from 'yunzai'
+import { defineConfig } from 'yunzaijs'
 export default defineConfig({
-  applications: ['yz-system', 'yz-yuki-plugin'], //该行添加 'yz-yuki-plugin'
-  middlewares: ['yunzai-mys/runtime', 'yunzai-mys/message']
+  applications: ["@yunzaijs/system", "yz-yuki-plugin"], //该行添加 'yz-yuki-plugin'
+  middlewares: ["@yunzaijs/mys/message", "@yunzaijs/mys/runtime"]
 })
 ```
 
-2. 安装到 `yunzai-next/plugins` 的方式：
+2. 安装到 `yunzaijs/plugins` 的方式：
 
 > 仅支持Yunzai-Next的分支，选择仓库：
 
@@ -179,14 +179,8 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 ||||
 | **其他指令** |  |  |
 | 查看版本信息 | 查看版本信息 | `#优纪版本` |
-| 更新yuki插件 | 系统指令更新yuki插件，yunzai-next需安装yz-system | `#更新yuki-plugin` |
-| 强制更新yuki插件 | 强制更新yuki插件，yunzai-next需安装yz-system| `#强制更新yuki-plugin` |
-
-</details>
-
-<details><summary>样式预览，点击展开</summary>
-
-![](/resources/img/readme/mini-help.jpg)
+| 更新yuki插件 | 系统指令更新yuki插件，yunzaiJS需安装`@yunzaijs/system` | `#更新yuki-plugin` |
+| 强制更新yuki插件 | 强制更新yuki插件，yunzaiJS需安装`@yunzaijs/system`| `#强制更新yuki-plugin` |
 
 </details>
 
@@ -229,8 +223,8 @@ yarn install
 |                              Nickname                               | Contribution            |
 | :-----------------------------------------------------------------: | ----------------------- |
 |Yunzai-Next||
-| [Yunzai-org文档](https://yunzai-org.github.io/docs/)               | Yunzai Next 文档      |
-| [Yunzai-Next 仓库](https://github.com/yunzai-org/yunzaijs/)           |  Yunzai Next       |
+| [YunzaiJS文档](https://yunzaijs.github.io/docs/)               | YunzaiJS 文档      |
+| [YunzaiJS 仓库](https://github.com/yunzaijs/core)           |  YunzaiJS       |
 |Yunzai-V3||
 | [功能/插件库](https://gitee.com/yhArcadia/Yunzai-Bot-plugins-index) | Yunzai-Bot 相关内容索引 |
 |       [TRSS-Yunzai](https://gitee.com/TimeRainStarSky/Yunzai)       | 时雨🌌星空的 TRSS-Yunzai |

package/defaultConfig/help/help.yaml

@@ -80,7 +80,7 @@
       desc: 查看版本信息
     - icon: 钓鱼
       title: '#更新yuki-plugin'
-      desc: '系统指令更新yuki插件,yz-next需安装yz-system'
+      desc: '系统指令更新yuki插件,yunzaiJS需安装`@yunzaijs/system`'
     - icon: pluie_lotus
       title: '#强制更新yuki-plugin'
-      desc: '强制更新yuki插件,yz-next需安装yz-system'
+      desc: '强制更新yuki插件,yunzaiJS需安装`@yunzaijs/system`'

package/lib/apps/bilibili.js

@@ -1,6 +1,6 @@
 import JSON from 'json5';
 import lodash from 'lodash';
-import { Messages, Bot, Redis } from 'yunzai';
+import { Messages, Bot, Redis } from 'yunzaijs';
 import { BiliQuery } from '../models/bilibili/bilibili.query.js';
 import { BiliTask } from '../models/bilibili/bilibili.task.js';
 import Config from '../utils/config.js';
@@ -205,7 +205,7 @@ message.use(async (e) => {
     if (e.isMaster) {
         await exitBiliLogin(e);
         await Redis.set('Yz:yuki:bili:loginCookie', '', { EX: 3600 * 24 * 180 });
-        e.reply(`登陆的B站ck并已删除~`);
+        e.reply(`扫码登陆的B站cookie已删除~`);
     }
     else {
         e.reply('未取得bot主人身份，无权限删除B站登录ck');

package/lib/apps/help.js

@@ -1,4 +1,4 @@
-import { Messages, Segment } from 'yunzai';
+import { Messages, Segment } from 'yunzaijs';
 import { renderPage } from '../utils/image.js';
 import Help from '../models/help/help.js';
 

package/lib/apps/version.js

@@ -1,4 +1,4 @@
-import { Messages, Segment } from 'yunzai';
+import { Messages, Segment } from 'yunzaijs';
 import { renderPage } from '../utils/image.js';
 import VersionData from '../models/version/version.js';
 

package/lib/apps/weibo.js

@@ -1,4 +1,4 @@
-import { Messages } from 'yunzai';
+import { Messages } from 'yunzaijs';
 import { WeiboQuery } from '../models/weibo/weibo.query.js';
 import { WeiboTask } from '../models/weibo/weibo.task.js';
 import Config from '../utils/config.js';

package/lib/components/dynamic/Footer.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ConfigController, BOT_NAME } from 'yunzai';
+import { ConfigController, BOT_NAME } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
 import { _paths, createRequire } from '../../utils/paths.js';

package/lib/components/help/Help.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BOT_NAME, ConfigController } from 'yunzai';
+import { BOT_NAME, ConfigController } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
 import { _paths, createRequire } from '../../utils/paths.js';

package/lib/components/version/Version.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { BOT_NAME, ConfigController } from 'yunzai';
+import { BOT_NAME, ConfigController } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import path from 'path';
 import { _paths, createRequire } from '../../utils/paths.js';

package/lib/index.js

@@ -1,5 +1,5 @@
 import chalk from 'chalk';
-import { applicationOptions, setBotTask, useEvent } from 'yunzai';
+import { applicationOptions, setBotTask, useEvent } from 'yunzaijs';
 import Config from './utils/config.js';
 import path from 'path';
 import { _paths } from './utils/paths.js';

package/lib/main.js

@@ -0,0 +1,11 @@
+import { createLogin, Client, Processor } from 'yunzaijs';
+
+setTimeout(async () => {
+    // 登录
+    await createLogin();
+    // 运行
+    await Client.run().then(async () => {
+        // 读取yunzai.config.js
+        await Processor.install('yunzaijs.config.ts');
+    });
+});

package/lib/models/bilibili/bilibili.buid.fp.js

@@ -0,0 +1,77 @@
+class Murmur3 {
+    static MOD = 1n << 64n;
+    static C1 = 0x87c37b91114253d5n;
+    static C2 = 0x4cf5ad432745937fn;
+    static C3 = 0x52dce729n;
+    static C4 = 0x38495ab5n;
+    static R1 = 27n;
+    static R2 = 31n;
+    static R3 = 33n;
+    static M = 5n;
+    static hash(source, seed) {
+        let h1 = BigInt(seed);
+        let h2 = BigInt(seed);
+        let processed = 0;
+        for (let i = 0; i < source.length; i += 16) {
+            const chunk = source.slice(i, i + 16);
+            processed += chunk.length;
+            if (chunk.length === 16) {
+                const k1 = BigInt(chunk.slice(0, 8).reduce((acc, val, idx) => acc | (BigInt(val) << BigInt(8 * idx)), 0n));
+                const k2 = BigInt(chunk.slice(8).reduce((acc, val, idx) => acc | (BigInt(val) << BigInt(8 * idx)), 0n));
+                h1 ^= (Murmur3.rotateLeft((k1 * Murmur3.C1) % Murmur3.MOD, Murmur3.R2) * Murmur3.C2) % Murmur3.MOD;
+                h1 = ((Murmur3.rotateLeft(h1, Murmur3.R1) + h2) * Murmur3.M + Murmur3.C3) % Murmur3.MOD;
+                h2 ^= (Murmur3.rotateLeft((k2 * Murmur3.C2) % Murmur3.MOD, Murmur3.R3) * Murmur3.C1) % Murmur3.MOD;
+                h2 = ((Murmur3.rotateLeft(h2, Murmur3.R2) + h1) * Murmur3.M + Murmur3.C4) % Murmur3.MOD;
+            }
+            else {
+                let k1 = 0n;
+                let k2 = 0n;
+                for (let j = 0; j < chunk.length; j++) {
+                    const byteVal = BigInt(chunk[j]);
+                    if (j < 8) {
+                        k1 |= byteVal << BigInt(8 * j);
+                    }
+                    else {
+                        k2 |= byteVal << BigInt(8 * (j - 8));
+                    }
+                }
+                k1 = (Murmur3.rotateLeft((k1 * Murmur3.C1) % Murmur3.MOD, Murmur3.R2) * Murmur3.C2) % Murmur3.MOD;
+                h1 ^= k1;
+                h2 ^= (Murmur3.rotateLeft((k2 * Murmur3.C2) % Murmur3.MOD, Murmur3.R3) * Murmur3.C1) % Murmur3.MOD;
+            }
+        }
+        h1 ^= BigInt(processed);
+        h2 ^= BigInt(processed);
+        h1 = (h1 + h2) % Murmur3.MOD;
+        h2 = (h2 + h1) % Murmur3.MOD;
+        h1 = Murmur3.fmix64(h1);
+        h2 = Murmur3.fmix64(h2);
+        h1 = (h1 + h2) % Murmur3.MOD;
+        h2 = (h2 + h1) % Murmur3.MOD;
+        return (h2 << BigInt(64)) | h1;
+    }
+    static rotateLeft(x, k) {
+        const index = Number(k);
+        const binStr = x.toString(2).padStart(64, '0');
+        return BigInt(`0b${binStr.slice(index)}${binStr.slice(0, index)}`);
+    }
+    static fmix64(k) {
+        const C1 = 0xff51afd7ed558ccdn;
+        const C2 = 0xc4ceb9fe1a85ec53n;
+        const R = 33;
+        let tmp = k;
+        tmp ^= tmp >> BigInt(R);
+        tmp = (tmp * C1) % Murmur3.MOD;
+        tmp ^= tmp >> BigInt(R);
+        tmp = (tmp * C2) % Murmur3.MOD;
+        tmp ^= tmp >> BigInt(R);
+        return tmp;
+    }
+}
+function gen_buvid_fp(uuid, seed) {
+    const source = new TextEncoder().encode(uuid);
+    const m = Murmur3.hash(source, seed);
+    return `${(m & (Murmur3.MOD - 1n)).toString(16)}${(m >> 64n).toString(16)}`;
+}
+
+export { gen_buvid_fp };

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

@@ -6,10 +6,11 @@ import { promisify } from 'node:util';
 import path from 'path';
 import QRCode from 'qrcode';
 import YAML from 'yaml';
-import { Segment, Bot, Redis } from 'yunzai';
+import { Segment, Bot, Redis } from 'yunzaijs';
 import { renderPage } from '../../utils/image.js';
 import { _paths } from '../../utils/paths.js';
 import { BiliApi } from './bilibili.api.js';
+import { gen_buvid_fp } from './bilibili.buid.fp.js';
 import { getBiliTicket } from './bilibili.ticket.js';
 
 /**
@@ -60,8 +61,8 @@ async function applyLoginQRCode(e) {
         return qrcodeKey;
     }
     else {
-        e.reply(`获取B站登录二维码失败: ${res.data.message}`);
-        throw new Error(`获取B站登录二维码失败: ${res.data.message}`);
+        e.reply(`获取B站登录二维码失败: ${res.data?.message}`);
+        throw new Error(`获取B站登录二维码失败: ${res.data?.message}`);
     }
 }
 /**处理扫码结果 */
@@ -149,12 +150,16 @@ async function exitBiliLogin(e) {
         e.reply('当前无可用的B站登录CK可退出登录');
         return;
     }
-    const postData = new URLSearchParams({ biliCSRF: biliCSRF });
+    const postData = String(biliCSRF)
+        .trim()
+        .replace(/^bili_jct=/g, '')
+        .replace(/;*$/g, '');
     try {
-        const resp = await axios.post(url, postData.toString(), {
+        const resp = await axios.post(url, { biliCSRF: postData }, {
             headers: {
                 'Host': 'passport.bilibili.com',
-                'Cookie': `DedeUserID=${DedeUserID}; bili_jct=${biliCSRF}; SESSDATA=${SESSDATA}`,
+                'User-Agent': BiliApi.BILIBILI_HEADERS['User-Agent'],
+                'Cookie': `${DedeUserID};${biliCSRF};${SESSDATA}`,
                 'Content-Type': 'application/x-www-form-urlencoded'
             }
         });
@@ -163,29 +168,27 @@ async function exitBiliLogin(e) {
             e.reply('当前缓存的B站登录CK早已失效！');
             return;
         }
-        const { code, status, data } = resp.data;
-        logger.mark('Response Data:', data);
-        if (status) {
-            switch (code) {
-                case 0:
-                    e.reply('当前缓存的B站登录CK已在服务器注销~');
-                    await Redis.set('Yz:yuki:bili:loginCookie', '', { EX: 3600 * 24 * 180 });
-                    e.reply(`登陆的B站ck并已删除~`);
-                    break;
-                case 2202:
-                    e.reply('csrf 请求非法，退出登录请求出错');
-                    break;
-                default:
-                    e.reply('当前缓存的B站登录CK早已失效！');
-            }
-        }
-        else {
-            e.reply('服务器响应异常，退出登录请求出错');
+        const res = resp.data;
+        logger?.debug(`exitBiliLogin:  ${JSON.stringify(res)}`);
+        const { code } = res;
+        switch (code) {
+            case 0:
+                e.reply('当前缓存的B站登录CK已在B站服务器退出登录~');
+                break;
+            case 2202:
+                e.reply('csrf 请求非法，退出登录请求出错');
+                break;
+            case -101:
+                e.reply('当前缓存的扫码B站ck未登录！');
+                break;
+            default:
+                e.reply('未知情况！无妨');
+                return;
         }
     }
     catch (error) {
+        e.reply('退出登录请求出错');
         console.error('Error during Bili login exit:', error);
-        e.reply('退出登录请求出错，请稍后再试');
     }
 }
 /**
@@ -397,18 +400,18 @@ async function getPayload(cookie) {
             '7003': 1, // indexedDb, !!window.indexedDB, html5 api
             '807e': 1, // cookieEnabled, navigator.cookieEnabled
             'b8ce': BiliApi.BILIBILI_HEADERS['User-Agent'], // ua "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:127.0) Gecko/20100101 Firefox/127.0",
-            '641c': 0,
-            '07a4': 'zh-CN',
-            '1c57': 'not available',
-            '0bd0': 16,
-            '748e': [1920, 1200],
-            'd61f': [1920, 1152],
-            'fc9d': -480,
-            '6aa9': 'Asia/Shanghai',
-            '75b8': 1,
-            '3b21': 1,
-            '8a1c': 0,
-            'd52f': 'not available',
+            '641c': 0, // webdriver, navigator.webdriver, like Selenium
+            '07a4': 'zh-CN', // language
+            '1c57': 'not available', // deviceMemory in GB, navigator.deviceMemory
+            '0bd0': 16, // hardwareConcurrency, navigator.hardwareConcurrency
+            '748e': [1920, 1200], // window.screen.width window.screen.height
+            'd61f': [1920, 1152], // window.screen.availWidth window.screen.availHeight
+            'fc9d': -480, // timezoneOffset, (new Date).getTimezoneOffset()
+            '6aa9': 'Asia/Shanghai', //Intl.DateTimeFormat().resolvedOptions().timeZone, // timezone, (new window.Intl.DateTimeFormat).resolvedOptions().timeZone
+            '75b8': 1, // sessionStorage, window.sessionStorage, html5 api
+            '3b21': 1, // localStorage, window.localStorage, html5 api
+            '8a1c': 0, // openDatabase, window.openDatabase, html5 api
+            'd52f': 'not available', // cpuClass, navigator.cpuClass
             'adca': BiliApi.BILIBILI_HEADERS['User-Agent'].includes('Windows') ? 'Win32' : 'Linux', // platform, navigator.platform
             '80c9': [
                 [
@@ -451,9 +454,9 @@ async function getPayload(cookie) {
                         ['text/pdf', 'pdf']
                     ]
                 ]
-            ],
-            '13ab': 'f3YAAAAASUVORK5CYII=',
-            'bfe9': 'kABYpRAGAVYzWJooB9Bf4P+UortSvxRY0AAAAASUVORK5CYII=',
+            ], // plugins
+            '13ab': 'f3YAAAAASUVORK5CYII=', // canvas fingerprint
+            'bfe9': 'kABYpRAGAVYzWJooB9Bf4P+UortSvxRY0AAAAASUVORK5CYII=', // webgl_str
             'a3c1': [
                 'extensions:ANGLE_instanced_arrays;EXT_blend_minmax;EXT_color_buffer_half_float;EXT_float_blend;EXT_frag_depth;EXT_shader_texture_lod;EXT_sRGB;EXT_texture_compression_bptc;EXT_texture_compression_rgtc;EXT_texture_filter_anisotropic;OES_element_index_uint;OES_fbo_render_mipmap;OES_standard_derivatives;OES_texture_float;OES_texture_float_linear;OES_texture_half_float;OES_texture_half_float_linear;OES_vertex_array_object;WEBGL_color_buffer_float;WEBGL_compressed_texture_s3tc;WEBGL_compressed_texture_s3tc_srgb;WEBGL_debug_renderer_info;WEBGL_debug_shaders;WEBGL_depth_texture;WEBGL_draw_buffers;WEBGL_lose_context;WEBGL_provoking_vertex',
                 'webgl aliased line width range:[1, 1]',
@@ -519,8 +522,8 @@ async function getPayload(cookie) {
                 'webgl fragment shader low int precision:0',
                 'webgl fragment shader low int precision rangeMin:31',
                 'webgl fragment shader low int precision rangeMax:30'
-            ],
-            '6bc5': 'Google Inc. (Intel)~ANGLE (Intel, Intel(R) HD Graphics Direct3D11 vs_5_0 ps_5_0), or similar',
+            ], // webgl_params, cab be set to [] if webgl is not supported
+            '6bc5': 'Google Inc. (Intel)~ANGLE (Intel, Intel(R) HD Graphics Direct3D11 vs_5_0 ps_5_0), or similar', // webglVendorAndRenderer
             'ed31': 0,
             '72bd': 0,
             '097b': 0,
@@ -604,6 +607,15 @@ async function postGateway(cookie) {
         throw error;
     }
 }
+/**生成buvid_fp
+ * @param {string} uuid
+ */
+async function get_buvid_fp(cookie) {
+    const uuid = await readSavedCookieItems(cookie, ['_uuid'], false);
+    const seedget = Math.floor(Math.random() * (60 - 1 + 1) + 1);
+    let buvidFp = gen_buvid_fp(uuid, seedget);
+    return `buvid_fp=${buvidFp};`;
+}
 /**
  * 获取有效bili_ticket并添加到cookie
  * @param {string} cookie
@@ -630,4 +642,4 @@ async function cookieWithBiliTicket(cookie) {
     }
 }
 
-export { applyLoginQRCode, checkBiliLogin, cookieWithBiliTicket, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, pollLoginQRCode, postGateway, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };
+export { applyLoginQRCode, checkBiliLogin, cookieWithBiliTicket, exitBiliLogin, genUUID, gen_b_lsid, getNewTempCk, get_buvid_fp, pollLoginQRCode, postGateway, readSavedCookieItems, readSavedCookieOtherItems, readSyncCookie, readTempCk, saveLocalBiliCk, saveLoginCookie, saveTempCk };

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

@@ -1,5 +1,5 @@
 import moment from 'moment';
-import { Bot, Segment } from 'yunzai';
+import { Bot, Segment } from 'yunzaijs';
 import { readSyncCookie, cookieWithBiliTicket } from './bilibili.models.js';
 import { BiliApi } from './bilibili.api.js';
 import axios from 'axios';

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

@@ -1,5 +1,5 @@
 import QRCode from 'qrcode';
-import { Redis, Bot, Segment } from 'yunzai';
+import { Redis, Bot, Segment } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import { renderPage } from '../../utils/image.js';
 import { BiliGetWebData } from './bilibili.get.web.data.js';

package/lib/models/weibo/weibo.get.web.data.js

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { Bot } from 'yunzai';
+import { Bot } from 'yunzaijs';
 import { WeiboApi } from './weibo.api.js';
 import { WeiboQuery } from './weibo.query.js';
 

package/lib/models/weibo/weibo.query.js

@@ -1,7 +1,7 @@
 import moment from 'moment';
 import fetch from 'node-fetch';
 import { WeiboApi } from './weibo.api.js';
-import { Bot, Segment } from 'yunzai';
+import { Bot, Segment } from 'yunzaijs';
 import { JSDOM } from 'jsdom';
 
 class WeiboQuery {

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

@@ -1,5 +1,5 @@
 import QRCode from 'qrcode';
-import { Redis, Bot, Segment } from 'yunzai';
+import { Redis, Bot, Segment } from 'yunzaijs';
 import Config from '../../utils/config.js';
 import { renderPage } from '../../utils/image.js';
 import { WeiboGetWebData } from './weibo.get.web.data.js';

package/lib/utils/config.js

@@ -61,7 +61,7 @@ class Config {
     }
     /**
      * 通用获取配置文件数据方法
-     * @param typeDir 配置文件目录类型对应路径 defaultConfig: defaultConfig 或 config: yunzai/data/yuki-plugin/config
+     * @param typeDir 配置文件目录类型对应路径 defaultConfig: defaultConfig 或 config: yunzaijs/data/yuki-plugin/config
      * @param appDir 配置app目录
      * @param functionName 配置文件名称，不包含.yaml后缀
      * @returns {object} 配置数据
@@ -77,7 +77,7 @@ class Config {
     }
     /**
      * 获取配置文件路径
-     * @param typeDir 配置文件目录类型对应路径 defaultConfig: defaultConfig 或 config: yunzai/data/yuki-plugin/config
+     * @param typeDir 配置文件目录类型对应路径 defaultConfig: defaultConfig 或 config: yunzaijs/data/yuki-plugin/config
      * @param appDir 配置app目录
      * @param functionName 配置文件名称，不包含.yaml后缀
      * @returns {string} 配置文件路径
@@ -93,7 +93,7 @@ class Config {
     /**
      * 监听配置文件的变化
      * @param configFilePath 文件路径
-     * @param typeDir 配置文件目录类型对应路径 defaultConfig: defaultConfig 或 config: yunzai/data/yuki-plugin/config
+     * @param typeDir 配置文件目录类型对应路径 defaultConfig: defaultConfig 或 config: yunzaijs/data/yuki-plugin/config
      * @param appDir 配置app目录
      * @param functionName 配置文件名称，不包含.yaml后缀
      */

package/lib/utils/image.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Picture } from 'react-puppeteer';
+import { Picture } from 'jsxp';
 import { YukiPuppeteerRender } from './puppeteer.render.js';
 import * as index from '../components/index.js';
 
@@ -35,9 +35,9 @@ class Image extends Picture {
         const Page = index[page];
         // 调用 yukiPuppeteerRender 进行截图操作
         return this.yukiPuppeteerRender.yukiScreenshot(this.Com.compile({
-            join_dir: page,
-            html_name: `${uid}.html`,
-            html_body: React.createElement(Page, { ...props }),
+            path: page,
+            name: `${uid}.html`,
+            component: React.createElement(Page, { ...props }),
             ...ComponentCreateOpsion
         }), ScreenshotOptions);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "2.0.5-1",
+  "version": "2.0.5-3",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
@@ -11,13 +11,15 @@
     "url": "https://github.com/snowtafir/yuki-plugin.git"
   },
   "scripts": {
-    "app": "npx tsx src/main.ts",
-    "img-dev": "npx tsx watch --clear-screen=false routes.server.ts",
+    "app": "node lib/main.js",
+    "dev": "lvy dev --yunzai",
+    "build": "lvy build",
+    "view": "lvy dev --view",
+    "img-dev": "npx tsx watch --clear-screen=false jsxp.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",
+    "start": "pm2 startOrRestart pm2.config.cjs",
+    "stop": "pm2 stop pm2.config.cjs",
+    "delete": "pm2 delete pm2.config.cjs",
     "format": "prettier --write .",
     "check-format": "git diff --exit-code",
     "prepare": "husky"
@@ -28,36 +30,23 @@
     "chokidar": "^3.6.0",
     "debug": "^4.3.6",
     "jsdom": "^24.1.1",
+    "jsxp": "^1.0.4",
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
     "md5": "^2.3.0",
     "moment": "^2.30.1",
     "node-fetch": "^3.3.2",
-    "puppeteer": "^23.3.1",
+    "puppeteer": "^23.5.3",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "^1.0.7",
     "redis": "^4.7.0",
     "yaml": "^2.5.1",
     "yarn": "^1.19.1"
   },
   "devDependencies": {
-    "@babel/core": "^7.25.2",
-    "@babel/preset-env": "^7.25.4",
-    "@babel/preset-react": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
     "@types/chalk": "2.2.0",
-    "@rollup/plugin-babel": "^6.0.4",
     "@types/lodash": "^4.17.7",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-image": "^3.0.3",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-replace": "^5.0.7",
-    "@rollup/plugin-terser": "^0.4.4",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/rollup-plugin-auto-external": "^2.0.5",
     "@types/jsdom": "^21.1.7",
     "@types/md5": "^2.3.5",
     "@types/node": "^22.2.0",
@@ -67,32 +56,26 @@
     "@types/react-dom": "^18.3.0",
     "@types/yaml": "1.9.7",
     "axios": "^1.7.7",
-    "babel-plugin-module-resolver": "^5.0.2",
     "chokidar": "^3.6.0",
     "husky": "^9.1.6",
     "jsdom": "^24.1.1",
+    "jsxp": "^1.0.4",
     "json5": "^2.2.3",
     "lodash": "^4.17.21",
+    "lvyjs": "^0.0.3",
     "md5": "^2.3.0",
     "node-fetch": "^3.3.2",
     "prettier": "^3.3.3",
-    "puppeteer": "^23.3.1",
+    "puppeteer": "^23.5.3",
     "qrcode": "^1.5.4",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "react-puppeteer": "^1.0.7",
     "redis": "^4.7.0",
-    "rollup": "^4.20.0",
-    "rollup-plugin-auto-external": "^2.0.0",
-    "rollup-plugin-copy": "^3.5.0",
-    "rollup-plugin-dts": "^6.1.1",
-    "rollup-plugin-ignore": "^1.0.10",
     "tailwindcss": "^3.4.9",
     "ts-node": "^10.9.2",
     "tsx": "^4.19.0",
     "typescript": "^5.5.4",
-    "yunzai": "^1.1.6",
-    "yunzai-mys": "^1.0.6"
+    "yunzaijs": "^1.0.0-rc.4"
   },
   "files": [
     "public",
@@ -113,7 +96,7 @@
     }
   },
   "keywords": [
-    "yunzai"
+    "yunzaijs"
   ],
   "publishConfig": {
     "registry": "https://registry.npmjs.org"

package/lib/apps/bilibili.d.ts

@@ -1,6 +0,0 @@
-export declare const YukiBli: new () => {
-    [key: string]: unknown;
-    rule: import("yunzai").AppsRulesType;
-    event: any;
-    e: unknown;
-};

package/lib/apps/help.d.ts

@@ -1,6 +0,0 @@
-export declare const YukiHelp: new () => {
-    [key: string]: unknown;
-    rule: import("yunzai").AppsRulesType;
-    event: any;
-    e: unknown;
-};