eva-md 0.3.2 → 0.4.3

package/README.md

@@ -10,7 +10,7 @@ EVA.md is a terminal media downloader built with Node.js and yt-dlp.
 ## Install
 
 ```cmd
-npm install --global eva-md
+npm install --global --allow-scripts=ffmpeg-static,youtube-dl-exec eva-md
 ```
 
 The package installs the `eva` command and downloads platform-specific yt-dlp and ffmpeg binaries through its dependencies.
@@ -26,7 +26,7 @@ The update command installs the latest published `eva-md` package globally. Rest
 
 ## Publish a release
 
-Sign in to npm, increment the version in `package.json`, then publish:
+Sign in to npm, increment the version in `package.json` and `package-lock.json`, then publish:
 
 ```cmd
 npm login
@@ -36,5 +36,5 @@ npm publish --access public
 The package name `eva-md` must be available to your npm account. Users can install or upgrade it with:
 
 ```cmd
-npm install --global eva-md
+npm install --global --allow-scripts=ffmpeg-static,youtube-dl-exec eva-md
 ```

package/eva.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * EVA.md v0.3.2 — EVA Media Downloader by .maxon
+ * EVA.md v0.3.3 — EVA Media Downloader by .maxon
  * Pure Node.js Interactive TUI (Zero external npm dependencies!)
  * Works just like Gemini CLI (`node eva.js` or `./eva.js`), with full mouse & keyboard support.
  *
@@ -46,8 +46,12 @@ const { spawn, spawnSync } = require('child_process');
 // Constants & Configuration
 // ---------------------------------------------------------------------------
 
-const APP_VERSION = 'v0.3.2 (Node.js)';
+const APP_VERSION = 'v0.4.3 (Node.js)';
 const CONFIG_PATH = path.join(os.homedir(), '.config', 'eva_md', 'config.json');
+const MAX_LOG_LINES = 200;
+const MAX_LOG_LINE_LENGTH = 500;
+const MAX_DOWNLOAD_RETRIES = 3;
+const ANSI_ESCAPE_RE = /\x1B(?:\[[0-?]*[ -/]*[@-~]|\][^\x07]*(?:\x07|\x1B\\)|[@-_])/g;
 
 // Strictly 1-cell narrow glyphs (CP437/WGL4 safe) so Windows Terminal / PowerShell NEVER shifts borders!
 const SOURCES = [
@@ -144,6 +148,79 @@ function formatBytesToMB(bytes) {
   return `${(bytes / (1024 * 1024)).toFixed(2)} MB`;
 }
 
+function sanitizeLogLine(line) {
+  return String(line)
+    .replace(ANSI_ESCAPE_RE, '')
+    .replace(/[\x00-\x1f\x7f-\x9f]/g, ' ')
+    .trim()
+    .slice(0, MAX_LOG_LINE_LENGTH);
+}
+
+function fitTextToCellWidth(text, width) {
+  const chars = [];
+  let totalCells = 0;
+  for (const char of String(text)) {
+    const code = char.codePointAt(0);
+    const zeroWidth =
+      /\p{Mark}/u.test(char) ||
+      code === 0x200d ||
+      (code >= 0xfe00 && code <= 0xfe0f) ||
+      (code >= 0xe0100 && code <= 0xe01ef);
+    if (zeroWidth) continue;
+    const isWide =
+      (code >= 0x1100 && code <= 0x11ff) ||
+      (code >= 0x2e80 && code <= 0xa4cf) ||
+      (code >= 0x20000 && code <= 0x3fffd) ||
+      (code >= 0xac00 && code <= 0xd7af) ||
+      (code >= 0xf900 && code <= 0xfaff) ||
+      (code >= 0xfe10 && code <= 0xfe6f) ||
+      (code >= 0xff01 && code <= 0xff60) ||
+      (code >= 0xffe0 && code <= 0xffe6) ||
+      (code >= 0x1f000 && code <= 0x1faff);
+    chars.push({ value: isWide || code > 0xffff ? '?' : char, width: 1 });
+    totalCells += 1;
+  }
+
+  const clipped = totalCells > width;
+  const contentWidth = clipped ? Math.max(0, width - 1) : width;
+  let result = '';
+  let cells = 0;
+  for (const char of chars) {
+    if (cells + char.width > contentWidth) break;
+    result += char.value;
+    cells += char.width;
+  }
+  if (clipped && width > 0) {
+    result += '…';
+    cells += 1;
+  }
+  return result + ' '.repeat(Math.max(0, width - cells));
+}
+
+function setWindowsProcessTreeState(rootPid, action) {
+  const script = [
+    `$rootId = ${rootPid}`,
+    "$operation = '" + action + "'",
+    "Add-Type -TypeDefinition 'using System; using System.Runtime.InteropServices; public static class EvaProcessControl { [DllImport(\"kernel32.dll\", SetLastError=true)] public static extern IntPtr OpenProcess(uint access, bool inherit, uint processId); [DllImport(\"kernel32.dll\")] public static extern bool CloseHandle(IntPtr handle); [DllImport(\"ntdll.dll\")] public static extern int NtSuspendProcess(IntPtr handle); [DllImport(\"ntdll.dll\")] public static extern int NtResumeProcess(IntPtr handle); }'",
+    '$processes = Get-CimInstance Win32_Process',
+    '$targets = New-Object System.Collections.Generic.List[int]',
+    '$targets.Add([int]$rootId)',
+    'for ($i = 0; $i -lt $targets.Count; $i++) { foreach ($entry in $processes) { $childId = [int]$entry.ProcessId; if ([int]$entry.ParentProcessId -eq $targets[$i] -and -not $targets.Contains($childId)) { $targets.Add($childId) } } }',
+    '$ordered = @($targets.ToArray())',
+    'if ($operation -eq "pause") { [array]::Reverse($ordered) }',
+    'foreach ($targetId in $ordered) { $handle = [EvaProcessControl]::OpenProcess(0x0800, $false, [uint32]$targetId); if ($handle -eq [IntPtr]::Zero) { continue }; try { if ($operation -eq "pause") { $result = [EvaProcessControl]::NtSuspendProcess($handle) } else { $result = [EvaProcessControl]::NtResumeProcess($handle) }; if ($result -ne 0) { throw "Process control failed for PID $targetId (NTSTATUS $result)" } } finally { [void][EvaProcessControl]::CloseHandle($handle) } }',
+  ].join('; ');
+  const result = spawnSync('powershell.exe', ['-NoProfile', '-NonInteractive', '-Command', script], {
+    encoding: 'utf8',
+    windowsHide: true,
+    timeout: 10000,
+  });
+  if (result.error) throw result.error;
+  if (result.status !== 0) {
+    throw new Error((result.stderr || result.stdout || `PowerShell exited with code ${result.status}`).trim());
+  }
+}
+
 function wrapTextByWords(text, maxWidth) {
   if (maxWidth <= 10) return [text.slice(0, Math.max(1, maxWidth))];
   const words = String(text).split(' ');
@@ -324,6 +401,40 @@ function detectSource(url, defaultId = 1) {
   return { id: found.id, name: found.name };
 }
 
+function isYouTubePlaylistUrl(url) {
+  try {
+    const parsed = new URL(url);
+    return /(^|\.)youtube\.com$/i.test(parsed.hostname) && Boolean(parsed.searchParams.get('list'));
+  } catch (_) {
+    return false;
+  }
+}
+
+function buildPlaylistDiscoveryArgs(opts, url) {
+  const args = ['--flat-playlist', '--dump-json', '--skip-download', '--no-warnings', '--encoding', 'utf-8'];
+  if (opts.usePlaylistItems && opts.playlistItems.trim()) {
+    args.push('--playlist-items', opts.playlistItems.trim());
+  }
+  if (opts.playlistReverse) args.push('--playlist-reverse');
+  if (opts.forceIpv4) args.push('-4');
+  if (opts.useProxy && opts.proxyUrl.trim()) args.push('--proxy', opts.proxyUrl.trim());
+  if (opts.useCookiesBrowser && opts.cookiesBrowser && opts.cookiesBrowser !== 'none') {
+    args.push('--cookies-from-browser', opts.cookiesBrowser);
+  }
+  args.push(url);
+  return args;
+}
+
+function playlistEntryUrl(entry, sourceUrl) {
+  for (const candidate of [entry.webpage_url, entry.original_url, entry.url]) {
+    if (typeof candidate === 'string' && /^https?:\/\//i.test(candidate)) return candidate;
+  }
+  if (entry.id && isYouTubePlaylistUrl(sourceUrl)) {
+    return `https://www.youtube.com/watch?v=${encodeURIComponent(entry.id)}`;
+  }
+  return '';
+}
+
 // ---------------------------------------------------------------------------
 // Download Manager (Subprocess Spawner & Real-Time Progress Parser)
 // ---------------------------------------------------------------------------
@@ -345,16 +456,43 @@ class DownloadManager {
 
   addTask(opts, startImmediately = true) {
     const url = opts.url.trim();
+    const taskOpts = { ...opts };
+    if (isYouTubePlaylistUrl(url)) {
+      const item = this._createQueueItem(taskOpts, url, 'Получение списка плейлиста…');
+      item.status = 'Preparing';
+      item.isPlaylistExpansion = true;
+      item.startImmediately = startImmediately;
+      item.cmdArgs = buildPlaylistDiscoveryArgs(taskOpts, url);
+      this.items.push(item);
+      this._expandPlaylist(item, taskOpts);
+      this.onUpdate();
+      return item;
+    }
+
+    const item = this._createQueueItem(taskOpts, url);
+    item.startImmediately = startImmediately;
+    this.items.push(item);
+    if (startImmediately) this._startNextQueued();
+    this.onUpdate();
+    return item;
+  }
+
+  _createQueueItem(opts, url, title = null, entry = null, entryIndex = 0) {
     const src = detectSource(url, opts.sourceId);
     const fmt = opts.bestVideoMerge && !opts.extractAudio ? 'mp4/mkv' : opts.audioFormat;
     const outDir = opts.outputDir.replace(/^~(?=$|\/|\\)/, os.homedir());
-    const cmdArgs = buildYtdlpArgs(opts, url);
+    const itemOpts = { ...opts, usePlaylistItems: false, playlistReverse: false };
+    if (entry && itemOpts.usePlaylistTemplate) {
+      const playlistIndex = String(entry.playlist_index || entryIndex + 1).padStart(2, '0');
+      itemOpts.outputTemplate = itemOpts.outputTemplate.replace(/%\(\s*playlist_index\s*\)s/g, playlistIndex);
+    }
+    const cmdArgs = entry ? buildYtdlpArgs(itemOpts, url) : buildYtdlpArgs(opts, url);
 
     let shortTitle = url.replace(/^https?:\/\//, '');
-    const item = {
+    return {
       id: this.nextId++,
       url,
-      title: `[${src.name}] ${shortTitle.slice(0, 44)}`,
+      title: entry && entry.title ? String(entry.title) : title || `[${src.name}] ${shortTitle.slice(0, 44)}`,
       sourceName: src.name,
       fmt,
       outDir,
@@ -364,18 +502,144 @@ class DownloadManager {
       speedStr: '',
       etaStr: '',
       status: 'Queued',
+      retryCount: 0,
       cmdArgs,
       errorMsg: '',
       proc: null,
       simTimer: null,
+      killTimer: null,
       logLines: [],
     };
-    this.items.push(item);
-    if (startImmediately) {
-      this.startItem(item);
+  }
+
+  _expandPlaylist(placeholder, opts) {
+    if (!this.ytdlpPath) {
+      placeholder.status = 'Error';
+      placeholder.errorMsg = 'yt-dlp not found in PATH';
+      placeholder.logLines.push(placeholder.errorMsg);
+      this.onUpdate();
+      return;
+    }
+
+    const proc = spawn(this.ytdlpPath, placeholder.cmdArgs, {
+      stdio: ['ignore', 'pipe', 'pipe'],
+      env: Object.assign({}, process.env, {
+        PYTHONIOENCODING: 'utf-8',
+        PYTHONUTF8: '1',
+        LANG: 'en_US.UTF-8',
+        LC_ALL: 'en_US.UTF-8',
+      }),
+      detached: process.platform !== 'win32',
+    });
+    placeholder.proc = proc;
+
+    const stdoutDecoder = new StringDecoder('utf8');
+    const stderrDecoder = new StringDecoder('utf8');
+    let stdoutBuffer = '';
+    let stderrBuffer = '';
+    const entries = [];
+    let processError = null;
+
+    const parseEntryLine = (line) => {
+      if (!line.trim()) return;
+      try {
+        entries.push(JSON.parse(line));
+      } catch (error) {
+        processError = `Could not parse playlist item: ${error.message}`;
+      }
+    };
+
+    proc.stdout.on('data', (chunk) => {
+      stdoutBuffer += stdoutDecoder.write(chunk);
+      const lines = stdoutBuffer.split(/\r?\n/);
+      stdoutBuffer = lines.pop();
+      lines.forEach(parseEntryLine);
+    });
+    proc.stderr.on('data', (chunk) => {
+      stderrBuffer += stderrDecoder.write(chunk);
+      const lines = stderrBuffer.split(/\r?\n/);
+      stderrBuffer = lines.pop();
+      for (const line of lines) {
+        const cleaned = sanitizeLogLine(line);
+        if (cleaned) {
+          placeholder.logLines.push(cleaned);
+          if (placeholder.logLines.length > MAX_LOG_LINES) placeholder.logLines.shift();
+        }
+      }
+      this.onUpdate();
+    });
+    proc.on('error', (error) => {
+      processError = `yt-dlp playlist scan error: ${error.message}`;
+    });
+    proc.on('close', (code) => {
+      stdoutBuffer += stdoutDecoder.end();
+      parseEntryLine(stdoutBuffer);
+      stderrBuffer += stderrDecoder.end();
+      const lastErrorLine = sanitizeLogLine(stderrBuffer);
+      if (lastErrorLine) placeholder.logLines.push(lastErrorLine);
+      placeholder.proc = null;
+
+      if (!this.items.includes(placeholder) || placeholder.status === 'Cancelled') return;
+      if (code !== 0 || processError || entries.length === 0) {
+        placeholder.status = 'Error';
+        placeholder.errorMsg =
+          processError || lastErrorLine || (entries.length === 0 ? 'Плейлист пуст или не удалось получить список.' : `Exit code ${code}`);
+        placeholder.logLines.push(sanitizeLogLine(placeholder.errorMsg));
+        this._startNextQueued();
+        this.onUpdate();
+        return;
+      }
+
+      const expanded = entries
+        .map((entry, index) => {
+          const entryUrl = playlistEntryUrl(entry, placeholder.url);
+          return entryUrl ? this._createQueueItem(opts, entryUrl, null, entry, index) : null;
+        })
+        .filter(Boolean);
+      if (expanded.length === 0) {
+        placeholder.status = 'Error';
+        placeholder.errorMsg = 'yt-dlp не вернул ссылок на треки плейлиста.';
+        placeholder.logLines.push(placeholder.errorMsg);
+        this._startNextQueued();
+        this.onUpdate();
+        return;
+      }
+
+      const index = this.items.indexOf(placeholder);
+      if (index === -1) return;
+      for (const item of expanded) item.startImmediately = placeholder.startImmediately;
+      this.items.splice(index, 1, ...expanded);
+      this._startNextQueued();
+      this.onUpdate();
+    });
+  }
+
+  _startNextQueued() {
+    if (this.items.some((item) => item.status === 'Downloading' || item.status === 'Paused')) return;
+    const next = this.items.find((item) => item.status === 'Queued' || item.status === 'Preparing');
+    if (!next || next.status === 'Preparing' || !next.startImmediately) return;
+    this.startItem(next);
+  }
+
+  _retryOrFinish(item, errorMsg) {
+    item.errorMsg = errorMsg;
+    if (item.retryCount < MAX_DOWNLOAD_RETRIES) {
+      item.retryCount += 1;
+      item.status = 'Queued';
+      item.progress = 0;
+      item.speedStr = '';
+      item.etaStr = '';
+      item.sizeStr = '—';
+      item.logLines.push(`Ошибка загрузки. Повтор ${item.retryCount}/${MAX_DOWNLOAD_RETRIES}: ${errorMsg}`);
+      const currentIndex = this.items.indexOf(item);
+      if (currentIndex !== -1) {
+        this.items.splice(currentIndex, 1);
+        this.items.push(item);
+      }
+    } else {
+      item.status = 'Error';
+      item.logLines.push(`Загрузка не удалась после ${MAX_DOWNLOAD_RETRIES} повторов: ${errorMsg}`);
     }
-    this.onUpdate();
-    return item;
   }
 
   _updateFinalFileSize(item) {
@@ -432,7 +696,7 @@ class DownloadManager {
   }
 
   startItem(item) {
-    if (item.status === 'Downloading') return;
+    if (item.status === 'Downloading' || item.proc) return;
     item.status = 'Downloading';
     item.errorMsg = '';
 
@@ -454,6 +718,7 @@ class DownloadManager {
         item.logLines.push('Error: yt-dlp binary not found. Install via brew/apt/winget or download standalone binary.');
       }
       this.onUpdate();
+      this._startNextQueued();
       return;
     }
 
@@ -467,14 +732,31 @@ class DownloadManager {
     const proc = spawn(this.ytdlpPath, item.cmdArgs, {
       stdio: ['ignore', 'pipe', 'pipe'],
       env: childEnv,
+      detached: process.platform !== 'win32',
     });
     item.proc = proc;
 
+    let updateTimer = null;
+    const scheduleUpdate = () => {
+      if (updateTimer) return;
+      updateTimer = setTimeout(() => {
+        updateTimer = null;
+        this.onUpdate();
+      }, 100);
+    };
+    const flushUpdate = () => {
+      if (updateTimer) {
+        clearTimeout(updateTimer);
+        updateTimer = null;
+      }
+      this.onUpdate();
+    };
+
     const handleLine = (line) => {
-      const trimmed = line.trim();
+      const trimmed = sanitizeLogLine(line);
       if (!trimmed) return;
       item.logLines.push(trimmed);
-      if (item.logLines.length > 200) item.logLines.shift();
+      if (item.logLines.length > MAX_LOG_LINES) item.logLines.shift();
 
       const mDest = this.destRe.exec(trimmed) || this.mergerRe.exec(trimmed) || this.alreadyRe.exec(trimmed);
       if (mDest) {
@@ -503,7 +785,7 @@ class DownloadManager {
         item.speedStr = mProg[3] || '';
         item.etaStr = mProg[4] || '';
       }
-      this.onUpdate();
+      scheduleUpdate();
     };
 
     const stdoutDecoder = new StringDecoder('utf8');
@@ -518,6 +800,14 @@ class DownloadManager {
       for (const p of parts) handleLine(p);
     });
 
+    proc.on('error', (error) => {
+      item.proc = null;
+      item.status = 'Error';
+      item.errorMsg = `yt-dlp process error: ${error.message}`;
+      item.logLines.push(sanitizeLogLine(item.errorMsg));
+      flushUpdate();
+    });
+
     proc.stderr.on('data', (chunk) => {
       stderrBuf += stderrDecoder.write(chunk);
       const parts = stderrBuf.split(/[\r\n]+/);
@@ -526,6 +816,10 @@ class DownloadManager {
     });
 
     proc.on('close', (code) => {
+      if (item.killTimer) {
+        clearTimeout(item.killTimer);
+        item.killTimer = null;
+      }
       const remOut = stdoutBuf + stdoutDecoder.end();
       const remErr = stderrBuf + stderrDecoder.end();
       if (remOut.trim()) handleLine(remOut);
@@ -533,18 +827,20 @@ class DownloadManager {
 
       item.proc = null;
       if (item.status === 'Cancelled' || item.status === 'Paused') {
-        this.onUpdate();
+        flushUpdate();
+        this._startNextQueued();
         return;
       }
       if (code === 0) {
         item.progress = 100;
         item.status = 'Done';
+        item.errorMsg = '';
         this._updateFinalFileSize(item);
       } else {
-        item.status = 'Error';
-        item.errorMsg = item.logLines[item.logLines.length - 1] || `Exit code ${code}`;
+        this._retryOrFinish(item, item.logLines[item.logLines.length - 1] || `Exit code ${code}`);
       }
-      this.onUpdate();
+      flushUpdate();
+      this._startNextQueued();
     });
   }
 
@@ -552,11 +848,14 @@ class DownloadManager {
     if (item.status !== 'Downloading') return;
     if (item.proc) {
       try {
-        item.proc.kill('SIGSTOP');
-        item.status = 'Paused';
-      } catch (_) {
-        item.proc.kill('SIGTERM');
+        if (process.platform === 'win32') {
+          setWindowsProcessTreeState(item.proc.pid, 'pause');
+        } else {
+          process.kill(-item.proc.pid, 'SIGSTOP');
+        }
         item.status = 'Paused';
+      } catch (error) {
+        item.logLines.push(sanitizeLogLine(`Pause failed: ${error.message}`));
       }
     } else if (item.simTimer) {
       item.status = 'Paused';
@@ -567,35 +866,81 @@ class DownloadManager {
   resumeItem(item) {
     if (item.status === 'Paused' && item.proc) {
       try {
-        item.proc.kill('SIGCONT');
+        if (process.platform === 'win32') {
+          setWindowsProcessTreeState(item.proc.pid, 'resume');
+        } else {
+          process.kill(-item.proc.pid, 'SIGCONT');
+        }
         item.status = 'Downloading';
         this.onUpdate();
         return;
-      } catch (_) {}
+      } catch (error) {
+        item.logLines.push(sanitizeLogLine(`Resume failed: ${error.message}`));
+        this.onUpdate();
+        return;
+      }
     }
     if (item.status === 'Paused' && item.simTimer) {
       item.status = 'Downloading';
       this.onUpdate();
       return;
     }
-    if (['Paused', 'Queued', 'Error', 'Cancelled'].includes(item.status)) {
-      this.startItem(item);
+    if (['Queued', 'Error', 'Cancelled'].includes(item.status)) {
+      if (item.status === 'Error' || item.status === 'Cancelled') item.retryCount = 0;
+      item.status = 'Queued';
+      this._startNextQueued();
     }
   }
 
   cancelItem(item) {
+    const waitingForProcessExit = Boolean(item.proc);
     if (item.simTimer) {
       clearInterval(item.simTimer);
       item.simTimer = null;
     }
     if (item.proc) {
-      try {
-        item.proc.kill('SIGTERM');
-      } catch (_) {}
-      item.proc = null;
+      const proc = item.proc;
+      if (process.platform === 'win32') {
+        const killer = spawn('taskkill', ['/PID', String(proc.pid), '/T', '/F'], {
+          stdio: 'ignore',
+          windowsHide: true,
+        });
+        killer.on('error', (error) => {
+          if (item.proc !== proc) return;
+          item.status = 'Error';
+          item.errorMsg = `Unable to stop yt-dlp process tree: ${error.message}`;
+          item.logLines.push(sanitizeLogLine(item.errorMsg));
+          this.onUpdate();
+        });
+        killer.on('close', (code) => {
+          if (item.proc !== proc || proc.exitCode !== null) return;
+          if (code !== 0) {
+            item.status = 'Error';
+            item.errorMsg = `taskkill exited with code ${code}`;
+            item.logLines.push(sanitizeLogLine(item.errorMsg));
+            this.onUpdate();
+          }
+        });
+      } else {
+        try {
+          process.kill(-proc.pid, 'SIGTERM');
+          item.killTimer = setTimeout(() => {
+            if (item.proc !== proc || proc.exitCode !== null) return;
+            try {
+              process.kill(-proc.pid, 'SIGKILL');
+            } catch (error) {
+              item.logLines.push(sanitizeLogLine(`Unable to force-stop yt-dlp: ${error.message}`));
+              this.onUpdate();
+            }
+          }, 1500);
+        } catch (error) {
+          item.logLines.push(sanitizeLogLine(`Unable to stop yt-dlp process tree: ${error.message}`));
+        }
+      }
     }
     item.status = 'Cancelled';
     this.onUpdate();
+    if (!waitingForProcessExit) this._startNextQueued();
   }
 
   removeItem(idx) {
@@ -627,6 +972,7 @@ class DownloadManager {
         clearInterval(item.simTimer);
         item.simTimer = null;
         item.status = 'Done';
+        this._startNextQueued();
       }
       this.onUpdate();
     }, 120);
@@ -657,6 +1003,11 @@ class ScreenBuffer {
     }
   }
 
+  putStrWithin(y, x, text, width, style = ANSI.fgWhite) {
+    if (width <= 0) return;
+    this.putStr(y, x, String(text).slice(0, width), style);
+  }
+
   drawBox(y, x, h, w, title = '', style = ANSI.fgWhite, titleStyle = ANSI.bold + ANSI.fgCyan) {
     if (h < 2 || w < 4) return;
     this.putStr(y, x, '┌' + '─'.repeat(w - 2) + '┐', style);
@@ -671,7 +1022,7 @@ class ScreenBuffer {
   }
 
   renderToAnsi() {
-    let out = `${CSI}H`;
+    let out = '';
     for (let r = 0; r < this.rows; r++) {
       let curStyle = '';
       let line = '';
@@ -684,8 +1035,7 @@ class ScreenBuffer {
         line += this.chars[r][c];
       }
       line += ANSI.reset;
-      if (r < this.rows - 1) line += '\r\n';
-      out += line;
+      out += `${CSI}${r + 1};1H${CSI}2K${line}`;
     }
     return out;
   }
@@ -702,6 +1052,7 @@ class EvaNodeTUI {
     this.focusOrder = [];
     this.hitboxes = [];
     this.selectedQueueIdx = 0;
+    this.selectedQueueItem = null;
     this.statusBanner = '';
 
     // Inline modal prompt state
@@ -843,6 +1194,12 @@ class EvaNodeTUI {
   // -------------------------------------------------------------------------
 
   render() {
+    if (this.selectedQueueItem) {
+      const selectedIndex = this.manager.items.indexOf(this.selectedQueueItem);
+      if (selectedIndex >= 0) this.selectedQueueIdx = selectedIndex;
+      else this.selectedQueueItem = null;
+    }
+
     const cols = process.stdout.columns || 100;
     const rows = process.stdout.rows || 28;
     const scr = new ScreenBuffer(cols, rows);
@@ -860,7 +1217,7 @@ class EvaNodeTUI {
     ASCII_LOGO.forEach((line, i) => {
       scr.putStr(1 + i, 2, line, ANSI.fgWhite + ANSI.bold);
     });
-    scr.putStr(7, 2, 'EVA MEDIA DOWNLOADER  —  by .maxon', ANSI.fgCyan);
+    scr.putStr(7, 2, 'EVA MEDIA DOWNLOADER', ANSI.fgCyan);
     scr.putStr(2, cols - APP_VERSION.length - 3, APP_VERSION, ANSI.fgWhite);
     if (cols >= 90) {
       const tagline = 'Music. Videos. Your collection.';
@@ -887,6 +1244,7 @@ class EvaNodeTUI {
       this.hitboxes.push({
         id: `tab_${nav.tab}`,
         y: r,
+        nav: true,
         x1: 2,
         x2: 2 + padded.length - 1,
         action: () => {
@@ -921,7 +1279,7 @@ class EvaNodeTUI {
       scr.putStr(rows - 2, prefix.length, this.modal.value.padEnd(Math.max(1, cols - prefix.length - 1), ' '), ANSI.fgYellow + ANSI.bold);
       scr.putStr(rows - 1, 0, ' [Enter] Применить   [Esc] Отмена   [Ctrl+U] Очистить '.padEnd(cols - 1, ' '), ANSI.bgWhite + ANSI.fgBlack);
     } else {
-      const footerLeft = 'EVA.md • yt-dlp';
+      const footerLeft = 'EVA.md x yt-dlp';
       scr.putStr(rows - 1, 2, footerLeft, ANSI.fgCyan + ANSI.bold);
 
       const items = this.manager.items;
@@ -1217,17 +1575,26 @@ class EvaNodeTUI {
 
   _renderQueueBox(scr, y, x, h, w) {
     scr.drawBox(y, x, h, w, 'Download Queue');
-    const titleColW = Math.max(18, w - 42);
-    const hdr = ` #  ${'Title'.padEnd(titleColW)} ${'Format'.padEnd(7)} ${'Size'.padEnd(10)} Status`;
-    scr.putStr(y + 1, x + 2, hdr.slice(0, w - 4), ANSI.fgCyan + ANSI.bold);
-    scr.putStr(y + 2, x + 1, '├' + '─'.repeat(w - 2) + '┤', ANSI.fgWhite);
+    const contentWidth = w - 4;
+    const titleX = 4;
+    const statusColW = Math.max(1, Math.min(29, Math.floor(contentWidth * 0.28), contentWidth - 26));
+    const statusX = contentWidth - statusColW - 1;
+    const sizeX = statusX - 1 - 10;
+    const formatX = sizeX - 1 - 7;
+    const titleColW = Math.max(0, formatX - titleX - 1);
+    scr.putStr(y + 1, x + 2 + titleX, 'Title'.slice(0, titleColW), ANSI.fgCyan + ANSI.bold);
+    scr.putStr(y + 1, x + 2 + formatX, 'Format', ANSI.fgCyan + ANSI.bold);
+    scr.putStr(y + 1, x + 2 + sizeX, 'Size', ANSI.fgCyan + ANSI.bold);
+    scr.putStr(y + 1, x + 2 + statusX, 'Status', ANSI.fgCyan + ANSI.bold);
+    scr.putStr(y + 2, x, '├' + '─'.repeat(w - 2) + '┤', ANSI.fgWhite);
 
     const items = this.manager.items;
     if (this.selectedQueueIdx >= items.length) {
       this.selectedQueueIdx = Math.max(0, items.length - 1);
     }
+    this.selectedQueueItem = items[this.selectedQueueIdx] || null;
 
-    const listRows = Math.max(1, h - 5);
+    const listRows = Math.max(1, h - 6);
     if (items.length === 0) {
       scr.putStr(y + 3, x + 4, 'Очередь пуста. Добавьте трек во вкладке [1] Download.', ANSI.fgWhite);
     } else {
@@ -1242,15 +1609,18 @@ class EvaNodeTUI {
         const filled = Math.round((it.progress / 100) * barW);
         const bar = '█'.repeat(Math.max(0, filled)) + '░'.repeat(Math.max(0, barW - filled));
         const pct = `${String(Math.round(it.progress)).padStart(3, ' ')}%`;
-        let statusText = `[${bar}] ${pct} ${it.status}`;
-        if (it.status === 'Error' && it.errorMsg) {
-          statusText = `ERR: ${it.errorMsg.slice(0, 18)}`;
+        let statusText;
+        if (it.status === 'Done') {
+          statusText = '✓ Done';
+        } else if (it.status === 'Error') {
+          statusText = '✗ Error';
+        } else {
+          statusText = `[${bar}] ${pct} ${it.status}`;
+          if (it.retryCount > 0) statusText += ` (${it.retryCount}/${MAX_DOWNLOAD_RETRIES})`;
         }
+        statusText = statusText.slice(0, statusColW).padEnd(statusColW);
 
         const seqNum = idx + 1;
-        const line = `${pointer}${String(seqNum).padEnd(2)} ${it.title.padEnd(titleColW).slice(0, titleColW)} ${it.fmt
-          .padEnd(7)
-          .slice(0, 7)} ${it.sizeStr.padEnd(10).slice(0, 10)} ${statusText}`;
         const st = isSel
           ? ANSI.bgWhite + ANSI.fgBlack + ANSI.bold
           : it.status === 'Done'
@@ -1259,7 +1629,12 @@ class EvaNodeTUI {
           ? ANSI.fgRed
           : ANSI.fgWhite;
 
-        scr.putStr(ry, x + 2, line.slice(0, w - 4), st);
+        scr.putStr(ry, x + 2, `${pointer}${String(seqNum).padEnd(2)} `, st);
+        const title = fitTextToCellWidth(it.title, titleColW);
+        scr.putStrWithin(ry, x + 2 + titleX, title, titleColW, st);
+        scr.putStr(ry, x + 2 + formatX, it.fmt.slice(0, 7).padEnd(7), st);
+        scr.putStr(ry, x + 2 + sizeX, it.sizeStr.slice(0, 10).padEnd(10), st);
+        scr.putStr(ry, x + 2 + statusX, statusText, st);
         this.hitboxes.push({
           id: `qitem_${idx}`,
           y: ry,
@@ -1267,6 +1642,7 @@ class EvaNodeTUI {
           x2: x + w - 3,
           action: () => {
             this.selectedQueueIdx = idx;
+            this.selectedQueueItem = it;
             this.render();
           },
         });
@@ -1274,14 +1650,16 @@ class EvaNodeTUI {
     }
 
     const ctrlY = y + h - 2;
-    scr.putStr(ctrlY - 1, x + 1, '├' + '─'.repeat(w - 2) + '┤', ANSI.fgWhite);
+    scr.putStr(ctrlY - 1, x, '├' + '─'.repeat(w - 2) + '┤', ANSI.fgWhite);
     let cx = x + 3;
-    cx = this.registerWidget(scr, 'q_resume', ctrlY, cx, '[r] Resume', () => this._qAction('resume')) + 2;
-    cx = this.registerWidget(scr, 'q_pause', ctrlY, cx, '[p] Pause', () => this._qAction('pause')) + 2;
-    cx = this.registerWidget(scr, 'q_cancel', ctrlY, cx, '[c] Cancel', () => this._qAction('cancel')) + 2;
-    cx = this.registerWidget(scr, 'q_remove', ctrlY, cx, '[d] Remove', () => this._qAction('remove')) + 2;
+    cx = this.registerWidget(scr, 'q_resume', ctrlY, cx, '[r]Resume', () => this._qAction('resume')) + 1;
+    cx = this.registerWidget(scr, 'q_pause', ctrlY, cx, '[p]Pause', () => this._qAction('pause')) + 1;
+    cx = this.registerWidget(scr, 'q_cancel', ctrlY, cx, '[c]Cancel', () => this._qAction('cancel')) + 1;
+    cx = this.registerWidget(scr, 'q_remove', ctrlY, cx, '[d]Remove', () => this._qAction('remove')) + 1;
     const activeCnt = items.filter((i) => i.status === 'Downloading').length;
-    scr.putStr(ctrlY, cx, `│ Active: ${activeCnt}/${items.length}`.slice(0, Math.max(0, x + w - cx - 2)), ANSI.fgCyan);
+    const activeLabel = `│ Active: ${activeCnt}/${items.length}`;
+    const activeX = x + w - activeLabel.length - 2;
+    if (activeX > cx) scr.putStr(ctrlY, activeX, activeLabel, ANSI.fgCyan);
   }
 
   _renderQueueTab(scr, x, w, rows) {
@@ -1326,22 +1704,31 @@ class EvaNodeTUI {
       }
     } catch (_) {}
 
-    const nameColW = Math.max(20, w - 28);
+    const contentWidth = w - 6;
+    const numberColW = 4;
+    const formatColW = 7;
+    const sizeColW = 10;
+    const nameColW = Math.min(60, Math.max(1, contentWidth - numberColW - formatColW - sizeColW - 5));
+    const formatX = numberColW + 1 + nameColW + 1;
+    const sizeX = formatX + formatColW + 1;
     if (files.length === 0) {
       scr.putStr(10, x + 3, `В папке ${outDir} пока нет скачанных медиафайлов.`.slice(0, w - 6), ANSI.fgWhite);
     } else {
-      scr.putStr(
-        10,
-        x + 3,
-        `${'#'.padEnd(4)} ${'Имя файла'.padEnd(nameColW)} ${'Формат'.padEnd(7)} Размер`.slice(0, w - 6),
-        ANSI.fgCyan + ANSI.bold
-      );
-      files.slice(0, h - 5).forEach((f, i) => {
+      scr.putStr(10, x + 3, '#', ANSI.fgCyan + ANSI.bold);
+      scr.putStr(10, x + 3 + numberColW + 1, 'Имя файла', ANSI.fgCyan + ANSI.bold);
+      scr.putStr(10, x + 3 + formatX, 'Формат', ANSI.fgCyan + ANSI.bold);
+      scr.putStr(10, x + 3 + sizeX, 'Размер', ANSI.fgCyan + ANSI.bold);
+      const visibleFileCount = Math.max(0, Math.min(files.length, rows - 15));
+      files.slice(0, visibleFileCount).forEach((f, i) => {
         const mb = formatBytesToMB(f.stat.size);
-        const line = `${String(i + 1).padEnd(4)} ${f.name.padEnd(nameColW).slice(0, nameColW)} ${f.ext
-          .slice(1)
-          .padEnd(7)} ${mb}`;
-        scr.putStr(12 + i, x + 3, line.slice(0, w - 6), ANSI.fgWhite);
+        const row = 12 + i;
+        const filename = f.name.length > nameColW
+          ? `${f.name.slice(0, Math.max(0, nameColW - 1))}…`
+          : f.name;
+        scr.putStr(row, x + 3, String(i + 1).padEnd(numberColW), ANSI.fgWhite);
+        scr.putStr(row, x + 3 + numberColW + 1, filename.slice(0, nameColW).padEnd(nameColW), ANSI.fgWhite);
+        scr.putStr(row, x + 3 + formatX, f.ext.slice(1, formatColW + 1).padEnd(formatColW), ANSI.fgWhite);
+        scr.putStr(row, x + 3 + sizeX, mb.slice(0, sizeColW).padStart(sizeColW), ANSI.fgWhite);
       });
     }
   }
@@ -1482,6 +1869,9 @@ class EvaNodeTUI {
       '  • Файлы: -o "%(playlist_index)s. %(title)s.%(ext)s", --download-archive archive.txt',
       '  • Плейлисты: --playlist-items 1-5, --playlist-reverse',
       '  • Сеть (вкладка Settings): -4, --proxy http://127.0.0.1:8080, --cookies-from-browser chrome',
+      `  `,
+      `  `,
+      `by .maxon `,
     ];
     lines.forEach((line, i) => {
       if (10 + i < rows - 2) scr.putStr(10 + i, x + 3, line.slice(0, w - 6), ANSI.fgWhite);
@@ -1531,6 +1921,7 @@ class EvaNodeTUI {
         if (this.opts.url.trim()) {
           const it = this.manager.addTask(this.opts, true);
           this.selectedQueueIdx = this.manager.items.length - 1;
+          this.selectedQueueItem = it;
           this.statusBanner = `+ #${this.manager.items.length} (${it.sourceName})`;
           this.render();
         }
@@ -1539,6 +1930,7 @@ class EvaNodeTUI {
     }
     const item = this.manager.addTask(this.opts, true);
     this.selectedQueueIdx = this.manager.items.length - 1;
+    this.selectedQueueItem = item;
     this.statusBanner = `+ #${this.manager.items.length} (${item.sourceName})`;
     this.render();
   }
@@ -1549,7 +1941,10 @@ class EvaNodeTUI {
     if (type === 'resume') this.manager.resumeItem(it);
     else if (type === 'pause') this.manager.pauseItem(it);
     else if (type === 'cancel') this.manager.cancelItem(it);
-    else if (type === 'remove') this.manager.removeItem(this.selectedQueueIdx);
+    else if (type === 'remove') {
+      this.manager.removeItem(this.selectedQueueIdx);
+      this.selectedQueueItem = null;
+    }
     this.render();
   }
 
@@ -1596,7 +1991,9 @@ class EvaNodeTUI {
       const my = parseInt(mouseMatch[3], 10) - 1;
       const isPress = mouseMatch[4] === 'M';
       if (isPress && btn === 0) {
-        const hit = this.hitboxes.find((h) => h.y === my && mx >= h.x1 && mx <= h.x2);
+        const hit = this.hitboxes.find((h) =>
+          mx >= h.x1 && mx <= h.x2 && (h.y === my || (h.nav && Math.abs(h.y - my) === 1))
+        );
         if (hit) {
           this.focusId = hit.id;
           hit.action();
@@ -1658,8 +2055,8 @@ class EvaNodeTUI {
 function updatePackage() {
   console.log('Обновление EVA.md...');
   const result = process.platform === 'win32'
-    ? spawnSync(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', 'npm install --global eva-md@latest'], { stdio: 'inherit' })
-    : spawnSync('npm', ['install', '--global', 'eva-md@latest'], { stdio: 'inherit' });
+    ? spawnSync(process.env.ComSpec || 'cmd.exe', ['/d', '/s', '/c', 'npm install --global --allow-scripts=ffmpeg-static,youtube-dl-exec eva-md@latest'], { stdio: 'inherit' })
+    : spawnSync('npm', ['install', '--global', '--allow-scripts=ffmpeg-static,youtube-dl-exec', 'eva-md@latest'], { stdio: 'inherit' });
 
   if (result.error) {
     console.error(`Не удалось запустить npm: ${result.error.message}`);
@@ -1740,9 +2137,13 @@ if (require.main === module) {
 module.exports = {
   createDefaultOptions,
   buildYtdlpArgs,
+  buildPlaylistDiscoveryArgs,
   buildCommandPreview,
   detectSource,
+  isYouTubePlaylistUrl,
+  playlistEntryUrl,
   DownloadManager,
   formatBytesToMB,
+  fitTextToCellWidth,
   wrapTextByWords,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "eva-md",
-	"version": "0.3.2",
+	"version": "0.4.3",
 	"description": "EVA Media Downloader CLI",
 	"main": "eva.js",
 	"bin": {