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

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

@@ -27,18 +27,18 @@ exports.executeAddSubtitle = void 0;
 const n8n_workflow_1 = require("n8n-workflow");
 const path = __importStar(require("path"));
 const fs = __importStar(require("fs-extra"));
+const os = __importStar(require("os"));
 const ffmpeg = require("fluent-ffmpeg");
 const utils_1 = require("../utils");
 /**
  * Escape special characters in file path for FFmpeg subtitles filter.
  */
 function escapeSubtitlePath(filePath) {
+    // For Windows paths and special characters
     return filePath
-        .replace(/\\/g, '\\\\\\\\')
+        .replace(/\\/g, '/')
         .replace(/:/g, '\\:')
-        .replace(/\[/g, '\\[')
-        .replace(/\]/g, '\\]')
-        .replace(/'/g, "\\'");
+        .replace(/'/g, "'\\''");
 }
 /**
  * Convert color to ASS format (&HAABBGGRR)
@@ -67,11 +67,15 @@ function colorToASS(color, opacity = 1) {
         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();
 }
 /**
  * Get ASS alignment number (numpad style)
+ * 7=top-left, 8=top-center, 9=top-right
+ * 4=middle-left, 5=middle-center, 6=middle-right
+ * 1=bottom-left, 2=bottom-center, 3=bottom-right
  */
 function getASSAlignment(horizontalAlign, verticalAlign) {
     var _a, _b;
@@ -90,28 +94,64 @@ function isASSFile(filePath) {
     return ext === '.ass' || ext === '.ssa';
 }
 /**
- * Build force_style string for subtitles filter
+ * Convert SRT content to ASS format with full styling support
  */
-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(',');
+function convertSRTtoASS(srtContent, fontName, fontSize, primaryColor, outlineColor, outlineWidth, backColor, enableBackground, alignment, marginV, marginL, marginR) {
+    // BorderStyle: 1=outline+shadow, 3=opaque box
+    const borderStyle = enableBackground ? 3 : 1;
+    const outline = enableBackground ? 0 : outlineWidth;
+    const shadow = enableBackground ? 2 : 0;
+    const header = `[Script Info]
+Title: Generated by MediaFX
+ScriptType: v4.00+
+WrapStyle: 0
+ScaledBorderAndShadow: yes
+PlayResX: 1920
+PlayResY: 1080
+
+[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},${outline},${shadow},${alignment},${marginL},${marginR},${marginV},1
+
+[Events]
+Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
+`;
+    // Parse SRT blocks
+    const blocks = srtContent.trim().split(/\r?\n\r?\n/);
+    const dialogues = [];
+    for (const block of blocks) {
+        const lines = block.trim().split(/\r?\n/);
+        if (lines.length < 2)
+            continue;
+        // Find timestamp line (may be first or second line)
+        let timestampLine = '';
+        let textStartIndex = 0;
+        for (let i = 0; i < lines.length; i++) {
+            if (lines[i].includes('-->')) {
+                timestampLine = lines[i];
+                textStartIndex = i + 1;
+                break;
+            }
+        }
+        if (!timestampLine)
+            continue;
+        // Parse timestamps: 00:00:01,000 --> 00:00:04,000
+        const match = timestampLine.match(/(\d{1,2}):(\d{2}):(\d{2})[,.](\d{3})\s*-->\s*(\d{1,2}):(\d{2}):(\d{2})[,.](\d{3})/);
+        if (!match)
+            continue;
+        // Convert to ASS time format: H:MM:SS.cc
+        const startTime = `${parseInt(match[1])}:${match[2]}:${match[3]}.${match[4].substring(0, 2)}`;
+        const endTime = `${parseInt(match[5])}:${match[6]}:${match[7]}.${match[8].substring(0, 2)}`;
+        // Get subtitle text (remaining lines)
+        const text = lines.slice(textStartIndex).join('\\N');
+        if (text.trim()) {
+            dialogues.push(`Dialogue: 0,${startTime},${endTime},Default,,0,0,0,,${text}`);
+        }
+    }
+    return header + dialogues.join('\n') + '\n';
 }
 async function executeAddSubtitle(video, subtitleFile, style, itemIndex) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e;
     const outputPath = (0, utils_1.getTempFile)(path.extname(video));
     // 1. Get Font
     const allFonts = (0, utils_1.getAvailableFonts)();
@@ -128,62 +168,42 @@ async function executeAddSubtitle(video, subtitleFile, style, itemIndex) {
     const enableBackground = (_b = style.enableBackground) !== null && _b !== void 0 ? _b : false;
     const backgroundColor = style.backgroundColor || 'black';
     const backgroundOpacity = (_c = style.backgroundOpacity) !== null && _c !== void 0 ? _c : 0.5;
-    // 2. Get alignment
+    // 2. Get alignment and padding
     const positionType = style.positionType || 'alignment';
     let horizontalAlign = 'center';
     let verticalAlign = 'bottom';
+    let paddingX = 20;
     let paddingY = 20;
     if (positionType === 'alignment') {
         horizontalAlign = style.horizontalAlign || 'center';
         verticalAlign = style.verticalAlign || 'bottom';
-        paddingY = (_d = style.paddingY) !== null && _d !== void 0 ? _d : 20;
+        paddingX = (_d = style.paddingX) !== null && _d !== void 0 ? _d : 20;
+        paddingY = (_e = style.paddingY) !== null && _e !== void 0 ? _e : 20;
     }
     const alignment = getASSAlignment(horizontalAlign, verticalAlign);
-    // 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 {
-        // 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(subtitleFile);
-    let subtitlesFilter;
+    // 4. Prepare subtitle file
+    let finalSubtitlePath = subtitleFile;
+    let tempAssFile = null;
     if (isASSFile(subtitleFile)) {
-        // ASS/SSA file: use directly without force_style
-        subtitlesFilter = `subtitles='${escapedPath}'`;
+        // ASS/SSA file: use directly
+        finalSubtitlePath = subtitleFile;
     }
     else {
-        // SRT file: apply force_style
-        const forceStyle = buildForceStyle(fontName, fontSize, primaryColorASS, outlineColorASS, outlineWidth, backColorASS, enableBackground, alignment, marginV);
-        subtitlesFilter = `subtitles='${escapedPath}':force_style='${forceStyle}'`;
+        // SRT file: convert to ASS for full styling support
+        const srtContent = await fs.readFile(subtitleFile, 'utf-8');
+        const assContent = convertSRTtoASS(srtContent, fontName, fontSize, primaryColorASS, outlineColorASS, outlineWidth, backColorASS, enableBackground, alignment, paddingY, paddingX, paddingX);
+        // Create temp ASS file with unique name
+        tempAssFile = path.join(os.tmpdir(), `mediafx_sub_${Date.now()}_${Math.random().toString(36).substring(7)}.ass`);
+        await fs.writeFile(tempAssFile, assContent, 'utf-8');
+        finalSubtitlePath = tempAssFile;
     }
+    // 5. Build FFmpeg command
+    const escapedPath = escapeSubtitlePath(finalSubtitlePath);
+    const subtitlesFilter = `ass='${escapedPath}'`;
     const command = ffmpeg(video)
         .videoFilters([subtitlesFilter])
         .audioCodec('copy')
@@ -196,5 +216,11 @@ 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.4",
+  "version": "1.6.6",
   "description": "N8N custom nodes for video editing and media processing (Enhanced fork with Speed control and Subtitle fixes)",
   "license": "MIT",
   "author": {