Fix batch info in footer: include batchCurrent/batchTotal in per-relay progress events, set currentBatch before each batch starts

www/js/version.json

@@ -1,5 +1,5 @@
 {
-  "VERSION": "v0.7.79",
-  "VERSION_NUMBER": "0.7.79",
-  "BUILD_DATE": "2026-06-30T14:36:42.724Z"
+  "VERSION": "v0.7.81",
+  "VERSION_NUMBER": "0.7.81",
+  "BUILD_DATE": "2026-06-30T14:55:04.841Z"
 }

www/ndk-worker.js

@@ -6210,8 +6210,11 @@ async function handlePublish(requestId, event, port) {
         const publishSessionId = `pub_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
         const publishedSoFar = new Set();
         const failedSoFar = new Set();       // explicit rejections (auth-required, blocked, etc.)
-        const timedOutSoFar = new Set();     // timeouts — NOT skip-marked (could be slow connect)
+        const timedOutSoFar = new Set();     // timeouts
         const totalTarget = isBroadcast ? allBroadcastUrls.length : 0;
+        // Track current batch for progress display. Updated by the batch loop.
+        let currentBatch = 0;
+        let totalBatches = 0;
 
         if (isBroadcast && totalTarget > 0) {
             console.log(`[Worker] Broadcasting to ${allBroadcastUrls.length} relays ` +
@@ -6243,6 +6246,8 @@ async function handlePublish(requestId, event, port) {
                     successful: publishedSoFar.size,
                     failed: failedSoFar.size + timedOutSoFar.size,
                     latestRelay: url,
+                    batchCurrent: currentBatch,
+                    batchTotal: totalBatches,
                 });
             });
 
@@ -6265,6 +6270,8 @@ async function handlePublish(requestId, event, port) {
                     failed: failedSoFar.size + timedOutSoFar.size,
                     latestRelay: url,
                     latestError: errMsg,
+                    batchCurrent: currentBatch,
+                    batchTotal: totalBatches,
                 });
             });
         }
@@ -6322,7 +6329,7 @@ async function handlePublish(requestId, event, port) {
                 for (let i = 0; i < broadcastOnlyUrls.length; i += BATCH_SIZE) {
                     batches.push(broadcastOnlyUrls.slice(i, i + BATCH_SIZE));
                 }
-                const totalBatches = batches.length;
+                totalBatches = batches.length;
                 console.log(`[Worker] Phase 2: Broadcasting to ${broadcastOnlyUrls.length} relays in ${totalBatches} batches of ${BATCH_SIZE}`);
 
                 // Emit a progress event showing batch info before starting batches.
@@ -6339,6 +6346,7 @@ async function handlePublish(requestId, event, port) {
                 });
 
                 for (let bi = 0; bi < batches.length; bi++) {
+                    currentBatch = bi + 1; // update before publish so per-relay events include it
                     const batch = batches[bi];
                     const batchSet = NDKRelaySet.fromRelayUrls(batch, ndk);
                     if (batchSet?.relays) {
@@ -6393,18 +6401,25 @@ async function handlePublish(requestId, event, port) {
             } catch (_cleanupErr) { /* ignore */ }
 
             // --- Failure marking (background, after all batches) ---
-            const newSkips = Array.from(failedSoFar)
+            // Skip-mark both explicit rejections AND timeouts. A relay that
+            // times out is either down, too slow, or unreachable — skip it
+            // next time to avoid wasting time on it.
+            const allFailed = [...Array.from(failedSoFar), ...Array.from(timedOutSoFar)];
+            const newSkips = allFailed
                 .filter(url => broadcastRelayUrls.has(url) && !skippedRelayUrls.has(url));
             if (newSkips.length > 0) {
                 for (const url of newSkips) {
+                    const isTimeout = timedOutSoFar.has(url);
                     skippedRelayUrls.set(url, {
-                        reason: 'publish-rejected',
+                        reason: isTimeout ? 'publish-timeout' : 'publish-rejected',
                         timestamp: Math.floor(Date.now() / 1000),
                     });
                 }
                 scheduleSkipMarkSave();
-                console.log(`[Worker] Skip-marked ${newSkips.length} rejected broadcast relays ` +
-                    `(${timedOutSoFar.size} timeouts excluded)`);
+                const timeoutCount = newSkips.filter(u => timedOutSoFar.has(u)).length;
+                const rejectCount = newSkips.length - timeoutCount;
+                console.log(`[Worker] Skip-marked ${newSkips.length} failed broadcast relays ` +
+                    `(${rejectCount} rejected, ${timeoutCount} timed out)`);
             }
 
             // Return early — we already sent the response above. The rest of
@@ -6480,27 +6495,25 @@ async function handlePublish(requestId, event, port) {
         console.log('[Worker] ❌ Failed relays:', relayResults.failed.length);
 
         // --- Failure marking for broadcast relays ---------------------------------
-        // Persist skip-marks ONLY for broadcast relays that EXPLICITLY rejected
-        // the publish (auth-required, blocked, invalid, etc.). We do NOT skip-mark
-        // relays that timed out — with hundreds of relays, a timeout often means
-        // the relay was slow to connect, not that it's broken. The relay:publish:failed
-        // listener above separates timeouts (timedOutSoFar) from explicit rejections
-        // (failedSoFar) by checking the error message for "timeout".
+        // Skip-mark both explicit rejections AND timeouts. A relay that times
+        // out is either down, too slow, or unreachable — skip it next time.
         if (isBroadcast) {
-            const newSkips = Array.from(failedSoFar)
+            const allFailed = [...Array.from(failedSoFar), ...Array.from(timedOutSoFar)];
+            const newSkips = allFailed
                 .filter(url => broadcastRelayUrls.has(url) && !skippedRelayUrls.has(url));
             if (newSkips.length > 0) {
                 for (const url of newSkips) {
+                    const isTimeout = timedOutSoFar.has(url);
                     skippedRelayUrls.set(url, {
-                        reason: 'publish-rejected',
+                        reason: isTimeout ? 'publish-timeout' : 'publish-rejected',
                         timestamp: Math.floor(Date.now() / 1000),
                     });
                 }
                 scheduleSkipMarkSave();
-                console.log(`[Worker] Skip-marked ${newSkips.length} rejected broadcast relays ` +
-                    `(${timedOutSoFar.size} timeouts excluded from skip-marking)`);
-            } else if (timedOutSoFar.size > 0) {
-                console.log(`[Worker] ${timedOutSoFar.size} broadcast relays timed out (not skip-marked — will retry next publish)`);
+                const timeoutCount2 = newSkips.filter(u => timedOutSoFar.has(u)).length;
+                const rejectCount2 = newSkips.length - timeoutCount2;
+                console.log(`[Worker] Skip-marked ${newSkips.length} failed broadcast relays ` +
+                    `(${rejectCount2} rejected, ${timeoutCount2} timed out)`);
             }
         }