@lee-jisoo/n8n-nodes-mediafx 1.6.2 → 1.6.4

package/dist/nodes/MediaFX/operations/addSubtitle.js

@@ -42,8 +42,6 @@ function escapeSubtitlePath(filePath) {
 }
 /**
  * Convert color to ASS format (&HAABBGGRR)
- * @param color - CSS color (hex #RRGGBB or named color)
- * @param opacity - Opacity 0-1 (0=transparent, 1=solid)
  */
 function colorToASS(color, opacity = 1) {
     let r = 'FF', g = 'FF', b = 'FF';
@@ -64,12 +62,11 @@ function colorToASS(color, opacity = 1) {
             magenta: 'FF00FF',
             orange: 'FFA500',
         };
-        const hex = namedColors[color.toLowerCase()] || 'FFFFFF';
+        const hex = namedColors[(color || 'white').toLowerCase()] || 'FFFFFF';
         r = hex.substring(0, 2);
         g = hex.substring(2, 4);
         b = hex.substring(4, 6);
     }
-    // ASS format: &HAABBGGRR (AA = alpha, 00=solid, FF=transparent)
     const alpha = Math.round((1 - opacity) * 255).toString(16).padStart(2, '0').toUpperCase();
     return `&H${alpha}${b}${g}${r}`.toUpperCase();
 }
@@ -85,47 +82,6 @@ function getASSAlignment(horizontalAlign, verticalAlign) {
     };
     return (_b = (_a = alignMap[verticalAlign]) === null || _a === void 0 ? void 0 : _a[horizontalAlign]) !== null && _b !== void 0 ? _b : 2;
 }
-/**
- * Parse SRT file and convert to ASS format
- */
-function convertSRTtoASS(srtContent, fontName, fontSize, primaryColor, outlineColor, outlineWidth, backgroundColor, backgroundOpacity, enableBackground, alignment, marginV) {
-    // ASS Header
-    const borderStyle = enableBackground ? 4 : 1; // 4=box, 1=outline+shadow
-    const backColor = colorToASS(backgroundColor, backgroundOpacity);
-    const assHeader = `[Script Info]
-Title: Converted from SRT
-ScriptType: v4.00+
-PlayResX: 1920
-PlayResY: 1080
-WrapStyle: 0
-
-[V4+ Styles]
-Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
-Style: Default,${fontName},${fontSize},${primaryColor},${primaryColor},${outlineColor},${backColor},0,0,0,0,100,100,0,0,${borderStyle},${outlineWidth},0,${alignment},20,20,${marginV},1
-
-[Events]
-Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
-`;
-    // Parse SRT content
-    const srtBlocks = srtContent.trim().split(/\n\s*\n/);
-    const dialogueLines = [];
-    for (const block of srtBlocks) {
-        const lines = block.trim().split('\n');
-        if (lines.length < 3)
-            continue;
-        // Parse timestamp line (format: 00:00:00,000 --> 00:00:00,000)
-        const timestampLine = lines[1];
-        const timestampMatch = timestampLine.match(/(\d{2}):(\d{2}):(\d{2})[,.](\d{3})\s*-->\s*(\d{2}):(\d{2}):(\d{2})[,.](\d{3})/);
-        if (!timestampMatch)
-            continue;
-        const startTime = `${timestampMatch[1]}:${timestampMatch[2]}:${timestampMatch[3]}.${timestampMatch[4].substring(0, 2)}`;
-        const endTime = `${timestampMatch[5]}:${timestampMatch[6]}:${timestampMatch[7]}.${timestampMatch[8].substring(0, 2)}`;
-        // Get text (lines 3+)
-        const text = lines.slice(2).join('\\N').replace(/\r/g, '');
-        dialogueLines.push(`Dialogue: 0,${startTime},${endTime},Default,,0,0,0,,${text}`);
-    }
-    return assHeader + dialogueLines.join('\n');
-}
 /**
  * Check if file is ASS/SSA format
  */
@@ -133,6 +89,27 @@ function isASSFile(filePath) {
     const ext = path.extname(filePath).toLowerCase();
     return ext === '.ass' || ext === '.ssa';
 }
+/**
+ * Build force_style string for subtitles filter
+ */
+function buildForceStyle(fontName, fontSize, primaryColor, outlineColor, outlineWidth, backColor, enableBackground, alignment, marginV) {
+    const borderStyle = enableBackground ? 4 : 1;
+    const styleParams = [
+        `FontName=${fontName}`,
+        `FontSize=${fontSize}`,
+        `PrimaryColour=${primaryColor}`,
+        `OutlineColour=${outlineColor}`,
+        `BackColour=${backColor}`,
+        `Bold=0`,
+        `Italic=0`,
+        `BorderStyle=${borderStyle}`,
+        `Outline=${outlineWidth}`,
+        `Shadow=0`,
+        `Alignment=${alignment}`,
+        `MarginV=${marginV}`,
+    ];
+    return styleParams.join(',');
+}
 async function executeAddSubtitle(video, subtitleFile, style, itemIndex) {
     var _a, _b, _c, _d;
     const outputPath = (0, utils_1.getTempFile)(path.extname(video));
@@ -155,31 +132,58 @@ async function executeAddSubtitle(video, subtitleFile, style, itemIndex) {
     const positionType = style.positionType || 'alignment';
     let horizontalAlign = 'center';
     let verticalAlign = 'bottom';
-    let marginV = 20;
+    let paddingY = 20;
     if (positionType === 'alignment') {
         horizontalAlign = style.horizontalAlign || 'center';
         verticalAlign = style.verticalAlign || 'bottom';
-        marginV = (_d = style.paddingY) !== null && _d !== void 0 ? _d : 20;
+        paddingY = (_d = style.paddingY) !== null && _d !== void 0 ? _d : 20;
     }
     const alignment = getASSAlignment(horizontalAlign, verticalAlign);
-    // 3. Prepare subtitle file
-    let finalSubtitlePath = subtitleFile;
-    let tempAssFile = null;
-    if (isASSFile(subtitleFile)) {
-        // ASS file: use directly (ignore style options)
-        finalSubtitlePath = subtitleFile;
+    // Get video height for accurate MarginV calculation
+    let videoHeight = 1080; // default fallback
+    try {
+        const videoInfo = await (0, utils_1.getVideoStreamInfo)(video);
+        if (videoInfo && videoInfo.height) {
+            videoHeight = videoInfo.height;
+        }
+    }
+    catch (e) {
+        // Use default if ffprobe fails
+        console.warn('Could not get video height, using default 1080');
+    }
+    // Calculate MarginV based on vertical alignment and video height
+    // ASS MarginV is the distance from the alignment edge
+    // For middle alignment, we calculate the margin to center the subtitle
+    let marginV = paddingY;
+    if (verticalAlign === 'middle') {
+        // For middle alignment (4,5,6), MarginV pushes from bottom
+        // To center: marginV = (videoHeight / 2) - fontSize - some_offset
+        // Simplified: use ~37% of video height as margin from bottom
+        marginV = Math.round(videoHeight * 0.37);
+    }
+    else if (verticalAlign === 'top') {
+        marginV = paddingY;
     }
     else {
-        // SRT file: convert to ASS with styles
-        const srtContent = await fs.readFile(subtitleFile, 'utf-8');
-        const assContent = convertSRTtoASS(srtContent, fontName, fontSize, colorToASS(fontColor, 1), colorToASS(outlineColor, 1), outlineWidth, backgroundColor, backgroundOpacity, enableBackground, alignment, marginV);
-        tempAssFile = (0, utils_1.getTempFile)('.ass');
-        await fs.writeFile(tempAssFile, assContent, 'utf-8');
-        finalSubtitlePath = tempAssFile;
+        // bottom
+        marginV = paddingY;
     }
+    // 3. Convert colors to ASS format
+    const primaryColorASS = colorToASS(fontColor, 1);
+    const outlineColorASS = colorToASS(outlineColor, 1);
+    const backColorASS = colorToASS(backgroundColor, backgroundOpacity);
     // 4. Build FFmpeg command
-    const escapedPath = escapeSubtitlePath(finalSubtitlePath);
-    const subtitlesFilter = `subtitles='${escapedPath}'`;
+    const escapedPath = escapeSubtitlePath(subtitleFile);
+    let subtitlesFilter;
+    if (isASSFile(subtitleFile)) {
+        // ASS/SSA file: use directly without force_style
+        subtitlesFilter = `subtitles='${escapedPath}'`;
+    }
+    else {
+        // SRT file: apply force_style
+        const forceStyle = buildForceStyle(fontName, fontSize, primaryColorASS, outlineColorASS, outlineWidth, backColorASS, enableBackground, alignment, marginV);
+        subtitlesFilter = `subtitles='${escapedPath}':force_style='${forceStyle}'`;
+    }
     const command = ffmpeg(video)
         .videoFilters([subtitlesFilter])
         .audioCodec('copy')
@@ -192,11 +196,5 @@ async function executeAddSubtitle(video, subtitleFile, style, itemIndex) {
         await fs.remove(outputPath).catch(() => { });
         throw new n8n_workflow_1.NodeOperationError(this.getNode(), `Error adding subtitles to video. FFmpeg error: ${error.message}`, { itemIndex });
     }
-    finally {
-        // Clean up temp ASS file
-        if (tempAssFile) {
-            await fs.remove(tempAssFile).catch(() => { });
-        }
-    }
 }
 exports.executeAddSubtitle = executeAddSubtitle;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lee-jisoo/n8n-nodes-mediafx",
-  "version": "1.6.2",
+  "version": "1.6.4",
   "description": "N8N custom nodes for video editing and media processing (Enhanced fork with Speed control and Subtitle fixes)",
   "license": "MIT",
   "author": {