Compare commits

...

6 Commits

5 changed files with 84 additions and 124 deletions

View File

@@ -556,9 +556,8 @@ import { initPostCards } from './js/post-interactions2.mjs';
const now = Math.floor(Date.now() / 1000);
const since = newestKnown > 0 ? Math.max(0, newestKnown - 30) : (now - 3600);
// Fire-and-forget: NDK.subscribe already calls trackUsers internally,
// but doing it explicitly avoids relying on internal timing.
void warmOutbox(authors).catch(() => {});
// NDK.subscribe already calls outboxTracker.trackUsers internally,
// so no explicit warmOutbox call is needed here.
subscribe(
{ kinds: [1], authors, since },
@@ -594,11 +593,8 @@ import { initPostCards } from './js/post-interactions2.mjs';
}
if (newAuthors.length > 0) {
try {
await warmOutbox(newAuthors);
} catch (e) {
console.warn('[feed.html] warmOutbox for new authors failed (non-blocking):', e?.message || e);
}
// NDK's fetchEvents/subscribe already calls outboxTracker.trackUsers
// internally for author-based filters, so no explicit warmOutbox needed.
try {
await fetchFeedWindow(newAuthors, { limit: INITIAL_POSTS_LOAD });
renderFeed();

View File

@@ -1038,7 +1038,7 @@ export async function getRelayData() {
pendingRequests.set(requestId, { resolve, reject });
// Set timeout
// Set timeout (15s — worker may be busy processing outbox/NDK events)
setTimeout(() => {
if (pendingRequests.has(requestId)) {
pendingRequests.delete(requestId);
@@ -1046,7 +1046,7 @@ export async function getRelayData() {
console.warn('[init-ndk] Get relay data timeout, returning empty array');
resolve([]);
}
}, 5000);
}, 15000);
ndkWorker.port.postMessage({
type: 'getRelayData',
@@ -1071,7 +1071,7 @@ export async function getRelayStats() {
pendingRequests.set(requestId, { resolve, reject });
// Set timeout
// Set timeout (15s — worker may be busy processing outbox/NDK events)
setTimeout(() => {
if (pendingRequests.has(requestId)) {
pendingRequests.delete(requestId);
@@ -1079,7 +1079,7 @@ export async function getRelayStats() {
console.warn('[init-ndk] Get relay stats timeout, returning empty object');
resolve({});
}
}, 5000);
}, 15000);
ndkWorker.port.postMessage({
type: 'getRelayStats',

View File

@@ -1,5 +1,5 @@
{
"VERSION": "v0.7.44",
"VERSION_NUMBER": "0.7.44",
"BUILD_DATE": "2026-06-26T13:54:18.538Z"
"VERSION": "v0.7.50",
"VERSION_NUMBER": "0.7.50",
"BUILD_DATE": "2026-06-26T14:52:01.942Z"
}

View File

@@ -6464,59 +6464,34 @@ async function handleGetDiscoveredRelays(requestId, port) {
}
// Build relayUrl -> [pubkeys] map by inverting the outbox tracker.
// ndk.outboxTracker.data is an LRUCache (typescript-lru-cache).
// We try a few iteration strategies to be resilient to API differences.
// The typescript-lru-cache iteration API is broken (it yields millions
// of phantom keys from only a handful of real entries), so instead of
// iterating the LRU cache we query the NDK cache for the user's kind 3
// contact list and then look up each followed pubkey by key.
const relayServesPubkeys = new Map(); // normalizedUrl -> Set<pubkey>
try {
const trackerData = ndk?.outboxTracker?.data;
if (trackerData) {
const collectForPubkey = (pubkey) => {
try {
const outboxItem = trackerData.get(pubkey);
const writeRelays = outboxItem?.writeRelays;
if (!writeRelays) return;
for (const r of writeRelays) {
const rUrl = r?.url ? normalizeRelayUrl(r.url) : (typeof r === 'string' ? normalizeRelayUrl(r) : null);
if (!rUrl) continue;
if (!relayServesPubkeys.has(rUrl)) {
relayServesPubkeys.set(rUrl, new Set());
}
relayServesPubkeys.get(rUrl).add(pubkey);
}
} catch (_) {
// ignore per-pubkey errors
}
};
const kind3Events = await ndk.fetchEvents(
{ kinds: [3], authors: [currentPubkey], limit: 1 },
{ cacheUsage: 'ONLY_CACHE' }
);
const latestKind3 = kind3Events && kind3Events.size > 0
? Array.from(kind3Events).sort((a, b) => (b.created_at || 0) - (a.created_at || 0))[0]
: null;
const followedPubkeys = latestKind3 ? extractFollowedPubkeysFromKind3(latestKind3) : [];
// Strategy 1: standard Map-like entries()
let iterated = false;
for (const pubkey of followedPubkeys) {
try {
if (typeof trackerData.entries === 'function') {
for (const [pubkey] of trackerData.entries()) {
collectForPubkey(pubkey);
const outboxItem = ndk?.outboxTracker?.data?.get(pubkey);
if (!outboxItem?.writeRelays) continue;
for (const relayUrl of outboxItem.writeRelays) {
const normalized = normalizeRelayUrl(relayUrl);
if (!normalized) continue;
if (!relayServesPubkeys.has(normalized)) {
relayServesPubkeys.set(normalized, new Set());
}
iterated = true;
relayServesPubkeys.get(normalized).add(pubkey);
}
} catch (_) {}
// Strategy 2: keys() + get()
if (!iterated) {
try {
if (typeof trackerData.keys === 'function') {
for (const pubkey of trackerData.keys()) {
collectForPubkey(pubkey);
}
iterated = true;
}
} catch (_) {}
}
// Strategy 3: iterate as Map directly
if (!iterated && trackerData instanceof Map) {
for (const pubkey of trackerData.keys()) {
collectForPubkey(pubkey);
}
}
}
} catch (err) {
console.warn('[Worker] getDiscoveredRelays: outbox tracker inversion failed:', err?.message || err);
@@ -6822,7 +6797,7 @@ self.onconnect = (event) => {
connectedPorts.push(port);
port.onmessage = async (e) => {
port.onmessage = (e) => {
const {
type,
pubkey,
@@ -6864,11 +6839,11 @@ self.onconnect = (event) => {
switch(type) {
case 'init':
await handleInit(pubkey, port);
void handleInit(pubkey, port);
break;
case 'subscribe':
await handleSubscribe(subId, filters, opts, port);
void handleSubscribe(subId, filters, opts, port);
break;
case 'unsubscribe':
@@ -6876,35 +6851,38 @@ self.onconnect = (event) => {
break;
case 'publish':
await handlePublish(requestId, event, port);
void handlePublish(requestId, event, port);
break;
case 'publishRaw':
await handlePublishRaw(requestId, event, port);
void handlePublishRaw(requestId, event, port);
break;
case 'publishRawToRelay':
await handlePublishRawToRelay(requestId, event, relayUrl, port);
void handlePublishRawToRelay(requestId, event, relayUrl, port);
break;
case 'sendNip17Message':
await handleSendNip17Message(requestId, recipientPubkey, content, port);
void handleSendNip17Message(requestId, recipientPubkey, content, port);
break;
case 'fetchEvents':
await handleFetchEvents(requestId, filters, relayUrl, port);
void handleFetchEvents(requestId, filters, relayUrl, port);
break;
case 'ndkFetchEvents':
await handleNdkFetchEvents(requestId, filters, port);
void handleNdkFetchEvents(requestId, filters, port);
break;
case 'warmOutbox':
await handleWarmOutbox(requestId, pubkeys, port);
// Don't await — trackUsers involves network I/O to outbox pool
// relays and would block the entire message dispatch loop,
// starving getRelayData/getRelayStats messages.
void handleWarmOutbox(requestId, pubkeys, port);
break;
case 'setRelayEventLogging':
await handleSetRelayEventLogging(requestId, enabled, port);
void handleSetRelayEventLogging(requestId, enabled, port);
break;
case 'getDiscoveredRelays':
@@ -6940,109 +6918,101 @@ self.onconnect = (event) => {
break;
case 'queryCache':
await handleQueryCache(requestId, filters, port);
void handleQueryCache(requestId, filters, port);
break;
case 'purgePlaylistCache':
await handlePurgePlaylistCache(requestId, playlistIdentifier, ownerPubkey, playlistKind, eventIds, port);
void handlePurgePlaylistCache(requestId, playlistIdentifier, ownerPubkey, playlistKind, eventIds, port);
break;
case 'syncMuteList': {
try {
const result = await loadWorkerMuteList(currentPubkey, { reason: 'sync-request' });
port.postMessage({
type: 'response',
requestId,
data: { success: true, result }
case 'syncMuteList':
void loadWorkerMuteList(currentPubkey, { reason: 'sync-request' })
.then((result) => {
port.postMessage({ type: 'response', requestId, data: { success: true, result } });
})
.catch((error) => {
port.postMessage({ type: 'response', requestId, error: error?.message || String(error) });
});
} catch (error) {
port.postMessage({
type: 'response',
requestId,
error: error?.message || String(error)
});
}
break;
}
case 'fetchCachedProfile':
await handleFetchCachedProfile(requestId, e.data.pubkey, port);
void handleFetchCachedProfile(requestId, e.data.pubkey, port);
break;
case 'storeProfile':
await handleStoreProfile(e.data.pubkey, e.data.profile);
void handleStoreProfile(e.data.pubkey, e.data.profile);
break;
case 'getAllCachedProfiles':
await handleGetAllCachedProfiles(requestId, port);
void handleGetAllCachedProfiles(requestId, port);
break;
case 'getUserSettings':
await handleGetUserSettings(requestId, port);
void handleGetUserSettings(requestId, port);
break;
case 'patchUserSettings':
await handlePatchUserSettings(requestId, patch, options, port);
void handlePatchUserSettings(requestId, patch, options, port);
break;
case 'setUserSettings':
await handleSetUserSettings(requestId, settings, options, port);
void handleSetUserSettings(requestId, settings, options, port);
break;
case 'resetUserSettings':
await handleResetUserSettings(requestId, options, port);
void handleResetUserSettings(requestId, options, port);
break;
case 'encryptContent':
await handleEncryptContent(requestId, e.data.recipientPubkey, e.data.plaintext, e.data.scheme, port);
void handleEncryptContent(requestId, e.data.recipientPubkey, e.data.plaintext, e.data.scheme, port);
break;
case 'decryptContent':
await handleDecryptContent(requestId, e.data.senderPubkey, e.data.ciphertext, e.data.scheme, port);
void handleDecryptContent(requestId, e.data.senderPubkey, e.data.ciphertext, e.data.scheme, port);
break;
case 'walletPublishMintList':
await handleWalletPublishMintList(requestId, relays, receiveMints, port);
void handleWalletPublishMintList(requestId, relays, receiveMints, port);
break;
case 'walletFetchMintList':
await handleWalletFetchMintList(requestId, targetPubkey, port);
void handleWalletFetchMintList(requestId, targetPubkey, port);
break;
case 'walletInit':
await handleWalletInit(requestId, port);
void handleWalletInit(requestId, port);
break;
case 'walletStart':
await handleWalletStart(requestId, pubkey, port);
void handleWalletStart(requestId, pubkey, port);
break;
case 'walletCreate':
await handleWalletCreate(requestId, mints, relays, port);
void handleWalletCreate(requestId, mints, relays, port);
break;
case 'walletHasWallet':
await handleWalletHasWallet(requestId, port);
void handleWalletHasWallet(requestId, port);
break;
case 'walletGetBalance':
await handleWalletGetBalance(requestId, port);
void handleWalletGetBalance(requestId, port);
break;
case 'walletGetMints':
await handleWalletGetMints(requestId, port);
void handleWalletGetMints(requestId, port);
break;
case 'walletReceiveToken':
await handleWalletReceiveToken(requestId, token, description, port);
void handleWalletReceiveToken(requestId, token, description, port);
break;
case 'walletSendToken':
await handleWalletSendToken(requestId, amount, memo, mint, port);
void handleWalletSendToken(requestId, amount, memo, mint, port);
break;
case 'walletSendNutzap':
await handleWalletSendNutzap(
void handleWalletSendNutzap(
requestId,
amount,
memo,
@@ -7057,23 +7027,23 @@ self.onconnect = (event) => {
break;
case 'walletCreateDeposit':
await handleWalletCreateDeposit(requestId, amount, mint, port);
void handleWalletCreateDeposit(requestId, amount, mint, port);
break;
case 'walletPayInvoice':
await handleWalletPayInvoice(requestId, invoice, mint, port);
void handleWalletPayInvoice(requestId, invoice, mint, port);
break;
case 'walletAddMint':
await handleWalletAddMint(requestId, mintUrl, port);
void handleWalletAddMint(requestId, mintUrl, port);
break;
case 'walletRemoveMint':
await handleWalletRemoveMint(requestId, mintUrl, port);
void handleWalletRemoveMint(requestId, mintUrl, port);
break;
case 'walletGetTransactions':
await handleWalletGetTransactions(requestId, port);
void handleWalletGetTransactions(requestId, port);
break;
case 'walletShutdown':
@@ -7081,11 +7051,11 @@ self.onconnect = (event) => {
break;
case 'walletCheckProofs':
await handleWalletCheckProofs(requestId, port);
void handleWalletCheckProofs(requestId, port);
break;
case 'walletRepublish':
await handleWalletRepublish(requestId, port);
void handleWalletRepublish(requestId, port);
break;
default:

View File

@@ -1586,14 +1586,8 @@ const versionInfo = await getVersion();
// Refresh relay table every 5 seconds
setInterval(refreshRelayData, 5000);
// Refresh discovered relays (outbox) on a slower 15s interval,
// and only when the section is expanded, to avoid blocking the
// worker's message queue with LRU cache iteration on every 5s cycle.
setInterval(() => {
if (discoveredRelaysExpanded) {
void refreshDiscoveredRelays();
}
}, 15000);
// Discovered relays are fetched only on manual expand click — no
// auto-refresh interval, to avoid blocking the worker's message queue.
// Sync connection history toggle state from localStorage
connectionHistoryEnabled = localStorage.getItem('relayConnectionHistory') === 'true';