karin-plugin-kkk 0.1.10-pr21.d6cca63 → 1.0.1-commit.069f646

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [1.0.0](https://github.com/ikenxuan/karin-plugin-kkk/compare/v0.1.9...v1.0.0) (2025-01-15)
+
+
+### ⚠ BREAKING CHANGES
+
+* 适配新版Karin ([#21](https://github.com/ikenxuan/karin-plugin-kkk/issues/21))
+
+### Features
+
+* 适配新版Karin ([#21](https://github.com/ikenxuan/karin-plugin-kkk/issues/21)) ([ef46290](https://github.com/ikenxuan/karin-plugin-kkk/commit/ef46290c67452237cb83fc4e552c3f3901f5a0a8))
+
 ## [0.1.9](https://github.com/ikenxuan/karin-plugin-kkk/compare/v0.1.8...v0.1.9) (2025-01-02)
 
 

package/README.md

@@ -40,7 +40,7 @@
 
    在 **Karin 根目录** 下运行
    ```sh
-   pnpm add karin-plugin-kkk -w
+   pnpm add karin-plugin-kkk@latest -w
    ```
    </details>
 
@@ -52,7 +52,7 @@
     
     1. 打开 Release 页面: https://github.com/ikenxuan/karin-plugin-kkk/releases
     2. 找到最新的版本，下载名为 `build.zip` 的压缩包
-    3. 在 `plugins/` 目录下解压该压缩包
+    3. 在 `plugins/` 目录下解压该压缩包，选择替换所有文件。
 
     * 完成后相关源码应在 `Karin根目录/plugins/karin-plugin-kkk/` 内<br><br>
 

package/lib/cli/commit.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/lib/cli/commit.js

@@ -0,0 +1,94 @@
+#!/usr/bin/env node
+import fs from 'fs';
+/**
+ * @description 获取package.json路径
+ */
+const getPkgPath = () => process.cwd() + '/package.json';
+/**
+ * @description 读取package.json
+ */
+const readPkg = () => JSON.parse(fs.readFileSync(getPkgPath(), 'utf-8'));
+/**
+ * @description 写入package.json
+ * @param pkg package.json
+ */
+const writePkg = (pkg) => fs.writeFileSync(getPkgPath(), JSON.stringify(pkg, null, 2));
+/**
+ * @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('COMMIT_HASH: ' + process.env.COMMIT_HASH);
+    const shortHash = process.env.COMMIT_HASH?.substring(0, 7) ?? 'unknown';
+    list[2] = `${Number(list[2]) + 1}`;
+    pkg.version = `${list.join('.')}-commit.${shortHash}`;
+};
+/**
+ * @description 设置环境变量
+ * @param pkg package.json
+ */
+const setEnvVariables = (pkg) => {
+    const githubEnvPath = process.env.GITHUB_ENV;
+    if (!githubEnvPath) {
+        throw new Error('GITHUB_ENV 环境变量未定义');
+    }
+    fs.appendFileSync(githubEnvPath, `PKG_NAME=${pkg.name}\nPKG_VERSION=${pkg.version}\n`);
+};
+/**
+ * @description 更新版本号并设置环境变量
+ */
+const version = () => {
+    console.log('开始执行版本更新...');
+    const pkg = readPkg();
+    console.log(`当前版本: ${pkg.version}`);
+    updateVersion(pkg);
+    console.log(`更新后版本: ${pkg.version}`);
+    writePkg(pkg);
+    console.log('package.json 写入成功');
+    setEnvVariables(pkg);
+    console.log('环境变量设置完成');
+};
+/**
+ * @description 删除devDependencies和peerDependencies
+ */
+const clean = () => {
+    console.log('开始清理依赖...');
+    const pkg = readPkg();
+    console.log('正在删除 devDependencies');
+    delete pkg.devDependencies;
+    writePkg(pkg);
+    console.log('依赖清理完成');
+};
+/**
+ * @description 执行所有操作
+ */
+const all = () => {
+    console.log('开始执行所有操作...');
+    const pkg = readPkg();
+    console.log(`当前版本: ${pkg.version}`);
+    updateVersion(pkg);
+    console.log(`更新后版本: ${pkg.version}`);
+    console.log('正在删除 devDependencies');
+    delete pkg.devDependencies;
+    writePkg(pkg);
+    console.log('package.json 写入成功');
+    setEnvVariables(pkg);
+    console.log('环境变量设置完成');
+    console.log('所有操作执行完毕');
+};
+const cmd = process.argv[2];
+console.log(`执行命令: ${cmd}`);
+if (cmd.includes('version')) {
+    version();
+}
+else if (cmd.includes('clean')) {
+    clean();
+}
+else if (cmd.includes('all')) {
+    all();
+}
+else {
+    console.log('未知命令，可用命令: version, clean, all');
+}

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

@@ -49,11 +49,6 @@ interface downLoadFileOptions {
      * @default {}
      */
     headers?: object;
-    /**
-     * 下载文件类型，默认为'.mp4'。
-     * @default '.mp4'
-     */
-    filetype?: string;
 }
 export declare class Base {
     e: Message;

package/lib/module/utils/Base.js

@@ -128,8 +128,7 @@ export class Base {
         // 下载文件，视频URL，标题和自定义headers
         let res = await this.DownLoadFile(downloadOpt.video_url, {
             title: Config.app.rmmp4 ? downloadOpt.title.timestampTitle : downloadOpt.title.originTitle,
-            headers: downloadOpt.headers ?? this.headers,
-            filetype: '.mp4'
+            headers: downloadOpt.headers ?? this.headers
         });
         res = { ...res, ...downloadOpt.title };
         // 将下载的文件大小转换为MB并保留两位小数
@@ -150,7 +149,7 @@ export class Base {
         const { filepath, totalBytes } = await new Networks({
             url: videoUrl, // 视频地址
             headers: opt.headers ?? this.headers, // 请求头
-            filepath: Common.tempDri.video + `${opt.title}${opt.filetype ?? '.mp4'}`, // 文件保存路径
+            filepath: Common.tempDri.video + opt.title, // 文件保存路径
             timeout: 30000 // 设置 30 秒超时
         }).downloadStream((downloadedBytes, totalBytes) => {
             // 定义进度条长度及生成进度条字符串的函数
@@ -181,8 +180,8 @@ export class Base {
             const downloadedSizeMB = (downloadedBytes / 1048576).toFixed(1);
             const totalSizeMB = (totalBytes / 1048576).toFixed(1);
             // 打印下载进度、速度和剩余时间
-            console.log(`🚀 Downloading 🚀 ${opt.title}${opt.filetype ?? '.mp4'} ${generateProgressBar(progressPercentage)} ${coloredPercentage} ${downloadedSizeMB}/${totalSizeMB} MB | ${formattedSpeed} 剩余: ${formattedRemainingTime}\r`);
-        });
+            console.log(`🚀 Downloading 🚀 ${opt.title} ${generateProgressBar(progressPercentage)} ${coloredPercentage} ${downloadedSizeMB}/${totalSizeMB} MB | ${formattedSpeed} 剩余: ${formattedRemainingTime}\r`);
+        }, 3);
         return { filepath, totalBytes };
     }
     /** 删文件 */

package/lib/module/utils/Render.js

@@ -66,9 +66,11 @@ export async function Render(path, params) {
  * @returns Preview | Stable
  */
 const releaseType = () => {
-    if (Version.pluginVersion.includes('beta')) {
+    const versionPattern = /^\d+\.\d+\.\d+$/;
+    if (versionPattern.test(Version.pluginVersion)) {
+        return 'Stable';
+    }
+    else {
         return 'Preview';
     }
-    else
-        return 'Stable';
 };

package/lib/platform/bilibili/bilibili.js

@@ -429,14 +429,12 @@ export class Bilibili extends Base {
         switch (this.STATUS) {
             case 'isLogin': {
                 const bmp4 = await this.DownLoadFile(this.TYPE === 'one_video' ? OBJECT.DATA.data?.dash?.video[0].base_url : OBJECT.video_url, {
-                    title: `Bil_V_${this.TYPE === 'one_video' ? OBJECT.INFODATA.data.bvid : OBJECT.INFODATA.result.season_id}`,
-                    headers: this.headers,
-                    filetype: '.mp4'
+                    title: `Bil_V_${this.TYPE === 'one_video' ? OBJECT.INFODATA.data.bvid : OBJECT.INFODATA.result.season_id}.mp4`,
+                    headers: this.headers
                 });
                 const bmp3 = await this.DownLoadFile(this.TYPE === 'one_video' ? OBJECT.DATA.data?.dash?.audio[0].base_url : OBJECT.audio_url, {
-                    title: `Bil_A_${this.TYPE === 'one_video' ? OBJECT.INFODATA.data.bvid : OBJECT.INFODATA.result.season_id}`,
-                    headers: this.headers,
-                    filetype: '.mp3'
+                    title: `Bil_A_${this.TYPE === 'one_video' ? OBJECT.INFODATA.data.bvid : OBJECT.INFODATA.result.season_id}.mp3`,
+                    headers: this.headers
                 });
                 if (bmp4.filepath && bmp3.filepath) {
                     await mergeFile('二合一（视频 + 音频）', {
@@ -473,7 +471,7 @@ export class Bilibili extends Base {
             }
             case '!isLogin': {
                 /** 没登录（没配置ck）情况下直接发直链，传直链在DownLoadVideo()处理 */
-                await this.DownLoadVideo({ video_url: OBJECT.DATA.data.durl[0].url, title: { timestampTitle: 'tmp_' + Date.now(), originTitle: this.downloadfilename } });
+                await this.DownLoadVideo({ video_url: OBJECT.DATA.data.durl[0].url, title: { timestampTitle: `tmp_${Date.now()}.mp4`, originTitle: `${this.downloadfilename}.mp4` } });
                 break;
             }
             default:

package/lib/platform/bilibili/getID.js

@@ -17,6 +17,14 @@ export async function getBilibiliID(url) {
             };
             break;
         }
+        case /festival\/([A-Za-z0-9]+)/.test(longLink): {
+            const festivalMatch = /festival\/([A-Za-z0-9]+)\?bvid=([A-Za-z0-9]+)/.exec(longLink);
+            result = {
+                type: 'one_video',
+                id: festivalMatch ? festivalMatch[2] : undefined
+            };
+            break;
+        }
         case /play\/(\S+?)\??/.test(longLink): {
             const playMatch = /play\/(\w+)/.exec(longLink);
             const id = playMatch ? playMatch[1] : '';

package/lib/platform/bilibili/push.js

@@ -294,7 +294,7 @@ export class Bilibilipush extends Base {
                                 if (send_video) {
                                     await this.DownLoadVideo({
                                         video_url: nocd_data.data.durl[0].url,
-                                        title: { timestampTitle: 'tmp_' + Date.now(), originTitle: dycrad.title }
+                                        title: { timestampTitle: `tmp_${Date.now()}.mp4`, originTitle: `${dycrad.title}.mp4` }
                                     }, { active: true, activeOption: { uin, group_id } });
                                 }
                                 break;

package/lib/platform/douyin/douyin.js

@@ -102,7 +102,7 @@ export class DouYin extends Base {
                     const cover = video.origin_cover.url_list[0]; // video cover image
                     const title = data.VideoData.aweme_detail.preview_title.substring(0, 80).replace(/[\\/:\*\?"<>\|\r\n]/g, ' '); // video title
                     g_title = title;
-                    mp4size = (video.play_addr.data_size / (1024 * 1024)).toFixed(2);
+                    mp4size = (video.bit_rate[0].play_addr.data_size / (1024 * 1024)).toFixed(2);
                     videores.push(segment.text(`标题：\n${title}`));
                     videores.push(segment.text(`视频帧率：${'' + FPS}\n视频大小：${mp4size}MB`));
                     videores.push(segment.text(`永久直链(302跳转)\nhttps://aweme.snssdk.com/aweme/v1/play/?video_id=${data.VideoData.aweme_detail.video.play_addr.uri}&ratio=1080p&line=0`));
@@ -132,7 +132,7 @@ export class DouYin extends Base {
                     await this.e.reply(img);
                 }
                 /** 发送视频 */
-                sendvideofile && this.is_mp4 && await this.DownLoadVideo({ video_url: g_video_url, title: { timestampTitle: 'tmp_' + Date.now(), originTitle: g_title } });
+                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': {
@@ -147,15 +147,13 @@ export class DouYin extends Base {
                     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_' + Date.now(),
-                        headers: this.headers,
-                        filetype: '.mp4'
+                        title: `Douyin_tmp_V_${Date.now()}.mp4`,
+                        headers: this.headers
                     });
                     // BGM
                     const liveimgbgm = await this.DownLoadFile(bgmurl, {
-                        title: 'Douyin_tmp_' + Date.now(),
-                        headers: this.headers,
-                        filetype: '.mp3'
+                        title: `Douyin_tmp_A_${Date.now()}.mp3`,
+                        headers: this.headers
                     });
                     if (liveimg.filepath && liveimgbgm.filepath) {
                         const resolvefilepath = Common.tempDri.video + `Douyin_Result_${Date.now()}.mp4`;

package/lib/platform/douyin/push.js

@@ -120,7 +120,7 @@ export class DouYinpush extends Base {
                                     // 下载视频
                                     await this.DownLoadVideo({
                                         video_url: downloadUrl,
-                                        title: { timestampTitle: 'tmp_' + Date.now(), originTitle: Detail_Data.desc }
+                                        title: { timestampTitle: `tmp_${Date.now()}.mp4`, originTitle: `${Detail_Data.desc}.mp4` }
                                     }, { active: true, activeOption: { uin, group_id } });
                                 }
                                 catch (error) {

package/lib/platform/kuaishou/kuaishou.js

@@ -33,7 +33,7 @@ export class Kuaishou extends Base {
             likeCount: data.VideoData.data.visionVideoDetail.photo.likeCount
         });
         await this.e.reply(img);
-        await this.DownLoadVideo({ video_url, title: Config.app.rmmp4 ? 'tmp_' + Date.now() : data.VideoData.data.visionVideoDetail.photo.caption });
+        await this.DownLoadVideo({ video_url, title: { timestampTitle: `tmp_${Date.now()}.mp4`, originTitle: `${data.VideoData.data.visionVideoDetail.photo.caption}.mp4` } });
         return true;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "0.1.10-pr21.d6cca63",
+  "version": "1.0.1-commit.069f646",
   "description": "a Karin video parsing tool",
   "keywords": [
     "karin-plugin",
@@ -32,6 +32,7 @@
     "clean": "npm lib/cli/pr.js clean",
     "fix": "eslint src/**/*.ts --fix",
     "pr": "node lib/cli/pr.js",
+    "commit": "node lib/cli/commit.js",
     "pub": "npm publish --access public",
     "pub-beta": "npm publish --tag beta",
     "sort": "npx sort-package-json",