From 36ff1f26985818af8f2ee47a986c485c92f6a35a Mon Sep 17 00:00:00 2001
From: sethwv-alt <alt@swvn.io>
Date: Tue, 25 Nov 2025 12:30:17 -0500
Subject: [PATCH] Load Time Improvements

---
 src/ffmpegConfig.js  | 12 ++++++------
 src/pageLoader.js    |  5 +----
 src/streamHandler.js | 19 +++++++++++++------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/ffmpegConfig.js b/src/ffmpegConfig.js
index 11b24a8..5aa5234 100644
--- a/src/ffmpegConfig.js
+++ b/src/ffmpegConfig.js
@@ -90,7 +90,7 @@ async function buildFFmpegArgs({ fps, useMusic, musicPath, inputFormat = 'jpeg',
         ...(captureAtHigherFps ? ['-r', fps.toString()] : []),
         '-tune', 'zerolatency',
         '-pix_fmt', 'yuv420p',
-        '-g', (fps * 2).toString(),   // Keyframe every 2 seconds for 2s segments
+        '-g', fps.toString(),         // Keyframe every 1 second for 1s segments
         '-bf', '0',                   // No B-frames for lower latency
         '-x264opts', 'nal-hrd=cbr:no-scenecut',  // Constant bitrate, no scene detection
         '-b:v', '2500k',              // Target bitrate for stable encoding
@@ -109,8 +109,8 @@ async function buildFFmpegArgs({ fps, useMusic, musicPath, inputFormat = 'jpeg',
         '-max_interleave_delta', '500000',  // Increased for smoother transitions (500ms)
         '-err_detect', 'ignore_err',  // Continue on minor audio errors
         '-f', 'hls',
-        '-hls_time', '2',             // 2-second segments for better buffering
-        '-hls_list_size', '10',       // Keep more segments in playlist for slower clients
+        '-hls_time', '1',             // 1-second segments for faster startup
+        '-hls_list_size', '3',        // Minimal segments for faster startup
         '-hls_flags', 'omit_endlist+program_date_time+independent_segments',
         '-hls_segment_type', 'mpegts',
         '-hls_start_number_source', 'epoch',
@@ -141,15 +141,15 @@ async function buildFFmpegArgs({ fps, useMusic, musicPath, inputFormat = 'jpeg',
     ...(captureAtHigherFps ? ['-r', fps.toString()] : []),
     '-tune', 'zerolatency',
     '-pix_fmt', 'yuv420p',
-    '-g', (fps * 2).toString(),   // Keyframe every 2 seconds for 2s segments
+    '-g', fps.toString(),         // Keyframe every 1 second for 1s segments
     '-bf', '0',
     '-x264opts', 'nal-hrd=cbr:no-scenecut',
     '-b:v', '2500k',
     '-maxrate', '2500k',
     '-bufsize', '5000k',
     '-f', 'hls',
-    '-hls_time', '2',             // 2-second segments for better buffering
-    '-hls_list_size', '10',       // Keep more segments in playlist for slower clients
+    '-hls_time', '1',             // 1-second segments for faster startup
+    '-hls_list_size', '3',        // Minimal segments for faster startup
     '-hls_flags', 'omit_endlist+program_date_time+independent_segments',
     '-hls_segment_type', 'mpegts',
     '-hls_start_number_source', 'epoch',
diff --git a/src/pageLoader.js b/src/pageLoader.js
index 1f3812b..b3e1044 100644
--- a/src/pageLoader.js
+++ b/src/pageLoader.js
@@ -34,12 +34,9 @@ async function setupPage(browser, { width, height }) {
  */
 async function waitForPageFullyLoaded(page, url) {
   try {
-    // Wait for DOM content and stylesheet to load
+    // Wait for DOM content to load - no artificial delay, stream starts immediately
     await page.goto(url, { waitUntil: 'domcontentloaded', timeout: 30000 });
     
-    // Wait a brief moment for stylesheet to apply
-    await new Promise(resolve => setTimeout(resolve, 500));
-    
     return true;
   } catch (err) {
     console.error('Page load error:', err.message);
diff --git a/src/streamHandler.js b/src/streamHandler.js
index e534b5f..f238bf5 100644
--- a/src/streamHandler.js
+++ b/src/streamHandler.js
@@ -427,17 +427,24 @@ async function streamHandler(req, res, { useMusic = false, musicPath, lateGeocod
         } catch (err) {}
         ffmpegProcess.kill('SIGTERM');
         
+        // Wait for FFmpeg to terminate before cleaning up playlist
+        const currentProcess = ffmpegProcess;
+        const currentPlaylistFile = playlistFile;
         setTimeout(() => {
-          if (ffmpegProcess && !ffmpegProcess.killed) {
-            ffmpegProcess.kill('SIGKILL');
+          if (currentProcess && !currentProcess.killed) {
+            currentProcess.kill('SIGKILL');
+          }
+          // Clean up per-stream playlist file after FFmpeg is terminated
+          if (currentPlaylistFile) {
+            try {
+              fs.unlinkSync(currentPlaylistFile);
+            } catch (err) {}
           }
         }, 5000);
         
         ffmpegProcess = null;
-      }
-      
-      // Clean up per-stream playlist file (rotated copy, not the shared one)
-      if (playlistFile) {
+      } else if (playlistFile) {
+        // FFmpeg already dead, safe to delete immediately
         try {
           fs.unlinkSync(playlistFile);
         } catch (err) {}