veodl 1.12.0 → 1.12.1

package/src/cli.js

@@ -624,7 +624,7 @@ async function runMain(args, { config }) {
     if (cookieWarning) stderr.write(`veo: ${cookieWarning}\n`);
 
     // For a single page, fall back to media requests observed while its player loads.
-    // Explicit --source always rediscovers: signed media URLs can expire between runs.
+    // Explicit --source rediscovers unless a completed local transfer is usable.
     if (!retryItems && options.urls.length === 1 && (!options.playlist || options.listSources)) {
       const discovery = await resolvePageSource(options, { signal: controller.signal, stderr, reporter,
         onBackend: backend => preparedBackends.set(options.url, backend) });
@@ -727,8 +727,12 @@ async function askSourceQuestion(prompt, signal) {
 }
 
 export async function resolvePageSource(options, { signal, stderr, reporter, onBackend, inspect, discover, ask = askSourceQuestion,
-  backendResolver, interactive = Boolean(process.stdin.isTTY && process.stderr.isTTY && !options.json) }) {
-  const { fetchMetadata, prepareBackend, runBackend } = await import('./downloader.js');
+  backendResolver, localRoot, interactive = Boolean(process.stdin.isTTY && process.stderr.isTTY && !options.json) }) {
+  const { fetchMetadata, prepareBackend, readReadyTransfer, runBackend } = await import('./downloader.js');
+  // Source validation remains necessary for new downloads and metadata actions;
+  // a completed local transfer can finish while its original source is offline.
+  if (!options.incognito && !options.dryRun && !options.listSources && !options.listFormats
+    && !options.listQualities && !options.listSubs && await readReadyTransfer(options, { localRoot, signal })) return {};
   const { discoverSources, formatSource, shouldOfferSourceDiscovery } = await import('./source-discovery.js');
   const backend = inspect ? null : await (backendResolver || prepareBackend)(options, { signal, reporter });
   if (backend) onBackend?.(backend);

package/src/compatibility.js

@@ -1,39 +1,39 @@
-import path from 'node:path';
-import { rename, rm } from 'node:fs/promises';
-
-export async function ensureCompatibility(file, { backend, runner, signal, convert = false, reporter }) {
-  const executable = name => path.join(backend.ffmpegLocation, name + (process.platform === 'win32' ? '.exe' : ''));
-  let streams;
-  try {
-    const raw = await runner(executable('ffprobe'), ['-v', 'error', '-show_streams', '-of', 'json', file], { signal });
-    streams = JSON.parse(raw).streams;
-    if (!Array.isArray(streams)) throw new Error('No stream metadata');
-  } catch (error) {
-    if (signal?.aborted || convert) throw error;
-    reporter?.status('Playback compatibility could not be checked; original media retained.');
-    return file;
-  }
-  const video = streams.find(stream => stream.codec_type === 'video' && !stream.disposition?.attached_pic);
-  const audio = streams.filter(stream => stream.codec_type === 'audio');
-  if (!video) return file;
-  const videoOK = video.codec_name === 'h264' && video.pix_fmt === 'yuv420p';
-  const audioOK = audio.every(stream => stream.codec_name === 'aac');
-  if (!convert) {
-    if (!videoOK || !audioOK) reporter?.status(`Playback note: ${video.codec_name}/${audio.map(stream => stream.codec_name).join(',') || 'no audio'} may require additional player codecs. Original quality retained; use --compatible for H.264/AAC conversion.`);
-    return file;
-  }
-  if (videoOK && audioOK && path.extname(file) === '.mp4') return file;
-  if (!videoOK && (video.color_transfer === 'smpte2084' || video.color_transfer === 'arib-std-b67')) throw new Error('HDR conversion needs tone mapping; original download retained. Use an HDR-capable player or disable --compatible.');
-  reporter?.status(videoOK && audioOK ? 'Preparing compatible MP4 without re-encoding…' : 'Converting to compatible H.264/AAC; this takes time and may lose quality…');
-  const temporary = path.join(path.dirname(file), 'compatible-output.mp4');
-  const target = path.join(path.dirname(file), 'media.mp4');
-  try {
-    await runner(executable('ffmpeg'), ['-hide_banner', '-loglevel', 'error', '-nostdin', '-y', '-i', file,
-      '-map', '0:v:0', '-map', '0:a?', '-map_metadata', '0',
-      '-c:v', videoOK ? 'copy' : 'libx264', ...(!videoOK ? ['-preset', 'fast', '-crf', '18', '-pix_fmt', 'yuv420p'] : []),
-      '-c:a', audioOK ? 'copy' : 'aac', ...(!audioOK ? ['-b:a', '192k'] : []), '-movflags', '+faststart', temporary], { signal });
-    await rename(temporary, target);
-    if (file !== target) await rm(file);
-    return target;
-  } finally { await rm(temporary, { force: true }); }
+import path from 'node:path';
+import { rename, rm } from 'node:fs/promises';
+
+export async function ensureCompatibility(file, { backend, runner, signal, convert = false, reporter }) {
+  const executable = name => path.join(backend.ffmpegLocation, name + (process.platform === 'win32' ? '.exe' : ''));
+  let streams;
+  try {
+    const raw = await runner(executable('ffprobe'), ['-v', 'error', '-show_streams', '-of', 'json', file], { signal });
+    streams = JSON.parse(raw).streams;
+    if (!Array.isArray(streams)) throw new Error('No stream metadata');
+  } catch (error) {
+    if (signal?.aborted || convert) throw error;
+    reporter?.status('Playback compatibility could not be checked; original media retained.');
+    return file;
+  }
+  const video = streams.find(stream => stream.codec_type === 'video' && !stream.disposition?.attached_pic);
+  const audio = streams.filter(stream => stream.codec_type === 'audio');
+  if (!video) return file;
+  const videoOK = video.codec_name === 'h264' && video.pix_fmt === 'yuv420p';
+  const audioOK = audio.every(stream => stream.codec_name === 'aac');
+  if (!convert) {
+    if (!videoOK || !audioOK) reporter?.status(`Playback note: ${video.codec_name}/${audio.map(stream => stream.codec_name).join(',') || 'no audio'} may require additional player codecs. Original quality retained; use --compatible for H.264/AAC conversion.`);
+    return file;
+  }
+  if (videoOK && audioOK && path.extname(file) === '.mp4') return file;
+  if (!videoOK && (video.color_transfer === 'smpte2084' || video.color_transfer === 'arib-std-b67')) throw new Error('HDR conversion needs tone mapping; original download retained. Use an HDR-capable player or disable --compatible.');
+  reporter?.status(videoOK && audioOK ? 'Preparing compatible MP4 without re-encoding…' : 'Converting to compatible H.264/AAC; this takes time and may lose quality…');
+  const temporary = path.join(path.dirname(file), 'compatible-output.mp4');
+  const target = path.join(path.dirname(file), 'media.mp4');
+  try {
+    await runner(executable('ffmpeg'), ['-hide_banner', '-loglevel', 'error', '-nostdin', '-y', '-i', file,
+      '-map', '0:v:0', '-map', '0:a?', '-map_metadata', '0',
+      '-c:v', videoOK ? 'copy' : 'libx264', ...(!videoOK ? ['-preset', 'fast', '-crf', '18', '-pix_fmt', 'yuv420p'] : []),
+      '-c:a', audioOK ? 'copy' : 'aac', ...(!audioOK ? ['-b:a', '192k'] : []), '-movflags', '+faststart', temporary], { signal });
+    await rename(temporary, target);
+    if (file !== target) await rm(file);
+    return target;
+  } finally { await rm(temporary, { force: true }); }
 }

package/src/config-clipboard.js

@@ -1,67 +1,67 @@
-import { spawn } from 'node:child_process';
-
-const MAX_TEXT = 2 * 1024 * 1024;
-
-// Prefer the clipboard for the active display server, then try the other common
-// Linux tools. A terminal reached over SSH may have neither display available.
-export function clipboardCommands(operation, { platform = process.platform, env = process.env } = {}) {
-  if (platform === 'win32') {
-    const setup = 'Add-Type -AssemblyName System.Windows.Forms; [Console]::InputEncoding = [System.Text.UTF8Encoding]::new($false); [Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false); ';
-    return [['powershell.exe', ['-NoProfile', '-NonInteractive', '-Sta', '-Command', setup + (operation === 'copy'
-      ? '[System.Windows.Forms.Clipboard]::SetText([Console]::In.ReadToEnd())'
-      : '[Console]::Out.Write([System.Windows.Forms.Clipboard]::GetText())')]]];
-  }
-  if (platform === 'darwin') return [[operation === 'copy' ? 'pbcopy' : 'pbpaste', []]];
-  if (platform === 'android') return [[operation === 'copy' ? 'termux-clipboard-set' : 'termux-clipboard-get', []]];
-  const wayland = [operation === 'copy' ? 'wl-copy' : 'wl-paste', operation === 'copy' ? [] : ['--no-newline']];
-  const xclip = ['xclip', ['-selection', 'clipboard', operation === 'copy' ? '-in' : '-out']];
-  const xsel = ['xsel', ['--clipboard', operation === 'copy' ? '--input' : '--output']];
-  const x11 = [xclip, xsel];
-  return env.WAYLAND_DISPLAY ? [wayland, ...x11] : env.DISPLAY ? [...x11, wayland] : [wayland, ...x11];
-}
-
-function runCommand([program, args], operation, value) {
-  return new Promise((resolve, reject) => {
-    // Clipboard owners such as xclip and wl-copy may continue in the background.
-    // Do not keep their inherited output pipes open after the command exits.
-    const child = spawn(program, args, {
-      shell: false, windowsHide: true,
-      stdio: operation === 'copy' ? ['pipe', 'ignore', 'ignore'] : ['ignore', 'pipe', 'ignore'],
-    });
-    const timer = setTimeout(() => child.kill(), 5000);
-    const chunks = [];
-    let size = 0, failed = false;
-    child.stdout?.on('data', chunk => {
-      size += chunk.length;
-      if (size > MAX_TEXT) child.kill();
-      else chunks.push(chunk);
-    });
-    child.stdin?.on('error', () => {});
-    child.on('error', () => { failed = true; });
-    child.on('close', code => {
-      clearTimeout(timer);
-      if (failed || code !== 0 || size > MAX_TEXT) reject(new Error('Clipboard command failed.'));
-      else resolve(operation === 'paste' ? Buffer.concat(chunks).toString('utf8') : undefined);
-    });
-    child.stdin?.end(value);
-  });
-}
-
-export async function clipboardText(operation, value = '', options = {}) {
-  if (Buffer.byteLength(value, 'utf8') > MAX_TEXT) throw new Error('Selection is too large for the editor clipboard.');
-  const candidates = clipboardCommands(operation, options);
-  for (const candidate of candidates) {
-    try { return await (options.run || runCommand)(candidate, operation, value); }
-    catch { /* Try the next available display-server clipboard. */ }
-  }
-  const platform = options.platform || process.platform;
-  const hint = platform === 'linux'
-    ? ' Install wl-clipboard, xclip or xsel and use a graphical session.'
-    : platform === 'android' ? ' Install the Termux:API app and pkg install termux-api.' : '';
-  throw new Error(`System clipboard is unavailable.${hint}`);
-}
-
-export const configClipboard = {
-  copy: value => clipboardText('copy', value),
-  paste: () => clipboardText('paste'),
-};
+import { spawn } from 'node:child_process';
+
+const MAX_TEXT = 2 * 1024 * 1024;
+
+// Prefer the clipboard for the active display server, then try the other common
+// Linux tools. A terminal reached over SSH may have neither display available.
+export function clipboardCommands(operation, { platform = process.platform, env = process.env } = {}) {
+  if (platform === 'win32') {
+    const setup = 'Add-Type -AssemblyName System.Windows.Forms; [Console]::InputEncoding = [System.Text.UTF8Encoding]::new($false); [Console]::OutputEncoding = [System.Text.UTF8Encoding]::new($false); ';
+    return [['powershell.exe', ['-NoProfile', '-NonInteractive', '-Sta', '-Command', setup + (operation === 'copy'
+      ? '[System.Windows.Forms.Clipboard]::SetText([Console]::In.ReadToEnd())'
+      : '[Console]::Out.Write([System.Windows.Forms.Clipboard]::GetText())')]]];
+  }
+  if (platform === 'darwin') return [[operation === 'copy' ? 'pbcopy' : 'pbpaste', []]];
+  if (platform === 'android') return [[operation === 'copy' ? 'termux-clipboard-set' : 'termux-clipboard-get', []]];
+  const wayland = [operation === 'copy' ? 'wl-copy' : 'wl-paste', operation === 'copy' ? [] : ['--no-newline']];
+  const xclip = ['xclip', ['-selection', 'clipboard', operation === 'copy' ? '-in' : '-out']];
+  const xsel = ['xsel', ['--clipboard', operation === 'copy' ? '--input' : '--output']];
+  const x11 = [xclip, xsel];
+  return env.WAYLAND_DISPLAY ? [wayland, ...x11] : env.DISPLAY ? [...x11, wayland] : [wayland, ...x11];
+}
+
+function runCommand([program, args], operation, value) {
+  return new Promise((resolve, reject) => {
+    // Clipboard owners such as xclip and wl-copy may continue in the background.
+    // Do not keep their inherited output pipes open after the command exits.
+    const child = spawn(program, args, {
+      shell: false, windowsHide: true,
+      stdio: operation === 'copy' ? ['pipe', 'ignore', 'ignore'] : ['ignore', 'pipe', 'ignore'],
+    });
+    const timer = setTimeout(() => child.kill(), 5000);
+    const chunks = [];
+    let size = 0, failed = false;
+    child.stdout?.on('data', chunk => {
+      size += chunk.length;
+      if (size > MAX_TEXT) child.kill();
+      else chunks.push(chunk);
+    });
+    child.stdin?.on('error', () => {});
+    child.on('error', () => { failed = true; });
+    child.on('close', code => {
+      clearTimeout(timer);
+      if (failed || code !== 0 || size > MAX_TEXT) reject(new Error('Clipboard command failed.'));
+      else resolve(operation === 'paste' ? Buffer.concat(chunks).toString('utf8') : undefined);
+    });
+    child.stdin?.end(value);
+  });
+}
+
+export async function clipboardText(operation, value = '', options = {}) {
+  if (Buffer.byteLength(value, 'utf8') > MAX_TEXT) throw new Error('Selection is too large for the editor clipboard.');
+  const candidates = clipboardCommands(operation, options);
+  for (const candidate of candidates) {
+    try { return await (options.run || runCommand)(candidate, operation, value); }
+    catch { /* Try the next available display-server clipboard. */ }
+  }
+  const platform = options.platform || process.platform;
+  const hint = platform === 'linux'
+    ? ' Install wl-clipboard, xclip or xsel and use a graphical session.'
+    : platform === 'android' ? ' Install the Termux:API app and pkg install termux-api.' : '';
+  throw new Error(`System clipboard is unavailable.${hint}`);
+}
+
+export const configClipboard = {
+  copy: value => clipboardText('copy', value),
+  paste: () => clipboardText('paste'),
+};