karin-plugin-kkk 1.0.4-commit.db43730 → 1.0.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [1.0.4](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.0.3...v1.0.4) (2025-01-19)
+
+
+### Bug Fixes
+
+* ci ([2cc5cbb](https://github.com/ikenxuan/karin-plugin-kkk/commit/2cc5cbb7ecca8b581905a6e5e5cbbb1e5dd6a829))
+* 细优 ([73b5562](https://github.com/ikenxuan/karin-plugin-kkk/commit/73b55621405a05e5e88e05aed7a3af28ab05eb8b))
+
+
+### Performance Improvements
+
+* 优化合辑解析 ([a2a75b4](https://github.com/ikenxuan/karin-plugin-kkk/commit/a2a75b423525180ea7f03f9112893640dea12238))
+
 ## [1.0.3](https://github.com/ikenxuan/karin-plugin-kkk/compare/1.0.2-commit.ced194c...v1.0.3-commit.ced194c) (2025-01-16)
 
 

package/lib/apps/push.d.ts

@@ -3,6 +3,6 @@ export declare const bilibiliPush: false | import("node-karin").Task;
 export declare const forcePush: import("node-karin").Command<"message.group">;
 export declare const setdyPush: import("node-karin").Command<"message.group">;
 export declare const setbiliPush: import("node-karin").Command<"message.group">;
-export declare const bilibiliPushList: import("node-karin").Command<keyof import("node-karin").MessageEventMap>;
-export declare const douyinPushList: import("node-karin").Command<keyof import("node-karin").MessageEventMap>;
+export declare const bilibiliPushList: import("node-karin").Command<"message.group">;
+export declare const douyinPushList: import("node-karin").Command<"message.group">;
 export declare const changeBotID: import("node-karin").Command<keyof import("node-karin").MessageEventMap>;

package/lib/apps/push.js

@@ -37,10 +37,10 @@ export const setbiliPush = karin.command(/^#设置[bB]站推送(?:[Uu][Ii][Dd]:)
 }, { name: 'kkk-推送功能-设置', event: 'message.group', perm: Config.bilibili.push.permission, dsbAdapter: ['qqbot'] });
 export const bilibiliPushList = karin.command(/^#?[bB]站推送列表$/, async (e) => {
     await new Bilibilipush(e).renderPushList(Config.pushlist.bilibili);
-});
+}, { name: 'kkk-推送功能-列表', event: 'message.group' });
 export const douyinPushList = karin.command(/^#?抖音推送列表$/, async (e) => {
     await new DouYinpush(e).renderPushList(Config.pushlist.douyin);
-});
+}, { name: 'kkk-推送功能-列表', event: 'message.group' });
 export const changeBotID = karin.command(/^#kkk设置推送机器人/, async (e) => {
     const newDouyinlist = Config.pushlist.douyin.map(item => {
         // 操作每个 group_id

package/lib/cli/pr.js

@@ -14,16 +14,15 @@ const readPkg = () => JSON.parse(fs.readFileSync(getPkgPath(), 'utf-8'));
  */
 const writePkg = (pkg) => fs.writeFileSync(getPkgPath(), JSON.stringify(pkg, null, 2));
 /**
- * @description 构建pr版本号 <主版本号>.<次版本号>.<修订号>.<PR标识PR编号>.<当前提交唯一短哈希>
+ * @description 构建pr版本号 <主版本号>.<次版本号>.<修订号>.<PR标识>.<PR编号>.<当前提交唯一短哈希>
  * @example 1.0.0.pr.184.a1b2c3d
  * @param pkg package.json
  */
 const updateVersion = (pkg) => {
     const list = pkg.version.split('.');
-    console.log('PR_COMMIT_HASH' + process.env.PR_COMMIT_HASH);
-    const shortHash = process.env.PR_COMMIT_HASH?.substring(0, 7) ?? 'unknown';
+    const shortHash = process.env.GITHUB_SHA?.substring(0, 7) ?? 'unknown';
     list[2] = `${Number(list[2]) + 1}`;
-    pkg.version = `${list.join('.')}-pr${process.env.PR_NUMBER}.${shortHash}`;
+    pkg.version = `${list.join('.')}.pr.${process.env.PR_NUMBER}.${shortHash}`;
 };
 /**
  * @description 设置环境变量

package/lib/module/utils/Base.d.ts

@@ -1,5 +1,5 @@
 import { Message } from 'node-karin';
-interface uploadFileOptions {
+type uploadFileOptions = {
     /** 是否使用群文件上传 */
     useGroupFile?: boolean;
     /** 消息ID，如果有，则将使用该消息ID制作回复元素 */
@@ -13,15 +13,15 @@ interface uploadFileOptions {
         /** 群号 */
         group_id: string;
     };
-}
+};
 /** 最少都要传一个 */
-interface title {
+type title = {
     /** 文件名：自定义 */
     originTitle?: string;
     /** 文件名：tmp + 时间戳 */
     timestampTitle?: string;
-}
-interface downloadFileOptions {
+};
+type downloadFileOptions = {
     /** 视频链接 */
     video_url: string;
     /** 文件名 */
@@ -30,8 +30,8 @@ interface downloadFileOptions {
     filetype?: string;
     /** 自定义请求头，将使用该请求头下载文件。 */
     headers?: object;
-}
-interface fileInfo {
+};
+export type fileInfo = {
     /** 视频文件的绝对路径 */
     filepath: string;
     /** 视频文件大小 */
@@ -40,8 +40,8 @@ interface fileInfo {
     originTitle?: title['originTitle'];
     /** 文件名：tmp + 时间戳 */
     timestampTitle?: title['timestampTitle'];
-}
-interface downLoadFileOptions {
+};
+type downLoadFileOptions = {
     /** 文件名 */
     title: string;
     /**
@@ -49,7 +49,7 @@ interface downLoadFileOptions {
      * @default {}
      */
     headers?: object;
-}
+};
 export declare class Base {
     e: Message;
     headers: any;

package/lib/platform/bilibili/bilibili.d.ts

@@ -43,11 +43,27 @@ export declare class Bilibili extends Base {
     }>;
 }
 export declare function replacetext(text: string, rich_text_nodes: any[]): string;
+/**
+ * 拼接B站动态卡片的html字符串
+ * @param colors 颜色数组
+ * @param text 卡片的文字
+ * @returns 拼接好的html字符串
+ */
 export declare const generateGradientStyle: (colors: string[], text: string) => string;
+/**
+ * 将给定的图片源数组转换为一个新的对象数组，每个对象包含单个图片源
+ * @param pic 一个包含图片源字符串的数组
+ * @returns 返回一个对象数组，每个对象包含单个图片源
+ */
 export declare const cover: (pic: {
     img_src: string;
 }[]) => {
     image_src: string;
 }[];
+/**
+ * 生成装饰卡片的HTML字符串
+ * @param decorate 装饰对象，包含卡片的URL和颜色信息
+ * @returns 返回装饰卡片的HTML字符串或空div字符串
+ */
 export declare const generateDecorationCard: (decorate: any) => string;
 export {};

package/lib/platform/bilibili/bilibili.js

@@ -599,6 +599,12 @@ const qnd = {
     126: '杜比视界',
     127: '超高清 8K'
 };
+/**
+ * 拼接B站动态卡片的html字符串
+ * @param colors 颜色数组
+ * @param text 卡片的文字
+ * @returns 拼接好的html字符串
+ */
 export const generateGradientStyle = (colors, text) => {
     if (!colors)
         return '';
@@ -608,6 +614,11 @@ export const generateGradientStyle = (colors, text) => {
     // 返回完整的CSS样式字符串
     return `<span style="font-family: bilifont; color: transparent; background-clip: text; margin: 0 200px 0 0; font-size: 43px; background-image: linear-gradient(135deg, ${gradientString} 0%, ${gradientString} 100%); ">${text}</span>`;
 };
+/**
+ * 将给定的图片源数组转换为一个新的对象数组，每个对象包含单个图片源
+ * @param pic 一个包含图片源字符串的数组
+ * @returns 返回一个对象数组，每个对象包含单个图片源
+ */
 export const cover = (pic) => {
     const imgArray = [];
     for (const i of pic) {
@@ -618,6 +629,11 @@ export const cover = (pic) => {
     }
     return imgArray;
 };
+/**
+ * 生成装饰卡片的HTML字符串
+ * @param decorate 装饰对象，包含卡片的URL和颜色信息
+ * @returns 返回装饰卡片的HTML字符串或空div字符串
+ */
 export const generateDecorationCard = (decorate) => {
     return decorate
         ? `<div style="display: flex; width: 500px; height: 150px; background-position: center; background-attachment: fixed; background-repeat: no-repeat; background-size: contain; align-items: center; justify-content: flex-end; background-image: url('${decorate.card_url}')">${generateGradientStyle(decorate.fan?.color_format?.colors, decorate.fan.num_str)}</div>`

package/lib/platform/douyin/douyin.js

@@ -136,26 +136,40 @@ export class DouYin extends Base {
                 return true;
             }
             case 'user_mix_videos': {
+                const emojiData = await getDouyinData('Emoji数据');
+                const commentsData = await douyinComments(data.CommentsData, emojiData);
+                const commentImage = await Render('douyin/comment', {
+                    Type: '合辑作品',
+                    CommentsData: commentsData,
+                    CommentLength: String(commentsData.jsonArray?.length ? commentsData.jsonArray.length : 0),
+                    share_url: this.is_mp4
+                        ? `https://aweme.snssdk.com/aweme/v1/play/?video_id=${data.VideoData.aweme_detail.video.play_addr.uri}&ratio=1080p&line=0`
+                        : data.VideoData.aweme_detail.share_url,
+                    VideoSize: '？？？',
+                    VideoFPS: '？？？',
+                    ImageLength: '？？？'
+                });
+                await this.e.reply(commentImage);
                 const images = [];
-                const bgmurl = data.aweme_details[0].music.play_url.uri;
-                for (const item of data.aweme_details[0].images) {
+                const temp = [];
+                /** BGM */
+                const liveimgbgm = await this.DownLoadFile(data.LiveImageData.aweme_details[0].music.play_url.uri, {
+                    title: `Douyin_tmp_A_${Date.now()}.mp3`,
+                    headers: this.headers
+                });
+                temp.push(liveimgbgm);
+                for (const item of data.LiveImageData.aweme_details[0].images) {
                     // 静态图片，clip_type为2
                     if (item.clip_type === 2) {
-                        images.push(segment.text(`动图直链:\nhttps://aweme.snssdk.com/aweme/v1/play/?video_id=${item.uri}&ratio=1080p&line=0`));
+                        images.push(segment.image((item.url_list[0])));
                         continue;
                     }
-                    images.push(segment.text(`动图直链:\nhttps://aweme.snssdk.com/aweme/v1/play/?video_id=${item.video.play_addr_h264.uri}&ratio=1080p&line=0`));
-                    // 动图
+                    /** 动图 */
                     const liveimg = await this.DownLoadFile(`https://aweme.snssdk.com/aweme/v1/play/?video_id=${item.video.play_addr_h264.uri}&ratio=1080p&line=0`, {
                         title: `Douyin_tmp_V_${Date.now()}.mp4`,
                         headers: this.headers
                     });
-                    // BGM
-                    const liveimgbgm = await this.DownLoadFile(bgmurl, {
-                        title: `Douyin_tmp_A_${Date.now()}.mp3`,
-                        headers: this.headers
-                    });
-                    if (liveimg.filepath && liveimgbgm.filepath) {
+                    if (liveimg.filepath) {
                         const resolvefilepath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
                         await mergeFile('视频*3 + 音频', {
                             path: liveimg.filepath,
@@ -165,21 +179,12 @@ export class DouYin extends Base {
                                 if (success) {
                                     const filePath = Common.tempDri.video + `tmp_${Date.now()}.mp4`;
                                     fs.renameSync(resultPath, filePath);
-                                    await this.removeFile(liveimgbgm.filepath, true);
                                     await this.removeFile(liveimg.filepath, true);
-                                    const stats = fs.statSync(filePath);
-                                    const fileSizeInMB = Number((stats.size / (1024 * 1024)).toFixed(2));
-                                    if (fileSizeInMB > Config.upload.groupfilevalue) {
-                                        this.e.reply(`视频大小: ${fileSizeInMB}MB 正通过群文件上传中...`);
-                                        return await this.upload_file({ filepath: filePath, totalBytes: fileSizeInMB }, '', { useGroupFile: true });
-                                    }
-                                    else {
-                                        /** 因为本地合成，没有视频直链 */
-                                        return await this.upload_file({ filepath: filePath, totalBytes: fileSizeInMB }, '');
-                                    }
+                                    temp.push({ filepath: filePath, totalBytes: 0 });
+                                    images.push(segment.video('file://' + filePath));
+                                    return true;
                                 }
                                 else {
-                                    await this.removeFile(liveimgbgm.filepath, true);
                                     await this.removeFile(liveimg.filepath, true);
                                     return true;
                                 }
@@ -188,7 +193,17 @@ export class DouYin extends Base {
                     }
                 }
                 const Element = common.makeForward(images, this.e.sender.userId, this.e.sender.nick);
-                await this.e.bot.sendForwardMsg(this.e.contact, Element);
+                try {
+                    await this.e.bot.sendForwardMsg(this.e.contact, Element);
+                }
+                catch (error) {
+                    await this.e.reply(JSON.stringify(error, null, 2));
+                }
+                finally {
+                    for (const item of temp) {
+                        await this.removeFile(item.filepath, true);
+                    }
+                }
                 return true;
             }
             case 'user_dynamic': {

package/lib/platform/douyin/getData.js

@@ -23,10 +23,14 @@ export async function fetchDouyinData(type, opt) {
             return CommentsData;
         }
         case 'user_mix_videos': {
+            const CommentsData = await getDouyinData('评论数据', dyck, {
+                aweme_id: opt.aweme_id,
+                number: Config.douyin.numcomment
+            });
             const LiveImageData = await getDouyinData('合辑作品数据', dyck, {
                 aweme_id: opt.aweme_id
             });
-            return LiveImageData;
+            return { LiveImageData, CommentsData };
         }
         case 'live_room_detail':
         case 'user_profile': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "1.0.4-commit.db43730",
+  "version": "1.0.4",
   "description": "a Karin video parsing tool",
   "keywords": [
     "karin-plugin",
@@ -45,17 +45,17 @@
     "log": "karin log",
     "up": "karin up",
     "init": "karin init",
-    "dev": "tsx watch --include \"./src/**/*\"  node_modules/node-karin/dist/index.js",
+    "dev": "tsx watch --include \"src/**/*.ts\" src/index.ts",
     "ts": "karin ts",
     "watch": "karin watch"
   },
   "dependencies": {
-    "@ikenxuan/amagi": "4.2.3",
+    "@ikenxuan/amagi": "4.2.4",
     "@karinjs/md-html": "^1.1.6",
     "cors": "^2.8.5",
     "heic-convert": "^2.1.0",
     "http-proxy-middleware": "^3.0.3",
-    "playwright": "^1.49.0",
+    "playwright": "^1.49.1",
     "qrcode": "^1.5.4",
     "sequelize": "6.37.3",
     "sqlite3": "5.1.6"