karin-plugin-kkk 1.6.6 → 1.6.8

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 变更日志
 
+## [1.6.8](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.7...v1.6.8) (2025-06-10)
+
+
+### Bug Fixes
+
+* 修复在根目录创建无关日志 ([f7eccaa](https://github.com/ikenxuan/karin-plugin-kkk/commit/f7eccaae568cdaf3b45b5df3b9c0732ead28f5bb))
+
+## [1.6.7](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.6...v1.6.7) (2025-06-05)
+
+
+### Bug Fixes
+
+* **bilibili:** 添加直播动态推送功能支持 ([231c7d7](https://github.com/ikenxuan/karin-plugin-kkk/commit/231c7d7a7ed9915819b55c9b6bb414276cee1996))
+* **bilibili:** 调整内容显示顺序并优化消息段格式 ([1abc7f5](https://github.com/ikenxuan/karin-plugin-kkk/commit/1abc7f59522f33f92caf8048276b78dfe7e3234f))
+* 优化类型导入使用type关键字 ([0d027d1](https://github.com/ikenxuan/karin-plugin-kkk/commit/0d027d1d313465f272fcc8f09507cd8b6da4c644))
+
 ## [1.6.6](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.5...v1.6.6) (2025-06-01)
 
 

package/lib/apps/admin.js

@@ -2,10 +2,10 @@ import fs from "node:fs";
 import karin, { logger } from "node-karin";
 import require$$1 from "path";
 import "sequelize";
-import "../chunk/db-DtVxNKzM.js";
+import "../chunk/db-C5Yqa6MH.js";
 import "../root.js";
-import "../chunk/vendor-CmoJNPr7.js";
-import { C as Config, a as Common, b as bilibiliLogin, d as douyinLogin } from "../chunk/main-bbR-e0ov.js";
+import "../chunk/vendor-FI9gb_Rv.js";
+import { C as Config, a as Common, b as bilibiliLogin, d as douyinLogin } from "../chunk/main-BAO84QDi.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";

package/lib/apps/help.js

@@ -1,12 +1,12 @@
 import { execSync } from "node:child_process";
 import fs from "node:fs";
-import { m as markdown } from "../chunk/vendor-CmoJNPr7.js";
+import { m as markdown } from "../chunk/vendor-FI9gb_Rv.js";
 import karin, { mkdirSync, render, segment, isPackaged, updatePkg, updateGitPlugin, logger, common, restart } from "node-karin";
 import { karinPathTemp } from "node-karin/root";
 import "sequelize";
-import "../chunk/db-DtVxNKzM.js";
+import "../chunk/db-C5Yqa6MH.js";
 import { Root } from "../root.js";
-import { R as Render, C as Config, a as Common } from "../chunk/main-bbR-e0ov.js";
+import { R as Render, C as Config, a as Common } from "../chunk/main-BAO84QDi.js";
 import "node-karin/axios";
 import "stream/promises";
 const help = karin.command(/^#?kkk帮助$/, async (e) => {

package/lib/apps/push.js

@@ -1,10 +1,10 @@
-import { d as getDouyinData, g as getBilibiliData } from "../chunk/vendor-CmoJNPr7.js";
+import { d as getDouyinData, g as getBilibiliData } from "../chunk/vendor-FI9gb_Rv.js";
 import karin from "node-karin";
 import "sequelize";
-import "../chunk/db-DtVxNKzM.js";
+import "../chunk/db-C5Yqa6MH.js";
 import "../root.js";
 import "node:fs";
-import { C as Config, c as DouYinpush, B as Bilibilipush } from "../chunk/main-bbR-e0ov.js";
+import { C as Config, c as DouYinpush, B as Bilibilipush } from "../chunk/main-BAO84QDi.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";

package/lib/apps/tools.js

@@ -1,10 +1,10 @@
 import karin, { logger } from "node-karin";
 import "sequelize";
-import "../chunk/db-DtVxNKzM.js";
+import "../chunk/db-C5Yqa6MH.js";
 import "../root.js";
 import "node:fs";
-import "../chunk/vendor-CmoJNPr7.js";
-import { e as getDouyinID, f as DouYin, C as Config, h as getBilibiliID, i as Bilibili, j as getKuaishouID, k as fetchKuaishouData, K as Kuaishou, a as Common } from "../chunk/main-bbR-e0ov.js";
+import "../chunk/vendor-FI9gb_Rv.js";
+import { e as getDouyinID, f as DouYin, C as Config, h as getBilibiliID, i as Bilibili, j as getKuaishouID, k as fetchKuaishouData, K as Kuaishou, a as Common } from "../chunk/main-BAO84QDi.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";

package/lib/chunk/{db-DtVxNKzM.js → db-C5Yqa6MH.js}

@@ -4,8 +4,8 @@ import { logger } from "node-karin";
 import { karinPathBase } from "node-karin/root";
 import { Root } from "../root.js";
 import "node:fs";
-import "./vendor-CmoJNPr7.js";
-import { C as Config, D as DynamicType } from "./main-bbR-e0ov.js";
+import "./vendor-FI9gb_Rv.js";
+import { C as Config, D as DynamicType } from "./main-BAO84QDi.js";
 import "node-karin/axios";
 import "stream/promises";
 const sequelize$1 = new Sequelize({

package/lib/chunk/{main-bbR-e0ov.js → main-BAO84QDi.js}

@@ -1,12 +1,12 @@
 import { Root } from "../root.js";
 import fs from "node:fs";
-import { C as Client, b as bilibiliErrorCodeMap, g as getBilibiliData, a as bilibiliApiUrls, w as wbi_sign, c as browserExports, i as index, d as getDouyinData, h as heicConvertExports, m as markdown } from "./vendor-CmoJNPr7.js";
+import { C as Client, b as bilibiliErrorCodeMap, g as getBilibiliData, a as bilibiliApiUrls, w as wbi_sign, c as browserExports, i as index, d as getDouyinData, h as heicConvertExports, m as markdown } from "./vendor-FI9gb_Rv.js";
 import karin, { logger, config, segment, createNotFoundResponse, copyConfigSync, filesByExt, watch, requireFileSync, ffmpeg, ffprobe, render, common, defineConfig, components, karinPathRoot, mkdirSync, handler } from "node-karin";
 import axios, { AxiosError } from "node-karin/axios";
 import { pipeline } from "stream/promises";
 import path, { join } from "node:path";
 import "sequelize";
-import { douyinDB, bilibiliDB, cleanOldDynamicCache } from "./db-DtVxNKzM.js";
+import { douyinDB, bilibiliDB, cleanOldDynamicCache } from "./db-C5Yqa6MH.js";
 import _ from "node-karin/lodash";
 import { execSync, spawn } from "node:child_process";
 import { chromium } from "playwright";
@@ -22,7 +22,6 @@ class Base {
     this.headers = baseHeaders;
     this._path = process.cwd()?.replace(/\\/g, "/");
     const client = Client({ douyin: Config.cookies.douyin, bilibili: Config.cookies.bilibili, kuaishou: Config.cookies.kuaishou });
-    this.amagi = client;
     this.amagi = new Proxy(client, {
       get(target, prop) {
         const method = target[prop];
@@ -197,8 +196,8 @@ const uploadFile = async (event, file, videoUrl, options) => {
     return false;
   } finally {
     const filePath = file.filepath;
-    logger.mark(`临时预览地址：http://localhost:${process.env.HTTP_PORT}/api/kkk/video/${filePath.split("/").pop()}`);
-    logger.info(`文件 ${filePath} 将在 10 分钟后删除`);
+    logger.mark(`临时预览地址：http://localhost:${process.env.HTTP_PORT}/api/kkk/video/${encodeURIComponent(filePath.split("/").pop() ?? "")}`);
+    Config.app.rmmp4 && logger.info(`文件 ${filePath} 将在 10 分钟后删除`);
     setTimeout(async () => {
       await Common.removeFile(filePath);
     }, 10 * 60 * 1e3);
@@ -779,7 +778,7 @@ class Cfg {
   async syncConfigToDatabase() {
     try {
       const pushCfg = this.getYaml("config", "pushlist");
-      const { bilibiliDB: bilibiliDB2, douyinDB: douyinDB2 } = await import("./db-DtVxNKzM.js");
+      const { bilibiliDB: bilibiliDB2, douyinDB: douyinDB2 } = await import("./db-C5Yqa6MH.js");
       if (pushCfg.bilibili) {
         await bilibiliDB2.syncConfigSubscriptions(pushCfg.bilibili);
       }
@@ -1189,24 +1188,25 @@ class Bilibili extends Base {
         if (Config.bilibili.displayContent && Config.bilibili.displayContent.length > 0) {
           const contentMap = {
             cover: segment.image(pic),
-            title: `
+            title: segment.text(`
 📺 标题: ${title}
-`,
-            author: `
+`),
+            author: segment.text(`
 👤 作者: ${name}
-`,
-            stats: this.formatVideoStats(view, danmaku, like, coin, share, favorite),
-            desc: `
+`),
+            stats: segment.text(this.formatVideoStats(view, danmaku, like, coin, share, favorite)),
+            desc: segment.text(`
 
-📝 简介: ${desc}`
+📝 简介: ${desc}`)
           };
-          Config.bilibili.displayContent.forEach((item) => {
-            if (contentMap[item]) {
+          const fixedOrder = ["cover", "title", "author", "stats", "desc"];
+          fixedOrder.forEach((item) => {
+            if (Config.bilibili.displayContent.includes(item) && contentMap[item]) {
               replyContent.push(contentMap[item]);
             }
           });
           if (replyContent.length > 0) {
-            await this.e.reply(replyContent.reverse());
+            await this.e.reply(replyContent);
           }
         }
         let videoSize = "";
@@ -1350,8 +1350,13 @@ ${this.downloadfilename}
       case "dynamic_info": {
         const dynamicInfo = await this.amagi.getBilibiliData("动态详情数据", { dynamic_id: iddata.dynamic_id });
         const dynamicInfoCard = await this.amagi.getBilibiliData("动态卡片数据", { dynamic_id: dynamicInfo.data.item.id_str, typeMode: "strict" });
-        const commentsData = await this.amagi.getBilibiliData("评论数据", { type: mapping_table(dynamicInfo.data.item.type), oid: oid(dynamicInfo, dynamicInfoCard), number: Config.bilibili.numcomment, typeMode: "strict" });
-        await this.amagi.getBilibiliData("Emoji数据");
+        const commentsData = dynamicInfo.data.item.type !== DynamicType.LIVE_RCMD && await this.amagi.getBilibiliData("评论数据", {
+          type: mapping_table(dynamicInfo.data.item.type),
+          oid: oid(dynamicInfo, dynamicInfoCard),
+          number: Config.bilibili.numcomment,
+          typeMode: "strict"
+        });
+        const dynamicCARD = JSON.parse(dynamicInfoCard.data.card.card);
         const userProfileData = await this.amagi.getBilibiliData("用户主页数据", { host_mid: dynamicInfo.data.item.modules.module_author.mid, typeMode: "strict" });
         switch (dynamicInfo.data.item.type) {
           /** 图文、纯图 */
@@ -1377,7 +1382,7 @@ ${this.downloadfilename}
               }
               await this.e.reply(img$1);
             }
-            const dynamicCARD = JSON.parse(dynamicInfoCard.data.card.card);
+            const dynamicCARD2 = JSON.parse(dynamicInfoCard.data.card.card);
             if ("topic" in dynamicInfo.data.item.modules.module_dynamic && dynamicInfo.data.item.modules.module_dynamic.topic !== null) {
               const name = dynamicInfo.data.item.modules.module_dynamic.topic.name;
               dynamicInfo.data.item.modules.module_dynamic.desc.rich_text_nodes.unshift({
@@ -1390,7 +1395,7 @@ ${this.downloadfilename}
 ` + dynamicInfo.data.item.modules.module_dynamic.desc.text;
             }
             await this.e.reply(await Render("bilibili/dynamic/DYNAMIC_TYPE_DRAW", {
-              image_url: cover(dynamicCARD.item.pictures),
+              image_url: cover(dynamicCARD2.item.pictures),
               text: replacetext(br$4(dynamicInfo.data.item.modules.module_dynamic.desc.text), dynamicInfo.data.item.modules.module_dynamic.desc.rich_text_nodes),
               dianzan: Count(dynamicInfo.data.item.modules.module_stat.like.count),
               pinglun: Count(dynamicInfo.data.item.modules.module_stat.comment.count),
@@ -1465,8 +1470,8 @@ ${this.downloadfilename}
                 break;
               }
               case DynamicType.DRAW: {
-                const dynamicCARD = await getBilibiliData("动态卡片数据", Config.cookies.bilibili, { dynamic_id: dynamicInfo.data.item.orig.id_str });
-                const cardData = JSON.parse(dynamicCARD.data.card.card);
+                const dynamicCARD2 = await getBilibiliData("动态卡片数据", Config.cookies.bilibili, { dynamic_id: dynamicInfo.data.item.orig.id_str });
+                const cardData = JSON.parse(dynamicCARD2.data.card.card);
                 data = {
                   username: checkvip$2(dynamicInfo.data.item.orig.modules.module_author),
                   create_time: Common.convertTimestampToDateTime(dynamicInfo.data.item.orig.modules.module_author.pub_ts),
@@ -1578,6 +1583,28 @@ ${this.downloadfilename}
             }
             break;
           }
+          /** 直播动态 */
+          case DynamicType.LIVE_RCMD: {
+            const userINFO = await getBilibiliData("用户主页数据", "", { host_mid: dynamicInfo.data.item.modules.module_author.mid, typeMode: "strict" });
+            img$1 = await Render(
+              "bilibili/dynamic/DYNAMIC_TYPE_LIVE_RCMD",
+              {
+                image_url: [{ image_src: dynamicCARD.live_play_info.cover }],
+                text: br$4(dynamicCARD.live_play_info.title),
+                liveinf: br$4(`${dynamicCARD.live_play_info.area_name} | 房间号: ${dynamicCARD.live_play_info.room_id}`),
+                username: checkvip$2(userINFO.data.card),
+                avatar_url: userINFO.data.card.face,
+                frame: dynamicInfo.data.item.modules.module_author.pendant.image,
+                fans: Count(userINFO.data.follower),
+                create_time: Common.convertTimestampToDateTime(dynamicInfo.data.item.modules.module_author.pub_ts),
+                now_time: Common.getCurrentTime(),
+                share_url: "https://live.bilibili.com/" + dynamicCARD.live_play_info.room_id,
+                dynamicTYPE: "直播动态"
+              }
+            );
+            await this.e.reply(img$1);
+            break;
+          }
           default:
             await this.e.reply(`该动态类型「${dynamicInfo.data.item.type}」暂未支持解析`);
             break;
@@ -5330,7 +5357,7 @@ function handling_at(data) {
   return data;
 }
 async function fetchKuaishouData(type, opt) {
-  const client = new Client({ kuaishou: Config.cookies.kuaishou });
+  const client = Client({ kuaishou: Config.cookies.kuaishou });
   switch (type) {
     case "one_work": {
       const VideoData = await client.getKuaishouData("单个视频作品数据", {