karin-plugin-kkk 1.3.0 → 1.4.0

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # 变更日志
 
+## [1.4.0](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.3.0...v1.4.0) (2025-05-03)
+
+
+### Features
+
+* close [#78](https://github.com/ikenxuan/karin-plugin-kkk/issues/78) ([39ae7e4](https://github.com/ikenxuan/karin-plugin-kkk/commit/39ae7e4b169c8c41fc11a8f685bf64af9d1aa9f1))
+* close [#80](https://github.com/ikenxuan/karin-plugin-kkk/issues/80) ([f3b30b2](https://github.com/ikenxuan/karin-plugin-kkk/commit/f3b30b2b95936b1b0bae09d058f52a65a3ca3268))
+
+
+### Bug Fixes
+
+* close [#74](https://github.com/ikenxuan/karin-plugin-kkk/issues/74) ([b16c890](https://github.com/ikenxuan/karin-plugin-kkk/commit/b16c8909fc1551bf54fc5945d5d44ee4cad6bfe5))
+* close [#79](https://github.com/ikenxuan/karin-plugin-kkk/issues/79) ([41fb13b](https://github.com/ikenxuan/karin-plugin-kkk/commit/41fb13b2208c1efa1e22cd50103ab6157ea1c44f))
+* 匹配m.douyin.com。close [#77](https://github.com/ikenxuan/karin-plugin-kkk/issues/77) ([c82c3f6](https://github.com/ikenxuan/karin-plugin-kkk/commit/c82c3f6b30f4dc0ef5588035786e3755aae2b451))
+* 将打包工具从`tsup`迁移到`vite` 适配`node-kairn` 1.8.0 版本 ([#71](https://github.com/ikenxuan/karin-plugin-kkk/issues/71)) ([fbbc329](https://github.com/ikenxuan/karin-plugin-kkk/commit/fbbc3297fb3d1cd3b9a0a6a630f0602de8624c10))
+
 ## [1.3.0](https://github.com/ikenxuan/karin-plugin-kkk/compare/v1.2.3...v1.3.0) (2025-04-26)
 
 

package/config/default_config/bilibili.yaml

@@ -13,6 +13,22 @@ numcomment: 5
 # 解析视频是否优先保内容，true为优先保证上传将使用最低分辨率，false为优先保清晰度将使用最高分辨率
 videopriority: false
 
+# 视频画质偏好设置，0 为自动根据大小选择，其他为固定画质
+#  - 0: 自动根据大小选择
+#  - 6: 240P 极速 (仅MP4格式支持)
+#  - 16: 360P 流畅
+#  - 32: 480P 清晰
+#  - 64: 720P 高清 (WEB默认值)
+#  - 74: 720P60 高帧率 (需登录)
+#  - 80: 1080P 高清 (TV/APP默认值，需登录)
+#  - 112: 1080P+ 高码率 (需大会员)
+#  - 116: 1080P60 高帧率 (需大会员)
+#  - 120: 4K 超清 (需大会员且支持4K)
+videoQuality: 0
+
+# 自动画质模式下可接受的最大视频大小（单位：MB），仅在 videoQuality 为 0 时生效
+maxAutoVideoSize: 50
+
 # 根据「视频拦截阈值」自动选择合适的分辨率，关闭后默认选择最大分辨率进行下载
 autoResolution: true
 

package/lib/Version.js

@@ -0,0 +1,16 @@
+import fs from "node:fs";
+import require$$7$1 from "node:path";
+import { fileURLToPath } from "node:url";
+import { karinPathRoot } from "node-karin/root";
+const pluginPath = require$$7$1.join(fileURLToPath(import.meta.url), "../..");
+const pkg = JSON.parse(fs.readFileSync(require$$7$1.join(pluginPath, "package.json"), "utf-8"));
+const Version = {
+  pluginName: pkg.name,
+  pluginVersion: pkg.version,
+  pluginPath,
+  karinVersion: process.env.KARIN_VERSION,
+  karinPath: karinPathRoot
+};
+export {
+  Version
+};

package/lib/apps/admin.js

@@ -1,52 +1,206 @@
-import { createRequire } from 'module';
-import '../chunk-KQITAYDY.js';
-import { bilibiliLogin, douyinLogin } from '../chunk-5WIDO4V7.js';
-import { Config, Common } from '../chunk-DSCWGW73.js';
-import { init_esm_shims } from '../chunk-XHTHHTBA.js';
-import fs from 'node:fs';
-import karin, { logger } from 'node-karin';
-import path from 'path';
-
-createRequire(import.meta.url);
-
-// src/apps/admin.ts
-init_esm_shims();
-var task = Config.app.rmmp4 && karin.task("[kkk-\u89C6\u9891\u7F13\u5B58\u81EA\u52A8\u5220\u9664]", "0 0 4 * * *", async () => {
+import fs from "node:fs";
+import karin, { handler, segment, logger } from "node-karin";
+import require$$1 from "path";
+import "sequelize";
+import { d as Common, C as Config } from "../chunk/douyin-CpQOEMNX.js";
+import { Version } from "../Version.js";
+import "stream/promises";
+import "node:path";
+import { b as bilibiliLogin } from "../chunk/index-BoFo2rq6.js";
+import "../chunk/index-BDlGFCbK.js";
+import { execSync, spawn } from "node:child_process";
+import { chromium } from "playwright";
+const startXvfb = async () => {
+  if (process.platform !== "linux") return;
+  const DISPLAY_NUMBER = ":150";
+  const LOCK_FILE = "/tmp/.X150-lock";
+  try {
+    execSync(`xdpyinfo -display ${DISPLAY_NUMBER}`, { stdio: "ignore" });
+    logger.debug(`检测到 DISPLAY ${DISPLAY_NUMBER} 已经在运行，无需启动新的 Xvfb。`);
+    return;
+  } catch (err) {
+    logger.debug(logger.red(`未检测到 DISPLAY ${DISPLAY_NUMBER}，尝试启动 Xvfb...`));
+  }
+  if (fs.existsSync(LOCK_FILE)) {
+    logger.debug(logger.red(`检测到锁文件 ${LOCK_FILE}，可能存在冲突。尝试清理...`));
+    try {
+      fs.unlinkSync(LOCK_FILE);
+      logger.debug(`成功清理锁文件 ${LOCK_FILE}`);
+    } catch (err) {
+      logger.debug(logger.red(`无法清理锁文件 ${LOCK_FILE}，请检查权限或手动处理。`));
+      throw err;
+    }
+  }
+  const xvfb = spawn("Xvfb", [DISPLAY_NUMBER, "-ac", "-screen", "0", "1280x1024x24"], {
+    stdio: "inherit"
+  });
+  xvfb.unref();
+  process.env.DISPLAY = DISPLAY_NUMBER;
+  let retries = 5;
+  while (retries > 0) {
+    try {
+      execSync(`xdpyinfo -display ${DISPLAY_NUMBER}`, { stdio: "ignore" });
+      logger.debug(`Xvfb (${DISPLAY_NUMBER}) 启动成功`);
+      return;
+    } catch (err) {
+      logger.debug(logger.yellow(`Xvfb (${DISPLAY_NUMBER}) 启动失败，正在重试...`));
+      retries -= 1;
+      if (retries > 0) {
+        await new Promise((resolve) => setTimeout(resolve, 1e3));
+      } else {
+        logger.debug(logger.red("Xvfb 启动失败，重试多次后仍未成功"));
+        throw err;
+      }
+    }
+  }
+};
+const douyinLogin = async (e) => {
+  const hal = await handler.call("kkk.douyinLogin", { e });
+  if (hal) return true;
+  const msg_id = [];
+  const message1 = await e.reply("免责声明:\n您将通过扫码完成获取抖音网页端的用户登录凭证（ck），该ck将用于请求抖音WEB API接口。\n本BOT不会上传任何有关你的信息到第三方，所配置的 ck 只会用于请求官方 API 接口。\n我方仅提供视频解析及相关抖音内容服务,若您的账号封禁、被盗等处罚与我方无关。\n害怕风险请勿扫码 ~");
+  try {
+    startXvfb();
+    const browser = await chromium.launch({
+      headless: false,
+      args: [
+        "--disable-blink-features=AutomationControlled",
+        // 禁用自动化控制
+        "--window-position=-10000,-10000",
+        // 将窗口移到屏幕外
+        "--start-minimized",
+        // 启动时最小化
+        "--mute-audio",
+        // 静音
+        "--no-sandbox"
+        // 使用无沙箱模式，适合无桌面环境
+      ]
+    });
+    const page = await browser.newPage();
+    await page.goto("https://www.douyin.com", { timeout: 12e4 });
+    const timeout = new Promise((resolve) => setTimeout(async () => {
+      await browser.close();
+    }, 12e4));
+    const qrCodePromise = (async () => {
+      try {
+        const qrCodeBase64 = await waitQrcode(page);
+        const base64Data = qrCodeBase64 ? qrCodeBase64.replace(/^data:image\/\w+;base64,/, "") : "";
+        const buffer = Buffer.from(base64Data, "base64");
+        fs.writeFileSync(`${Common.tempDri.default}DouyinLoginQrcode.png`, buffer);
+        const message2 = await e.reply([segment.image("base64://" + base64Data), segment.text("请在120秒内通过抖音APP扫码进行登录")], { reply: true });
+        msg_id.push(message2.messageId, message1.messageId);
+        page.on("response", async (response) => {
+          try {
+            logger.debug(`接收到响应：${response.url()}`);
+            if (response.status() === 302 && response.url().includes("/passport/sso/login/callback")) {
+              const localCookies = await page.context().cookies();
+              const cookieString = localCookies.map((cookie) => `${cookie.name}=${cookie.value}`).join("; ");
+              Config.Modify("cookies", "douyin", cookieString);
+              await e.reply("登录成功！用户登录凭证已保存至cookies.yaml", { reply: true });
+              await browser.close();
+              await Promise.all(msg_id.map(async (id) => {
+                await e.bot.recallMsg(e.contact, id);
+              }));
+            } else if (response.headers()["content-type"] && response.headers()["content-type"].includes("application/json") && response.url().includes("https://sso.douyin.com")) {
+              const responseBody = await response.body();
+              const jsonResponse = JSON.parse(responseBody.toString());
+              logger.debug(`SSO 回调 Code：${jsonResponse.error_code}`, `响应内容：${jsonResponse.description}`);
+              if (jsonResponse.error_code === 2046) {
+                logger.debug("需要短信验证码");
+                await page.getByText("接收短信验证").click();
+                const elements = page.locator(":has-text('为保护账号安全，请输入当前手机号')");
+                const texts = await elements.allInnerTexts();
+                await page.getByText("获取验证码").click();
+                const message3 = await e.reply(segment.text(texts.pop()));
+                msg_id.push(message3.messageId);
+                const ctx = await karin.ctx(e, { reply: true });
+                await page.getByPlaceholder("请输入验证码").click();
+                await page.getByPlaceholder("请输入验证码").fill(ctx.msg);
+                await page.getByText("验证", { exact: true }).click();
+              }
+            }
+          } catch (error) {
+            await browser.close();
+            await Promise.all(msg_id.map(async (id) => {
+              await e.bot.recallMsg(e.contact, id);
+            }));
+          }
+        });
+      } catch (error) {
+        await browser.close();
+        await Promise.all(msg_id.map(async (id) => {
+          await e.bot.recallMsg(e.contact, id);
+        }));
+        await e.reply("登录超时！二维码已失效！", { reply: true });
+        logger.error(error);
+      }
+    })();
+    await Promise.race([qrCodePromise, timeout]);
+  } catch (error) {
+    logger.error(error);
+    if (error.message.includes("npx playwright install")) {
+      const msg = await e.reply("首次使用，正在初始化 playwright 环境，请稍等片刻...");
+      execSync("npx playwright install chromium", { cwd: Version.pluginPath, stdio: "inherit" });
+      await e.reply(`playwright 初始化成功，请再次发送「${e.msg}」`);
+      await e.bot.recallMsg(e.contact, msg.messageId);
+      return true;
+    } else {
+      await e.reply("chromiun 环境初始化失败，请查看控制台错误日志", { reply: true });
+    }
+  }
+  return true;
+};
+const waitQrcode = async (page) => {
+  const qrCodeSelector = ".web-login-scan-code__content__qrcode-wrapper img";
+  const loginButton = page.getByRole("button", { name: "登录" });
+  const qrCodeImage = await page.waitForSelector(qrCodeSelector, { state: "attached", timeout: 3e4 });
+  if (qrCodeImage) {
+    const qrCodeBase64 = await qrCodeImage.getAttribute("src");
+    return qrCodeBase64;
+  } else {
+    await loginButton.click();
+    await page.waitForSelector(qrCodeSelector, { timeout: 2e4 });
+    const qrCodeImage2 = await page.waitForSelector(qrCodeSelector, { timeout: 2e4 });
+    const qrCodeBase64 = await qrCodeImage2.getAttribute("src");
+    return qrCodeBase64;
+  }
+};
+const task = Config.app.rmmp4 && karin.task("[kkk-视频缓存自动删除]", "0 0 4 * * *", async () => {
   try {
     await removeAllFiles(Common.tempDri.video);
-    logger.mark(Common.tempDri.video + "\u76EE\u5F55\u4E0B\u6240\u6709\u6587\u4EF6\u5DF2\u5220\u9664");
+    logger.mark(Common.tempDri.video + "目录下所有文件已删除");
   } catch (err) {
-    console.error("\u5220\u9664\u6587\u4EF6\u65F6\u51FA\u9519:", err);
+    console.error("删除文件时出错:", err);
   }
 });
-var biLogin = karin.command(/^#?(kkk)?\s*B站\s*(扫码)?\s*登录$/i, async (e) => {
+const biLogin = karin.command(/^#?(kkk)?\s*B站\s*(扫码)?\s*登录$/i, async (e) => {
   await bilibiliLogin(e);
   return true;
-}, { perm: Config.bilibili.loginPerm, name: "kkk-ck\u7BA1\u7406" });
-var dylogin = karin.command(/^#?(kkk)?抖音(扫码)?登录$/, async (e) => {
+}, { perm: Config.bilibili.loginPerm, name: "kkk-ck管理" });
+const dylogin = karin.command(/^#?(kkk)?抖音(扫码)?登录$/, async (e) => {
   await douyinLogin(e);
   return true;
-}, { perm: Config.douyin.loginPerm, name: "kkk-ck\u7BA1\u7406" });
-var setdyck = karin.command(/^#?(kkk)?s*设置抖音ck$/i, async (e) => {
-  const msg = await e.reply("\u8BF7\u53D1\u5728120\u79D2\u5185\u9001\u6296\u97F3ck\n\u6559\u7A0B\uFF1Ahttps://ikenxuan.github.io/kkkkkk-10086/docs/intro/other#%E9%85%8D%E7%BD%AE%E4%B8%8D%E5%90%8C%E5%B9%B3%E5%8F%B0%E7%9A%84-cookies\n");
+}, { perm: Config.douyin.loginPerm, name: "kkk-ck管理" });
+const setdyck = karin.command(/^#?(kkk)?s*设置抖音ck$/i, async (e) => {
+  const msg = await e.reply("请发在120秒内送抖音ck\n教程：https://ikenxuan.github.io/kkkkkk-10086/docs/intro/other#%E9%85%8D%E7%BD%AE%E4%B8%8D%E5%90%8C%E5%B9%B3%E5%8F%B0%E7%9A%84-cookies\n");
   const context = await karin.ctx(e);
   Config.Modify("cookies", "douyin", context.msg);
   await e.bot.recallMsg(e.contact, msg.messageId);
-  await e.reply("\u8BBE\u7F6E\u6210\u529F\uFF01", { at: true });
+  await e.reply("设置成功！", { at: true });
   return true;
-}, { perm: "master", name: "kkk-ck\u7BA1\u7406", event: "message.friend" });
-var setbilick = karin.command(/^#?(kkk)?s*设置s*(B站)ck$/i, async (e) => {
-  const msg = await e.reply("\u8BF7\u53D1\u5728120\u79D2\u5185\u9001B\u7AD9ck\n\u6559\u7A0B\uFF1Ahttps://ikenxuan.github.io/kkkkkk-10086/docs/intro/other#%E9%85%8D%E7%BD%AE%E4%B8%8D%E5%90%8C%E5%B9%B3%E5%8F%B0%E7%9A%84-cookies\n");
+}, { perm: "master", name: "kkk-ck管理", event: "message.friend" });
+const setbilick = karin.command(/^#?(kkk)?s*设置s*(B站)ck$/i, async (e) => {
+  const msg = await e.reply("请发在120秒内送B站ck\n教程：https://ikenxuan.github.io/kkkkkk-10086/docs/intro/other#%E9%85%8D%E7%BD%AE%E4%B8%8D%E5%90%8C%E5%B9%B3%E5%8F%B0%E7%9A%84-cookies\n");
   const context = await karin.ctx(e);
   Config.Modify("cookies", "bilibili", context.msg);
   await e.bot.recallMsg(e.contact, msg.messageId);
-  await e.reply("\u8BBE\u7F6E\u6210\u529F\uFF01", { at: true });
+  await e.reply("设置成功！", { at: true });
   return true;
-}, { perm: "master", name: "kkk-ck\u7BA1\u7406", event: "message.friend" });
+}, { perm: "master", name: "kkk-ck管理", event: "message.friend" });
 async function removeAllFiles(dir) {
   const files = await fs.promises.readdir(dir);
   for (const file of files) {
-    const filePath = path.join(dir, file);
+    const filePath = require$$1.join(dir, file);
     const stats = await fs.promises.stat(filePath);
     if (stats.isDirectory()) {
       await removeAllFiles(filePath);
@@ -56,5 +210,10 @@ async function removeAllFiles(dir) {
     }
   }
 }
-
-export { biLogin, dylogin, setbilick, setdyck, task };
+export {
+  biLogin,
+  dylogin,
+  setbilick,
+  setdyck,
+  task
+};

package/lib/apps/help.js

@@ -1,22 +1,19 @@
-import { createRequire } from 'module';
-import { Render, Config, Version, Common } from '../chunk-DSCWGW73.js';
-import { init_esm_shims } from '../chunk-XHTHHTBA.js';
-import { execSync } from 'node:child_process';
-import fs from 'node:fs';
-import { markdown } from '@karinjs/md-html';
-import karin, { mkdirSync, render, segment, isPackaged, updatePkg, updateGitPlugin, logger, common, restart } from 'node-karin';
-import { karinPathTemp } from 'node-karin/root';
-
-createRequire(import.meta.url);
-
-// src/apps/help.ts
-init_esm_shims();
-var help = karin.command(/^#?kkk帮助$/, async (e) => {
+import { execSync } from "node:child_process";
+import fs from "node:fs";
+import { m as markdown } from "../chunk/index-BDlGFCbK.js";
+import karin, { mkdirSync, render, segment, isPackaged, updatePkg, updateGitPlugin, logger, common, restart } from "node-karin";
+import { karinPathTemp } from "node-karin/root";
+import "sequelize";
+import { C as Config, d as Common } from "../chunk/douyin-CpQOEMNX.js";
+import { Version } from "../Version.js";
+import "stream/promises";
+import { R as Render } from "../chunk/Render-CCORwrkI.js";
+const help = karin.command(/^#?kkk帮助$/, async (e) => {
   const img = await Render("help/index");
   await e.reply(img);
   return true;
-}, { name: "kkk-\u5E2E\u52A9" });
-var version = karin.command(/^#?kkk版本$/, async (e) => {
+}, { name: "kkk-帮助" });
+const version = karin.command(/^#?kkk版本$/, async (e) => {
   Config.douyin.push.switch = false;
   const changelogs2 = fs.readFileSync(Version.pluginPath + "/CHANGELOG.md", "utf8");
   const html = markdown(changelogs2, {
@@ -28,8 +25,8 @@ var version = karin.command(/^#?kkk版本$/, async (e) => {
   const img = await render.renderHtml(htmlPath);
   await e.reply(segment.image("base64://" + img));
   return true;
-}, { name: "kkk-\u7248\u672C" });
-var changelogs = karin.command(/^#?kkk更新日志$/, async (e) => {
+}, { name: "kkk-版本" });
+const changelogs = karin.command(/^#?kkk更新日志$/, async (e) => {
   const commits = getLatestCommitsSync();
   let htmlString = "";
   for (const commit of commits) {
@@ -50,12 +47,12 @@ var changelogs = karin.command(/^#?kkk更新日志$/, async (e) => {
   const img = await render.renderHtml(htmlPath);
   await e.reply(segment.image("base64://" + img));
   return true;
-}, { name: "kkk-\u66F4\u65B0\u65E5\u5FD7" });
-var update = karin.command(/^#?kkk更新(预览版)?$/, async (e) => {
+}, { name: "kkk-更新日志" });
+const update = karin.command(/^#?kkk更新(预览版)?$/, async (e) => {
   let status = "failed";
   let data = "";
   if (isPackaged) {
-    if (e.msg.includes("\u9884\u89C8\u7248")) {
+    if (e.msg.includes("预览版")) {
       const resolve = await updatePkg(Version.pluginName, "beta");
       status = resolve.status;
       data = resolve.data;
@@ -66,7 +63,7 @@ var update = karin.command(/^#?kkk更新(预览版)?$/, async (e) => {
     }
   } else {
     let cmd = "git pull";
-    if (e.msg.includes("\u5F3A\u5236")) {
+    if (e.msg.includes("强制")) {
       cmd = "git reset --hard && git pull --allow-unrelated-histories";
     }
     const resolve = await updateGitPlugin(Version.pluginPath, cmd);
@@ -74,21 +71,21 @@ var update = karin.command(/^#?kkk更新(预览版)?$/, async (e) => {
     data = resolve.data;
   }
   logger.debug(data);
-  await e.bot.sendForwardMsg(e.contact, common.makeForward([segment.text(`\u66F4\u65B0 ${Version.pluginName}...
+  await e.bot.sendForwardMsg(e.contact, common.makeForward([segment.text(`更新 ${Version.pluginName}...
 ${JSON.stringify(data)}`)], e.sender.userId, e.sender.nick));
   if (status === "ok") {
     try {
       await e.reply(`
-\u66F4\u65B0\u5B8C\u6210\uFF0C\u5F00\u59CB\u91CD\u542F \u672C\u6B21\u8FD0\u884C\u65F6\u95F4\uFF1A${common.uptime()}`, { at: true });
+更新完成，开始重启 本次运行时间：${common.uptime()}`, { at: true });
       await restart(e.selfId, e.contact, e.messageId);
       return true;
     } catch (error) {
-      await e.reply(`${Version.pluginName}\u91CD\u542F\u5931\u8D25\uFF0C\u8BF7\u624B\u52A8\u91CD\u542F\u4EE5\u5E94\u7528\u66F4\u65B0\uFF01`);
+      await e.reply(`${Version.pluginName}重启失败，请手动重启以应用更新！`);
     }
   }
   return true;
-}, { name: "kkk-\u66F4\u65B0", perm: "master" });
-var getLatestCommitsSync = () => {
+}, { name: "kkk-更新", perm: "master" });
+const getLatestCommitsSync = () => {
   const command = 'git log -150 --pretty=format:"%h %an %s"';
   const output = execSync(command, { cwd: Version.pluginPath }).toString();
   const commits = output.trim().split("\n");
@@ -101,7 +98,7 @@ var getLatestCommitsSync = () => {
     return { sha, committer, message };
   }).slice(0, 50);
 };
-var setColor = (message) => {
+const setColor = (message) => {
   switch (true) {
     case message.includes("feat"):
       return "10px solid #a9ffb9";
@@ -115,5 +112,9 @@ var setColor = (message) => {
       return "2px solid";
   }
 };
-
-export { changelogs, help, update, version };
+export {
+  changelogs,
+  help,
+  update,
+  version
+};