highperfocused/nostrudel
1
0
Fork 0
mirror of https://github.com/hzrd149/nostrudel.git synced 2025-09-21 14:09:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

use relay pool connections in event console

Browse Source
This commit is contained in:
hzrd149
2024-06-03 08:56:18 -05:00
parent 421f27d19b
commit 733ba9380a
2 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/services/relay-pool.ts
View File

@@ -7,7 +7,7 @@ setInterval(() => {
if (document.visibilityState === "visible") { if (document.visibilityState === "visible") {
relayPoolService.disconnectFromUnused(); relayPoolService.disconnectFromUnused();
} }
}, 30_000); }, 60_000);
offlineMode.subscribe((offline) => { offlineMode.subscribe((offline) => {
if (offline) { if (offline) {

32
src/views/tools/event-console/index.tsx
View File

@@ -15,9 +15,9 @@ import {
Text, Text,
useDisclosure, useDisclosure,
} from "@chakra-ui/react"; } from "@chakra-ui/react";
import { AbstractRelay, NostrEvent, Relay, Subscription } from "nostr-tools"; import { AbstractRelay, NostrEvent, Subscription } from "nostr-tools";
import { useLocalStorage } from "react-use"; import { useLocalStorage } from "react-use";
import { Subscription as IDBSubscription, CacheRelay } from "nostr-idb"; import { Subscription as IDBSubscription } from "nostr-idb";
import _throttle from "lodash.throttle"; import _throttle from "lodash.throttle";
import stringify from "json-stringify-deterministic"; import stringify from "json-stringify-deterministic";
import { useSearchParams } from "react-router-dom"; import { useSearchParams } from "react-router-dom";
@@ -37,7 +37,7 @@ import { RelayUrlInput } from "../../../components/relay-url-input";
import { validateRelayURL } from "../../../helpers/relay"; import { validateRelayURL } from "../../../helpers/relay";
import FilterEditor from "./filter-editor"; import FilterEditor from "./filter-editor";
import { safeJson } from "../../../helpers/parse"; import { safeJson } from "../../../helpers/parse";
import WasmRelay from "../../../services/wasm-relay"; import relayPoolService from "../../../services/relay-pool";
const EventTimeline = memo(({ events }: { events: NostrEvent[] }) => { const EventTimeline = memo(({ events }: { events: NostrEvent[] }) => {
return ( return (
@@ -56,7 +56,7 @@ export default function EventConsoleView() {
const helpModal = useDisclosure(); const helpModal = useDisclosure();
const queryRelay = useDisclosure({ defaultIsOpen: params.has("relay") }); const queryRelay = useDisclosure({ defaultIsOpen: params.has("relay") });
const [relayURL, setRelayURL] = useState(params.get("relay") || ""); const [relayURL, setRelayURL] = useState(params.get("relay") || "");
const [relay, setRelay] = useState<Relay | null>(null); const [relay, setRelay] = useState<AbstractRelay | null>(null);
const [sub, setSub] = useState<Subscription | IDBSubscription | null>(null); const [sub, setSub] = useState<Subscription | IDBSubscription | null>(null);
@@ -91,22 +91,20 @@ export default function EventConsoleView() {
if (queryRelay.isOpen) { if (queryRelay.isOpen) {
const url = validateRelayURL(relayURL); const url = validateRelayURL(relayURL);
if (!relay || relay.url !== url.toString()) { if (!relay || relay.url !== url.toString()) {
if (relay) relay.close(); r = await relayPoolService.requestRelay(url);
r = new Relay(url.toString()); await relayPoolService.requestConnect(r);
await r.connect();
setRelay(r); setRelay(r);
} else r = relay; } else r = relay;
} else { } else {
if (relay) { if (relay) setRelay(null);
relay.close();
setRelay(null);
}
} }
await new Promise<void>((res) => { await new Promise<void>((res) => {
let buffer: NostrEvent[] = []; let buffer: NostrEvent[] = [];
const flush = _throttle(() => setEvents([...buffer]), 1000 / 10, { trailing: true }); const flush = _throttle(() => setEvents([...buffer]), 1000 / 10, { trailing: true });
setError("");
const s = r.subscribe([filter], { const s = r.subscribe([filter], {
onevent: (e) => { onevent: (e) => {
buffer.push(e); buffer.push(e);
@@ -116,6 +114,9 @@ export default function EventConsoleView() {
setEvents([...buffer]); setEvents([...buffer]);
res(); res();
}, },
onclose: (reason) => {
if (!buffer.length) setError(reason);
},
}); });
setSub(s); setSub(s);
}); });
@@ -188,7 +189,14 @@ export default function EventConsoleView() {
<AlertTitle>Error</AlertTitle> <AlertTitle>Error</AlertTitle>
<AlertDescription whiteSpace="pre">{error}</AlertDescription> <AlertDescription whiteSpace="pre">{error}</AlertDescription>
</Box> </Box>
<CloseButton alignSelf="flex-start" position="relative" right={-1} top={-1} onClick={() => setError("")} /> <CloseButton
alignSelf="flex-start"
position="relative"
right={-1}
top={-1}
onClick={() => setError("")}
ml="auto"
/>
</Alert> </Alert>
)} )}