Bubbles workign but sound issues:

common-utils

@@ -1 +1 @@
-Subproject commit f14b0fb9ba0096171cc049cf6606c114c6ae3951
+Subproject commit d4042809c56e544a633fe81717b5f4b06ee1662d

utils/bubble/Bubble.js

@@ -94,6 +94,14 @@ class BubbleMaker {
         workingVideo = videoPath;
       }
     }
+    // figure out whether the current working video actually contains an audio stream
+    let workingHasAudio = false;
+    try {
+      const m2 = await FFMpegUtils.getMediaMetadata(workingVideo);
+      workingHasAudio = !!(m2 && m2.audio);
+    } catch (e) {
+      // if ffprobe fails, assume no audio
+    }
     // helper that computes input flag, video filter snippet and audio filter
     // snippet for a single bubble.  It largely mirrors the logic used later
     // when executing ffmpeg, but stops before constructing the command.
@@ -228,10 +236,13 @@ class BubbleMaker {
         let current = workingVideo;
         for (let idx = 0; idx < bubble.length; idx++) {
           const tmp = tempPath('bubble-step', 'mp4');
+          onLog && onLog(`sequential loop idx=${idx}, source=${current}, tmp=${tmp}`);
           // attempt normal rendering
           try {
             await this.makeBubble(current, bubble[idx], tmp, onLog, false);
+            onLog && onLog(`render finished idx=${idx}, exists=${fs.existsSync(tmp)}`);
           } catch (err) {
+            onLog && onLog(`render error idx=${idx}: ${err}`);
             // if it failed and there is an audio effect we can retry without it
             if (bubble[idx] && bubble[idx].audioEffectFile) {
               onLog && onLog('bubble render failed, retrying without audio effect: ' + err);
@@ -259,6 +270,23 @@ class BubbleMaker {
           current = tmp;
         }
         fs.copyFileSync(current, outputPath);
+        // if we detached audio at the very top, put it back now
+        if (detachAudio && originalHasAudio && workingVideo !== videoPath) {
+          const finalWithAudio = tempPath('withaudio', 'mp4');
+          onLog && onLog(`Re‑attaching audio from ${videoPath} to ${outputPath}`);
+          await FFMpegUtils.execute(`ffmpeg -i "${outputPath}" -i "${videoPath}" -c copy -map 0:v -map 1:a "${finalWithAudio}"`);
+          // rename may fail across filesystems (EXDEV), so fall back to copy+unlink
+          try {
+            fs.renameSync(finalWithAudio, outputPath);
+          } catch (err) {
+            if (err && err.code === 'EXDEV') {
+              fs.copyFileSync(finalWithAudio, outputPath);
+              fs.unlinkSync(finalWithAudio);
+            } else {
+              throw err;
+            }
+          }
+        }
         return outputPath;
       }
 
@@ -300,14 +328,14 @@ class BubbleMaker {
 
       const videoFilter = filterParts.length ? filterParts.join(';') : '';
       // build audio filter: keep main audio (if present) and mix any effect streams.
-      const workingHasAudio = !(detachAudio && originalHasAudio);
+      // `workingHasAudio` was determined above after probing metadata.
       let audioFilter = workingHasAudio ? '[0:a]aresample=async=1[a0]' : '';
       if (audioParts.length) {
         if (workingHasAudio) {
           audioFilter += ';' + audioParts.join(';');
           const mixInputs = 1 + effectLabels.length;
           audioFilter += ';[a0]' + effectLabels.map(l => `[${l}]`).join('') +
-            `amix=inputs=${mixInputs}:duration=first:dropout_transition=0`;
+            `amix=inputs=${mixInputs}:duration=longest:dropout_transition=0`;
           if (mixInputs > 1) {
             audioFilter += `,volume=${mixInputs}`;
           }
@@ -318,7 +346,7 @@ class BubbleMaker {
           const mixInputs = effectLabels.length;
           if (mixInputs > 1) {
             audioFilter += ';' + effectLabels.map(l => `[${l}]`).join('') +
-              `amix=inputs=${mixInputs}:duration=first:dropout_transition=0,volume=${mixInputs}[aout]`;
+              `amix=inputs=${mixInputs}:duration=longest:dropout_transition=0,volume=${mixInputs}[aout]`;
           } else if (mixInputs === 1) {
             // single effect stream is already trimmed/delayed; alias to aout
             audioFilter += `;${effectLabels[0]}anull[aout]`;
@@ -333,7 +361,7 @@ class BubbleMaker {
       }
       const fc = [videoFilter, audioFilter].filter(Boolean).join(';');
 
-      const cmd = `ffmpeg ${inputs.join(' ')} -filter_complex "${fc}" -map "${currentLabel === '[0:v]' ? '[0:v]' : currentLabel}" ${audioFilter ? '-map "[aout]" -c:a aac' : ''} -c:v libx264 -preset veryfast -crf 23 -shortest "${outputPath}" -y`;
+      const cmd = `ffmpeg ${inputs.join(' ')} -filter_complex "${fc}" -map "${currentLabel === '[0:v]' ? '[0:v]' : currentLabel}" ${audioFilter ? '-map "[aout]" -c:a aac' : ''} -c:v libx264 -preset veryfast -crf 23 "${outputPath}" -y`;
       onLog && onLog('Running ffmpeg: ' + cmd);
       try {
         await FFMpegUtils.execute(cmd);
@@ -341,7 +369,7 @@ class BubbleMaker {
         // if audio mixing caused failure, try again without any audio effects
         if (audioParts.length) {
           onLog && onLog('ffmpeg optimized mix failed, retrying without audio effects: ' + err);
-          const retryCmd = `ffmpeg ${inputs.join(' ')} -filter_complex "${videoFilter}" -map "${currentLabel === '[0:v]' ? '[0:v]' : currentLabel}" -c:v libx264 -preset veryfast -crf 23 -shortest "${outputPath}" -y`;
+          const retryCmd = `ffmpeg ${inputs.join(' ')} -filter_complex "${videoFilter}" -map "${currentLabel === '[0:v]' ? '[0:v]' : currentLabel}" -c:v libx264 -preset veryfast -crf 23 "${outputPath}" -y`;
           onLog && onLog('Running ffmpeg (no audio): ' + retryCmd);
           await FFMpegUtils.execute(retryCmd);
         } else {
@@ -353,7 +381,16 @@ class BubbleMaker {
         const finalWithAudio = tempPath('withaudio', 'mp4');
         onLog && onLog(`Re‑attaching audio from ${videoPath} to ${outputPath}`);
         await FFMpegUtils.execute(`ffmpeg -i "${outputPath}" -i "${videoPath}" -c copy -map 0:v -map 1:a "${finalWithAudio}"`);
-        fs.renameSync(finalWithAudio, outputPath);
+        try {
+          fs.renameSync(finalWithAudio, outputPath);
+        } catch (err) {
+          if (err && err.code === 'EXDEV') {
+            fs.copyFileSync(finalWithAudio, outputPath);
+            fs.unlinkSync(finalWithAudio);
+          } else {
+            throw err;
+          }
+        }
       }
       return outputPath;
     }
@@ -567,6 +604,7 @@ class BubbleMaker {
       let audioFilter = '';
       let audioMap = '-map "[aout]" -c:a aac';
       let extraAudioInput = '';
+      // workingHasAudio already computed above from metadata
       if (bubble.audioEffectFile) {
         let audioPath = resolveAudioPath(bubble.audioEffectFile);
         if (!audioPath) {
@@ -580,16 +618,21 @@ class BubbleMaker {
           // overlay is input 1, so effect audio will be input 2
           const audioInputIndex = 2;
           const clipSec = Math.min((typeof bubble.audioEffectDurationSec === 'number' ? bubble.audioEffectDurationSec : (to - from)), (to - from));
-          audioFilter = `[0:a]aresample=async=1[a0];[${audioInputIndex}:a]atrim=0:${clipSec},asetpts=PTS-STARTPTS,volume=${aVol}[aeff];[aeff]adelay=${delayMs}|${delayMs}[aeffd];[a0][aeffd]amix=inputs=2:duration=first:dropout_transition=0`; // will boost below
-          // compensate for division by inputs (2)
-          audioFilter += ",volume=2[aout]";
+          if (workingHasAudio) {
+            // mix the existing track with the effect stream without adjusting overall level
+            audioFilter = `[0:a]aresample=async=1[a0];[${audioInputIndex}:a]atrim=0:${clipSec},asetpts=PTS-STARTPTS,volume=${aVol}[aeff];[aeff]adelay=${delayMs}|${delayMs}[aeffd];[a0][aeffd]amix=inputs=2:duration=longest:dropout_transition=0[aout]`;
+          } else {
+            // only effect present
+            audioFilter = `[${audioInputIndex}:a]atrim=0:${clipSec},asetpts=PTS-STARTPTS,volume=${aVol}[aeff];[aeff]adelay=${delayMs}|${delayMs}[aeffd]`;
+            audioFilter += `;[aeffd]anull[aout]`;
+          }
         } else {
-          // fallback to mapping main audio
-          audioFilter = `[0:a]aresample=async=1[aout]`;
+          // fallback to mapping main audio (if any)
+          audioFilter = workingHasAudio ? `[0:a]aresample=async=1[aout]` : '';
         }
       } else {
         // map main audio through as aout
-        audioFilter = `[0:a]aresample=async=1[aout]`;
+        audioFilter = workingHasAudio ? `[0:a]aresample=async=1[aout]` : '';
       }
 
       const fc = `${videoFilter};${audioFilter}`;
@@ -597,7 +640,7 @@ class BubbleMaker {
       // Build final command
       // place extraAudioInput after overlayInputFlag
       const inputs = `${overlayInputFlag} ${extraAudioInput}`.trim();
-      cmd = `ffmpeg -i "${workingVideo}" ${inputs} -filter_complex "${fc}" -map "[vout]" ${audioMap} -c:v libx264 -preset veryfast -crf 23 -shortest "${outputPath}" -y`;
+      cmd = `ffmpeg -i "${workingVideo}" ${inputs} -filter_complex "${fc}" -map "[vout]" ${audioMap} -c:v libx264 -preset veryfast -crf 23 "${outputPath}" -y`;
 
     } else if (bubble.bubbleText && bubble.bubbleText.text) {
       const t = bubble.bubbleText;
@@ -683,28 +726,54 @@ class BubbleMaker {
             const delayMs = Math.round(from * 1000);
             const audioInputIndex = 1;
             const clipSec = Math.min((typeof bubble.audioEffectDurationSec === 'number' ? bubble.audioEffectDurationSec : (to - from)), (to - from));
-            const fc = `${videoFilter};[0:a]aresample=async=1[a0];[${audioInputIndex}:a]atrim=0:${clipSec},asetpts=PTS-STARTPTS,volume=${aVol}[aeff];[aeff]adelay=${delayMs}|${delayMs}[aeffd];[a0][aeffd]amix=inputs=2:duration=first:dropout_transition=0,volume=2[aout]`;
+            // build fc depending on whether the working video has audio
+            let fc;
+            if (workingHasAudio) {
+              fc = `${videoFilter};[0:a]aresample=async=1[a0];[${audioInputIndex}:a]atrim=0:${clipSec},asetpts=PTS-STARTPTS,volume=${aVol}[aeff];[aeff]adelay=${delayMs}|${delayMs}[aeffd];[a0][aeffd]amix=inputs=2:duration=longest:dropout_transition=0[aout]`;
+            } else {
+              // no main audio stream, just use effect and then pad with null to produce aout
+              fc = `${videoFilter};[${audioInputIndex}:a]atrim=0:${clipSec},asetpts=PTS-STARTPTS,volume=${aVol}[aeff];[aeff]adelay=${delayMs}|${delayMs}[aeffd];[aeffd]anull[aout]`;
+            }
             if (bgPath) {
-              cmd = `ffmpeg -i "${workingVideo}" -i "${bgPath}" -i "${audioPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -shortest "${outputPath}" -y`;
+              cmd = `ffmpeg -i "${workingVideo}" -i "${bgPath}" -i "${audioPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac "${outputPath}" -y`;
             } else {
-              cmd = `ffmpeg -i "${workingVideo}" -i "${audioPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -shortest "${outputPath}" -y`;
+              cmd = `ffmpeg -i "${workingVideo}" -i "${audioPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac "${outputPath}" -y`;
             }
           } else {
-            // fallback
+            // fallback with only main audio (if it exists)
+            if (workingHasAudio) {
+              const fc = `${videoFilter};[0:a]aresample=async=1[aout]`;
+              if (bgPath) {
+                cmd = `ffmpeg -i "${videoPath}" -i "${bgPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -b:a 128k "${outputPath}" -y`;
+              } else {
+                cmd = `ffmpeg -i "${videoPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -b:a 128k "${outputPath}" -y`;
+              }
+            } else {
+              // no audio at all, just video
+              const fc = `${videoFilter}`;
+              if (bgPath) {
+                cmd = `ffmpeg -i "${videoPath}" -i "${bgPath}" -filter_complex "${fc}" -map "[vout]" -c:v libx264 -preset veryfast -crf 23 "${outputPath}" -y`;
+              } else {
+                cmd = `ffmpeg -i "${videoPath}" -filter_complex "${fc}" -map "[vout]" -c:v libx264 -preset veryfast -crf 23 "${outputPath}" -y`;
+              }
+            }
+          }
+        } else {
+          // no audio mixing; if bg present include it as input
+          if (workingHasAudio) {
             const fc = `${videoFilter};[0:a]aresample=async=1[aout]`;
             if (bgPath) {
               cmd = `ffmpeg -i "${videoPath}" -i "${bgPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -b:a 128k -shortest "${outputPath}" -y`;
             } else {
               cmd = `ffmpeg -i "${videoPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -b:a 128k -shortest "${outputPath}" -y`;
             }
-          }
-        } else {
-          // no audio mixing; if bg present include it as input
-          const fc = `${videoFilter};[0:a]aresample=async=1[aout]`;
-          if (bgPath) {
-            cmd = `ffmpeg -i "${videoPath}" -i "${bgPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -b:a 128k -shortest "${outputPath}" -y`;
           } else {
-            cmd = `ffmpeg -i "${videoPath}" -filter_complex "${fc}" -map "[vout]" -map "[aout]" -c:v libx264 -preset veryfast -crf 23 -c:a aac -b:a 128k -shortest "${outputPath}" -y`;
+            const fc = `${videoFilter}`;
+            if (bgPath) {
+              cmd = `ffmpeg -i "${videoPath}" -i "${bgPath}" -filter_complex "${fc}" -map "[vout]" -c:v libx264 -preset veryfast -crf 23 -shortest "${outputPath}" -y`;
+            } else {
+              cmd = `ffmpeg -i "${videoPath}" -filter_complex "${fc}" -map "[vout]" -c:v libx264 -preset veryfast -crf 23 -shortest "${outputPath}" -y`;
+            }
           }
         }
       }

utils/bubble/bubble-templates.js

@@ -5,7 +5,7 @@ export const BaseBubbleTemplates = {
     // top-level bubble background controls whether a box is rendered
     backgroundColor: '#ffffff',
     borderRadius: 20,
-    audioEffectFile: 'woosh',
+    audioEffectFile: 'click',
     animExtra: {
       template: 'slide_down',
       durationSec: 0.1