一分钟搭建影视站,支持Docker等部署方式
fix(ui): 剧集实时更新
ykq0078cb93129c512
diff --git a/js/ui.js b/js/ui.jsindex 9389b2d..cf0433a 100644--- a/js/ui.js+++ b/js/ui.js@@ -21,7 +21,7 @@ function showToast(message, type = 'error') {// 首先确保toast元素存在let toast = document.getElementById('toast');let toastMessage = document.getElementById('toastMessage');-+// 如果toast元素不存在,创建它if (!toast) {toast = document.createElement('div');@@ -31,13 +31,13 @@ function showToast(message, type = 'error') {toastMessage = document.createElement('p');toastMessage.id = 'toastMessage';toast.appendChild(toastMessage);-+document.body.appendChild(toast);}-+// 将新的toast添加到队列toastQueue.push({ message, type });-+// 如果当前没有显示中的toast,则开始显示if (!isShowingToast) {showNextToast();@@ -49,33 +49,33 @@ function showNextToast() {isShowingToast = false;return;}-+isShowingToast = true;const { message, type } = toastQueue.shift();-+const toast = document.getElementById('toast');const toastMessage = document.getElementById('toastMessage');-+const bgColors = {'error': 'bg-red-500','success': 'bg-green-500','info': 'bg-blue-500','warning': 'bg-yellow-500'};-+const bgColor = bgColors[type] || bgColors.error;toast.className = `fixed top-4 left-1/2 -translate-x-1/2 px-6 py-3 rounded-lg shadow-lg transform transition-all duration-300 ${bgColor} text-white z-50`;toastMessage.textContent = message;-+// 显示提示toast.style.opacity = '1';toast.style.transform = 'translateX(-50%) translateY(0)';-+// 3秒后自动隐藏setTimeout(() => {toast.style.opacity = '0';toast.style.transform = 'translateX(-50%) translateY(-100%)';-+// 等待动画完成后显示下一个toastsetTimeout(() => {showNextToast();@@ -91,12 +91,12 @@ function showLoading(message = '加载中...') {if (loadingTimeoutId) {clearTimeout(loadingTimeoutId);}-+const loading = document.getElementById('loading');const messageEl = loading.querySelector('p');messageEl.textContent = message;loading.style.display = 'flex';-+// 设置30秒后自动关闭loading,防止无限loadingloadingTimeoutId = setTimeout(() => {hideLoading();@@ -110,7 +110,7 @@ function hideLoading() {clearTimeout(loadingTimeoutId);loadingTimeoutId = null;}-+const loading = document.getElementById('loading');loading.style.display = 'none';}@@ -135,12 +135,12 @@ function getSearchHistory() {try {const data = localStorage.getItem(SEARCH_HISTORY_KEY);if (!data) return [];-+const parsed = JSON.parse(data);-+// 检查是否是数组if (!Array.isArray(parsed)) return [];-+// 支持旧格式(字符串数组)和新格式(对象数组)return parsed.map(item => {if (typeof item === 'string') {@@ -157,36 +157,36 @@ function getSearchHistory() {// 保存搜索历史的增强版本 - 添加时间戳和最大数量限制,现在缓存2个月function saveSearchHistory(query) {if (!query || !query.trim()) return;-+// 清理输入,防止XSSquery = query.trim().substring(0, 50).replace(/</g, '<').replace(/>/g, '>');-+let history = getSearchHistory();-+// 获取当前时间const now = Date.now();-+// 过滤掉超过2个月的记录(约60天,60*24*60*60*1000 = 5184000000毫秒)- history = history.filter(item =>+ history = history.filter(item =>typeof item === 'object' && item.timestamp && (now - item.timestamp < 5184000000));-+// 删除已存在的相同项- history = history.filter(item =>+ history = history.filter(item =>typeof item === 'object' ? item.text !== query : item !== query);-+// 新项添加到开头,包含时间戳history.unshift({text: query,timestamp: now});-+// 限制历史记录数量if (history.length > MAX_HISTORY_ITEMS) {history = history.slice(0, MAX_HISTORY_ITEMS);}-+try {localStorage.setItem(SEARCH_HISTORY_KEY, JSON.stringify(history));} catch (e) {@@ -199,7 +199,7 @@ function saveSearchHistory(query) {console.error('再次保存搜索历史失败:', e2);}}-+renderSearchHistory();}@@ -207,25 +207,25 @@ function saveSearchHistory(query) {function renderSearchHistory() {const historyContainer = document.getElementById('recentSearches');if (!historyContainer) return;-+const history = getSearchHistory();-+if (history.length === 0) {historyContainer.innerHTML = '';return;}-+// 创建一个包含标题和清除按钮的行historyContainer.innerHTML = `<div class="flex justify-between items-center w-full mb-2"><div class="text-gray-500">最近搜索:</div>- <button id="clearHistoryBtn" class="text-gray-500 hover:text-white transition-colors"+ <button id="clearHistoryBtn" class="text-gray-500 hover:text-white transition-colors"onclick="clearSearchHistory()" aria-label="清除搜索历史">清除搜索历史</button></div>`;-+history.forEach(item => {const tag = document.createElement('button');tag.className = 'search-tag flex items-center gap-1';@@ -246,13 +246,13 @@ function renderSearchHistory() {renderSearchHistory();};tag.appendChild(deleteButton);-+// 添加时间提示(如果有时间戳)if (item.timestamp) {const date = new Date(item.timestamp);tag.title = `搜索于: ${date.toLocaleString()}`;}-+tag.onclick = function() {document.getElementById('searchInput').value = item.text;search();@@ -305,16 +305,16 @@ function toggleHistory(e) {}}if (e) e.stopPropagation();-+const panel = document.getElementById('historyPanel');if (panel) {panel.classList.toggle('show');-+// 如果打开了历史记录面板,则加载历史数据if (panel.classList.contains('show')) {loadViewingHistory();}-+// 如果设置面板是打开的,则关闭它const settingsPanel = document.getElementById('settingsPanel');if (settingsPanel && settingsPanel.classList.contains('show')) {@@ -328,32 +328,32 @@ function formatTimestamp(timestamp) {const date = new Date(timestamp);const now = new Date();const diff = now - date;-+// 小于1小时,显示"X分钟前"if (diff < 3600000) {const minutes = Math.floor(diff / 60000);return minutes <= 0 ? '刚刚' : `${minutes}分钟前`;}-+// 小于24小时,显示"X小时前"if (diff < 86400000) {const hours = Math.floor(diff / 3600000);return `${hours}小时前`;}-+// 小于7天,显示"X天前"if (diff < 604800000) {const days = Math.floor(diff / 86400000);return `${days}天前`;}-+// 其他情况,显示完整日期const year = date.getFullYear();const month = (date.getMonth() + 1).toString().padStart(2, '0');const day = date.getDate().toString().padStart(2, '0');const hour = date.getHours().toString().padStart(2, '0');const minute = date.getMinutes().toString().padStart(2, '0');-+return `${year}-${month}-${day} ${hour}:${minute}`;}@@ -372,14 +372,14 @@ function getViewingHistory() {function loadViewingHistory() {const historyList = document.getElementById('historyList');if (!historyList) return;-+const history = getViewingHistory();-+if (history.length === 0) {historyList.innerHTML = `<div class="text-center text-gray-500 py-8">暂无观看记录</div>`;return;}-+// 渲染历史记录historyList.innerHTML = history.map(item => {// 防止XSS@@ -387,21 +387,31 @@ function loadViewingHistory() {.replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"');-- const safeSource = item.sourceName ?- item.sourceName.replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"') :++ const safeSource = item.sourceName ?+ item.sourceName.replace(/</g, '<').replace(/>/g, '>').replace(/"/g, '"') :'未知来源';-- const episodeText = item.episodeIndex !== undefined ?- `${item.episodeIndex + 1}` : '';-++ const episodeText = item.episodeIndex !== undefined ?+ `第${item.episodeIndex + 1}集` : '';++ // 格式化剧集信息+ let episodeInfoHtml = '';+ if (item.episodes && Array.isArray(item.episodes) && item.episodes.length > 0) {+ const totalEpisodes = item.episodes.length;+ const syncStatus = item.lastSyncTime ?+ `<span class="text-green-400 text-xs" title="剧集列表已同步">✓</span>` :+ `<span class="text-yellow-400 text-xs" title="使用缓存数据">⚠</span>`;+ episodeInfoHtml = `<span class="text-xs text-gray-400">共${totalEpisodes}集 ${syncStatus}</span>`;+ }+// 格式化进度信息let progressHtml = '';if (item.playbackPosition && item.duration && item.playbackPosition > 10 && item.playbackPosition < item.duration * 0.95) {const percent = Math.round((item.playbackPosition / item.duration) * 100);const formattedTime = formatPlaybackTime(item.playbackPosition);const formattedDuration = formatPlaybackTime(item.duration);-+progressHtml = `<div class="history-progress"><div class="progress-bar">@@ -411,14 +421,14 @@ function loadViewingHistory() {</div>`;}-+// 为防止XSS,使用encodeURIComponent编码URLconst safeURL = encodeURIComponent(item.url);-+// 构建历史记录项HTML,添加删除按钮,需要放在position:relative的容器中return `<div class="history-item cursor-pointer relative group" onclick="playFromHistory('${item.url}', '${safeTitle}', ${item.episodeIndex || 0}, ${item.playbackPosition || 0})">- <button onclick="event.stopPropagation(); deleteHistoryItem('${safeURL}')"+ <button onclick="event.stopPropagation(); deleteHistoryItem('${safeURL}')"class="absolute right-2 top-2 opacity-0 group-hover:opacity-100 transition-opacity duration-200 text-gray-400 hover:text-red-400 p-1 rounded-full hover:bg-gray-800 z-10"title="删除记录"><svg class="w-4 h-4" fill="none" stroke="currentColor" viewBox="0 0 24 24">@@ -431,6 +441,8 @@ function loadViewingHistory() {<span class="history-episode">${episodeText}</span>${episodeText ? '<span class="history-separator mx-1">·</span>' : ''}<span class="history-source">${safeSource}</span>+ ${episodeInfoHtml ? '<span class="history-separator mx-1">·</span>' : ''}+ ${episodeInfoHtml}</div>${progressHtml}<div class="history-time">${formatTimestamp(item.timestamp)}</div>@@ -438,7 +450,7 @@ function loadViewingHistory() {</div>`;}).join('');-+// 检查是否存在较多历史记录,添加底部边距确保底部按钮不会挡住内容if (history.length > 5) {historyList.classList.add('pb-4');@@ -448,10 +460,10 @@ function loadViewingHistory() {// 格式化播放时间为 mm:ss 格式function formatPlaybackTime(seconds) {if (!seconds || isNaN(seconds)) return '00:00';-+const minutes = Math.floor(seconds / 60);const remainingSeconds = Math.floor(seconds % 60);-+return `${minutes.toString().padStart(2, '0')}:${remainingSeconds.toString().padStart(2, '0')}`;}@@ -460,19 +472,19 @@ function deleteHistoryItem(encodedUrl) {try {// 解码URLconst url = decodeURIComponent(encodedUrl);-+// 获取当前历史记录const history = getViewingHistory();-+// 过滤掉要删除的项const newHistory = history.filter(item => item.url !== url);-+// 保存回localStoragelocalStorage.setItem('viewingHistory', JSON.stringify(newHistory));-+// 重新加载历史记录显示loadViewingHistory();-+// 显示成功提示showToast('已删除该记录', 'success');} catch (e) {@@ -487,6 +499,7 @@ async function playFromHistory(url, title, episodeIndex, playbackPosition = 0) {try {let episodesList = [];let historyItem = null; // To store the full history item+ let syncSuccessful = false;// 检查viewingHistory,查找匹配的项const historyRaw = localStorage.getItem('viewingHistory');@@ -504,8 +517,11 @@ async function playFromHistory(url, title, episodeIndex, playbackPosition = 0) {}}- // Attempt to fetch fresh episode list if we have the necessary info+ // Always attempt to fetch fresh episode list if we have the necessary infoif (historyItem && historyItem.vod_id && historyItem.sourceName) {+ // Show loading toast to indicate syncing+ showToast('正在同步最新剧集列表...', 'info');+// console.log(`[playFromHistory in ui.js] Attempting to fetch details for vod_id: ${historyItem.vod_id}, sourceName: ${historyItem.sourceName}`); // Log 4try {// Construct the API URL for detail fetching@@ -513,19 +529,41 @@ async function playFromHistory(url, title, episodeIndex, playbackPosition = 0) {// Add a cache buster timestampconst timestamp = new Date().getTime();const apiUrl = `/api/detail?id=${encodeURIComponent(historyItem.vod_id)}&source=${encodeURIComponent(historyItem.sourceName)}&_t=${timestamp}`;-- const response = await fetch(apiUrl);++ // Add timeout to the fetch request+ const controller = new AbortController();+ const timeoutId = setTimeout(() => controller.abort(), 10000); // 10 second timeout++ const response = await fetch(apiUrl, {+ signal: controller.signal+ });+ clearTimeout(timeoutId);+if (!response.ok) {throw new Error(`API request failed with status ${response.status}`);}const videoDetails = await response.json();if (videoDetails && videoDetails.episodes && videoDetails.episodes.length > 0) {+ const oldEpisodeCount = episodesList.length;episodesList = videoDetails.episodes;+ syncSuccessful = true;++ // Show success message with episode count info+ const newEpisodeCount = episodesList.length;+ if (newEpisodeCount > oldEpisodeCount) {+ showToast(`已同步最新剧集列表 (${newEpisodeCount}集,新增${newEpisodeCount - oldEpisodeCount}集)`, 'success');+ } else if (newEpisodeCount === oldEpisodeCount) {+ showToast(`剧集列表已是最新 (${newEpisodeCount}集)`, 'success');+ } else {+ showToast(`已同步最新剧集列表 (${newEpisodeCount}集)`, 'success');+ }+// console.log(`成功获取 "${title}" 最新剧集列表:`, episodesList.length, "集");- // Optionally, update the history item in localStorage with the fresh episodes+ // Update the history item in localStorage with the fresh episodesif (historyItem) {historyItem.episodes = [...episodesList]; // Deep copy+ historyItem.lastSyncTime = Date.now(); // Add sync timestampconst history = JSON.parse(historyRaw); // Re-parse to ensure we have the latest versionconst idx = history.findIndex(item => item.url === url);if (idx !== -1) {@@ -536,12 +574,19 @@ async function playFromHistory(url, title, episodeIndex, playbackPosition = 0) {}} else {// console.log(`未能获取 "${title}" 的最新剧集列表,或列表为空。将使用已存储的剧集。`);+ showToast('未获取到最新剧集信息,使用缓存数据', 'warning');}} catch (fetchError) {// console.error(`获取 "${title}" 最新剧集列表失败:`, fetchError, "将使用已存储的剧集。");+ if (fetchError.name === 'AbortError') {+ showToast('同步剧集列表超时,使用缓存数据', 'warning');+ } else {+ showToast('同步剧集列表失败,使用缓存数据', 'warning');+ }}} else if (historyItem) {// console.log(`历史记录项 "${title}" 缺少 vod_id 或 sourceName,无法刷新剧集列表。将使用已存储的剧集。`);+ showToast('无法同步剧集列表,使用缓存数据', 'info');}@@ -647,9 +692,9 @@ function addToViewingHistory(videoInfo) {// console.warn(`addToViewingHistory: videoInfo for "${videoInfo.title}" was missing sourceName or vod_id for preferred showIdentifier. Generated fallback: ${videoInfo.showIdentifier}`);}}-- const existingIndex = history.findIndex(item =>- item.title === videoInfo.title &&++ const existingIndex = history.findIndex(item =>+ item.title === videoInfo.title &&item.sourceName === videoInfo.sourceName &&item.showIdentifier === videoInfo.showIdentifier // Strict check using the determined showIdentifier);@@ -668,15 +713,15 @@ function addToViewingHistory(videoInfo) {existingItem.duration = videoInfo.duration || existingItem.duration;if (videoInfo.episodes && Array.isArray(videoInfo.episodes) && videoInfo.episodes.length > 0) {- if (!existingItem.episodes ||- !Array.isArray(existingItem.episodes) ||+ if (!existingItem.episodes ||+ !Array.isArray(existingItem.episodes) ||existingItem.episodes.length !== videoInfo.episodes.length ||!videoInfo.episodes.every((ep, i) => ep === existingItem.episodes[i])) {existingItem.episodes = [...videoInfo.episodes];// console.log(`更新 (addToViewingHistory) "${videoInfo.title}" 的剧集数据: ${videoInfo.episodes.length}集`);}}-+history.splice(existingIndex, 1);history.unshift(existingItem);// console.log(`更新历史记录 (addToViewingHistory): "${videoInfo.title}", 第 ${videoInfo.episodeIndex !== undefined ? videoInfo.episodeIndex + 1 : 'N/A'} 集`);@@ -686,23 +731,23 @@ function addToViewingHistory(videoInfo) {...videoInfo, // Includes the showIdentifier we ensured is presenttimestamp: Date.now()};-+if (videoInfo.episodes && Array.isArray(videoInfo.episodes)) {newItem.episodes = [...videoInfo.episodes];} else {newItem.episodes = [];}-+history.unshift(newItem);// console.log(`创建新的历史记录 (addToViewingHistory): "${videoInfo.title}", Episode: ${videoInfo.episodeIndex !== undefined ? videoInfo.episodeIndex + 1 : 'N/A'}`);}-+// 限制历史记录数量为50条const maxHistoryItems = 50;if (history.length > maxHistoryItems) {history.splice(maxHistoryItems);}-+// 保存到本地存储localStorage.setItem('viewingHistory', JSON.stringify(history));} catch (e) {@@ -726,10 +771,10 @@ function clearViewingHistory() {const originalToggleSettings = toggleSettings;toggleSettings = function(e) {if (e) e.stopPropagation();-+// 原始设置面板切换逻辑originalToggleSettings(e);-+// 如果历史记录面板是打开的,则关闭它const historyPanel = document.getElementById('historyPanel');if (historyPanel && historyPanel.classList.contains('show')) {@@ -742,10 +787,10 @@ document.addEventListener('DOMContentLoaded', function() {document.addEventListener('click', function(e) {const historyPanel = document.getElementById('historyPanel');const historyButton = document.querySelector('button[onclick="toggleHistory(event)"]');-- if (historyPanel && historyButton &&- !historyPanel.contains(e.target) &&- !historyButton.contains(e.target) &&++ if (historyPanel && historyButton &&+ !historyPanel.contains(e.target) &&+ !historyButton.contains(e.target) &&historyPanel.classList.contains('show')) {historyPanel.classList.remove('show');}@@ -768,9 +813,9 @@ function clearLocalStorage() {modal.innerHTML = `<div class="bg-[#191919] rounded-lg p-6 max-w-md w-full max-h-[90vh] overflow-y-auto relative"><button id="closeBoxModal" class="absolute top-4 right-4 text-gray-400 hover:text-white text-xl">×</button>-+<h3 class="text-xl font-bold text-red-500 mb-4">警告</h3>-+<div class="mb-0"><div class="text-sm font-medium text-gray-300">确定要清除页面缓存吗?</div><div class="text-sm font-medium text-gray-300 mb-4">此功能会删除你的观看记录、自定义 API 接口和 Cookie,<scan class="text-red-500 font-bold">此操作不可恢复!</scan></div>@@ -793,7 +838,7 @@ function clearLocalStorage() {document.getElementById('confirmBoxModal').addEventListener('click', function () {// 清除所有localStorage数据localStorage.clear();-+// 清除所有cookieconst cookies = document.cookie.split(";");for (let i = 0; i < cookies.length; i++) {@@ -802,13 +847,13 @@ function clearLocalStorage() {const name = eqPos > -1 ? cookie.substr(0, eqPos).trim() : cookie.trim();document.cookie = name + "=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/";}-+modal.innerHTML = `<div class="bg-[#191919] rounded-lg p-6 max-w-md w-full max-h-[90vh] overflow-y-auto relative"><button id="closeBoxModal" class="absolute top-4 right-4 text-gray-400 hover:text-white text-xl">×</button>-+<h3 class="text-xl font-bold text-white mb-4">提示</h3>-+<div class="mb-4"><div class="text-sm font-medium text-gray-300 mb-4">页面缓存和Cookie已清除,<span id="countdown">3</span> 秒后自动刷新本页面。</div></div>@@ -816,7 +861,7 @@ function clearLocalStorage() {let countdown = 3;const countdownElement = document.getElementById('countdown');-+const countdownInterval = setInterval(() => {countdown--;if (countdown >= 0) {@@ -857,7 +902,7 @@ function showImportBox(fun) {modal.innerHTML = `<div class="bg-[#191919] rounded-lg p-6 max-w-md w-full max-h-[90vh] overflow-y-auto relative"><button id="closeBoxModal" class="absolute top-4 right-4 text-gray-400 hover:text-white text-xl">×</button>-+<div class="m-4"><div id="dropZone" class="w-full py-9 bg-[#111] rounded-2xl border border-gray-300 gap-3 grid border-dashed"><div class="grid gap-1">