From 00e385cdbea66202e7e78b188b6afabad57a450a Mon Sep 17 00:00:00 2001
From: zefie <zefie@zefie.net>
Date: Mon, 4 May 2026 08:38:22 -0400
Subject: [PATCH] various fixups, allow FTP max size config

---
 .../ServiceVault/wtv-author/documents.js      |  6 ++--
 .../ServiceVault/wtv-flashrom/get-lc2-page.js |  4 ++-
 zefie_wtvp_minisrv/includes/classes/WTVFTP.js |  2 +-
 zefie_wtvp_minisrv/includes/config.json       |  1 +
 zefie_wtvp_minisrv/tools/encode_webtv_mpeg.js | 30 ++++++-------------
 5 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/documents.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/documents.js
index f18fc4f6..0a5a758a 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/documents.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-author/documents.js
@@ -197,10 +197,12 @@ if (minisrv_config.services["wtv-author"].max_pages) {
 </table>
 <p>A maximum of <b>${minisrv_config.services["wtv-author"].max_pages}</b> pages can be created, regardless of publish status.
 <br><br>
-Your published pages are available at<br>
+`
+if (numofpages > 0) {
+`Your published pages are available at<br>
 <a href="http://${site}/${session_data.getSessionData("subscriber_username")}/">http://${site}/${session_data.getSessionData("subscriber_username")}/</a>
 </table>`
-
+}
 }
 data += `
 <SCRIPT language=JavaScript>
diff --git a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js
index 1c06fea3..616e3c56 100644
--- a/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js
+++ b/zefie_wtvp_minisrv/includes/ServiceVault/wtv-flashrom/get-lc2-page.js
@@ -72,6 +72,8 @@ async function processLC2DownloadPage(flashrom_info, headers, numparts = null) {
 			downloadTime = elapsedMinutes * remainingParts;
 		}
 		session.lastDownloadTime = now;
+
+		if (isNaN(downloadTime) || downloadTime < 1) downloadTime = 1;
 		
 
 		headers = `200 OK
@@ -127,7 +129,7 @@ Updating now
 <font size=+1>
 Your ${session_data.getBoxName()} is being<br>updated automatically.
 <p> <font size=+1>
-This will take about ${downloadTime} minutes and<br>then you can use your ${session_data.getBoxName()} again.
+This will take about ${downloadTime} minute${downloadTime !== 1 ? "s" : ""} and<br>then you can use your ${session_data.getBoxName()} again.
 `;
 		if (flashrom_info.is_bootrom && flashrom_info.part_number === (flashrom_info.part_count - 1)) {
 			data += `<p>
diff --git a/zefie_wtvp_minisrv/includes/classes/WTVFTP.js b/zefie_wtvp_minisrv/includes/classes/WTVFTP.js
index 8c5b5823..0efaa49b 100644
--- a/zefie_wtvp_minisrv/includes/classes/WTVFTP.js
+++ b/zefie_wtvp_minisrv/includes/classes/WTVFTP.js
@@ -70,7 +70,7 @@ class WTVFTP {
                         stream.on('data', (chunk) => {
                             chunks.push(chunk);
                             totalsize += chunk.length;
-                            if (totalsize > 1024 * 1024 * 4) {
+                            if (totalsize > 1024 * 1024 * this.minisrv_config.services[this.service_name].max_response_size) {
                                 this.sendToClient(socket, { 'Status': '413 The item chosen contains too much information to be used.', 'Content-Type': 'text/plain' }, 'Item too large');
                                 ftpClient.end();
                                 return;
diff --git a/zefie_wtvp_minisrv/includes/config.json b/zefie_wtvp_minisrv/includes/config.json
index 1dee62f1..691b13b9 100644
--- a/zefie_wtvp_minisrv/includes/config.json
+++ b/zefie_wtvp_minisrv/includes/config.json
@@ -351,6 +351,7 @@
     "ftp": {
       "port": 1650,
       "connections": 3,
+      "max_response_size": 8, // Megabytes      
       "handler_module": "WTVFTP",
       "handler_extra_vars": ["wtvmime"]
     },
diff --git a/zefie_wtvp_minisrv/tools/encode_webtv_mpeg.js b/zefie_wtvp_minisrv/tools/encode_webtv_mpeg.js
index 410fc606..26efcd7e 100644
--- a/zefie_wtvp_minisrv/tools/encode_webtv_mpeg.js
+++ b/zefie_wtvp_minisrv/tools/encode_webtv_mpeg.js
@@ -225,45 +225,33 @@ function buildWebTVPS(videoES, audioES, outputPath, audioIntervalOverride, baHea
         return false;
     }
 
-    // Match known-working WebTV cadence (attract.mpg is ~1 audio per 7 video packs)
-    const inferredInterval = Math.max(1, Math.round(vChunks.length / aChunks.length));
+    // Use natural A/V ratio — matches actual bitrate split in the encoded file.
+    // attract.mpg uses 7 because its video bitrate is ~7x its audio bitrate.
+    // Our encoded video is lower bitrate so the natural ratio is ~3.
+    const naturalInterval = Math.max(1, Math.round(vChunks.length / aChunks.length));
     const audioInterval = Number.isFinite(audioIntervalOverride) && audioIntervalOverride > 0
         ? Math.floor(audioIntervalOverride)
-        : Math.max(1, Math.round((inferredInterval + 7) / 2));
+        : naturalInterval;
     console.log(`[*] ${vChunks.length} video chunks, ${aChunks.length} audio chunks, ` +
                 `1 audio per ~${audioInterval} video`);
 
     const packs = [];
     let aIdx = 0;
 
-    // Pre-fill: 3 audio packs to prime the WebTV audio buffer
+    // Pre-fill: 3 audio packs to prime the WebTV audio buffer (matches attract.mpg)
     const preFill = Math.min(3, aChunks.length);
     for (let k = 0; k < preFill; k++, aIdx++) {
         packs.push(makePack(0xC0, aChunks[aIdx]));
     }
 
+    // Simple fixed-interval interleave: emit audioInterval video packs, then 1 audio pack
     let vIdx = 0;
-
-    // Spread audio over the full video timeline to avoid starving early playback
-    // and dumping remaining audio at EOF.
     while (vIdx < vChunks.length || aIdx < aChunks.length) {
-        if (vIdx >= vChunks.length) {
-            packs.push(makePack(0xC0, aChunks[aIdx++]));
-            continue;
-        }
-        if (aIdx >= aChunks.length) {
+        for (let k = 0; k < audioInterval && vIdx < vChunks.length; k++) {
             packs.push(makePack(0xE0, vChunks[vIdx++]));
-            continue;
         }
-
-        const videoProgress = vIdx / vChunks.length;
-        const audioProgress = aIdx / aChunks.length;
-
-        // Prefer video until audio falls behind target cadence.
-        if (audioProgress + (1 / Math.max(1, audioInterval * aChunks.length)) < videoProgress) {
+        if (aIdx < aChunks.length) {
             packs.push(makePack(0xC0, aChunks[aIdx++]));
-        } else {
-            packs.push(makePack(0xE0, vChunks[vIdx++]));
         }
     }