From d09e9820a25e539e992fdae0c60c884872f0c0f5 Mon Sep 17 00:00:00 2001 From: huangxd- <649924757@qq.com> Date: Mon, 6 Oct 2025 16:38:06 +0800 Subject: [PATCH] =?UTF-8?q?vercel/cloudflare=E9=BB=98=E8=AE=A4=E5=BC=80?= =?UTF-8?q?=E5=90=AF=E5=B7=B4=E5=93=88=E5=A7=86=E7=89=B9=E6=BA=90=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * vercel/cloudflare默认开启巴哈姆特源 在home页面打印所有环境变量，用于确认配置的环境变量是否生效 * match接口增加从网盘命名 无忧渡.S01E01.2160p.WEB-DL.H265.DDP.5.1 中提取 title/season/episode，用于自动匹配 --- danmu_api/worker.js | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/danmu_api/worker.js b/danmu_api/worker.js index 0ca3d0d..87bcaef 100644 --- a/danmu_api/worker.js +++ b/danmu_api/worker.js @@ -1,6 +1,6 @@ // 全局状态（Cloudflare 和 Vercel 都可能重用实例） // ⚠️ 不是持久化存储，每次冷启动会丢失 -const VERSION = "1.2.4"; +const VERSION = "1.2.5"; let animes = []; let episodeIds = []; let episodeNum = 10001; // 全局变量，用于自增 ID @@ -11,6 +11,7 @@ const MAX_LOGS = 500; const MAX_ANIMES = 100; const vodAllowedPlatforms = ["qiyi", "bilibili1", "imgo", "youku", "qq"]; const allowedPlatforms = ["qiyi", "bilibili1", "imgo", "youku", "qq", "renren", "hanjutv", "bahamut"]; +let envs = {}; // ===================== // 环境变量处理 @@ -82,9 +83,12 @@ function resolveYoukuConcurrency(env) { const DEFAULT_SOURCE_ORDER = "vod,360,renren,hanjutv"; // 默认 源排序 let sourceOrderArr = []; -function resolveSourceOrder(env) { +function resolveSourceOrder(env, deployPlatform) { // 获取环境变量中的 SOURCE_ORDER 配置 let sourceOrder = DEFAULT_SOURCE_ORDER; + if (deployPlatform === "cloudflare" || deployPlatform === "vercel") { + sourceOrder += ",bahamut"; + } if (env && env.SOURCE_ORDER) { sourceOrder = env.SOURCE_ORDER; // Cloudflare Workers @@ -174,8 +178,6 @@ function resolveEpisodeTitleFilter(env) { keywords = DEFAULT_EPISODE_TITLE_FILTER; } - log("log", "EPISODE_TITLE_FILTER keywords: ", keywords); - // 返回由过滤后的关键字生成的正则表达式 return new RegExp( "^" + @@ -1254,6 +1256,11 @@ function convertToAsciiSum(sid) { return hash < 10000 ? hash + 10000 : hash; } +// 基础加密函数 - 将字符串转换为星号 +function encryptStr(str) { + return '*'.repeat(str.length); +} + // ===================== // 获取腾讯弹幕 // ===================== @@ -3627,8 +3634,6 @@ async function matchAniAndEp(season, episode, searchData, title, req, platform) return filterEp && !episodeTitleFilter.test(filterEp); // 如果##中的内容匹配正则表达式 }); - log("info", "filteredEpisodes", filteredEpisodes); - if (platform) { const firstIndex = filteredEpisodes.findIndex(episode => extractTitle(episode.episodeTitle) === platform); const indexCount = filteredEpisodes.filter(episode => extractTitle(episode.episodeTitle) === platform).length; @@ -3714,10 +3719,10 @@ async function matchAnime(url, req) { log("info", `Processing anime match for query: ${fileName}`); log("info", `Parsed cleanFileName: ${cleanFileName}, preferredPlatform: ${preferredPlatform}`); - const regex = /^(.+?)\s+S(\d+)E(\d+)$/; + const regex = /^(.+?)[.\s]+S(\d+)E(\d+)/i; const match = cleanFileName.match(regex); - let title = match ? match[1] : cleanFileName; + let title = match ? match[1].trim() : cleanFileName; let season = match ? parseInt(match[2]) : null; let episode = match ? parseInt(match[3]) : null; @@ -4017,19 +4022,31 @@ async function getComment(path) { return jsonResponse({ count: danmus.length, comments: danmus }); } -async function handleRequest(req, env) { +async function handleRequest(req, env, deployPlatform) { token = resolveToken(env); // 每次请求动态获取，确保热更新环境变量后也能生效 + envs["token"] = encryptStr(token); otherServer = resolveOtherServer(env); + envs["otherServer"] = otherServer; vodServer = resolveVodServer(env); + envs["vodServer"] = vodServer; vodServer2 = resolveVodServer2(env); + envs["vodServer2"] = vodServer2; bilibliCookie = resolveBilibiliCookie(env); + envs["bilibliCookie"] = encryptStr(bilibliCookie); youkuConcurrency = resolveYoukuConcurrency(env); - sourceOrderArr = resolveSourceOrder(env); + envs["youkuConcurrency"] = youkuConcurrency; + sourceOrderArr = resolveSourceOrder(env, deployPlatform); + envs["sourceOrderArr"] = sourceOrderArr; platformOrderArr = resolvePlatformOrder(env); + envs["platformOrderArr"] = platformOrderArr; episodeTitleFilter = resolveEpisodeTitleFilter(env); + envs["episodeTitleFilter"] = episodeTitleFilter; blockedWords = resolveBlockedWords(env); + envs["blockedWords"] = blockedWords; groupMinute = resolveGroupMinute(env); + envs["groupMinute"] = groupMinute; proxyUrl = resolveProxyUrl(env); + envs["proxyUrl"] = proxyUrl; const url = new URL(req.url); let path = url.pathname; @@ -4042,6 +4059,7 @@ async function handleRequest(req, env) { return jsonResponse({ message: "Welcome to the LogVar Danmu API server", version: VERSION, + envs: envs, repository: "https://github.com/huangxd-/danmu_api.git", description: "一个人人都能部署的基于 js 的弹幕 API 服务器，支持爱优腾芒哔人韩巴弹幕直接获取，兼容弹弹play的搜索、详情查询和弹幕获取接口，并提供日志记录，支持vercel/cloudflare/docker/claw等部署方式，不用提前下载弹幕，没有nas或小鸡也能一键部署。", notice: "本项目仅为个人爱好开发，代码开源。如有任何侵权行为，请联系本人删除。有问题提issue或私信机器人都ok。https://t.me/ddjdd_bot" @@ -4154,7 +4172,7 @@ async function handleRequest(req, env) { // --- Cloudflare Workers 入口 --- export default { async fetch(request, env, ctx) { - return handleRequest(request, env); + return handleRequest(request, env, "cloudflare"); }, }; @@ -4169,7 +4187,7 @@ export async function vercelHandler(req, res) { : undefined, }); - const response = await handleRequest(cfReq, process.env); + const response = await handleRequest(cfReq, process.env, "vercel"); res.status(response.status); response.headers.forEach((value, key) => res.setHeader(key, value));