karin-plugin-kkk 1.6.8 → 1.6.9

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # 变更日志
 
+## [1.6.9](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.8...v1.6.9) (2025-06-11)
+
+
+### Bug Fixes
+
+* **web:** 更新插件配置和依赖项 ([380f538](https://github.com/ikenxuan/karin-plugin-kkk/commit/380f5386b77a4dd7ee5e7649dcf458c40da27b52))
+* **推送配置:** 为推送列表添加启用开关功能 ([9865228](https://github.com/ikenxuan/karin-plugin-kkk/commit/98652285d07fda962af4dff313ac9ab9199a19eb))
+
 ## [1.6.8](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.6.7...v1.6.8) (2025-06-10)
 
 

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-C5Yqa6MH.js";
+import "../chunk/db-BwUYgCsJ.js";
 import "../root.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 { C as Config, a as Common, b as bilibiliLogin, d as douyinLogin } from "../chunk/main-NN4to0wU.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";

package/lib/apps/help.js

@@ -4,9 +4,9 @@ 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-C5Yqa6MH.js";
+import "../chunk/db-BwUYgCsJ.js";
 import { Root } from "../root.js";
-import { R as Render, C as Config, a as Common } from "../chunk/main-BAO84QDi.js";
+import { R as Render, C as Config, a as Common } from "../chunk/main-NN4to0wU.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-FI9gb_Rv.js";
 import karin from "node-karin";
 import "sequelize";
-import "../chunk/db-C5Yqa6MH.js";
+import "../chunk/db-BwUYgCsJ.js";
 import "../root.js";
 import "node:fs";
-import { C as Config, c as DouYinpush, B as Bilibilipush } from "../chunk/main-BAO84QDi.js";
+import { C as Config, c as DouYinpush, B as Bilibilipush } from "../chunk/main-NN4to0wU.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-C5Yqa6MH.js";
+import "../chunk/db-BwUYgCsJ.js";
 import "../root.js";
 import "node:fs";
 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 { 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-NN4to0wU.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";

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

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

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

@@ -6,7 +6,7 @@ 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-C5Yqa6MH.js";
+import { douyinDB, bilibiliDB, cleanOldDynamicCache } from "./db-BwUYgCsJ.js";
 import _ from "node-karin/lodash";
 import { execSync, spawn } from "node:child_process";
 import { chromium } from "playwright";
@@ -530,7 +530,14 @@ class Cfg {
       const config2 = YAML.parseDocument(fs.readFileSync(`${this.dirCfgPath}/${file}`, "utf8"));
       const defConfig = YAML.parseDocument(fs.readFileSync(`${this.defCfgPath}/${file}`, "utf8"));
       const { differences, result } = this.mergeObjectsWithPriority(config2, defConfig);
-      if (differences) {
+      let needsUpdate = differences;
+      if (file === "pushlist.yaml") {
+        const updated = this.addSwitchFieldToPushlist(result);
+        if (updated) {
+          needsUpdate = true;
+        }
+      }
+      if (needsUpdate) {
         fs.writeFileSync(`${this.dirCfgPath}/${file}`, result.toString({ lineWidth: -1 }));
       }
     }
@@ -748,6 +755,40 @@ class Cfg {
     }
     this.setNestedValue(subMap, keys.slice(1), value);
   }
+  /**
+   * 为推送列表配置添加switch字段兼容
+   * @param doc YAML文档
+   * @returns 是否有更新
+   */
+  addSwitchFieldToPushlist(doc) {
+    let hasUpdates = false;
+    const contents = doc.contents;
+    const douyinList = contents.get("douyin");
+    if (YAML.isSeq(douyinList)) {
+      for (const item of douyinList.items) {
+        if (YAML.isMap(item)) {
+          const switchField = item.get("switch");
+          if (switchField === void 0) {
+            item.set("switch", true);
+            hasUpdates = true;
+          }
+        }
+      }
+    }
+    const bilibiliList = contents.get("bilibili");
+    if (YAML.isSeq(bilibiliList)) {
+      for (const item of bilibiliList.items) {
+        if (YAML.isMap(item)) {
+          const switchField = item.get("switch");
+          if (switchField === void 0) {
+            item.set("switch", true);
+            hasUpdates = true;
+          }
+        }
+      }
+    }
+    return hasUpdates;
+  }
   mergeObjectsWithPriority(userDoc, defaultDoc) {
     let differences = false;
     const mergeYamlNodes = (target, source) => {
@@ -778,7 +819,7 @@ class Cfg {
   async syncConfigToDatabase() {
     try {
       const pushCfg = this.getYaml("config", "pushlist");
-      const { bilibiliDB: bilibiliDB2, douyinDB: douyinDB2 } = await import("./db-C5Yqa6MH.js");
+      const { bilibiliDB: bilibiliDB2, douyinDB: douyinDB2 } = await import("./db-BwUYgCsJ.js");
       if (pushCfg.bilibili) {
         await bilibiliDB2.syncConfigSubscriptions(pushCfg.bilibili);
       }
@@ -2670,7 +2711,8 @@ https://t.bilibili.com/${dynamicId}`);
   async getDynamicList(userList) {
     const willbepushlist = {};
     try {
-      for (const item of userList) {
+      const filteredUserList = userList.filter((item) => item.switch !== false);
+      for (const item of filteredUserList) {
         const dynamic_list = await this.amagi.getBilibiliData("用户主页动态列表数据", { host_mid: item.host_mid, typeMode: "strict" });
         if (dynamic_list.data.items.length > 0) {
           for (const dynamic of dynamic_list.data.items) {
@@ -2810,6 +2852,7 @@ UID：${host_mid}`);
         data.data.card.name
       );
       config2.bilibili.push({
+        switch: true,
         host_mid,
         group_id: [`${groupId}:${botId}`],
         remark: data.data.card.name
@@ -3036,17 +3079,23 @@ const getVideoRouter = (req, res) => {
 const webConfig = defineConfig({
   info: {
     id: "karin-plugin-kkk",
-    name: "karin-plugin-kkk",
+    name: "kkk插件",
     description: "Karin 的「抖音」「B站」视频解析/动态推送插件",
     icon: {
-      name: "verified ",
-      color: "#FFFF55"
+      name: "radio_button_checked",
+      color: "#F31260"
     },
+    version: Root.pluginVersion,
     author: [
       {
         name: "ikenxuan",
         home: "https://github.com/ikenxuan",
         avatar: "https://github.com/ikenxuan.png"
+      },
+      {
+        name: "sj817",
+        home: "https://github.com/sj817",
+        avatar: "https://github.com/sj817.png"
       }
     ]
   },
@@ -3135,8 +3184,9 @@ const webConfig = defineConfig({
               }),
               components.switch.create("APIServerMount", {
                 label: "挂载到 Karin",
-                description: "API 服务是否挂载到 Karin 上，开启后监听端口为 Karin 的 http 端口，修改后需重启",
-                defaultSelected: all.app.APIServerMount
+                description: "API 服务是否挂载到 Karin 上，开启后监听端口为 Karin 的 http 端口，修改后需重启。需开启「API服务」",
+                defaultSelected: all.app.APIServerMount,
+                isDisabled: !all.app.APIServer
               }),
               components.input.number("APIServerPort", {
                 label: "API服务端口",
@@ -3217,29 +3267,32 @@ const webConfig = defineConfig({
               components.switch.create("tip", {
                 label: "解析提示",
                 description: "抖音解析提示，发送提示信息：“检测到抖音链接，开始解析”",
-                defaultSelected: all.douyin.tip
+                defaultSelected: all.douyin.tip,
+                isDisabled: !all.douyin.switch
               }),
               components.switch.create("comment", {
                 label: "评论解析",
                 description: "抖音评论解析，开启后可发送抖音作品评论图",
-                defaultSelected: all.douyin.comment
+                defaultSelected: all.douyin.comment,
+                isDisabled: !all.douyin.switch || !all.douyin.switch
               }),
               components.input.number("numcomment", {
                 label: "评论解析数量",
                 defaultValue: all.douyin.numcomment.toString(),
                 rules: [{ min: 1 }],
-                isDisabled: !all.douyin.comment
+                isDisabled: !all.douyin.comment || !all.douyin.switch
               }),
               components.switch.create("realCommentCount", {
                 label: "显示真实评论数量",
                 description: "评论图是否显示真实评论数量，关闭则显示解析到的评论数量",
                 defaultSelected: all.douyin.realCommentCount,
-                isDisabled: !all.douyin.comment
+                isDisabled: !all.douyin.comment || !all.douyin.switch
               }),
               components.switch.create("autoResolution", {
                 label: "自动分辨率",
                 description: "根据「视频拦截阈值」自动选择合适的分辨率，关闭后默认选择最大分辨率进行下载",
-                defaultSelected: all.douyin.autoResolution
+                defaultSelected: all.douyin.autoResolution,
+                isDisabled: !all.douyin.switch
               }),
               components.radio.group("loginPerm", {
                 label: "谁可以触发扫码登录",
@@ -3284,6 +3337,7 @@ const webConfig = defineConfig({
                 description: "修改后需重启",
                 orientation: "horizontal",
                 defaultValue: all.douyin.push.permission,
+                isDisabled: !all.douyin.push.switch,
                 color: "warning",
                 radio: [
                   components.radio.create("push:permission:radio-1", {
@@ -3312,25 +3366,29 @@ const webConfig = defineConfig({
                 label: "定时任务表达式",
                 description: "定时推送的时间，格式为cron表达式（默认为每十分钟执行一次）",
                 defaultValue: all.douyin.push.cron,
-                color: "warning"
+                color: "warning",
+                isDisabled: !all.douyin.push.switch
               }),
               components.switch.create("push:parsedynamic", {
                 label: "作品解析",
                 description: "触发推送时是否一同解析该作品",
                 defaultSelected: all.douyin.push.parsedynamic,
-                color: "warning"
+                color: "warning",
+                isDisabled: !all.douyin.push.switch
               }),
               components.switch.create("push:log", {
                 label: "推送日志",
                 description: "是否打印推送日志（修改后需重启）",
                 defaultSelected: all.douyin.push.log,
-                color: "warning"
+                color: "warning",
+                isDisabled: !all.douyin.push.switch
               }),
               components.radio.group("push:shareType", {
                 label: "推送图二维码的类型",
                 orientation: "horizontal",
                 defaultValue: all.douyin.push.shareType,
                 color: "warning",
+                isDisabled: !all.douyin.push.switch,
                 radio: [
                   components.radio.create("push:shareType.radio-1", {
                     label: "网页链接",
@@ -3364,34 +3422,39 @@ const webConfig = defineConfig({
               components.switch.create("tip", {
                 label: "解析提示",
                 description: "B站解析提示，发送提示信息：“检测到B站链接，开始解析”",
-                defaultSelected: all.bilibili.tip
+                defaultSelected: all.bilibili.tip,
+                isDisabled: !all.bilibili.switch
               }),
               components.switch.create("comment", {
                 label: "评论解析",
                 description: "B站评论解析，开启后可发送B站作品评论图",
-                defaultSelected: all.bilibili.comment
+                defaultSelected: all.bilibili.comment,
+                isDisabled: !all.bilibili.switch
               }),
               components.input.number("numcomment", {
                 label: "评论解析数量",
                 defaultValue: all.bilibili.numcomment.toString(),
-                rules: [{ min: 1 }]
+                rules: [{ min: 1 }],
+                isDisabled: !all.bilibili.comment || !all.bilibili.switch
               }),
               components.switch.create("realCommentCount", {
                 label: "显示真实评论数量",
                 description: "评论图是否显示真实评论数量，关闭则显示解析到的评论数量",
                 defaultSelected: all.bilibili.realCommentCount,
-                isDisabled: !all.bilibili.comment
+                isDisabled: !all.bilibili.comment || !all.bilibili.switch
               }),
               components.switch.create("videopriority", {
                 label: "优先保内容",
                 description: "解析视频是否优先保内容，true为优先保证上传将使用最低分辨率，false为优先保清晰度将使用最高分辨率",
-                defaultSelected: all.bilibili.videopriority
+                defaultSelected: all.bilibili.videopriority,
+                isDisabled: !all.bilibili.switch
               }),
               components.radio.group("videoQuality", {
                 label: "画质偏好",
                 description: "解析视频的分辨率偏好。",
                 orientation: "horizontal",
                 defaultValue: all.bilibili.videoQuality.toString(),
+                isDisabled: !all.bilibili.switch,
                 radio: [
                   components.radio.create("videoQuality:radio-1", {
                     label: "自动选择",
@@ -3446,7 +3509,7 @@ const webConfig = defineConfig({
                 label: "视频体积上限（MB）",
                 description: '根据该值自动选择分辨率进行下载。仅在「画质偏好」 为 "自动选择" 时生效',
                 defaultValue: all.bilibili.maxAutoVideoSize.toString(),
-                isDisabled: all.bilibili.videoQuality !== 0,
+                isDisabled: all.bilibili.videoQuality !== 0 || !all.bilibili.switch,
                 rules: [{ min: 1, max: 2e4 }]
               }),
               components.radio.group("loginPerm", {
@@ -3482,6 +3545,7 @@ const webConfig = defineConfig({
                 description: "若什么都不选，则不会返回任何视频相关信息",
                 orientation: "horizontal",
                 defaultValue: all.bilibili.displayContent,
+                isDisabled: !all.bilibili.switch,
                 checkbox: [
                   components.checkbox.create("displayContent:checkbox:1", {
                     label: "封面",
@@ -3521,6 +3585,7 @@ const webConfig = defineConfig({
                 orientation: "horizontal",
                 defaultValue: all.bilibili.push.permission,
                 color: "warning",
+                isDisabled: !all.bilibili.push.switch,
                 radio: [
                   components.radio.create("push:permission:radio-1", {
                     label: "所有人",
@@ -3548,25 +3613,28 @@ const webConfig = defineConfig({
                 label: "定时任务表达式",
                 description: "定时推送的时间，格式为cron表达式（默认为每十分钟执行一次）",
                 defaultValue: all.bilibili.push.cron,
-                color: "warning"
+                color: "warning",
+                isDisabled: !all.bilibili.push.switch
               }),
               components.switch.create("push:parsedynamic", {
                 label: "作品解析",
                 description: "触发推送时是否一同解析该作品",
                 defaultSelected: all.bilibili.push.parsedynamic,
-                color: "warning"
+                color: "warning",
+                isDisabled: !all.bilibili.push.switch
               }),
               components.switch.create("push:log", {
                 label: "推送日志",
                 description: "是否打印推送日志（修改后需重启）",
                 defaultSelected: all.bilibili.push.log,
-                color: "warning"
+                color: "warning",
+                isDisabled: !all.bilibili.push.switch
               }),
               components.radio.group("push:pushVideoQuality", {
                 label: "解析视频动态时的画质偏好",
                 description: "「作品解析」开启时生效，仅对视频动态有效",
                 orientation: "horizontal",
-                isDisabled: !all.bilibili.push.parsedynamic,
+                isDisabled: !all.bilibili.push.parsedynamic || !all.bilibili.push.switch,
                 defaultValue: all.bilibili.push.pushVideoQuality.toString(),
                 color: "warning",
                 radio: [
@@ -3623,7 +3691,7 @@ const webConfig = defineConfig({
                 label: "视频动态的视频体积上限（MB）",
                 description: '根据该值自动选择分辨率进行下载。仅在「解析视频动态时的画质偏好」 为 "自动选择" 且「作品解析」开启时生效，仅对视频动态有效',
                 defaultValue: all.bilibili.push.pushMaxAutoVideoSize.toString(),
-                isDisabled: !all.bilibili.push.parsedynamic || all.bilibili.push.pushVideoQuality !== 0,
+                isDisabled: !all.bilibili.push.parsedynamic || all.bilibili.push.pushVideoQuality !== 0 || !all.bilibili.push.switch,
                 rules: [{ min: 1, max: 2e4 }],
                 color: "warning"
               })
@@ -3647,17 +3715,20 @@ const webConfig = defineConfig({
               components.switch.create("tip", {
                 label: "解析提示",
                 description: "快手解析提示，发送提示信息：“检测到快手链接，开始解析”",
-                defaultSelected: all.kuaishou.tip
+                defaultSelected: all.kuaishou.tip,
+                isDisabled: !all.kuaishou.switch
               }),
               components.switch.create("comment", {
                 label: "评论解析",
                 description: "快手评论解析，开启后可发送快手作品评论图",
-                defaultSelected: all.kuaishou.comment
+                defaultSelected: all.kuaishou.comment,
+                isDisabled: !all.kuaishou.switch
               }),
               components.input.number("numcomment", {
                 label: "评论解析数量",
                 defaultValue: all.kuaishou.numcomment.toString(),
-                rules: [{ min: 1 }]
+                rules: [{ min: 1 }],
+                isDisabled: !all.kuaishou.switch || !all.kuaishou.comment
               })
             ]
           })
@@ -3743,6 +3814,11 @@ const webConfig = defineConfig({
           children: components.accordion.createItem("accordion-item-douyin", {
             className: "ml-4 mr-4",
             children: [
+              components.switch.create("switch", {
+                label: "是否启用",
+                description: "是否启用该订阅项",
+                color: "warning"
+              }),
               components.input.string("short_id", {
                 placeholder: "",
                 label: "抖音号",
@@ -3841,6 +3917,11 @@ const webConfig = defineConfig({
           children: components.accordion.createItem("accordion-item-bilibili", {
             className: "ml-4 mr-4",
             children: [
+              components.switch.create("switch", {
+                label: "是否启用",
+                description: "是否启用该订阅项",
+                color: "warning"
+              }),
               components.input.number("host_mid", {
                 placeholder: "",
                 label: "UID",
@@ -4971,7 +5052,8 @@ class DouYinpush extends Base {
   async getDynamicList(userList) {
     const willbepushlist = {};
     try {
-      for (const item of userList) {
+      const filteredUserList = userList.filter((item) => item.switch !== false);
+      for (const item of filteredUserList) {
         const sec_uid = item.sec_uid;
         const videolist = await this.amagi.getDouyinData("用户主页视频列表数据", { sec_uid, typeMode: "strict" });
         const userinfo = await this.amagi.getDouyinData("用户主页数据", { sec_uid, typeMode: "strict" });
@@ -5131,6 +5213,7 @@ sec_uid${UserInfoData.user.sec_uid}`);
         }
       } else {
         config2.douyin.push({
+          switch: true,
           sec_uid,
           group_id: [`${groupId}:${botId}`],
           remark: UserInfoData.user.nickname,

package/lib/index.js

@@ -3,11 +3,11 @@ import { app, mkdirSync, logger as logger$1 } from "node-karin";
 import express from "node-karin/express";
 import { karinPathBase } from "node-karin/root";
 import "sequelize";
-import "./chunk/db-C5Yqa6MH.js";
+import "./chunk/db-BwUYgCsJ.js";
 import { Root } from "./root.js";
 import "node:fs";
-import { C as Config, v as videoStreamRouter, g as getVideoRouter, a as Common } from "./chunk/main-BAO84QDi.js";
-import { w } from "./chunk/main-BAO84QDi.js";
+import { C as Config, v as videoStreamRouter, g as getVideoRouter, a as Common } from "./chunk/main-NN4to0wU.js";
+import { w } from "./chunk/main-NN4to0wU.js";
 import "node-karin/axios";
 import "stream/promises";
 import "node:path";

package/lib/web.config.js

@@ -1 +1 @@
-export { w as default } from './chunk/main-BAO84QDi.js';
+export { w as default } from './chunk/main-NN4to0wU.js';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "karin-plugin-kkk",
-  "version": "1.6.8",
+  "version": "1.6.9",
   "description": "Karin 的「抖音」「B 站」视频解析/动态推送插件",
   "keywords": [
     "karin-plugin",