fixed bugs

package-lock.json

@@ -2049,9 +2049,9 @@
       }
     },
     "node_modules/get-tsconfig": {
-      "version": "4.7.4",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.4.tgz",
-      "integrity": "sha512-ofbkKj+0pjXjhejr007J/fLf+sW+8H7K5GCm+msC8q3IpvgjobpyPqSRFemNyIMxklC0zeJpi7VDFna19FacvQ==",
+      "version": "4.7.5",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz",
+      "integrity": "sha512-ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==",
       "dev": true,
       "dependencies": {
         "resolve-pkg-maps": "^1.0.0"

src/bug-in-bun/aitube_ffmpeg/concatenate/concatenateAudio.ts

@@ -86,7 +86,7 @@ export async function concatenateAudio({
       prevLabel
     })
     */
-
+ 
     let cmd: FfmpegCommand = ffmpeg() // .outputOptions('-vn');
 
     audioFilePaths.forEach((audio, i) => {

src/bug-in-bun/aitube_ffmpeg/concatenate/concatenateVideosWithAudio.ts

@@ -38,6 +38,7 @@ export const concatenateVideosWithAudio = async ({
   asBase64 = false,
 }: ConcatenateVideoWithAudioOptions): Promise<string> => {
 
+  console.log(`concatenateVideosWithAudio()`)
   try {
     // Prepare temporary directories
     const tempDir = await getRandomDirectory()
@@ -113,6 +114,7 @@ export const concatenateVideosWithAudio = async ({
           '-map', '[a]',
           '-c:v', 'copy',
           '-c:a', 'aac',
+          '-shortest'
         ]);
       } else {
         // console.log(`concatenateVideosWithAudio: case 2: additional audio was provided, but we don't already have audio: we overwrite`)
@@ -123,6 +125,7 @@ export const concatenateVideosWithAudio = async ({
           '-map', '1:a',
           '-c:v', 'copy',
           '-c:a', 'aac',
+          '-shortest'
         ]);
       }
     } else {
@@ -135,7 +138,6 @@ export const concatenateVideosWithAudio = async ({
       ]);
     }
 
-
     /*
     console.log("concatenateVideosWithAudio: DEBUG:", {
       videoTracksVolume,
@@ -147,9 +149,9 @@ export const concatenateVideosWithAudio = async ({
       audioFilePath,
       // additionalAudioVolume,
       finalOutputFilePath
-     })
-     */
-
+    })
+    */
+ 
     // Set up event handlers for ffmpeg processing
     const promise = new Promise<string>((resolve, reject) => {
       ffmpegCommand.on('start', function(commandLine) {

src/bug-in-bun/aitube_ffmpeg/overlay/htmlToBase64Png.ts

@@ -30,11 +30,22 @@ export async function htmlToBase64Png({
   const browser = await puppeteer.launch({
     headless: true,
 
+    // for macOS do this (yeah.. with the "no quarantine"..)
+    // brew install chromium --no-quarantine
+    // and:
+    // which chromium
+    // to detect where the executable path is
+
     // apparently we need those, see:
     // https://unix.stackexchange.com/questions/694734/puppeteer-in-alpine-docker-with-chromium-headless-dosent-seems-to-work
-    executablePath: '/usr/bin/chromium-browser',
+    // https://stackoverflow.com/questions/59979188/error-failed-to-launch-the-browser-process-puppeteer
+    executablePath:
+    os.type() === "Darwin"
+    ? '/opt/homebrew/bin/chromium'
+    : '/usr/bin/chromium-browser',
+
     args: [
-      '--no-sandbox',
+      '--no-sandbox', // for alpine
       '--headless',
       '--disable-gpu',
       '--disable-dev-shm-usage'

src/core/exporters/storyboardSegmentToVideoFile.ts

@@ -41,21 +41,30 @@ export async function storyboardSegmentToVideoFile({
   const interfaceSegment = interfaceSegments.at(0)
   if (interfaceSegment) {
     // here we are free to use mp4, since this is an internal intermediary format
-    const videoSegmentWithOverlayFilePath = join(outputDir, `tmp_asset_${segment.id}_with_interface.mp4`)
-
-    await addTextToVideo({
-      inputVideoPath: storyboardSegmentVideoFilePath,
-      outputVideoPath: videoSegmentWithOverlayFilePath,
-      text: interfaceSegment.assetUrl.startsWith("data:text/")
-        ? atob(extractBase64(interfaceSegment.assetUrl).data)
-        : interfaceSegment.assetUrl,
-      width: clap.meta.width,
-      height: clap.meta.height,
-    })
-
-    // we overwrite
-    await deleteFile(storyboardSegmentVideoFilePath)
-    storyboardSegmentVideoFilePath = videoSegmentWithOverlayFilePath
+    let videoSegmentWithOverlayFilePath = join(outputDir, `tmp_asset_${segment.id}_with_interface.mp4`)
+
+    let success = false
+    // this can fail due to puppeteer
+    try {
+      await addTextToVideo({
+        inputVideoPath: storyboardSegmentVideoFilePath,
+        outputVideoPath: videoSegmentWithOverlayFilePath,
+        text: interfaceSegment.assetUrl.startsWith("data:text/")
+          ? atob(extractBase64(interfaceSegment.assetUrl).data)
+          : interfaceSegment.assetUrl,
+        width: clap.meta.width,
+        height: clap.meta.height,
+      })
+      success = true
+    } catch (err) {
+      console.error(`failed to add text to the video: ${err}`)
+      success = false
+    }
+    if (success) {
+      // we overwrite
+      await deleteFile(storyboardSegmentVideoFilePath)
+      storyboardSegmentVideoFilePath = videoSegmentWithOverlayFilePath
+    }
   }
 
   const dialogueSegments = filterSegments(

src/index.ts

@@ -82,7 +82,7 @@ app.post("/", async (req, res) => {
       res.download(outputFilePath, async () => {
         // clean-up after ourselves (we clear the whole tmp directory)
         await deleteFile(tmpWorkDir)
-        console.log("cleared the temporary folder")
+        // console.log("cleared the temporary folder")
       })
       return
     } catch (err) {

src/main.ts

@@ -41,6 +41,7 @@ export async function clapToTmpVideoFilePath({
   tmpWorkDir: string
   outputFilePath: string
 }> {
+  console.log(`clapToTmpVideoFilePath()`)
 
   // in case we have an issue with the format
   if (format !== "mp4" && format !== "webm") {
@@ -104,7 +105,7 @@ export async function clapToTmpVideoFilePath({
 
   console.log(`clapToTmpVideoFilePath: concatenatedVideosNoMusic`, concatenatedVideosNoMusic)
   
-  const audioTracks: string[] = []
+  const musicFilePaths: string[] = []
 
   const musicSegments = clap.segments.filter(s =>
       s.category === ClapSegmentCategory.MUSIC &&
@@ -137,56 +138,67 @@ export async function clapToTmpVideoFilePath({
       continue
     }
 
-    const newTrackFileName = await writeBase64ToFile(
+    const newMusicFilePath = await writeBase64ToFile(
       segment.assetUrl,
       join(outputDir, `tmp_asset_${segment.id}.${analysis.extension}`)
     )
 
-    audioTracks.push(newTrackFileName)
+    // console.log("wrote music to " + newMusicFilePath)
+    musicFilePaths.push(newMusicFilePath)
 
     availableMusicDurationInMs += durationInMs
   }
 
   let concatenatedAudio: ConcatenateAudioOutput | undefined = undefined
 
-  if (audioTracks.length > 0) {
-    console.log(`clapToTmpVideoFilePath: calling concatenateAudio over ${audioTracks.length} audio tracks`)
+  if (musicFilePaths.length > 0) {
+    // console.log(`clapToTmpVideoFilePath: calling concatenateAudio over ${musicFilePaths.length} audio tracks`)
     
     if (!detectedMusicTrackFormat) {
       throw new Error(`uh that's weird, we couldn't detect the audio type`)
     }
 
-    const availableMusicTracks = [...audioTracks]
+    const availableMusicFilePaths = [...musicFilePaths]
 
     // if we don't have enough music audio content
     while (availableMusicDurationInMs < totalDurationInMs) {
-      let trackToUse = availableMusicTracks.shift()
+      let musicFilePathToRepeat = availableMusicFilePaths.shift()
 
       // abort if there are no available tracks (for some reason)
-      if (!trackToUse) { break }
+      if (!musicFilePathToRepeat) { break }
 
-      availableMusicTracks.push(trackToUse)
+      availableMusicFilePaths.push(musicFilePathToRepeat)
 
       // we artificially duplicate it (note: this will be cross-faded)
-      const { durationInMs } = await getMediaInfo(trackToUse)
+      const { durationInMs } = await getMediaInfo(musicFilePathToRepeat)
 
       // let's abord if we have bad data
       if (!durationInMs || durationInMs < 1000) { break }
  
-      audioTracks.push(trackToUse)
+      musicFilePaths.push(musicFilePathToRepeat)
   
       availableMusicDurationInMs += durationInMs
     }
 
+    /*
+    console.log("DEBUG:", {
+      musicFilePaths,
+      availableMusicFilePaths,
+      availableMusicDurationInMs
+    })
+    */
+
+
     concatenatedAudio = await concatenateAudio({
       output: join(outputDir, `tmp_asset_concatenated_audio.${detectedMusicTrackFormat}`),
-      audioTracks,
+      audioFilePaths: musicFilePaths,
       crossfadeDurationInSec: 2, // 2 seconds
       outputFormat: detectedMusicTrackFormat
     })
-    console.log(`clapToTmpVideoFilePath: concatenatedAudio = ${concatenatedAudio}`)
+    // console.log(`clapToTmpVideoFilePath: concatenatedAudio = ${concatenatedAudio}`)
   }
 
+  /*
   console.log(`calling concatenateVideosWithAudio: `, {
     output: join(outputDir, `final_video.${format}`),
     format,
@@ -196,6 +208,7 @@ export async function clapToTmpVideoFilePath({
     videoTracksVolume: concatenatedAudio ? 0.85 : 1.0,
     audioTrackVolume: concatenatedAudio ? 0.15 : 0.0, // let's keep the music volume low
   })
+  */
 
   const finalFilePathOfVideoWithMusic = await concatenateVideosWithAudio({
     output: join(outputDir, `final_video.${format}`),
@@ -211,14 +224,16 @@ export async function clapToTmpVideoFilePath({
   
   if (clearTmpFilesAtEnd) {
     // we delete all the temporary assets
-    console.log(`clapToTmpVideoFilePath: calling deleteFilesWithName(${outputDir}, 'tmp_asset_')`)
+    // console.log(`clapToTmpVideoFilePath: calling deleteFilesWithName(${outputDir}, 'tmp_asset_')`)
     await deleteFilesWithName(outputDir, `tmp_asset_`)
   }
 
+  /*
   console.log(`clapToTmpVideoFilePath: returning ${JSON.stringify( {
     tmpWorkDir: outputDir,
     outputFilePath: finalFilePathOfVideoWithMusic
   }, null, 2)}`)
+  */
 
   return {
     tmpWorkDir: outputDir,