@studiomeyer/mcp-video 1.0.0 → 1.0.2

package/src/tools/engine/narrated-video.ts

@@ -9,10 +9,12 @@
  * 3. Merge video + audio into final output
  */
 
-import { execFile } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from '../../lib/logger.js';
+import { withTempDir } from '../../lib/temp-dir.js';
+import { validateFfmpegPath, type FfmpegProtocolSet } from '../../lib/ffmpeg-safety.js';
+import { runFfmpeg as runFfmpegSafe } from '../../lib/ffmpeg-run.js';
 import { generateSpeech } from './tts.js';
 import type { TTSProvider, ElevenLabsVoice, ElevenLabsModel, OpenAIVoice, OpenAIModel } from './tts.js';
 import { recordWebsite } from './capture.js';
@@ -91,10 +93,7 @@ export async function createNarratedVideo(
     viewport = 'desktop',
   } = config;
 
-  const tempDir = `/tmp/narrated-video-${Date.now()}`;
-  fs.mkdirSync(tempDir, { recursive: true });
-
-  try {
+  return withTempDir('narrated-video', async (tempDir) => {
     // ─── Step 1: Generate all speech segments ───────────────────
     logger.info(`Generating ${segments.length} speech segment(s)...`);
     const audioPaths: string[] = [];
@@ -197,14 +196,11 @@ export async function createNarratedVideo(
       finalPath,
     );
 
-    await runFfmpeg(mergeArgs);
+    await runFfmpeg(mergeArgs, config.backgroundMusicPath ? 'https-input' : 'local-only');
 
     const finalStats = fs.statSync(finalPath);
     const finalDuration = await getMediaDuration(finalPath);
 
-    // ─── Cleanup ────────────────────────────────────────────────
-    fs.rmSync(tempDir, { recursive: true, force: true });
-
     logger.info(`Narrated video ready: ${finalPath} (${finalDuration.toFixed(1)}s, ${(finalStats.size / 1024 / 1024).toFixed(2)} MB)`);
 
     return {
@@ -221,11 +217,7 @@ export async function createNarratedVideo(
       },
       url,
     };
-  } catch (error) {
-    // Cleanup on error
-    try { fs.rmSync(tempDir, { recursive: true, force: true }); } catch { /* ignore */ }
-    throw error;
-  }
+  });
 }
 
 // ─── Helpers ────────────────────────────────────────────────────────
@@ -234,34 +226,30 @@ export async function createNarratedVideo(
  * Concatenate multiple audio files using ffmpeg concat demuxer
  */
 async function concatenateAudio(files: string[], outputPath: string): Promise<void> {
+  for (const f of files) validateFfmpegPath(f, 'concat-input');
+  validateFfmpegPath(outputPath, 'concat-output');
+
   // Create concat list file
   const listPath = outputPath + '.txt';
-  const listContent = files.map((f) => `file '${f}'`).join('\n');
+  const listContent = files.map((f) => `file '${f.replace(/'/g, "'\\''")}'`).join('\n');
   fs.writeFileSync(listPath, listContent);
 
-  await runFfmpeg([
-    '-y',
-    '-f', 'concat',
-    '-safe', '0',
-    '-i', listPath,
-    '-c:a', 'libmp3lame',
-    '-b:a', '192k',
-    outputPath,
-  ]);
-
-  // Cleanup list file
-  fs.unlinkSync(listPath);
+  try {
+    await runFfmpeg([
+      '-y',
+      '-f', 'concat',
+      '-safe', '0',
+      '-i', listPath,
+      '-c:a', 'libmp3lame',
+      '-b:a', '192k',
+      outputPath,
+    ]);
+  } finally {
+    // Cleanup list file
+    try { fs.unlinkSync(listPath); } catch { /* already gone */ }
+  }
 }
 
-function runFfmpeg(args: string[]): Promise<string> {
-  return new Promise((resolve, reject) => {
-    execFile('ffmpeg', args, { maxBuffer: 50 * 1024 * 1024 }, (error, stdout, stderr) => {
-      if (error) {
-        logger.error(`ffmpeg failed: ${stderr}`);
-        reject(new Error(`ffmpeg failed: ${stderr || error.message}`));
-        return;
-      }
-      resolve(stdout);
-    });
-  });
+function runFfmpeg(args: string[], protocols: FfmpegProtocolSet = 'local-only'): Promise<string> {
+  return runFfmpegSafe(args, { maxBuffer: 50 * 1024 * 1024, protocols, label: 'narrated-video' });
 }

package/src/tools/engine/smart-screenshot.ts

@@ -16,6 +16,7 @@ import type { Page, Browser, BrowserContext, ElementHandle } from 'playwright';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from '../../lib/logger.js';
+import { guardFinalUrl } from '../../lib/url-guard.js';
 
 const OUTPUT_DIR = process.env.VIDEO_OUTPUT_DIR || './output';
 
@@ -425,6 +426,13 @@ export async function smartScreenshot(config: SmartScreenshotConfig): Promise<Sm
       await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 30000 });
     });
 
+    // Post-redirect guard: follow-the-redirect must not land on a private IP.
+    const finalUrl = page.url();
+    const finalGuard = guardFinalUrl(finalUrl);
+    if (!finalGuard.ok) {
+      throw new Error(`post-redirect check failed — final URL rejected: ${finalGuard.reason}`);
+    }
+
     await page.waitForTimeout(waitAfterLoad);
 
     // ─── 3. Dismiss overlays ────────────────────────────────────

package/src/tools/engine/social-format.ts

@@ -2,10 +2,10 @@
  * Social media format converter — crop, scale, pad for every platform
  */
 
-import { execFile } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from '../../lib/logger.js';
+import { runFfmpeg as runFfmpegSafe } from '../../lib/ffmpeg-run.js';
 
 // ─── Format Definitions ─────────────────────────────────────────────
 
@@ -133,14 +133,5 @@ export async function convertToAllFormats(
 // ─── Helper ─────────────────────────────────────────────────────────
 
 function runFfmpeg(args: string[]): Promise<string> {
-  return new Promise((resolve, reject) => {
-    execFile('ffmpeg', args, { maxBuffer: 50 * 1024 * 1024 }, (error, stdout, stderr) => {
-      if (error) {
-        logger.error(`ffmpeg failed: ${stderr}`);
-        reject(new Error(`ffmpeg failed: ${stderr || error.message}`));
-        return;
-      }
-      resolve(stdout);
-    });
-  });
+  return runFfmpegSafe(args, { maxBuffer: 50 * 1024 * 1024, label: 'social-format' });
 }

package/src/tools/engine/template-renderer.ts

@@ -8,10 +8,10 @@
  * concat, audio, social-format.
  */
 
-import { execFile } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from '../../lib/logger.js';
+import { runFfmpeg as runFfmpegSafe } from '../../lib/ffmpeg-run.js';
 import { getTemplate } from './templates.js';
 import type { VideoTemplate, TemplateSlot } from './templates.js';
 
@@ -55,16 +55,7 @@ export interface RenderResult {
 // ─── Helpers ────────────────────────────────────────────────────────
 
 function runFfmpeg(args: string[], timeoutMs = 600_000): Promise<string> {
-  return new Promise((resolve, reject) => {
-    execFile('ffmpeg', args, { maxBuffer: 100 * 1024 * 1024, timeout: timeoutMs }, (error, stdout, stderr) => {
-      if (error) {
-        logger.error(`ffmpeg failed: ${stderr}`);
-        reject(new Error(`ffmpeg failed: ${stderr || error.message}`));
-        return;
-      }
-      resolve(stdout);
-    });
-  });
+  return runFfmpegSafe(args, { maxBuffer: 100 * 1024 * 1024, timeoutMs, label: 'template-renderer' });
 }
 
 function ensureDir(filePath: string): void {

package/src/tools/engine/text-animations.ts

@@ -5,10 +5,10 @@
  * manipulation to create effects like typewriter, pop, slide, bounce, etc.
  */
 
-import { execFile } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from '../../lib/logger.js';
+import { runFfmpeg as runFfmpegSafe } from '../../lib/ffmpeg-run.js';
 
 // ─── Types ──────────────────────────────────────────────────────────
 
@@ -81,16 +81,7 @@ export const TEXT_ANIMATION_DESCRIPTIONS: Record<TextAnimation, string> = {
 // ─── Helpers ────────────────────────────────────────────────────────
 
 function runFfmpeg(args: string[], timeoutMs = 300_000): Promise<string> {
-  return new Promise((resolve, reject) => {
-    execFile('ffmpeg', args, { maxBuffer: 100 * 1024 * 1024, timeout: timeoutMs }, (error, stdout, stderr) => {
-      if (error) {
-        logger.error(`ffmpeg failed: ${stderr}`);
-        reject(new Error(`ffmpeg failed: ${stderr || error.message}`));
-        return;
-      }
-      resolve(stdout);
-    });
-  });
+  return runFfmpegSafe(args, { maxBuffer: 100 * 1024 * 1024, timeoutMs, label: 'text-animations' });
 }
 
 function ensureDir(filePath: string): void {

package/src/tools/engine/text-overlay.ts

@@ -2,9 +2,9 @@
  * Text overlay engine — animated titles, subtitles, watermarks
  */
 
-import { execFile } from 'child_process';
 import * as fs from 'fs';
 import { logger } from '../../lib/logger.js';
+import { runFfmpeg as runFfmpegSafe } from '../../lib/ffmpeg-run.js';
 
 // ─── Types ──────────────────────────────────────────────────────────
 
@@ -130,14 +130,5 @@ function findFont(): string {
 }
 
 function runFfmpeg(args: string[]): Promise<string> {
-  return new Promise((resolve, reject) => {
-    execFile('ffmpeg', args, { maxBuffer: 50 * 1024 * 1024 }, (error, stdout, stderr) => {
-      if (error) {
-        logger.error(`ffmpeg failed: ${stderr}`);
-        reject(new Error(`ffmpeg failed: ${stderr || error.message}`));
-        return;
-      }
-      resolve(stdout);
-    });
-  });
+  return runFfmpegSafe(args, { maxBuffer: 50 * 1024 * 1024, label: 'text-overlay' });
 }

package/src/tools/engine/tts.ts

@@ -10,6 +10,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from '../../lib/logger.js';
+import { sanitizeErrorMessage } from '../../lib/error-sanitizer.js';
 import { getMediaDuration } from './audio.js';
 
 // ─── Types ──────────────────────────────────────────────────────────
@@ -121,7 +122,7 @@ export async function generateSpeech(config: TTSConfig): Promise<TTSResult> {
   } catch (error) {
     // Fallback: try the other provider
     const fallback = provider === 'elevenlabs' ? 'openai' : 'elevenlabs';
-    const msg = error instanceof Error ? error.message : String(error);
+    const msg = sanitizeErrorMessage(error);
     logger.warn(`${provider} TTS failed (${msg}), falling back to ${fallback}`);
 
     try {
@@ -131,7 +132,7 @@ export async function generateSpeech(config: TTSConfig): Promise<TTSResult> {
         audioPath = await openaiTTS(config, finalPath);
       }
     } catch (fallbackError) {
-      const fbMsg = fallbackError instanceof Error ? fallbackError.message : String(fallbackError);
+      const fbMsg = sanitizeErrorMessage(fallbackError);
       throw new Error(`Both TTS providers failed. ${provider}: ${msg}, ${fallback}: ${fbMsg}`);
     }
   }
@@ -197,8 +198,12 @@ async function elevenLabsTTS(config: TTSConfig, outputPath: string): Promise<str
   });
 
   if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`ElevenLabs API ${response.status}: ${errorText}`);
+    const errorText = await response.text().catch(() => '');
+    throw new Error(
+      sanitizeErrorMessage(errorText, {
+        prefix: `ElevenLabs API ${response.status}: `,
+      })
+    );
   }
 
   const arrayBuffer = await response.arrayBuffer();
@@ -236,8 +241,12 @@ async function openaiTTS(config: TTSConfig, outputPath: string): Promise<string>
   });
 
   if (!response.ok) {
-    const errorText = await response.text();
-    throw new Error(`OpenAI TTS API ${response.status}: ${errorText}`);
+    const errorText = await response.text().catch(() => '');
+    throw new Error(
+      sanitizeErrorMessage(errorText, {
+        prefix: `OpenAI TTS API ${response.status}: `,
+      })
+    );
   }
 
   const arrayBuffer = await response.arrayBuffer();

package/src/tools/engine/voice-effects.ts

@@ -5,10 +5,10 @@
  * Works on both audio files and video files (preserves video stream).
  */
 
-import { execFile } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import { logger } from '../../lib/logger.js';
+import { runFfmpeg as runFfmpegSafe, runFfprobe as runFfprobeSafe } from '../../lib/ffmpeg-run.js';
 
 // ─── Types ──────────────────────────────────────────────────────────
 
@@ -141,25 +141,11 @@ function getEffectFilter(effect: VoiceEffect, intensity: number): { filter: stri
 // ─── Helpers ────────────────────────────────────────────────────────
 
 function runFfmpeg(args: string[], timeoutMs = 300_000): Promise<string> {
-  return new Promise((resolve, reject) => {
-    execFile('ffmpeg', args, { maxBuffer: 100 * 1024 * 1024, timeout: timeoutMs }, (error, stdout, stderr) => {
-      if (error) {
-        logger.error(`ffmpeg failed: ${stderr}`);
-        reject(new Error(`ffmpeg failed: ${stderr || error.message}`));
-        return;
-      }
-      resolve(stdout);
-    });
-  });
+  return runFfmpegSafe(args, { maxBuffer: 100 * 1024 * 1024, timeoutMs, label: 'voice-effects' });
 }
 
 function runFfprobe(args: string[]): Promise<string> {
-  return new Promise((resolve, reject) => {
-    execFile('ffprobe', args, { maxBuffer: 10 * 1024 * 1024 }, (error, stdout) => {
-      if (error) { reject(new Error(`ffprobe failed: ${error.message}`)); return; }
-      resolve(stdout.trim());
-    });
-  });
+  return runFfprobeSafe(args, { maxBuffer: 10 * 1024 * 1024, label: 'voice-effects-probe' }).then((s) => s.trim());
 }
 
 function ensureDir(filePath: string): void {