karin-plugin-kkk 1.0.6 → 1.0.8-pr32.022e593

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [1.0.7](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.0.6...v1.0.7) (2025-01-30)
+
+
+### Bug Fixes
+
+* 抖音推送图集解析 ([0ccc71a](https://github.com/ikenxuan/karin-plugin-kkk/commit/0ccc71a0bdb2e302a00a28bc9bbeeee415af4dba))
+* 移除无用导入 ([3a3aac3](https://github.com/ikenxuan/karin-plugin-kkk/commit/3a3aac37291dae65cad66f0a9fc80850ad95c265))
+
 ## [1.0.6](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.0.5...v1.0.6) (2025-01-21)
 
 

package/README.md

@@ -88,19 +88,17 @@ git clone https://github.com/你的GitHub用户名/karin-plugin-kkk.git
 ```sh
 cd karin-plugin-kkk/
 ```
-4. 安装依赖
+4. 初始化开发环境
+```sh
+pnpm run init
+```
+5. 安装依赖
 ```sh
 pnpm install
 ```
-5. 启动开发环境
-
-两条命令任选一条执行
-
+6. 启动开发环境 
 ```sh
-# 自动重载 apps 目录下的所有文件
-pnpm ts
-# 保存 src 目录下的文件后自动重启
-pnpm watch
+pnpm dev
 ```
 </details>
 

package/lib/apps/admin.js

@@ -36,30 +36,29 @@ export const setbilick = karin.command(/^#?(kkk)?s*设置s*(B站)ck$/i, async (e
     await e.reply('设置成功！', { at: true });
     return true;
 }, { perm: 'master', name: 'kkk-ck管理', event: 'message.friend' });
-const authFailMsg = '你暂时没有这个权限使用这个功能啦 ~ 只有主人可以使用哦';
 // 插件类
 export class Admin extends Plugin {
     constructor() {
         super({
             name: 'kkk-管理',
             rule: [
-                { reg: createSwitchRegExp('app'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('app'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createCustomRegExp('app'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('douyin'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('douyin'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('douyin'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('bilibili'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('upload'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('upload'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('upload'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: createSwitchRegExp('kuaishou'), fnc: 'ConfigSwitch', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigNumber', permission: 'master', authFailMsg },
-                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigCustom', permission: 'master', authFailMsg },
-                { reg: /^#kkk设置$/, fnc: 'index_Settings', permission: 'master', authFailMsg },
-                { reg: /^#?kkk删除缓存$/, fnc: 'deleteCache', permission: 'master', authFailMsg }
+                { reg: createSwitchRegExp('app'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('app'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createCustomRegExp('app'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('douyin'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('douyin'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('douyin'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('bilibili'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('bilibili'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('upload'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('upload'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('upload'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: createSwitchRegExp('kuaishou'), fnc: 'ConfigSwitch', permission: 'master' },
+                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigNumber', permission: 'master' },
+                { reg: createNumberRegExp('kuaishou'), fnc: 'ConfigCustom', permission: 'master' },
+                { reg: /^#kkk设置$/, fnc: 'index_Settings', permission: 'master' },
+                { reg: /^#?kkk删除缓存$/, fnc: 'deleteCache', permission: 'master' }
             ]
         });
     }

package/lib/cli/pr.js

@@ -22,7 +22,7 @@ const updateVersion = (pkg) => {
     const list = pkg.version.split('.');
     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/Networks.d.ts

@@ -29,7 +29,7 @@ export declare class Networks {
     getfetch(): Promise<AxiosResponse | boolean>;
     returnResult(): Promise<AxiosResponse>;
     /** 最终地址（跟随重定向） */
-    getLongLink(): Promise<string>;
+    getLongLink(url?: string): Promise<string>;
     /** 获取首个302链接 */
     getLocation(): Promise<AxiosResponse['headers']['location']>;
     /** 获取数据并处理数据的格式化，默认json */

package/lib/module/utils/Networks.js

@@ -156,19 +156,20 @@ export class Networks {
         return response;
     }
     /** 最终地址（跟随重定向） */
-    async getLongLink() {
+    async getLongLink(url = '') {
         try {
-            const response = await this.axiosInstance({
-                method: 'GET',
-                url: this.url
-            });
-            return response.request.res.responseUrl; // axios中获取最终的请求URL
+            const response = await this.axiosInstance.get(this.url || url);
+            return response.request.res.responseUrl;
         }
         catch (error) {
-            if (error instanceof AxiosError) {
-                throw new Error(error.stack);
+            const axiosError = error;
+            if (axiosError.response && axiosError.response.status === 302) {
+                // 获取重定向地址
+                const redirectUrl = axiosError.response.headers.location;
+                // 递归调用，直到获取最终地址
+                return this.getLongLink(redirectUrl);
             }
-            return '';
+            throw error;
         }
     }
     /** 获取首个302链接 */

package/lib/platform/douyin/douyin.d.ts

@@ -26,7 +26,8 @@ export type dyVideo = {
 export declare class DouYin extends Base {
     e: Message;
     type: DouyinDataTypes[keyof DouyinDataTypes];
-    is_mp4: any;
+    is_mp4: boolean | undefined;
+    is_slides: boolean;
     get botadapter(): string;
     constructor(e: Message, iddata: ExtendedDouyinOptionsType);
     RESOURCES(data: any): Promise<true | undefined>;

package/lib/platform/douyin/douyin.js

@@ -11,6 +11,7 @@ export class DouYin extends Base {
     e;
     type;
     is_mp4;
+    is_slides;
     get botadapter() {
         return this.e.bot?.adapter?.name;
     }
@@ -19,46 +20,119 @@ export class DouYin extends Base {
         this.e = e;
         this.type = iddata?.type;
         this.is_mp4 = iddata?.is_mp4;
+        this.is_slides = false;
     }
     async RESOURCES(data) {
         switch (this.type) {
             case 'one_work': {
                 if (Config.douyin.tip)
                     this.e.reply('检测到抖音链接，开始解析');
+                this.is_slides = data.VideoData.aweme_detail.is_slides === true;
                 let g_video_url = '';
                 let g_title;
-                const full_data = [];
                 /** 图集 */
                 let imagenum = 0;
                 const image_res = [];
                 if (this.is_mp4 === false) {
-                    const image_data = [];
-                    const imageres = [];
-                    let image_url;
-                    for (let i = 0; i < data.VideoData.aweme_detail.images.length; i++) {
-                        image_url = data.VideoData.aweme_detail.images[i].url_list[2] || data.VideoData.aweme_detail.images[i].url_list[1]; // 图片地址
-                        const title = data.VideoData.aweme_detail.preview_title.substring(0, 50).replace(/[\\/:\*\?"<>\|\r\n]/g, ' '); // 标题，去除特殊字符
-                        g_title = title;
-                        imageres.push(segment.image(image_url));
-                        imagenum++;
-                        if (Config.app.rmmp4 === false) {
-                            mkdirSync(`${Common.tempDri.images}${g_title}`);
-                            const path = `${Common.tempDri.images}${g_title}/${i + 1}.png`;
-                            await new Networks({ url: image_url, type: 'arraybuffer' }).getData().then((data) => fs.promises.writeFile(path, Buffer.from(data)));
+                    switch (true) {
+                        // 图集
+                        case this.is_slides === false: {
+                            const image_data = [];
+                            const imageres = [];
+                            let image_url;
+                            for (let i = 0; i < data.VideoData.aweme_detail.images.length; i++) {
+                                image_url = data.VideoData.aweme_detail.images[i].url_list[2] || data.VideoData.aweme_detail.images[i].url_list[1]; // 图片地址
+                                const title = data.VideoData.aweme_detail.preview_title.substring(0, 50).replace(/[\\/:\*\?"<>\|\r\n]/g, ' '); // 标题，去除特殊字符
+                                g_title = title;
+                                imageres.push(segment.image(image_url));
+                                imagenum++;
+                                if (Config.app.rmmp4 === false) {
+                                    mkdirSync(`${Common.tempDri.images}${g_title}`);
+                                    const path = `${Common.tempDri.images}${g_title}/${i + 1}.png`;
+                                    await new Networks({ url: image_url, type: 'arraybuffer' }).getData().then((data) => fs.promises.writeFile(path, Buffer.from(data)));
+                                }
+                            }
+                            const res = common.makeForward(imageres, this.e.sender.userId, this.e.sender.nick);
+                            image_data.push(res);
+                            image_res.push(image_data);
+                            if (imageres.length === 1) {
+                                await this.e.reply(segment.image(image_url));
+                            }
+                            else {
+                                await this.e.bot.sendForwardMsg(this.e.contact, res, {
+                                    source: '图片合集',
+                                    summary: `查看${res.length}张图片消息`,
+                                    prompt: '抖音图集解析结果',
+                                    news: [{ text: '点击查看解析结果' }]
+                                });
+                            }
+                            break;
+                        }
+                        // 合辑
+                        case data.VideoData.aweme_detail.is_slides === true: {
+                            const images = [];
+                            const temp = [];
+                            /** BGM */
+                            const liveimgbgm = await this.DownLoadFile(data.VideoData.aweme_detail.music.play_url.uri, {
+                                title: `Douyin_tmp_A_${Date.now()}.mp3`,
+                                headers: this.headers
+                            });
+                            temp.push(liveimgbgm);
+                            for (const item of data.VideoData.aweme_detail.images) {
+                                imagenum++;
+                                // 静态图片，clip_type为2
+                                if (item.clip_type === 2) {
+                                    images.push(segment.image((item.url_list[0])));
+                                    continue;
+                                }
+                                /** 动图 */
+                                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
+                                });
+                                if (liveimg.filepath) {
+                                    const resolvefilepath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
+                                    await mergeFile('视频*3 + 音频', {
+                                        path: liveimg.filepath,
+                                        path2: liveimgbgm.filepath,
+                                        resultPath: resolvefilepath,
+                                        callback: async (success, resultPath) => {
+                                            if (success) {
+                                                const filePath = Common.tempDri.video + `tmp_${Date.now()}.mp4`;
+                                                fs.renameSync(resultPath, filePath);
+                                                await this.removeFile(liveimg.filepath, true);
+                                                temp.push({ filepath: filePath, totalBytes: 0 });
+                                                images.push(segment.video('file://' + filePath));
+                                                return true;
+                                            }
+                                            else {
+                                                await this.removeFile(liveimg.filepath, true);
+                                                return true;
+                                            }
+                                        }
+                                    });
+                                }
+                            }
+                            const Element = common.makeForward(images, this.e.sender.userId, this.e.sender.nick);
+                            try {
+                                await this.e.bot.sendForwardMsg(this.e.contact, Element, {
+                                    source: '合辑内容',
+                                    summary: `查看${Element.length}张图片/视频消息`,
+                                    prompt: '抖音合辑解析结果',
+                                    news: [{ text: '点击查看解析结果' }]
+                                });
+                            }
+                            catch (error) {
+                                await this.e.reply(JSON.stringify(error, null, 2));
+                            }
+                            finally {
+                                for (const item of temp) {
+                                    await this.removeFile(item.filepath, true);
+                                }
+                            }
+                            break;
                         }
                     }
-                    const res = common.makeForward(imageres, this.e.sender.userId, this.e.sender.nick);
-                    image_data.push(res);
-                    image_res.push(image_data);
-                    if (imageres.length === 1) {
-                        await this.e.reply(segment.image(image_url));
-                    }
-                    else {
-                        await this.e.bot.sendForwardMsg(this.e.contact, res);
-                    }
-                }
-                else {
-                    image_res.push('图集信息解析失败');
                 }
                 /** 背景音乐 */
                 if (data.VideoData.aweme_detail.music) {
@@ -118,7 +192,7 @@ export class DouYin extends Base {
                     const list = await Emoji(EmojiData);
                     const commentsArray = await douyinComments(data.CommentsData, list);
                     const img = await Render('douyin/comment', {
-                        Type: this.is_mp4 ? '视频' : '图集',
+                        Type: this.is_mp4 ? '视频' : this.is_slides ? '合辑' : '图集',
                         CommentsData: commentsArray,
                         CommentLength: String(commentsArray.jsonArray?.length ? commentsArray.jsonArray.length : 0),
                         share_url: this.is_mp4
@@ -135,75 +209,6 @@ export class DouYin extends Base {
                 sendvideofile && this.is_mp4 && await this.DownLoadVideo({ video_url: g_video_url, title: { timestampTitle: `tmp_${Date.now()}.mp4`, originTitle: `${g_title}.mp4` } });
                 return true;
             }
-            case 'user_mix_videos': {
-                const emojiData = await getDouyinData('Emoji数据');
-                const commentsData = await douyinComments(data.CommentsData, Emoji(emojiData));
-                const commentImage = await Render('douyin/comment', {
-                    Type: '合辑作品',
-                    CommentsData: commentsData,
-                    CommentLength: String(commentsData.jsonArray?.length ? commentsData.jsonArray.length : 0),
-                    share_url: data.LiveImageData.aweme_details[0].share_url,
-                    VideoSize: '？？？',
-                    VideoFPS: '？？？',
-                    ImageLength: '？？？'
-                });
-                await this.e.reply(commentImage);
-                const 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.image((item.url_list[0])));
-                        continue;
-                    }
-                    /** 动图 */
-                    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
-                    });
-                    if (liveimg.filepath) {
-                        const resolvefilepath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;
-                        await mergeFile('视频*3 + 音频', {
-                            path: liveimg.filepath,
-                            path2: liveimgbgm.filepath,
-                            resultPath: resolvefilepath,
-                            callback: async (success, resultPath) => {
-                                if (success) {
-                                    const filePath = Common.tempDri.video + `tmp_${Date.now()}.mp4`;
-                                    fs.renameSync(resultPath, filePath);
-                                    await this.removeFile(liveimg.filepath, true);
-                                    temp.push({ filepath: filePath, totalBytes: 0 });
-                                    images.push(segment.video('file://' + filePath));
-                                    return true;
-                                }
-                                else {
-                                    await this.removeFile(liveimg.filepath, true);
-                                    return true;
-                                }
-                            }
-                        });
-                    }
-                }
-                const Element = common.makeForward(images, this.e.sender.userId, this.e.sender.nick);
-                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': {
                 const veoarray = [];
                 veoarray.unshift('------------------------------ | ---------------------------- |\n');
@@ -241,6 +246,10 @@ export class DouYin extends Base {
                     }
                     const search_data = new_userdata;
                 }
+                if (!data.music_info.play_url) {
+                    await this.e.reply('解析错误！该音乐抖音未提供下载链接，无法下载', { reply: true });
+                    return true;
+                }
                 img = await Render('douyin/musicinfo', {
                     image_url: data.music_info.cover_hd.url_list[0],
                     desc: data.music_info.title,

package/lib/platform/douyin/getID.js

@@ -7,19 +7,14 @@ import { Networks } from '../../module/utils/index.js';
  * @returns
  */
 export async function getDouyinID(url, log = true) {
-    const longLink = await new Networks({ url }).getLongLink();
+    const longLink = await new Networks({
+        url,
+        headers: {
+            'User-Agent': 'Apifox/1.0.0 (https://apifox.com)'
+        }
+    }).getLongLink();
     let result = {};
     switch (true) {
-        case /https:\/\/(?:www\.iesdouyin\.com)\/share\/slides/.test(longLink):
-        case longLink === 'https://www.douyin.com/': {
-            const match = longLink.match(/share\/slides\/(\d+)/);
-            result = {
-                type: 'user_mix_videos',
-                aweme_id: match ? match[1] : undefined,
-                is_mp4: false
-            };
-            break;
-        }
         case longLink.includes('webcast.amemv.com'):
         case longLink.includes('live.douyin.com'): {
             if (longLink.includes('webcast.amemv.com')) {

package/lib/platform/douyin/push.js

@@ -130,7 +130,7 @@ export class DouYinpush extends Base {
                             else if (!iddata.is_mp4 && iddata.type === 'one_work') { // 如果新作品是图集
                                 const imageres = [];
                                 let image_url;
-                                for (const item of Detail_Data.aweme_detail.images) {
+                                for (const item of Detail_Data.images) {
                                     image_url = item.url_list[2] || item.url_list[1]; // 图片地址
                                     imageres.push(segment.image(image_url));
                                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "1.0.6",
+  "version": "1.0.8-pr32.022e593",
   "description": "a Karin video parsing tool",
   "keywords": [
     "karin-plugin",
@@ -36,18 +36,9 @@
     "pub": "npm publish --access public",
     "pub-beta": "npm publish --tag beta",
     "sort": "npx sort-package-json",
-    "karin": "karin",
-    "app": "karin app",
     "start": "karin start",
-    "pm2": "karin pm2",
-    "stop": "karin stop",
-    "rs": "karin rs",
-    "log": "karin log",
-    "up": "karin up",
     "init": "karin init",
-    "dev": "tsx watch --include \"src/**/*.ts\" src/index.ts",
-    "ts": "karin ts",
-    "watch": "karin watch"
+    "dev": "tsx watch --include \"src/**/*.ts\" src/index.ts"
   },
   "dependencies": {
     "@ikenxuan/amagi": "4.2.5",

package/resources/template/douyin/html/comment.html

@@ -12,7 +12,7 @@
       {{if Type == '视频'}}
       <div class="top-info">视频大小：{{VideoSize}}MB</div>
       <div class="top-info">视频帧率：{{VideoFPS}}Hz</div>
-      {{else if Type == '图集'}}
+      {{else if Type == '图集' || Type == '合辑'}}
       <div class="top-info">图片数量：{{ImageLength}}张</div>
       {{/if}}
     </div>