yz-yuki-plugin 1.0.3-rc.5 → 1.0.4

package/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.0.4
+* 优化代码，npm 包增加 typescript 类型定义文件
+* 统一配置文件目录：yunzai/data/yuki-plugin/config/，更新后如需使用旧配置文件，请自行移动旧配置文件到新目录
+* 优化哔哩登录日志
+* 优化渲染
+* 增加哔哩 MAJOR_TYPE_DRAW MAJOR_TYPE_ARTICLE 动态子类型
+
 # 1.0.3
 * 修复群组与好友动态推送混淆问题
 * 更新获取B站up信息api

package/README.md

@@ -123,14 +123,19 @@ https://m.weibo.cn/u/7643376782 # 7643376782 为崩坏星穹铁道博主uid
 - [x] 微博动态
 
 
-## ✨指令列表
+## 🚀指令列表
 
 <details><summary>点击展开</summary>
 
+> [!IMPORTANT] 
+> 统一的配置文件路径：
+
+`Yunzai/data/yuki-plugin/config/`，启动一次后，即可查看配置文件。
+
 > [!TIP]
 > 指令前缀：`#优纪`、`#yuki`、`/优纪`、`/yuki`，
 
-> 示例：`#优纪订阅B站推送uid`、`#yuki订阅B站推送uid`、`/优纪订阅B站推送uid`、`/yuki订阅B站推送uid`。
+示例：`#优纪订阅B站推送uid`、`#yuki订阅B站推送uid`、`/优纪订阅B站推送uid`、`/yuki订阅B站推送uid`。
 
 | 用途 | 描述 | 指令 |
 | --------- | ----------- | ------------ |

package/lib/apps/index.d.ts

@@ -0,0 +1,4 @@
+export * from '@/apps/bilibili';
+export * from '@/apps/weibo';
+export * from '@/apps/help';
+export * from '@/apps/version';

package/lib/components/index.d.ts

@@ -0,0 +1,5 @@
+declare const MainPage: typeof import("@/components/dynamic/MainPage").default;
+declare const Help: typeof import("@/components/help/Help").default;
+declare const LoginQrcodePage: typeof import("@/components/loginQrcode/Page").default;
+declare const Version: typeof import("@/components/version/Version").default;
+export { Help, LoginQrcodePage, MainPage, Version };

package/lib/{types/index.d.ts → index.d.ts}

@@ -1,5 +1,5 @@
 declare const _default: () => {
     create(): void;
-    mounted<T extends keyof import("yunzai").EventEmun = "message.group">(): import("yunzai").Application<any>[];
+    mounted<T extends keyof import("yunzai").EventEmun = "message.group">(e: Parameters<import("yunzai").EventEmun[T]>[0]): Promise<any[]>;
 };
 export default _default;

package/lib/index.js

@@ -1,27 +1,43 @@
 import chalk from 'chalk';
-import { useAppStorage, applicationOptions } from 'yunzai';
+import { applicationOptions, useEvent } from 'yunzai';
 import Config from './utils/config.js';
 import * as index$1 from './apps/index.js';
 
-const Data = useAppStorage();
 var index = () => {
+    const rules = [];
     return applicationOptions({
         create() {
-            let count = 0;
             for (const key in index$1) {
-                Data.push(new index$1[key]());
-                count++;
+                const app = new index$1[key]();
+                for (const rule of app.rule) {
+                    rules.push({
+                        reg: rule.reg,
+                        key: key
+                    });
+                }
             }
             logger.info(chalk.rgb(0, 190, 255)(`-----------------------------------------`));
-            logger.info(chalk.rgb(255, 225, 255)(`|优纪插件 ${Config.getLatestVersion()} 初始化~`));
-            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`));
+            logger.info(chalk.rgb(255, 225, 255)(`优纪插件 ${Config.getLatestVersion()} 初始化~`));
+            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`));
             logger.info(chalk.rgb(0, 190, 255)(`-----------------------------------------`));
-            logger.info(chalk.rgb(0, 190, 255)(`★ 优纪插件加载完成，共计加载${count}个app`));
+            logger.info(chalk.rgb(0, 190, 255)(`★ 优纪插件加载完成了喵~`));
         },
-        mounted() {
-            return Data;
+        async mounted(e) {
+            const data = [];
+            const cache = {};
+            await useEvent(e => {
+                for (const item of rules) {
+                    if (new RegExp(item.reg).test(e.msg) &&
+                        index$1[item.key] &&
+                        !cache[item.key]) {
+                        cache[item.key] = true;
+                        data.push(new index$1[item.key]());
+                    }
+                }
+            }, [e, 'message']);
+            return data;
         }
     });
 };

package/lib/main.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/{types/models → models}/bilibili/bilibili.task.d.ts

@@ -1,6 +1,6 @@
 import { EventType } from 'yunzai';
-import { MainProps } from "../../components/dynamic/MainPage";
-import { ScreenshotOptions } from './../../utils/puppeteer.render';
+import { MainProps } from "@/components/dynamic/MainPage";
+import { ScreenshotOptions } from '@/utils/puppeteer.render';
 export declare class BiliTask {
     taskName: string;
     groupKey: string;

package/lib/{types/models → models}/weibo/weibo.task.d.ts

@@ -1,6 +1,6 @@
 import { EventType } from 'yunzai';
-import { MainProps } from "../../components/dynamic/MainPage";
-import { ScreenshotOptions } from '../../utils/puppeteer.render';
+import { MainProps } from "@/components/dynamic/MainPage";
+import { ScreenshotOptions } from '@/utils/puppeteer.render';
 export declare class WeiboTask {
     taskName: string;
     groupKey: string;

package/lib/utils/config.js

@@ -22,23 +22,35 @@ class Config {
         this.initConfigFiles();
     }
     initConfigFiles() {
-        let bilibiliSetFile = path.join(_paths.pluginPath, 'config/bilibili/config.yaml');
-        let bilibiliPushFile = path.join(_paths.pluginPath, 'config/bilibili/push.yaml');
-        let weiboSetFile = path.join(_paths.pluginPath, 'config/weibo/config.yaml');
-        let weiboPushFile = path.join(_paths.pluginPath, 'config/weibo/push.yaml');
         const configFiles = [
-            { file: bilibiliSetFile, defaultFile: path.join(_paths.pluginPath, 'defaultConfig/bilibili/config.yaml'), dir: 'config/bilibili' },
-            { file: bilibiliPushFile, defaultFile: path.join(_paths.pluginPath, 'defaultConfig/bilibili/push.yaml'), dir: 'config/bilibili' },
-            { file: weiboSetFile, defaultFile: path.join(_paths.pluginPath, 'defaultConfig/weibo/config.yaml'), dir: 'config/weibo' },
-            { file: weiboPushFile, defaultFile: path.join(_paths.pluginPath, 'defaultConfig/weibo/push.yaml'), dir: 'config/weibo' }
+            {
+                configFile: path.join(_paths.botYukiData, 'config/bilibili/config.yaml'),
+                defaultFile: path.join(_paths.pluginPath, 'defaultConfig/bilibili/config.yaml'),
+                dir: 'config/bilibili'
+            },
+            {
+                configFile: path.join(_paths.botYukiData, 'config/bilibili/push.yaml'),
+                defaultFile: path.join(_paths.pluginPath, 'defaultConfig/bilibili/push.yaml'),
+                dir: 'config/bilibili'
+            },
+            {
+                configFile: path.join(_paths.botYukiData, 'config/weibo/config.yaml'),
+                defaultFile: path.join(_paths.pluginPath, 'defaultConfig/weibo/config.yaml'),
+                dir: 'config/weibo'
+            },
+            {
+                configFile: path.join(_paths.botYukiData, 'config/weibo/push.yaml'),
+                defaultFile: path.join(_paths.pluginPath, 'defaultConfig/weibo/push.yaml'),
+                dir: 'config/weibo'
+            }
         ];
-        for (const { file, defaultFile, dir } of configFiles) {
-            if (!fs.existsSync(file)) {
-                const configDir = path.join(_paths.pluginPath, dir);
+        for (const { configFile, defaultFile, dir } of configFiles) {
+            if (!fs.existsSync(configFile)) {
+                const configDir = path.join(_paths.botYukiData, dir);
                 if (!fs.existsSync(configDir)) {
                     fs.mkdirSync(configDir, { recursive: true });
                 }
-                fs.copyFileSync(defaultFile, file);
+                fs.copyFileSync(defaultFile, configFile);
             }
         }
     }
@@ -52,7 +64,12 @@ class Config {
         return this[key];
     }
     getConfigFilePath(typeDir, appDir, functionName) {
-        return path.join(_paths.pluginPath, `${typeDir}`, `${appDir}`, `${functionName}.yaml`);
+        if (typeDir === "defaultConfig") {
+            return path.join(_paths.pluginPath, `${typeDir}`, `${appDir}`, `${functionName}.yaml`);
+        }
+        else {
+            return path.join(_paths.botYukiData, `${typeDir}`, `${appDir}`, `${functionName}.yaml`);
+        }
     }
     watch(configFilePath, typeDir, appDir, functionName) {
         const key = `${typeDir}_${appDir}_${functionName}`;

package/lib/{types/utils → utils}/image.d.ts

@@ -1,5 +1,5 @@
 import { Picture, ComponentCreateOpsionType } from 'react-puppeteer';
-import { ScreenshotOptions } from './puppeteer.render';
+import { ScreenshotOptions } from '@/utils/puppeteer.render';
 export declare class Image extends Picture {
     constructor();
     renderPage<T = any>(uid: number | string, page: string, props?: T, ScreenshotOptions?: ScreenshotOptions, ComponentCreateOpsion?: ComponentCreateOpsionType): Promise<false | {

package/lib/utils/puppeteer.render.js

@@ -77,12 +77,10 @@ class YukiPuppeteerRender extends Puppeteer {
                 });
                 numSun++;
                 if (buff !== false) {
-                    if (!Buffer.isBuffer(buff)) {
-                        buff = Buffer.from(buff);
-                    }
-                    const kb = (buff?.length / 1024).toFixed(2) + "kb";
+                    let imgBuff = !Buffer.isBuffer(buff) ? Buffer.from(buff) : buff;
+                    const kb = (imgBuff?.length / 1024).toFixed(2) + "kb";
                     logger.mark(`[图片生成][${name}][${numSun}次] ${kb} ${logger.green(`${Date.now() - start}ms`)}`);
-                    ret.push(buff);
+                    ret.push(imgBuff);
                 }
                 else {
                     logger.error(`[puppeteer]`, '截图失败');

package/package.json

@@ -1,28 +1,29 @@
 {
   "name": "yz-yuki-plugin",
-  "version": "1.0.3-rc.5",
+  "version": "1.0.4",
   "description": "优纪插件，yunzaijs 关于 微博推送、B站推送 等功能的拓展插件",
   "author": "snowtafir",
   "type": "module",
   "license": "MIT",
-  "main": "main.js",
+  "private": false,
   "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",
-    "img": "npm run css && nodemon --config routes.nodemon.json",
-    "build": "npm run css:m && rollup  --config rollup.config.js",
-    "css": "tailwindcss -i ./src/input.css -o ./public/output.css",
-    "css:m": "tailwindcss -i ./src/input.css -o ./public/output.css -m",
-    "css:watch": "tailwindcss -i ./src/input.css -o ./public/output.css --watch",
+    "app": "npx tsx src/main.ts",
+    "img-dev": "npx tsx watch --clear-screen=false routes.server.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 ."
   },
   "dependencies": {
     "axios": "^1.7.3",
+    "chalk": "^5.3.0",
     "chokidar": "^3.6.0",
+    "debug": "^4.3.6",
     "jsdom": "^24.1.1",
     "json5": "^2.2.3",
     "md5": "^2.3.0",
@@ -38,6 +39,13 @@
     "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",
@@ -47,7 +55,6 @@
     "@rollup/plugin-typescript": "^11.1.6",
     "@types/rollup-plugin-auto-external": "^2.0.5",
     "@types/jsdom": "^21.1.7",
-    "@types/lodash": "^4.17.7",
     "@types/md5": "^2.3.5",
     "@types/node": "^22.2.0",
     "@types/node-fetch": "^2.6.11",
@@ -56,6 +63,7 @@
     "@types/react-dom": "^18.3.0",
     "@types/yaml": "1.9.7",
     "axios": "^1.7.3",
+    "babel-plugin-module-resolver": "^5.0.2",
     "chokidar": "^3.6.0",
     "jsdom": "^24.1.1",
     "json5": "^2.2.3",
@@ -76,9 +84,10 @@
     "rollup-plugin-ignore": "^1.0.10",
     "tailwindcss": "^3.4.9",
     "ts-node": "^10.9.2",
+    "tsx": "^4.18.0",
     "typescript": "^5.5.4",
-    "yunzai": "^1.0.1-rc.5",
-    "yunzai-mys": "^1.0.0-rc.1"
+    "yunzai": "^1.0.6",
+    "yunzai-mys": "^1.0.5"
   },
   "files": [
     "public",
@@ -91,18 +100,18 @@
     "LICENSE",
     ".puppeteerrc.cjs"
   ],
-  "types": "lib/types",
+  "types": "lib",
   "exports": {
     ".": {
       "import": "./lib/index.js",
-      "types": "./lib/types/index.d.ts"
+      "types": "./lib/index.d.ts"
     }
   },
   "keywords": [
     "yunzai"
   ],
   "publishConfig": {
-    "registry": "https://registry.npmjs.org/"
+    "registry": "https://registry.npmjs.org"
   },
   "engines": {
     "node": ">=16.14.0"

package/lib/types/apps/index.d.ts

@@ -1,4 +0,0 @@
-export * from './bilibili';
-export * from './weibo';
-export * from './help';
-export * from './version';

package/lib/types/components/index.d.ts

@@ -1,5 +0,0 @@
-declare const MainPage: typeof import("./dynamic/MainPage").default;
-declare const Help: typeof import("./help/Help").default;
-declare const LoginQrcodePage: typeof import("./loginQrcode/Page").default;
-declare const Version: typeof import("./version/Version").default;
-export { Help, LoginQrcodePage, MainPage, Version };