fix: recover community access visibility (#2074)

Signed-off-by: Kalvin Chau <kalvin@block.xyz>
Co-authored-by: npub1dccv64krpcpse5cmkzfeh998cftungyatw3djt8jwdw6g43f7fyqzzmrf7 <6e30cd56c30e030cd31bb0939b94a7c257c9a09d5ba2d92cf2735da45629f248@sprout-oss.stage.blox.sqprod.co>
This commit is contained in:
Kalvin C
2026-07-18 12:01:03 -07:00
committed by GitHub
parent 3afc518c70
commit ca384d082d
13 changed files with 477 additions and 46 deletions

View File

@@ -0,0 +1,71 @@
import assert from "node:assert/strict";
import test from "node:test";
import { handleRelayClosed } from "./relayClosedRecovery.ts";
test("production CLOSED handler rejects history once and clears its timeout", () => {
const originalWindow = globalThis.window;
const clearedTimeouts = [];
globalThis.window = {
clearTimeout: (timeout) => clearedTimeouts.push(timeout),
};
try {
const errors = [];
const subscriptions = new Map([
[
"history-1",
{
mode: "history",
events: [],
resolve: () => assert.fail("CLOSED must not resolve history"),
reject: (error) => errors.push(error),
timeout: 42,
},
],
]);
const input = {
subscriptions,
subId: "history-1",
sendReq: () => Promise.resolve(),
};
handleRelayClosed({
...input,
message: "rate-limited: too many concurrent requests",
});
handleRelayClosed({ ...input, message: "late CLOSED" });
assert.equal(subscriptions.has("history-1"), false);
assert.deepEqual(clearedTimeouts, [42]);
assert.equal(errors.length, 1);
assert.equal(
errors[0].message,
"rate-limited: too many concurrent requests",
);
} finally {
globalThis.window = originalWindow;
}
});
test("production CLOSED handler removes terminal live subscriptions", () => {
let readyCalls = 0;
const subscriptions = new Map([
[
"live-1",
{
mode: "live",
filter: { kinds: [9], limit: 50 },
onEvent: () => {},
resolveReady: () => {
readyCalls += 1;
},
},
],
]);
handleRelayClosed({
subscriptions,
subId: "live-1",
message: "restricted: access revoked",
sendReq: () => Promise.resolve(),
});
assert.equal(subscriptions.has("live-1"), false);
assert.equal(readyCalls, 1);
});

View File

@@ -0,0 +1,37 @@
import assert from "node:assert/strict";
import test from "node:test";
import { shouldWarnMissingMembershipSnapshot } from "./relayMembers.ts";
test("missing snapshot warns when the relay requires membership", () => {
assert.equal(
shouldWarnMissingMembershipSnapshot({
snapshotFound: false,
membershipRequired: true,
membership: null,
}),
true,
);
});
test("missing snapshot is normal on an open relay", () => {
assert.equal(
shouldWarnMissingMembershipSnapshot({
snapshotFound: false,
membershipRequired: false,
membership: null,
}),
false,
);
});
test("an available snapshot never warns", () => {
assert.equal(
shouldWarnMissingMembershipSnapshot({
snapshotFound: true,
membershipRequired: true,
membership: null,
}),
false,
);
});

View File

@@ -1,5 +1,5 @@
import { relayClient } from "@/shared/api/relayClient";
import { signRelayEvent } from "@/shared/api/tauri";
import { getRelayHttpUrl, signRelayEvent } from "@/shared/api/tauri";
import { getIdentity } from "@/shared/api/tauriIdentity";
import type {
RelayEvent,
@@ -34,9 +34,16 @@ export type RelayMembershipLookup = {
* be treated as a denial by onboarding.
*/
snapshotFound: boolean;
membershipRequired: boolean;
membership: RelayMember | null;
};
export function shouldWarnMissingMembershipSnapshot(
lookup: RelayMembershipLookup | undefined,
): boolean {
return lookup?.membershipRequired === true && !lookup.snapshotFound;
}
export function relayMembersFromEvent(event: RelayEvent): RelayMember[] {
const seen = new Set<string>();
const members: RelayMember[] = [];
@@ -68,14 +75,20 @@ export function relayMembersFromEvent(event: RelayEvent): RelayMember[] {
export function relayMembershipLookupFromEvent(
event: RelayEvent | null,
pubkey: string,
membershipRequired = event !== null,
): RelayMembershipLookup {
if (!event) {
return { snapshotFound: false, membership: null };
return {
snapshotFound: false,
membershipRequired,
membership: null,
};
}
const normalizedPubkey = normalizePubkey(pubkey);
return {
snapshotFound: true,
membershipRequired,
membership:
relayMembersFromEvent(event).find(
(member) => normalizePubkey(member.pubkey) === normalizedPubkey,
@@ -97,12 +110,29 @@ export async function listRelayMembers(): Promise<RelayMember[]> {
return event ? relayMembersFromEvent(event) : [];
}
async function relayRequiresMembership(): Promise<boolean> {
const base = (await getRelayHttpUrl()).replace(/\/+$/, "");
const response = await fetch(`${base}/info`, {
headers: { Accept: "application/nostr+json" },
});
if (!response.ok) {
throw new Error(`Relay information request failed (${response.status}).`);
}
const info = (await response.json()) as { supported_nips?: unknown };
return (
Array.isArray(info.supported_nips) &&
info.supported_nips.some((nip) => nip === 43)
);
}
export async function getMyRelayMembershipLookup(): Promise<RelayMembershipLookup> {
const [{ pubkey }, event] = await Promise.all([
getIdentity(),
fetchMembershipListEvent(),
]);
return relayMembershipLookupFromEvent(event, pubkey);
const membershipRequired =
event !== null || (await relayRequiresMembership());
return relayMembershipLookupFromEvent(event, pubkey, membershipRequired);
}
export async function getMyRelayMembership(): Promise<RelayMember | null> {