|
|
|
|
@@ -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 ` +
|
|
|
|
|
@@ -6230,11 +6233,16 @@ async function handlePublish(requestId, event, port) {
|
|
|
|
|
latestRelay: null,
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
// Debug: track publish start time for timing analysis
|
|
|
|
|
const publishStartTime = Date.now();
|
|
|
|
|
|
|
|
|
|
ndkEvent.on('relay:published', (relay) => {
|
|
|
|
|
const url = relay?.url || String(relay || '');
|
|
|
|
|
if (!url) return;
|
|
|
|
|
const elapsed = ((Date.now() - publishStartTime) / 1000).toFixed(1);
|
|
|
|
|
publishedSoFar.add(url);
|
|
|
|
|
trackRelayWrite(url);
|
|
|
|
|
console.log(`[Worker][broadcast] ✅ ${url} published (${elapsed}s) — batch ${currentBatch}/${totalBatches}, ${publishedSoFar.size}/${totalTarget} total`);
|
|
|
|
|
broadcast({
|
|
|
|
|
type: 'broadcastProgress',
|
|
|
|
|
sessionId: publishSessionId,
|
|
|
|
|
@@ -6243,6 +6251,8 @@ async function handlePublish(requestId, event, port) {
|
|
|
|
|
successful: publishedSoFar.size,
|
|
|
|
|
failed: failedSoFar.size + timedOutSoFar.size,
|
|
|
|
|
latestRelay: url,
|
|
|
|
|
batchCurrent: currentBatch,
|
|
|
|
|
batchTotal: totalBatches,
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
@@ -6250,11 +6260,14 @@ async function handlePublish(requestId, event, port) {
|
|
|
|
|
const url = relay?.url || String(relay || '');
|
|
|
|
|
if (!url) return;
|
|
|
|
|
const errMsg = err?.message || String(err) || '';
|
|
|
|
|
const elapsed = ((Date.now() - publishStartTime) / 1000).toFixed(1);
|
|
|
|
|
const isTimeout = /timeout/i.test(errMsg);
|
|
|
|
|
if (isTimeout) {
|
|
|
|
|
timedOutSoFar.add(url);
|
|
|
|
|
console.log(`[Worker][broadcast] ⏱️ ${url} TIMEOUT (${elapsed}s) — batch ${currentBatch}/${totalBatches}`);
|
|
|
|
|
} else {
|
|
|
|
|
failedSoFar.add(url);
|
|
|
|
|
console.log(`[Worker][broadcast] ❌ ${url} REJECTED (${elapsed}s): ${errMsg} — batch ${currentBatch}/${totalBatches}`);
|
|
|
|
|
}
|
|
|
|
|
broadcast({
|
|
|
|
|
type: 'broadcastProgress',
|
|
|
|
|
@@ -6265,6 +6278,8 @@ async function handlePublish(requestId, event, port) {
|
|
|
|
|
failed: failedSoFar.size + timedOutSoFar.size,
|
|
|
|
|
latestRelay: url,
|
|
|
|
|
latestError: errMsg,
|
|
|
|
|
batchCurrent: currentBatch,
|
|
|
|
|
batchTotal: totalBatches,
|
|
|
|
|
});
|
|
|
|
|
});
|
|
|
|
|
}
|
|
|
|
|
@@ -6322,7 +6337,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,7 +6354,10 @@ 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 batchStartTime = Date.now();
|
|
|
|
|
console.log(`[Worker][broadcast] Batch ${bi + 1}/${totalBatches} starting — ${batch.length} relays: ${batch.slice(0, 5).join(', ')}${batch.length > 5 ? '...' : ''}`);
|
|
|
|
|
const batchSet = NDKRelaySet.fromRelayUrls(batch, ndk);
|
|
|
|
|
if (batchSet?.relays) {
|
|
|
|
|
for (const relay of batchSet.relays) {
|
|
|
|
|
@@ -6355,6 +6373,19 @@ async function handlePublish(requestId, event, port) {
|
|
|
|
|
} catch (batchErr) {
|
|
|
|
|
// Expected — some relays in this batch may fail.
|
|
|
|
|
}
|
|
|
|
|
// --- Detect silent failures ---
|
|
|
|
|
// NDK's relay.publish() can resolve false without emitting
|
|
|
|
|
// relay:publish:failed (e.g., DNS errors, connection refused,
|
|
|
|
|
// HTTP handshake failures). These relays are not in any of
|
|
|
|
|
// our tracked sets. Mark them as timed out so they get
|
|
|
|
|
// skip-marked and don't waste time on the next publish.
|
|
|
|
|
for (const url of batch) {
|
|
|
|
|
if (!publishedSoFar.has(url) && !failedSoFar.has(url) && !timedOutSoFar.has(url)) {
|
|
|
|
|
timedOutSoFar.add(url);
|
|
|
|
|
const elapsed = ((Date.now() - publishStartTime) / 1000).toFixed(1);
|
|
|
|
|
console.log(`[Worker][broadcast] ⏱️ ${url} SILENT TIMEOUT (${elapsed}s) — batch ${currentBatch}/${totalBatches} (no response, likely connection failure)`);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Emit a progress event with batch info after each batch.
|
|
|
|
|
broadcast({
|
|
|
|
|
type: 'broadcastProgress',
|
|
|
|
|
@@ -6367,7 +6398,8 @@ async function handlePublish(requestId, event, port) {
|
|
|
|
|
batchCurrent: bi + 1,
|
|
|
|
|
batchTotal: totalBatches,
|
|
|
|
|
});
|
|
|
|
|
console.log(`[Worker] Batch ${bi + 1}/${totalBatches} complete — ` +
|
|
|
|
|
const batchElapsed = ((Date.now() - batchStartTime) / 1000).toFixed(1);
|
|
|
|
|
console.log(`[Worker] Batch ${bi + 1}/${totalBatches} complete (${batchElapsed}s) — ` +
|
|
|
|
|
`${publishedSoFar.size}/${totalTarget} total succeeded, ` +
|
|
|
|
|
`${failedSoFar.size + timedOutSoFar.size} failed/timeout so far`);
|
|
|
|
|
}
|
|
|
|
|
|