fix: harden media handoff and live logs

Reject stale extension media cookie headers before yt-dlp metadata work, preserve ordinary capture cookies, and advance the companion extension. Stream redacted diagnostic logs only while the visible Logs view is active, with bounded batched updates and race-safe snapshot handoff.
2026-08-10 19:47:42 +00:00 · 2026-07-10 19:02:39 +03:30
parent 4f4c655de6
commit 248f3869ad
13 changed files with 348 additions and 114 deletions
@@ -120,9 +120,8 @@ export const AddDownloadsModal = () => {
    if (context) return extensionHeaders(context).trim();
    return hasExtensionRequestContext ? '' : headers.trim();
  };
-  const cookiesForRow = (sourceUrl: string, omitRequestCookies = false) => {
+  const cookiesForRow = (sourceUrl: string) => {
    if (cookiesManuallyEditedRef.current) return cookies.trim();
-    if (omitRequestCookies) return '';
    const context = requestContextForUrl(sourceUrl);
    if (context) return context.cookies.trim();
    return hasExtensionRequestContext ? '' : cookies.trim();
@@ -303,25 +302,7 @@ export const AddDownloadsModal = () => {
              cookies: rowCookies || null,
              proxy
            };
-            let requestCookiesOmitted = false;
-            let mediaData;
-            try {
-              mediaData = await fetchMediaMetadataDeduped(mediaMetadataArgs);
-            } catch (error) {
-              const capturedCookies = requestContextForUrl(row.sourceUrl)?.cookies.trim();
-              if (!rowCookies || !capturedCookies || cookiesManuallyEditedRef.current) {
-                throw error;
-              }
-              console.warn(
-                'Media metadata rejected the captured Cookie header; retrying without request cookies',
-                error
-              );
-              mediaData = await fetchMediaMetadataDeduped({
-                ...mediaMetadataArgs,
-                cookies: null
-              });
-              requestCookiesOmitted = true;
-            }
+            const mediaData = await fetchMediaMetadataDeduped(mediaMetadataArgs);
            if (mediaData && mediaData.formats.length > 0) {
              const mappedFormats = mediaData.formats.map(f => {
                const quality = f.resolution || 'Video';
@@ -353,7 +334,6 @@ export const AddDownloadsModal = () => {
                  size: mappedFormats[0].bytes ? mappedFormats[0].detail : undefined,
                  sizeBytes: mappedFormats[0].bytes || undefined,
                  status: 'ready',
-                  requestCookiesOmitted,
                  formats: mappedFormats,
                  selectedFormat: 0
                })
@@ -729,7 +709,7 @@ export const AddDownloadsModal = () => {
          checksum: checksumEnabled && checksumValue.trim()
            ? `${checksumAlgo}=${checksumValue.trim()}`
            : undefined,
-          cookies: cookiesForRow(item.sourceUrl, item.requestCookiesOmitted) || undefined,
+          cookies: cookiesForRow(item.sourceUrl) || undefined,
          mirrors: mirrors.trim() || undefined,
          destination: useSharedDestination
            ? finalLocation
@@ -1148,11 +1128,6 @@ export const AddDownloadsModal = () => {
                        className="add-download-control w-full px-3 py-1.5 text-xs font-mono"
                        aria-label="Cookies"
                      />
-                      {!cookiesManuallyEditedRef.current && parsedItems.some(item => item.requestCookiesOmitted) && (
-                        <p className="mt-1 text-[10px] text-amber-400">
-                          Media metadata only worked without the captured cookies, so they will be omitted for affected rows. Edit this field to force a manual value.
-                        </p>
-                      )}
                    </div>
                    <div>
                      <label className="block text-[10px] uppercase font-bold tracking-wider text-text-muted mb-1">Mirrors</label>
@@ -7,11 +7,15 @@ import { FileDown, Trash2, Terminal, Filter, Play, Pause, Info, Copy } from 'luc
 import { WindowDragRegion } from './WindowDragRegion';
 import { useToast } from '../contexts/ToastContext';
 import { useSettingsStore } from '../store/useSettingsStore';
-
-interface LogEntry {
-  level: 'Trace' | 'Debug' | 'Info' | 'Warn' | 'Error';
-  message: string;
-}
+import {
+  MAX_LOG_LINES,
+  appendBoundedLogEntries,
+  liveLogEntry,
+  mergeLogSnapshotAndLiveEntries,
+  persistedLogEntry,
+  pushBoundedLogEntry,
+  type LogEntry
+} from '../utils/logEntries';

 export default function LogsView() {
  const { addToast } = useToast();
@@ -20,56 +24,75 @@ export default function LogsView() {
  const [logs, setLogs] = useState<LogEntry[]>([]);
  const [levelFilter, setLevelFilter] = useState<LogEntry['level'] | 'All'>('All');
  const [contextMenu, setContextMenu] = useState<{ x: number; y: number; text: string } | null>(null);
+  const [pageVisible, setPageVisible] = useState(() => document.visibilityState !== 'hidden');
  const scrollRef = useRef<HTMLDivElement>(null);
-  const rawLineCountRef = useRef(0);
-
-  const MAX_LOG_LINES = 2000;
+  const liveBatchRef = useRef<LogEntry[]>([]);
+  const liveFrameRef = useRef<number | null>(null);

  useEffect(() => {
+    const handleVisibilityChange = () => setPageVisible(document.visibilityState !== 'hidden');
+    document.addEventListener('visibilitychange', handleVisibilityChange);
+    return () => document.removeEventListener('visibilitychange', handleVisibilityChange);
+  }, []);
+
+  useEffect(() => {
+    if (!pageVisible) {
+      void invoke('set_log_stream_active', { active: false }).catch(console.error);
+      return;
+    }
+
+    if (!logsEnabled) {
+      void invoke('set_log_stream_active', { active: false }).catch(console.error);
+    }
+
    let active = true;
-    let unlisten: (() => void) | undefined;
+    let initialized = false;
+    let pendingLiveEntries: LogEntry[] = [];
+    let unlistenPromise: Promise<() => void> | undefined;
+
+    const scheduleLiveEntry = (entry: LogEntry) => {
+      if (!initialized) {
+        pushBoundedLogEntry(pendingLiveEntries, entry);
+        return;
+      }
+
+      pushBoundedLogEntry(liveBatchRef.current, entry);
+      if (liveFrameRef.current !== null) return;
+      liveFrameRef.current = window.requestAnimationFrame(() => {
+        liveFrameRef.current = null;
+        if (!active || liveBatchRef.current.length === 0) return;
+        const batch = liveBatchRef.current;
+        liveBatchRef.current = [];
+        setLogs(current => appendBoundedLogEntries(current, batch));
+      });
+    };

    const init = async () => {
      try {
        await initLogger();
-        const [lines] = await Promise.all([
-          invoke('read_logs', { limit: MAX_LOG_LINES })
-        ]);
        if (!active) return;
-        const initialLogs = lines.map(message => {
-          const level: LogEntry['level'] = message.includes('[ERROR]') ? 'Error'
-            : message.includes('[WARN]') ? 'Warn'
-              : message.includes('[INFO]') ? 'Info'
-                : message.includes('[TRACE]') ? 'Trace'
-                  : 'Debug';
-          return { level, message };
-        });
-        
-        setLogs(initialLogs);
-        rawLineCountRef.current = initialLogs.length;

        if (logsEnabled) {
-          unlisten = await attachLogger((log) => {
+          unlistenPromise = attachLogger((log) => {
            if (!active) return;
-            const levelStr: LogEntry['level'] = log.level === 5 ? 'Error'
-              : log.level === 4 ? 'Warn'
-                : log.level === 3 ? 'Info'
-                  : log.level === 1 ? 'Trace'
-                    : 'Debug';
-
-            const timeStr = new Date().toISOString().replace('T', ' ').substring(0, 19);
-            const formattedMsg = `[${timeStr}] [${levelStr.toUpperCase()}] ${log.message}`;
-
-            setLogs(prev => {
-              const newLogs = [...prev, { level: levelStr, message: formattedMsg }];
-              rawLineCountRef.current = newLogs.length;
-              if (newLogs.length > MAX_LOG_LINES + 500) {
-                return newLogs.slice(newLogs.length - MAX_LOG_LINES);
-              }
-              return newLogs;
-            });
+            scheduleLiveEntry(liveLogEntry(log.level, log.message));
          });
+          await unlistenPromise;
+          if (!active) return;
+          await invoke('set_log_stream_active', { active: true });
+          if (!active) {
+            await invoke('set_log_stream_active', { active: false }).catch(console.error);
+            return;
+          }
        }
+
+        const lines = await invoke('read_logs', { limit: MAX_LOG_LINES });
+        if (!active) return;
+        const snapshot = lines.map(persistedLogEntry);
+        initialized = true;
+        const caughtUpLogs = mergeLogSnapshotAndLiveEntries(snapshot, pendingLiveEntries);
+        pendingLiveEntries = [];
+        setLogs(caughtUpLogs);
      } catch (e) {
        console.error('Failed to init logs:', e);
      }
@@ -78,9 +101,19 @@ export default function LogsView() {
    
    return () => {
      active = false;
-      if (unlisten) unlisten();
+      liveBatchRef.current = [];
+      if (liveFrameRef.current !== null) {
+        window.cancelAnimationFrame(liveFrameRef.current);
+        liveFrameRef.current = null;
+      }
+      if (logsEnabled) {
+        void invoke('set_log_stream_active', { active: false }).catch(console.error);
+      }
+      if (unlistenPromise) {
+        void unlistenPromise.then(unlisten => unlisten()).catch(console.error);
+      }
    };
-  }, [logsEnabled]);
+  }, [logsEnabled, pageVisible]);

  useEffect(() => {
    if (scrollRef.current) {
@@ -139,6 +172,11 @@ export default function LogsView() {
  };

  const handleClear = async () => {
+    liveBatchRef.current = [];
+    if (liveFrameRef.current !== null) {
+      window.cancelAnimationFrame(liveFrameRef.current);
+      liveFrameRef.current = null;
+    }
    setLogs([]);
    await invoke('clear_logs').catch(console.error);
  };