Browse Source

Merge remote-tracking branch 'origin/fix-merge' - preserving boss's improvements including NDK state sharing, code cleanup, and auth store refactoring

master
silberengel 7 months ago
parent
commit
14169961a5
  1. 40
      README.md
  2. 2187
      deno.lock
  3. 7
      playwright.config.ts
  4. 88
      src/app.css
  5. 4
      src/app.d.ts
  6. 10
      src/app.html
  7. 45
      src/lib/components/CommentViewer.svelte
  8. 100
      src/lib/components/ContentWithEmbeddedEvents.svelte
  9. 83
      src/lib/components/EmbeddedEventRenderer.svelte
  10. 475
      src/lib/components/EventDetails.svelte
  11. 22
      src/lib/components/EventInput.svelte
  12. 13
      src/lib/components/EventSearch.svelte
  13. 5
      src/lib/components/LoginModal.svelte
  14. 78
      src/lib/components/Notifications.svelte
  15. 22
      src/lib/components/RelayActions.svelte
  16. 9
      src/lib/components/RelayDisplay.svelte
  17. 8
      src/lib/components/RelayStatus.svelte
  18. 40
      src/lib/components/embedded_events/EmbeddedEvent.svelte
  19. 317
      src/lib/components/embedded_events/EmbeddedSnippets.svelte
  20. 7
      src/lib/components/publications/PublicationFeed.svelte
  21. 1
      src/lib/components/publications/PublicationSection.svelte
  22. 10
      src/lib/components/publications/table_of_contents.svelte.ts
  23. 7
      src/lib/components/util/Interactions.svelte
  24. 12
      src/lib/components/util/Profile.svelte
  25. 7
      src/lib/consts.ts
  26. 85
      src/lib/data_structures/docs/relay_selector_design.md
  27. 310
      src/lib/data_structures/publication_tree.ts
  28. 65
      src/lib/data_structures/websocket_pool.ts
  29. 2
      src/lib/navigator/EventNetwork/types.ts
  30. 2
      src/lib/navigator/EventNetwork/utils/common.ts
  31. 325
      src/lib/navigator/EventNetwork/utils/forceSimulation.ts
  32. 439
      src/lib/navigator/EventNetwork/utils/networkBuilder.ts
  33. 115
      src/lib/navigator/EventNetwork/utils/personNetworkBuilder.ts
  34. 83
      src/lib/navigator/EventNetwork/utils/starForceSimulation.ts
  35. 186
      src/lib/navigator/EventNetwork/utils/starNetworkBuilder.ts
  36. 29
      src/lib/navigator/EventNetwork/utils/tagNetworkBuilder.ts
  37. 331
      src/lib/ndk.ts
  38. 8
      src/lib/parser.ts
  39. 28
      src/lib/services/event_search_service.ts
  40. 65
      src/lib/services/publisher.ts
  41. 20
      src/lib/services/search_state_manager.ts
  42. 2
      src/lib/state.ts
  43. 11
      src/lib/stores/authStore.Svelte.ts
  44. 26
      src/lib/stores/networkStore.ts
  45. 643
      src/lib/stores/userStore.ts
  46. 43
      src/lib/stores/visualizationConfig.ts
  47. 24
      src/lib/utils.ts
  48. 10
      src/lib/utils/ZettelParser.ts
  49. 273
      src/lib/utils/asciidoc_metadata.ts
  50. 4
      src/lib/utils/community_checker.ts
  51. 59
      src/lib/utils/displayLimits.ts
  52. 103
      src/lib/utils/eventColors.ts
  53. 152
      src/lib/utils/eventDeduplication.ts
  54. 95
      src/lib/utils/event_input_utils.ts
  55. 71
      src/lib/utils/event_kind_utils.ts
  56. 96
      src/lib/utils/event_search.ts
  57. 12
      src/lib/utils/image_utils.ts
  58. 96
      src/lib/utils/kind24_utils.ts
  59. 58
      src/lib/utils/markup/MarkupInfo.md
  60. 3
      src/lib/utils/markup/advancedAsciidoctorPostProcessor.ts
  61. 44
      src/lib/utils/markup/advancedMarkupParser.ts
  62. 24
      src/lib/utils/markup/asciidoctorPostProcessor.ts
  63. 54
      src/lib/utils/markup/basicMarkupParser.ts
  64. 57
      src/lib/utils/markup/embeddedMarkupParser.ts
  65. 147
      src/lib/utils/markup/markupServices.ts
  66. 4
      src/lib/utils/markup/tikzRenderer.ts
  67. 2
      src/lib/utils/mime.ts
  68. 106
      src/lib/utils/network_detection.ts
  69. 47
      src/lib/utils/nostrEventService.ts
  70. 148
      src/lib/utils/nostrUtils.ts
  71. 40
      src/lib/utils/nostr_identifiers.ts
  72. 306
      src/lib/utils/notification_utils.ts
  73. 22
      src/lib/utils/npubCache.ts
  74. 81
      src/lib/utils/profileCache.ts
  75. 822
      src/lib/utils/profile_search.ts
  76. 7
      src/lib/utils/relayDiagnostics.ts
  77. 84
      src/lib/utils/relay_info_service.ts
  78. 380
      src/lib/utils/relay_management.ts
  79. 16
      src/lib/utils/search_result_formatter.ts
  80. 14
      src/lib/utils/search_utility.ts
  81. 800
      src/lib/utils/subscription_search.ts
  82. 126
      src/lib/utils/tag_event_fetch.ts
  83. 91
      src/lib/utils/websocket_utils.ts
  84. 29
      src/routes/+layout.svelte
  85. 139
      src/routes/+layout.ts
  86. 7
      src/routes/contact/+page.svelte
  87. 234
      src/routes/events/+page.svelte
  88. 6
      src/routes/my-notes/+page.svelte
  89. 10
      src/routes/new/edit/+page.svelte
  90. 5
      src/routes/proxy+layout.ts
  91. 6
      src/routes/publication/+page.server.ts
  92. 26
      src/routes/publication/[type]/[identifier]/+layout.server.ts
  93. 63
      src/routes/publication/[type]/[identifier]/+page.ts
  94. 25
      src/routes/visualize/+page.svelte
  95. 10
      src/routes/visualize/+page.ts
  96. 5
      src/styles/events.css
  97. 8
      src/styles/notifications.css
  98. 20
      src/styles/publications.css
  99. 6
      src/styles/scrollbar.css
  100. 28
      src/styles/visualize.css
  101. Some files were not shown because too many files have changed in this diff Show More

40
README.md

@ -3,19 +3,31 @@ @@ -3,19 +3,31 @@
# Alexandria
Alexandria is a reader and writer for curated publications, including e-books.
For a thorough introduction, please refer to our [project documention](https://next-alexandria.gitcitadel.eu/publication?d=gitcitadel-project-documentation-by-stella-v-1), viewable on Alexandria, or to the Alexandria [About page](https://next-alexandria.gitcitadel.eu/about).
For a thorough introduction, please refer to our
[project documention](https://next-alexandria.gitcitadel.eu/publication?d=gitcitadel-project-documentation-by-stella-v-1),
viewable on Alexandria, or to the Alexandria
[About page](https://next-alexandria.gitcitadel.eu/about).
It also contains a [universal event viewer](https://next-alexandria.gitcitadel.eu/events), with which you can search our relays, some aggregator relays, and your own relay list, to find and view event data.
It also contains a
[universal event viewer](https://next-alexandria.gitcitadel.eu/events), with
which you can search our relays, some aggregator relays, and your own relay
list, to find and view event data.
## Issues and Patches
If you would like to suggest a feature or report a bug, please use the [Alexandria Contact page](https://next-alexandria.gitcitadel.eu/contact).
If you would like to suggest a feature or report a bug, please use the
[Alexandria Contact page](https://next-alexandria.gitcitadel.eu/contact).
You can also contact us [on Nostr](https://next-alexandria.gitcitadel.eu/events?id=nprofile1qqsggm4l0xs23qfjwnkfwf6fqcs66s3lz637gaxhl4nwd2vtle8rnfqprfmhxue69uhhg6r9vehhyetnwshxummnw3erztnrdaks5zhueg), directly.
You can also contact us
[on Nostr](https://next-alexandria.gitcitadel.eu/events?id=nprofile1qqsggm4l0xs23qfjwnkfwf6fqcs66s3lz637gaxhl4nwd2vtle8rnfqprfmhxue69uhhg6r9vehhyetnwshxummnw3erztnrdaks5zhueg),
directly.
## Developing
Make sure that you have [Node.js](https://nodejs.org/en/download/package-manager) (v22 or above) or [Deno](https://docs.deno.com/runtime/getting_started/installation/) (v2) installed.
Make sure that you have
[Node.js](https://nodejs.org/en/download/package-manager) (v22 or above) or
[Deno](https://docs.deno.com/runtime/getting_started/installation/) (v2)
installed.
Once you've cloned this repo, install dependencies with NPM:
@ -43,7 +55,8 @@ deno task dev @@ -43,7 +55,8 @@ deno task dev
## Building
Alexandria is configured to run on a Node server. The [Node adapter](https://svelte.dev/docs/kit/adapter-node) works on Deno as well.
Alexandria is configured to run on a Node server. The
[Node adapter](https://svelte.dev/docs/kit/adapter-node) works on Deno as well.
To build a production version of your app with Node, use:
@ -71,7 +84,8 @@ deno task preview @@ -71,7 +84,8 @@ deno task preview
## Docker + Deno
This application is configured to use the Deno runtime. A Docker container is provided to handle builds and deployments.
This application is configured to use the Deno runtime. A Docker container is
provided to handle builds and deployments.
To build the app for local development:
@ -87,9 +101,11 @@ docker run -d -p 3000:3000 local-alexandria @@ -87,9 +101,11 @@ docker run -d -p 3000:3000 local-alexandria
## Testing
_These tests are under development, but will run. They will later be added to the container._
_These tests are under development, but will run. They will later be added to
the container._
To run the Vitest suite we've built, install the program locally and run the tests.
To run the Vitest suite we've built, install the program locally and run the
tests.
```bash
npm run test
@ -103,4 +119,8 @@ npx playwright test @@ -103,4 +119,8 @@ npx playwright test
## Markup Support
Alexandria supports both Markdown and AsciiDoc markup for different content types. For a detailed list of supported tags and features in the basic and advanced markdown parsers, as well as information about AsciiDoc usage for publications and wikis, see [MarkupInfo.md](./src/lib/utils/markup/MarkupInfo.md).
Alexandria supports both Markdown and AsciiDoc markup for different content
types. For a detailed list of supported tags and features in the basic and
advanced markdown parsers, as well as information about AsciiDoc usage for
publications and wikis, see
[MarkupInfo.md](./src/lib/utils/markup/MarkupInfo.md).

2187
deno.lock

File diff suppressed because it is too large Load Diff

7
playwright.config.ts

@ -27,7 +27,7 @@ export default defineConfig({ @@ -27,7 +27,7 @@ export default defineConfig({
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
use: {
/* Base URL to use in actions like `await page.goto('/')`. */
baseURL: 'http://localhost:5173',
baseURL: "http://localhost:5173",
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
trace: "on-first-retry",
@ -49,7 +49,6 @@ export default defineConfig({ @@ -49,7 +49,6 @@ export default defineConfig({
name: "webkit",
use: { ...devices["Desktop Safari"] },
},
/* Test against mobile viewports. */
// {
// name: 'Mobile Chrome',
@ -73,8 +72,8 @@ export default defineConfig({ @@ -73,8 +72,8 @@ export default defineConfig({
/* Run your local dev server before starting the tests */
webServer: {
command: 'npm run dev',
url: 'http://localhost:5173',
command: "npm run dev",
url: "http://localhost:5173",
reuseExistingServer: !process.env.CI,
},

88
src/app.css

@ -2,7 +2,6 @@ @@ -2,7 +2,6 @@
@import "./styles/scrollbar.css";
@import "./styles/publications.css";
@import "./styles/visualize.css";
@import "./styles/events.css";
@import "./styles/asciidoc.css";
/* Custom styles */
@ -28,7 +27,9 @@ @@ -28,7 +27,9 @@
}
div[role="tooltip"] button.btn-leather {
@apply hover:text-primary-600 dark:hover:text-primary-400 hover:border-primary-600 dark:hover:border-primary-400 hover:bg-gray-200 dark:hover:bg-gray-700;
@apply hover:text-primary-600 dark:hover:text-primary-400
hover:border-primary-600 dark:hover:border-primary-400 hover:bg-gray-200
dark:hover:bg-gray-700;
}
.image-border {
@ -36,8 +37,10 @@ @@ -36,8 +37,10 @@
}
div.card-leather {
@apply shadow-none text-primary-1000 border-s-4 bg-highlight border-primary-200 has-[:hover]:border-primary-700;
@apply dark:bg-primary-1000 dark:border-primary-800 dark:has-[:hover]:bg-primary-950 dark:has-[:hover]:border-primary-500;
@apply shadow-none text-primary-1000 border-s-4 bg-highlight
border-primary-200 has-[:hover]:border-primary-700;
@apply dark:bg-primary-1000 dark:border-primary-800
dark:has-[:hover]:bg-primary-950 dark:has-[:hover]:border-primary-500;
}
div.card-leather h1,
@ -46,11 +49,13 @@ @@ -46,11 +49,13 @@
div.card-leather h4,
div.card-leather h5,
div.card-leather h6 {
@apply text-gray-900 hover:text-primary-600 dark:text-gray-100 dark:hover:text-primary-400;
@apply text-gray-900 hover:text-primary-600 dark:text-gray-100
dark:hover:text-primary-400;
}
div.card-leather .font-thin {
@apply text-gray-900 hover:text-primary-700 dark:text-gray-100 dark:hover:text-primary-300;
@apply text-gray-900 hover:text-primary-700 dark:text-gray-100
dark:hover:text-primary-300;
}
main {
@ -74,7 +79,8 @@ @@ -74,7 +79,8 @@
div.note-leather,
p.note-leather,
section.note-leather {
@apply bg-primary-0 dark:bg-primary-1000 text-gray-900 dark:text-gray-100 p-2 rounded;
@apply bg-primary-0 dark:bg-primary-1000 text-gray-900 dark:text-gray-100
p-2 rounded;
}
.edit div.note-leather:hover:not(:has(.note-leather:hover)),
@ -117,7 +123,8 @@ @@ -117,7 +123,8 @@
}
div.modal-leather > div {
@apply bg-primary-0 dark:bg-primary-950 border-b-[1px] border-primary-100 dark:border-primary-600;
@apply bg-primary-0 dark:bg-primary-950 border-b-[1px] border-primary-100
dark:border-primary-600;
}
div.modal-leather > div > h1,
@ -126,11 +133,14 @@ @@ -126,11 +133,14 @@
div.modal-leather > div > h4,
div.modal-leather > div > h5,
div.modal-leather > div > h6 {
@apply text-gray-900 hover:text-gray-900 dark:text-gray-100 dark:hover:text-gray-100;
@apply text-gray-900 hover:text-gray-900 dark:text-gray-100
dark:hover:text-gray-100;
}
div.modal-leather button {
@apply bg-primary-0 hover:bg-primary-0 dark:bg-primary-950 dark:hover:bg-primary-950 text-gray-900 hover:text-primary-600 dark:text-gray-100 dark:hover:text-primary-400;
@apply bg-primary-0 hover:bg-primary-0 dark:bg-primary-950
dark:hover:bg-primary-950 text-gray-900 hover:text-primary-600
dark:text-gray-100 dark:hover:text-primary-400;
}
/* Navbar */
@ -143,7 +153,8 @@ @@ -143,7 +153,8 @@
}
nav.navbar-leather svg {
@apply fill-gray-900 hover:fill-primary-600 dark:fill-gray-100 dark:hover:fill-primary-400;
@apply fill-gray-900 hover:fill-primary-600 dark:fill-gray-100
dark:hover:fill-primary-400;
}
nav.navbar-leather h1,
@ -152,7 +163,8 @@ @@ -152,7 +163,8 @@
nav.navbar-leather h4,
nav.navbar-leather h5,
nav.navbar-leather h6 {
@apply text-gray-900 hover:text-primary-600 dark:text-gray-100 dark:hover:text-primary-400;
@apply text-gray-900 hover:text-primary-600 dark:text-gray-100
dark:hover:text-primary-400;
}
div.skeleton-leather div {
@ -201,16 +213,16 @@ @@ -201,16 +213,16 @@
.network-node-content {
@apply fill-primary-100;
}
/* Person link colors */
.person-link-signed {
@apply stroke-green-500;
}
.person-link-referenced {
@apply stroke-blue-400;
}
/* Person anchor node */
.person-anchor-node {
@apply fill-green-400 stroke-green-600;
@ -272,11 +284,13 @@ @@ -272,11 +284,13 @@
/* Lists */
.ol-leather li a,
.ul-leather li a {
@apply text-gray-900 hover:text-primary-600 dark:text-gray-100 dark:hover:text-primary-400;
@apply text-gray-900 hover:text-primary-600 dark:text-gray-100
dark:hover:text-primary-400;
}
.link {
@apply underline cursor-pointer hover:text-primary-600 dark:hover:text-primary-400;
@apply underline cursor-pointer hover:text-primary-600
dark:hover:text-primary-400;
}
/* Card with transition */
@ -290,11 +304,14 @@ @@ -290,11 +304,14 @@
}
.tags span {
@apply bg-primary-50 text-primary-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded-sm dark:bg-primary-900 dark:text-primary-200;
@apply bg-primary-50 text-primary-800 text-sm font-medium me-2 px-2.5 py-0.5
rounded-sm dark:bg-primary-900 dark:text-primary-200;
}
.npub-badge {
@apply inline-flex space-x-1 items-center text-primary-600 dark:text-primary-500 hover:underline me-2 px-2 py-0.5 rounded-sm border border-primary-600 dark:border-primary-500;
@apply inline-flex space-x-1 items-center text-primary-600
dark:text-primary-500 hover:underline me-2 px-2 py-0.5 rounded-sm border
border-primary-600 dark:border-primary-500;
svg {
@apply fill-primary-600 dark:fill-primary-500;
@ -303,16 +320,25 @@ @@ -303,16 +320,25 @@
}
@layer components {
canvas.qr-code {
@apply block mx-auto my-4;
}
/* Legend */
.leather-legend {
@apply relative m-4 sm:m-0 sm:absolute sm:top-1 sm:left-1 flex-shrink-0 p-2 rounded;
@apply shadow-none text-primary-1000 border border-s-4 bg-highlight border-primary-200 has-[:hover]:border-primary-700;
@apply dark:bg-primary-1000 dark:border-primary-800 dark:has-[:hover]:bg-primary-950 dark:has-[:hover]:border-primary-500;
@apply relative m-4 sm:m-0 sm:absolute sm:top-1 sm:left-1 flex-shrink-0 p-2
rounded;
@apply shadow-none text-primary-1000 border border-s-4 bg-highlight
border-primary-200 has-[:hover]:border-primary-700;
@apply dark:bg-primary-1000 dark:border-primary-800
dark:has-[:hover]:bg-primary-950 dark:has-[:hover]:border-primary-500;
}
/* Tooltip */
.tooltip-leather {
@apply fixed p-4 rounded shadow-lg bg-primary-0 dark:bg-primary-1000 text-gray-900 dark:text-gray-100 border border-gray-200 dark:border-gray-700 transition-colors duration-200;
@apply fixed p-4 rounded shadow-lg bg-primary-0 dark:bg-primary-1000
text-gray-900 dark:text-gray-100 border border-gray-200
dark:border-gray-700 transition-colors duration-200;
max-width: 400px;
z-index: 1000;
}
@ -536,13 +562,15 @@ @@ -536,13 +562,15 @@
input[type="tel"],
input[type="url"],
textarea {
@apply bg-primary-0 dark:bg-primary-1000 text-gray-900 dark:text-gray-100 border-s-4 border-primary-200 rounded shadow-none px-4 py-2;
@apply bg-primary-0 dark:bg-primary-1000 text-gray-900 dark:text-gray-100
border-s-4 border-primary-200 rounded shadow-none px-4 py-2;
@apply focus:border-primary-600 dark:focus:border-primary-400;
}
/* Table of Contents highlighting */
.toc-highlight {
@apply bg-primary-200 dark:bg-primary-700 border-l-4 border-primary-600 dark:border-primary-400 font-medium;
@apply bg-primary-200 dark:bg-primary-700 border-l-4 border-primary-600
dark:border-primary-400 font-medium;
transition: all 0.2s ease-in-out;
}
@ -551,14 +579,8 @@ @@ -551,14 +579,8 @@
}
/* Override prose first-line bold styling */
.prose p:first-line {
font-weight: normal !important;
}
.prose-sm p:first-line {
font-weight: normal !important;
}
.prose p:first-line,
.prose-sm p:first-line,
.prose-invert p:first-line {
font-weight: normal !important;
}

4
src/app.d.ts vendored

@ -23,7 +23,9 @@ declare global { @@ -23,7 +23,9 @@ declare global {
var MathJax: any;
var nostr: NDKNip07Signer & {
getRelays: () => Promise<Record<string, Record<string, boolean | undefined>>>;
getRelays: () => Promise<
Record<string, Record<string, boolean | undefined>>
>;
// deno-lint-ignore no-explicit-any
signEvent: (event: any) => Promise<any>;
};

10
src/app.html

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
@ -26,14 +26,18 @@ @@ -26,14 +26,18 @@
},
};
</script>
<script src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
<script
src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"
></script>
<!-- highlight.js for code highlighting -->
<link
rel="stylesheet"
href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github-dark.min.css"
/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script>
<script
src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"
></script>
%sveltekit.head%
</head>

45
src/lib/components/CommentViewer.svelte

@ -2,16 +2,16 @@ @@ -2,16 +2,16 @@
import { Button, P, Heading } from "flowbite-svelte";
import { getUserMetadata, toNpub } from "$lib/utils/nostrUtils";
import { neventEncode } from "$lib/utils";
import { activeInboxRelays, ndkInstance } from "$lib/ndk";
import { activeInboxRelays, getNdkContext } from "$lib/ndk";
import { goto } from "$app/navigation";
import { onMount } from "svelte";
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import { userBadge } from "$lib/snippets/UserSnippets.svelte";
import { parseBasicmarkup } from "$lib/utils/markup/basicMarkupParser";
import { parseRepostContent, parseContent as parseNotificationContent } from "$lib/utils/notification_utils";
import EmbeddedEvent from "./embedded_events/EmbeddedEvent.svelte";
const { event } = $props<{ event: NDKEvent }>();
const ndk = getNdkContext();
// AI-NOTE: 2025-01-08 - Clean, efficient comment viewer implementation
// This component fetches and displays threaded comments with proper hierarchy
// Uses simple, reliable profile fetching and efficient state management
@ -126,15 +126,15 @@ @@ -126,15 +126,15 @@
// Get all available relays for a more comprehensive search
// Use the full NDK pool relays instead of just active relays
const ndkPoolRelays = Array.from($ndkInstance.pool.relays.values()).map(relay => relay.url);
const ndkPoolRelays = Array.from(ndk.pool.relays.values()).map(relay => relay.url);
console.log(`[CommentViewer] Using ${ndkPoolRelays.length} NDK pool relays for search:`, ndkPoolRelays);
// Try all filters to find comments with full relay set
activeSub = $ndkInstance.subscribe(filters);
activeSub = ndk.subscribe(filters);
// Also try a direct search for the specific comment we're looking for
console.log(`[CommentViewer] Also searching for specific comment: 64173a81c2a8e26342d4a75d3def804da8644377bde99cfdfeaf189dff87f942`);
const specificCommentSub = $ndkInstance.subscribe({
const specificCommentSub = ndk.subscribe({
ids: ["64173a81c2a8e26342d4a75d3def804da8644377bde99cfdfeaf189dff87f942"]
});
@ -293,7 +293,7 @@ @@ -293,7 +293,7 @@
try {
// Try a broader search to see if there are any events that might be comments
const testSub = $ndkInstance.subscribe({
const testSub = ndk.subscribe({
kinds: [1, 1111, 9802],
"#e": [event.id],
limit: 10,
@ -464,7 +464,7 @@ @@ -464,7 +464,7 @@
console.log(`[CommentViewer] Fetching nested replies for event:`, eventId);
// Search for replies to this specific event
const nestedSub = $ndkInstance.subscribe({
const nestedSub = ndk.subscribe({
kinds: [1, 1111, 9802],
"#e": [eventId],
limit: 50,
@ -508,7 +508,7 @@ @@ -508,7 +508,7 @@
if (dTag) {
const eventAddress = `${event.kind}:${event.pubkey}:${dTag}`;
const nip22Sub = $ndkInstance.subscribe({
const nip22Sub = ndk.subscribe({
kinds: [1111, 9802],
"#a": [eventAddress],
limit: 50,
@ -654,19 +654,6 @@ @@ -654,19 +654,6 @@
return `${actualLevel * 16}px`;
}
async function parseContent(content: string, eventKind?: number): Promise<string> {
if (!content) return "";
// Use parseRepostContent for kind 6 and 16 events (reposts)
if (eventKind === 6 || eventKind === 16) {
return await parseRepostContent(content);
} else {
return await parseNotificationContent(content);
}
}
// AI-NOTE: 2025-01-24 - Get highlight source information
function getHighlightSource(highlightEvent: NDKEvent): { type: string; value: string; url?: string } | null {
// Check for e-tags (nostr events)
@ -785,11 +772,7 @@ @@ -785,11 +772,7 @@
<div class="text-sm text-gray-600 dark:text-gray-400 mb-2">
<span class="font-medium">Comment:</span>
</div>
{#await parseContent(node.event.getMatchingTags("comment")[0]?.[1] || "") then parsedContent}
{@html parsedContent}
{:catch}
{@html node.event.getMatchingTags("comment")[0]?.[1] || ""}
{/await}
<EmbeddedEvent nostrIdentifier={node.event.getMatchingTags("comment")[0]?.[1]} nestingLevel={0} />
</div>
{:else}
<!-- Simple highlight -->
@ -829,11 +812,7 @@ @@ -829,11 +812,7 @@
</div>
{:else}
<!-- Regular comment content -->
{#await parseContent(node.event.content || "", node.event.kind) then parsedContent}
{@html parsedContent}
{:catch}
{@html node.event.content || ""}
{/await}
<EmbeddedEvent nostrIdentifier={node.event.id} nestingLevel={0} />
{/if}
</div>
</div>

100
src/lib/components/ContentWithEmbeddedEvents.svelte

@ -1,100 +0,0 @@ @@ -1,100 +0,0 @@
<script lang="ts">
import { onMount } from "svelte";
import { parseBasicmarkup } from "$lib/utils/markup/basicMarkupParser";
import EmbeddedEvent from "./EmbeddedEvent.svelte";
const {
content,
nestingLevel = 0,
} = $props<{
content: string;
nestingLevel?: number;
}>();
let parsedContent = $state("");
let embeddedEvents = $state<Array<{
id: string;
nostrId: string;
nestingLevel: number;
}>>([]);
// Maximum nesting level allowed
const MAX_NESTING_LEVEL = 3;
// AI-NOTE: 2025-01-24 - Component for rendering content with embedded Nostr events
// Processes content and replaces nostr: links with EmbeddedEvent components
$effect(() => {
if (content) {
processContent();
}
});
async function processContent() {
try {
// First parse the basic markup
parsedContent = await parseBasicmarkup(content);
// Then find and extract embedded events
extractEmbeddedEvents();
} catch (error) {
console.error("Error processing content:", error);
parsedContent = content; // Fallback to raw content
}
}
function extractEmbeddedEvents() {
const nostrPattern = /nostr:(npub|nprofile|note|nevent|naddr)[a-zA-Z0-9]{20,}/g;
const events: Array<{
id: string;
nostrId: string;
nestingLevel: number;
}> = [];
let match;
while ((match = nostrPattern.exec(parsedContent)) !== null) {
const nostrId = match[0];
const componentId = `embedded-event-${Math.random().toString(36).substr(2, 9)}`;
events.push({
id: componentId,
nostrId,
nestingLevel: nestingLevel,
});
// Replace the nostr: link with a placeholder
parsedContent = parsedContent.replace(
nostrId,
`<div class="embedded-event-placeholder" data-component-id="${componentId}"></div>`
);
}
embeddedEvents = events;
}
function renderEmbeddedEvent(eventInfo: { id: string; nostrId: string; nestingLevel: number }) {
if (eventInfo.nestingLevel >= MAX_NESTING_LEVEL) {
// At max nesting level, just show the link
return `<a href="/events?id=${eventInfo.nostrId}" class="text-primary-600 dark:text-primary-500 hover:underline break-all">${eventInfo.nostrId}</a>`;
}
// Return a placeholder that will be replaced by the component
return `<div class="embedded-event-placeholder" data-component-id="${eventInfo.id}"></div>`;
}
</script>
<div class="content-with-embedded-events min-w-0 overflow-hidden">
{@html parsedContent}
<!-- Render embedded events -->
{#each embeddedEvents as eventInfo}
<div class="my-4 min-w-0 overflow-hidden" data-component-id={eventInfo.id}>
<EmbeddedEvent
nostrIdentifier={eventInfo.nostrId}
nestingLevel={eventInfo.nestingLevel}
/>
</div>
{/each}
</div>

83
src/lib/components/EmbeddedEventRenderer.svelte

@ -1,83 +0,0 @@ @@ -1,83 +0,0 @@
<script lang="ts">
import { onMount } from "svelte";
import EmbeddedEvent from "./EmbeddedEvent.svelte";
const {
content,
nestingLevel = 0,
} = $props<{
content: string;
nestingLevel?: number;
}>();
let embeddedEvents = $state<Array<{
id: string;
nostrId: string;
nestingLevel: number;
}>>([]);
// AI-NOTE: 2025-01-24 - Component that renders content and replaces embedded event placeholders
// with actual EmbeddedEvent components
$effect(() => {
if (content) {
extractEmbeddedEvents();
}
});
function extractEmbeddedEvents() {
const placeholderPattern = /<div class="embedded-event-placeholder" data-nostr-id="([^"]+)" data-nesting-level="(\d+)" id="([^"]+)"><\/div>/g;
const events: Array<{
id: string;
nostrId: string;
nestingLevel: number;
}> = [];
let match;
while ((match = placeholderPattern.exec(content)) !== null) {
const nostrId = match[1];
const level = parseInt(match[2], 10);
const componentId = match[3];
// Only process event-related identifiers (note, nevent, naddr)
if (nostrId.match(/^nostr:(note|nevent|naddr)/)) {
events.push({
id: componentId,
nostrId,
nestingLevel: level,
});
}
}
embeddedEvents = events;
}
function renderContent() {
let renderedContent = content;
// Replace placeholders with component references
embeddedEvents.forEach(eventInfo => {
const placeholder = `<div class="embedded-event-placeholder" data-nostr-id="${eventInfo.nostrId}" data-nesting-level="${eventInfo.nestingLevel}" id="${eventInfo.id}"></div>`;
const componentRef = `<div class="embedded-event-component" data-component-id="${eventInfo.id}"></div>`;
renderedContent = renderedContent.replace(placeholder, componentRef);
});
return renderedContent;
}
</script>
<div class="embedded-event-renderer">
{@html renderContent()}
<!-- Render embedded events -->
{#each embeddedEvents as eventInfo}
<div class="my-4" data-component-id={eventInfo.id}>
<EmbeddedEvent
nostrIdentifier={eventInfo.nostrId}
nestingLevel={eventInfo.nestingLevel}
/>
</div>
{/each}
</div>

475
src/lib/components/EventDetails.svelte

@ -1,11 +1,8 @@ @@ -1,11 +1,8 @@
<script lang="ts">
import { parseEmbeddedMarkup } from "$lib/utils/markup/embeddedMarkupParser";
import EmbeddedEventRenderer from "./EmbeddedEventRenderer.svelte";
import { getMimeTags } from "$lib/utils/mime";
import { userBadge } from "$lib/snippets/UserSnippets.svelte";
import { toNpub } from "$lib/utils/nostrUtils";
import { neventEncode, naddrEncode, nprofileEncode } from "$lib/utils";
import { nip19 } from "nostr-tools";
import { activeInboxRelays } from "$lib/ndk";
import type { NDKEvent } from "$lib/utils/nostrUtils";
import { getMatchingTags } from "$lib/utils/nostrUtils";
@ -17,15 +14,11 @@ @@ -17,15 +14,11 @@
import { navigateToEvent } from "$lib/utils/nostrEventService";
import ContainingIndexes from "$lib/components/util/ContainingIndexes.svelte";
import Notifications from "$lib/components/Notifications.svelte";
import { parseRepostContent } from "$lib/utils/notification_utils";
import { checkCommunity } from "$lib/utils/search_utility";
import { isPubkeyInUserLists, fetchCurrentUserLists } from "$lib/utils/user_lists";
import EmbeddedEvent from "./embedded_events/EmbeddedEvent.svelte";
const {
event,
profile = null,
searchValue = null,
communityStatusMap = {},
} = $props<{
event: NDKEvent;
profile?: {
@ -38,67 +31,12 @@ @@ -38,67 +31,12 @@
lud16?: string;
nip05?: string;
} | null;
searchValue?: string | null;
communityStatusMap?: Record<string, boolean>;
}>();
let showFullContent = $state(false);
let parsedContent = $state("");
let contentProcessing = $state(false);
let authorDisplayName = $state<string | undefined>(undefined);
let communityStatus = $state<boolean | null>(null);
let isInUserLists = $state<boolean | null>(null);
// Determine if content should be truncated
let shouldTruncate = $state(false);
$effect(() => {
shouldTruncate = event.content.length > 250 && !showFullContent;
});
// Check community status and user list status for the event author
$effect(() => {
if (event?.pubkey) {
// First check if we have cached profileData with user list information
const cachedProfileData = (event as any).profileData;
console.log(`[EventDetails] Checking user list status for ${event.pubkey}, cached profileData:`, cachedProfileData);
if (cachedProfileData && typeof cachedProfileData.isInUserLists === 'boolean') {
isInUserLists = cachedProfileData.isInUserLists;
console.log(`[EventDetails] Using cached user list status for ${event.pubkey}: ${isInUserLists}`);
} else {
console.log(`[EventDetails] No cached user list data, fetching for ${event.pubkey}`);
// Fallback to fetching user lists
fetchCurrentUserLists()
.then((userLists) => {
console.log(`[EventDetails] Fetched ${userLists.length} user lists for ${event.pubkey}`);
isInUserLists = isPubkeyInUserLists(event.pubkey, userLists);
console.log(`[EventDetails] Final user list status for ${event.pubkey}: ${isInUserLists}`);
})
.catch((error) => {
console.error(`[EventDetails] Error fetching user lists for ${event.pubkey}:`, error);
isInUserLists = false;
});
}
// Check community status - use cached data if available
if (communityStatusMap[event.pubkey] !== undefined) {
communityStatus = communityStatusMap[event.pubkey];
console.log(`[EventDetails] Using cached community status for ${event.pubkey}: ${communityStatus}`);
} else {
// Fallback to checking community status
checkCommunity(event.pubkey)
.then((status) => {
communityStatus = status;
})
.catch(() => {
communityStatus = false;
});
}
}
});
let showFullContent = $state(false);
let shouldTruncate = $derived(event.content.length > 250 && !showFullContent);
// AI-NOTE: Event metadata extraction functions
function getEventTitle(event: NDKEvent): string {
// First try to get title from title tag
const titleTag = getMatchingTags(event, "title")[0]?.[1];
@ -139,188 +77,125 @@ @@ -139,188 +77,125 @@
return getMatchingTags(event, "summary")[0]?.[1] || "";
}
function getEventHashtags(event: NDKEvent): string[] {
return getMatchingTags(event, "t").map((tag: string[]) => tag[1]);
}
function getEventTypeDisplay(event: NDKEvent): string {
const [mTag, MTag] = getMimeTags(event.kind || 0);
return MTag[1].split("/")[1] || `Event Kind ${event.kind}`;
}
// AI-NOTE: Tag processing utilities
function isValidHexString(str: string): boolean {
return /^[0-9a-fA-F]{64}$/.test(str);
}
function createMockEvent(id: string, kind: number = 1): any {
return {
id,
kind,
content: "",
tags: [],
pubkey: "",
sig: "",
};
}
function createMockAddressableEvent(kind: number, pubkey: string, d: string): any {
return {
kind,
pubkey,
tags: [["d", d]],
content: "",
id: "",
sig: "",
};
}
function renderTag(tag: string[]): string {
const [tagType, tagValue] = tag;
if (!tagValue) {
return `<span class='bg-primary-50 text-primary-800 px-2 py-1 rounded text-xs font-mono'>${tagType}:${tagValue}</span>`;
}
try {
switch (tagType) {
case "a": {
const parts = tagValue.split(":");
if (parts.length >= 3) {
const [kind, pubkey, d] = parts;
if (pubkey && isValidHexString(pubkey)) {
const mockEvent = createMockAddressableEvent(+kind, pubkey, d);
const naddr = naddrEncode(mockEvent, $activeInboxRelays);
return `<a href='/events?id=${naddr}' class='underline text-primary-700'>a:${tagValue}</a>`;
}
}
break;
}
case "e":
case "note": {
if (isValidHexString(tagValue)) {
const mockEvent = createMockEvent(tagValue);
const nevent = neventEncode(mockEvent, $activeInboxRelays);
const prefix = tagType === "note" ? "note:" : "e:";
return `<a href='/events?id=${nevent}' class='underline text-primary-700'>${prefix}${tagValue}</a>`;
}
break;
}
case "d": {
return `<a href='/events?d=${encodeURIComponent(tagValue)}' class='underline text-primary-700'>d:${tagValue}</a>`;
}
}
} catch (error) {
console.warn(`Failed to encode ${tagType} tag:`, tagValue, error);
}
return `<span class='bg-primary-50 text-primary-800 px-2 py-1 rounded text-xs font-mono'>${tagType}:${tagValue}</span>`;
}
function getTagButtonInfo(tag: string[]): {
text: string;
gotoValue?: string;
} {
const [tagType, tagValue] = tag;
if (!tagValue) {
return { text: `${tagType}:${tagValue}` };
}
try {
switch (tagType) {
case "a": {
const parts = tagValue.split(":");
if (parts.length >= 3) {
const [kind, pubkey, d] = parts;
if (pubkey && isValidHexString(pubkey)) {
const mockEvent = createMockAddressableEvent(+kind, pubkey, d);
const naddr = naddrEncode(mockEvent, $activeInboxRelays);
return { text: `a:${tagValue}`, gotoValue: naddr };
}
if (tag[0] === "a" && tag.length > 1) {
const parts = tag[1].split(":");
if (parts.length >= 3) {
const [kind, pubkey, d] = parts;
// Validate that pubkey is a valid hex string
if (pubkey && /^[0-9a-fA-F]{64}$/.test(pubkey)) {
try {
const mockEvent = {
kind: +kind,
pubkey,
tags: [["d", d]],
content: "",
id: "",
sig: "",
} as any;
const naddr = naddrEncode(mockEvent, $activeInboxRelays);
return {
text: `a:${tag[1]}`,
gotoValue: naddr,
};
} catch (error) {
console.warn("Failed to encode naddr for a tag:", tag[1], error);
return { text: `a:${tag[1]}` };
}
break;
} else {
console.warn("Invalid pubkey in a tag:", pubkey);
return { text: `a:${tag[1]}` };
}
case "e":
case "note": {
if (isValidHexString(tagValue)) {
const mockEvent = createMockEvent(tagValue);
const nevent = neventEncode(mockEvent, $activeInboxRelays);
const prefix = tagType === "note" ? "note:" : "e:";
return { text: `${prefix}${tagValue}`, gotoValue: nevent };
}
break;
}
case "p": {
const npub = toNpub(tagValue);
} else {
console.warn("Invalid a tag format:", tag[1]);
return { text: `a:${tag[1]}` };
}
} else if (tag[0] === "e" && tag.length > 1) {
// Validate that event ID is a valid hex string
if (/^[0-9a-fA-F]{64}$/.test(tag[1])) {
try {
const mockEvent = {
id: tag[1],
kind: 1,
content: "",
tags: [],
pubkey: "",
sig: "",
} as any;
const nevent = neventEncode(mockEvent, $activeInboxRelays);
return {
text: `p:${npub || tagValue}`,
gotoValue: npub || undefined,
text: `e:${tag[1]}`,
gotoValue: nevent,
};
} catch (error) {
console.warn("Failed to encode nevent for e tag:", tag[1], error);
return { text: `e:${tag[1]}` };
}
case "d": {
return { text: `d:${tagValue}`, gotoValue: `d:${tagValue}` };
}
case "t": {
return { text: `t:${tagValue}`, gotoValue: `t:${tagValue}` };
}
} else {
console.warn("Invalid event ID in e tag:", tag[1]);
return { text: `e:${tag[1]}` };
}
} catch (error) {
console.warn(`Failed to encode ${tagType} tag:`, tagValue, error);
}
return { text: `${tagType}:${tagValue}` };
}
// AI-NOTE: URL generation functions
function getNeventUrl(event: NDKEvent): string {
return neventEncode(event, $activeInboxRelays);
}
function getNaddrUrl(event: NDKEvent): string {
return naddrEncode(event, $activeInboxRelays);
}
function getNprofileUrl(pubkey: string): string {
return nprofileEncode(pubkey, $activeInboxRelays);
}
// AI-NOTE: Content processing effect
$effect(() => {
if (event && event.kind !== 0 && event.content) {
contentProcessing = true;
// Use parseRepostContent for kind 6 and 16 events (reposts)
if (event.kind === 6 || event.kind === 16) {
parseRepostContent(event.content).then((html) => {
parsedContent = html;
contentProcessing = false;
}).catch((error) => {
console.error('Error parsing repost content:', error);
contentProcessing = false;
});
} else if (tag[0] === "p" && tag.length > 1) {
const npub = toNpub(tag[1]);
return {
text: `p:${npub || tag[1]}`,
gotoValue: npub ? npub : undefined,
};
} else if (tag[0] === "note" && tag.length > 1) {
// 'note' tags are the same as 'e' tags but with different prefix
if (/^[0-9a-fA-F]{64}$/.test(tag[1])) {
try {
const mockEvent = {
id: tag[1],
kind: 1,
content: "",
tags: [],
pubkey: "",
sig: "",
} as any;
const nevent = neventEncode(mockEvent, $activeInboxRelays);
return {
text: `note:${tag[1]}`,
gotoValue: nevent,
};
} catch (error) {
console.warn("Failed to encode nevent for note tag:", tag[1], error);
return { text: `note:${tag[1]}` };
}
} else {
// Use embedded markup parser for better Nostr event support
parseEmbeddedMarkup(event.content, 0).then((html) => {
parsedContent = html;
contentProcessing = false;
}).catch((error) => {
console.error('Error parsing embedded markup:', error);
contentProcessing = false;
});
console.warn("Invalid event ID in note tag:", tag[1]);
return { text: `note:${tag[1]}` };
}
} else {
contentProcessing = false;
parsedContent = "";
} else if (tag[0] === "d" && tag.length > 1) {
// 'd' tags are used for identifiers in addressable events
return {
text: `d:${tag[1]}`,
gotoValue: `d:${tag[1]}`,
};
} else if (tag[0] === "t" && tag.length > 1) {
// 't' tags are hashtags - navigate to t-tag search
return {
text: `t:${tag[1]}`,
gotoValue: `t:${tag[1]}`,
};
}
});
return { text: `${tag[0]}:${tag[1]}` };
}
// AI-NOTE: Author metadata effect
$effect(() => {
if (!event?.pubkey) {
authorDisplayName = undefined;
return;
}
getUserMetadata(toNpub(event.pubkey) as string).then((profile) => {
authorDisplayName =
profile.displayName ||
@ -330,90 +205,51 @@ @@ -330,90 +205,51 @@
});
});
// AI-NOTE: Identifier helpers
// --- Identifier helpers ---
function getIdentifiers(
event: NDKEvent,
profile: any,
): { label: string; value: string; link?: string }[] {
const ids: { label: string; value: string; link?: string }[] = [];
if (event.kind === 0) {
// Profile event identifiers
// NIP-05
const nip05 = profile?.nip05 || getMatchingTags(event, "nip05")[0]?.[1];
// npub
const npub = toNpub(event.pubkey);
if (npub) {
if (npub)
ids.push({ label: "npub", value: npub, link: `/events?id=${npub}` });
}
// Decode npub to get raw hex string for nprofile encoding
let rawPubkey = event.pubkey;
if (event.pubkey.startsWith('npub')) {
try {
const decoded = nip19.decode(event.pubkey);
if (decoded.type === 'npub') {
rawPubkey = decoded.data;
}
} catch (error) {
console.warn('Failed to decode npub for nprofile encoding:', error);
}
}
// nprofile
ids.push({
label: "nprofile",
value: nprofileEncode(rawPubkey, $activeInboxRelays),
link: `/events?id=${nprofileEncode(rawPubkey, $activeInboxRelays)}`,
value: nprofileEncode(event.pubkey, $activeInboxRelays),
link: `/events?id=${nprofileEncode(event.pubkey, $activeInboxRelays)}`,
});
// For nevent encoding, we need to ensure the event has proper hex strings
try {
const nevent = neventEncode(event, $activeInboxRelays);
ids.push({
label: "nevent",
value: nevent,
link: `/events?id=${nevent}`,
});
} catch (error) {
console.warn('Failed to encode nevent for profile event:', error);
// Fallback: just show the event ID
ids.push({ label: "event id", value: event.id });
}
// nevent
ids.push({
label: "nevent",
value: neventEncode(event, $activeInboxRelays),
link: `/events?id=${neventEncode(event, $activeInboxRelays)}`,
});
// hex pubkey
ids.push({ label: "pubkey", value: event.pubkey });
} else {
// Non-profile event identifiers
// For nevent encoding, we need to ensure the event has proper hex strings
try {
const nevent = neventEncode(event, $activeInboxRelays);
ids.push({
label: "nevent",
value: nevent,
link: `/events?id=${nevent}`,
});
} catch (error) {
console.warn('Failed to encode nevent for non-profile event:', error);
// Fallback: just show the event ID
ids.push({ label: "event id", value: event.id });
}
// nevent
ids.push({
label: "nevent",
value: neventEncode(event, $activeInboxRelays),
link: `/events?id=${neventEncode(event, $activeInboxRelays)}`,
});
// naddr (if addressable)
try {
const naddr = naddrEncode(event, $activeInboxRelays);
ids.push({ label: "naddr", value: naddr, link: `/events?id=${naddr}` });
} catch {}
// hex id
ids.push({ label: "id", value: event.id });
}
return ids;
}
function isCurrentSearch(value: string): boolean {
if (!searchValue) return false;
// Compare ignoring case and possible nostr: prefix
const norm = (s: string) => s.replace(/^nostr:/, "").toLowerCase();
return norm(value) === norm(searchValue);
}
// AI-NOTE: Navigation handler for internal links
onMount(() => {
function handleInternalLinkClick(event: MouseEvent) {
const target = event.target as HTMLElement;
@ -442,58 +278,20 @@ @@ -442,58 +278,20 @@
<Notifications {event} />
{/if}
{#if !(event.kind === 0)}
<div class="flex items-center space-x-2 min-w-0">
{#if toNpub(event.pubkey)}
<span class="text-gray-600 dark:text-gray-400 min-w-0 flex items-center gap-2"
<span class="text-gray-600 dark:text-gray-400 min-w-0"
>Author: {@render userBadge(
toNpub(event.pubkey) as string,
profile?.display_name || undefined,
)}
{#if isInUserLists === true}
<div
class="flex-shrink-0 w-4 h-4 bg-red-100 dark:bg-red-900 rounded-full flex items-center justify-center"
title="In your lists (follows, etc.)"
>
<svg
class="w-3 h-3 text-red-600 dark:text-red-400"
fill="currentColor"
viewBox="0 0 24 24"
>
<path
d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
/>
</svg>
</div>
{:else if isInUserLists === false}
<div class="flex-shrink-0 w-4 h-4"></div>
{/if}
{#if communityStatus === true}
<div
class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
title="Has posted to the community"
>
<svg
class="w-3 h-3 text-yellow-600 dark:text-yellow-400"
fill="currentColor"
viewBox="0 0 24 24"
>
<path
d="M12 2l3.09 6.26L22 9.27l-5 4.87 1.18 6.88L12 17.77l-6.18 3.25L7 14.14 2 9.27l6.91-1.01L12 2z"
/>
</svg>
</div>
{:else if communityStatus === false}
<div class="flex-shrink-0 w-4 h-4"></div>
{/if}
</span>
)}</span
>
{:else}
<span class="text-gray-600 dark:text-gray-400 min-w-0 break-words"
>Author: {profile?.display_name || event.pubkey}</span
>
{/if}
</div>
{/if}
<div class="flex items-center space-x-2 min-w-0">
<span class="text-gray-700 dark:text-gray-300 flex-shrink-0">Kind:</span>
@ -519,30 +317,25 @@ @@ -519,30 +317,25 @@
<div class="flex flex-col space-y-1 min-w-0">
<span class="text-gray-700 dark:text-gray-300 font-semibold">Content:</span>
<div class="prose dark:prose-invert max-w-none text-gray-900 dark:text-gray-100 break-words overflow-wrap-anywhere min-w-0">
{#if contentProcessing}
<div class="text-gray-500 dark:text-gray-400 italic">Processing content...</div>
{:else}
<div class={shouldTruncate ? 'max-h-32 overflow-hidden' : ''}>
<EmbeddedEventRenderer content={parsedContent} nestingLevel={0} />
</div>
{#if shouldTruncate}
<button
class="mt-2 text-primary-700 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-200"
onclick={() => (showFullContent = true)}>Show more</button
>
{/if}
{/if}
<div class={shouldTruncate ? 'max-h-32 overflow-hidden' : ''}>
<EmbeddedEvent nostrIdentifier={event.id} nestingLevel={0} />
</div>
{#if shouldTruncate}
<button
class="mt-2 text-primary-700 hover:text-primary-900 dark:text-primary-400 dark:hover:text-primary-200"
onclick={() => (showFullContent = true)}>Show more</button
>
{/if}
</div>
</div>
</div>
{/if}
<!-- Show ProfileHeader for all events except profile events (kind 0) when in search context to avoid redundancy -->
{#if (event.kind === 0)}
<!-- If event is profile -->
{#if event.kind === 0}
<ProfileHeader
{event}
{profile}
{communityStatusMap}
/>
{/if}

22
src/lib/components/EventInput.svelte

@ -13,23 +13,24 @@ @@ -13,23 +13,24 @@
get30040FixGuidance,
} from "$lib/utils/event_input_utils";
import {
extractDocumentMetadata,
extractSmartMetadata,
metadataToTags,
removeMetadataFromContent
} from "$lib/utils/asciidoc_metadata";
import { get } from "svelte/store";
import { ndkInstance } from "$lib/ndk";
import { userPubkey } from "$lib/stores/authStore.Svelte";
import { userStore } from "$lib/stores/userStore";
import { NDKEvent as NDKEventClass } from "@nostr-dev-kit/ndk";
import NDK, { NDKEvent as NDKEventClass } from "@nostr-dev-kit/ndk";
import type { NDKEvent } from "$lib/utils/nostrUtils";
import { prefixNostrAddresses } from "$lib/utils/nostrUtils";
import { activeInboxRelays, activeOutboxRelays } from "$lib/ndk";
import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
import { Button } from "flowbite-svelte";
import { goto } from "$app/navigation";
import { WebSocketPool } from "$lib/data_structures/websocket_pool";
import { anonymousRelays } from "$lib/consts";
const ndk = getNdkContext();
let kind = $state<number>(30040);
let tags = $state<[string, string][]>([]);
let content = $state("");
@ -162,8 +163,11 @@ @@ -162,8 +163,11 @@
}
function validate(): { valid: boolean; reason?: string; warning?: string } {
const currentUserPubkey = get(userPubkey as any);
const userState = get(userStore);
const pubkey = userState.pubkey;
// Try userPubkey first, then fallback to userStore
const pubkey = currentUserPubkey || userState.pubkey;
if (!pubkey) return { valid: false, reason: "Not logged in." };
if (!content.trim()) return { valid: false, reason: "Content required." };
@ -217,9 +221,11 @@ @@ -217,9 +221,11 @@
createdAt = Math.floor(Date.now() / 1000);
try {
const ndk = get(ndkInstance);
const userState = get(userStore);
const pubkey = userState.pubkey;
const currentUserPubkey = get(userPubkey as any);
const userState = get(userStore);
// Try userPubkey first, then fallback to userStore
const pubkey = currentUserPubkey || userState.pubkey;
if (!ndk || !pubkey) {
error = "NDK or pubkey missing.";
loading = false;

13
src/lib/components/EventSearch.svelte

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
<script lang="ts">
import { onMount } from 'svelte';
import { goto } from '$app/navigation';
import { Input, Button } from "flowbite-svelte";
import { Spinner } from "flowbite-svelte";
@ -10,12 +9,10 @@ @@ -10,12 +9,10 @@
searchNip05,
} from "$lib/utils/search_utility";
import { neventEncode, naddrEncode, nprofileEncode } from "$lib/utils";
import { activeInboxRelays, activeOutboxRelays, ndkInstance } from "$lib/ndk";
import { searchRelays } from "$lib/consts";
import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
import { getMatchingTags, toNpub } from "$lib/utils/nostrUtils";
import type { SearchResult } from '$lib/utils/search_types';
import { userStore } from "$lib/stores/userStore";
import { get } from "svelte/store";
import type NDK from '@nostr-dev-kit/ndk';
// Props definition
let {
loading,
@ -48,6 +45,8 @@ @@ -48,6 +45,8 @@
onLoadingChange?: (loading: boolean) => void;
} = $props();
const ndk = getNdkContext();
// Component state
let searchQuery = $state("");
let localError = $state<string | null>(null);
@ -462,7 +461,6 @@ @@ -462,7 +461,6 @@
// This ensures searches can proceed even if some relay types are not available
while (retryCount < maxRetries) {
// Check if we have any relays in the NDK pool
const ndk = get(ndkInstance);
if (ndk && ndk.pool && ndk.pool.relays && ndk.pool.relays.size > 0) {
console.debug(`EventSearch: Found ${ndk.pool.relays.size} relays in NDK pool`);
break;
@ -481,7 +479,6 @@ @@ -481,7 +479,6 @@
// AI-NOTE: 2025-01-24 - Don't fail if no relays are available, let the search functions handle fallbacks
// The search functions will use all available relays including fallback relays
const ndk = get(ndkInstance);
const poolRelayCount = ndk?.pool?.relays?.size || 0;
console.log("EventSearch: Relay status for search:", {

5
src/lib/components/LoginModal.svelte

@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
import { Button, Modal } from "flowbite-svelte";
import { loginWithExtension } from "$lib/stores/userStore";
import { userStore } from "$lib/stores/userStore";
import { getNdkContext } from "$lib/ndk";
const {
show = false,
@ -13,6 +14,8 @@ @@ -13,6 +14,8 @@
onLoginSuccess?: () => void;
}>();
const ndk = getNdkContext();
let signInFailed = $state<boolean>(false);
let errorMessage = $state<string>("");
let user = $state($userStore);
@ -42,7 +45,7 @@ @@ -42,7 +45,7 @@
signInFailed = false;
errorMessage = "";
await loginWithExtension();
await loginWithExtension(ndk);
} catch (e: unknown) {
console.error(e);
signInFailed = true;

78
src/lib/components/Notifications.svelte

@ -1,39 +1,33 @@ @@ -1,39 +1,33 @@
<script lang="ts">
import "../../styles/notifications.css";
import { onMount } from "svelte";
import { Heading, P } from "flowbite-svelte";
import type { NDKEvent } from "$lib/utils/nostrUtils";
import { userStore } from "$lib/stores/userStore";
import { ndkInstance, activeInboxRelays } from "$lib/ndk";
import { goto } from "$app/navigation";
import { get } from "svelte/store";
import { nip19 } from "nostr-tools";
import { communityRelays, localRelays, anonymousRelays, searchRelays } from "$lib/consts";
import { createKind24Reply, getKind24RelaySet } from "$lib/utils/kind24_utils";
import { anonymousRelays } from "$lib/consts";
import { getKind24RelaySet } from "$lib/utils/kind24_utils";
import { createSignedEvent } from "$lib/utils/nostrEventService";
import RelayDisplay from "$lib/components/RelayDisplay.svelte";
import RelayInfoList from "$lib/components/RelayInfoList.svelte";
import { Modal, Button } from "flowbite-svelte";
import { searchProfiles } from "$lib/utils/search_utility";
import type { NostrProfile } from "$lib/utils/search_types";
import { PlusOutline, ReplyOutline, UserOutline } from "flowbite-svelte-icons";
import {
truncateContent,
truncateRenderedContent,
parseContent,
parseRepostContent,
renderQuotedContent,
getNotificationType,
fetchAuthorProfiles
} from "$lib/utils/notification_utils";
fetchAuthorProfiles,
quotedContent,
} from "$lib/components/embedded_events/EmbeddedSnippets.svelte";
import { buildCompleteRelaySet } from "$lib/utils/relay_management";
import { formatDate, neventEncode } from "$lib/utils";
import { toNpub, getUserMetadata, NDKRelaySetFromNDK } from "$lib/utils/nostrUtils";
import { userBadge } from "$lib/snippets/UserSnippets.svelte";
import EmbeddedEventRenderer from "./EmbeddedEventRenderer.svelte";
import { NDKRelaySetFromNDK } from "$lib/utils/nostrUtils";
import EmbeddedEvent from "./embedded_events/EmbeddedEvent.svelte";
import { getNdkContext } from "$lib/ndk";
const { event } = $props<{ event: NDKEvent }>();
const ndk = getNdkContext();
// Handle navigation events from quoted messages
$effect(() => {
if (typeof window !== 'undefined') {
@ -59,7 +53,6 @@ @@ -59,7 +53,6 @@
let notificationMode = $state<"to-me" | "from-me" | "public-messages">("to-me");
let authorProfiles = $state<Map<string, { name?: string; displayName?: string; picture?: string }>>(new Map());
let filteredByUser = $state<string | null>(null);
// New Message Modal state
let showNewMessageModal = $state(false);
@ -68,7 +61,6 @@ @@ -68,7 +61,6 @@
let newMessageRelays = $state<string[]>([]);
let isComposingMessage = $state(false);
let replyToMessage = $state<NDKEvent | null>(null);
let quotedContent = $state<string>("");
// Recipient Selection Modal state
let showRecipientModal = $state(false);
@ -165,8 +157,6 @@ @@ -165,8 +157,6 @@
filteredByUser = null;
}
// AI-NOTE: New Message Modal Functions
function openNewMessageModal(messageToReplyTo?: NDKEvent) {
showNewMessageModal = true;
@ -177,12 +167,7 @@ @@ -177,12 +167,7 @@
replyToMessage = messageToReplyTo || null;
// If replying, set up the quote and pre-select all original recipients plus sender
if (messageToReplyTo) {
// Store clean content for UI display (no markdown formatting)
quotedContent = messageToReplyTo.content.length > 200
? messageToReplyTo.content.slice(0, 200) + "..."
: messageToReplyTo.content;
if (messageToReplyTo) {
// Collect all recipients: original sender + all p-tag recipients
const recipientPubkeys = new Set<string>();
@ -217,8 +202,6 @@ @@ -217,8 +202,6 @@
}).filter(recipient => recipient.pubkey); // Ensure we have valid pubkeys
console.log(`Pre-loaded ${selectedRecipients.length} recipients for reply:`, selectedRecipients.map(r => r.displayName || r.name || r.pubkey?.slice(0, 8)));
} else {
quotedContent = "";
}
}
@ -229,7 +212,6 @@ @@ -229,7 +212,6 @@
newMessageRelays = [];
isComposingMessage = false;
replyToMessage = null;
quotedContent = "";
}
// AI-NOTE: Recipient Selection Modal Functions
@ -485,7 +467,6 @@ @@ -485,7 +467,6 @@
error = null;
try {
const ndk = get(ndkInstance);
if (!ndk) throw new Error("No NDK instance available");
const userStoreValue = get(userStore);
@ -522,7 +503,7 @@ @@ -522,7 +503,7 @@
.sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
.slice(0, 100);
authorProfiles = await fetchAuthorProfiles(notifications);
authorProfiles = await fetchAuthorProfiles(notifications, ndk);
} catch (err) {
console.error("[Notifications] Error fetching notifications:", err);
error = err instanceof Error ? err.message : "Failed to fetch notifications";
@ -539,7 +520,6 @@ @@ -539,7 +520,6 @@
error = null;
try {
const ndk = get(ndkInstance);
if (!ndk) throw new Error("No NDK instance available");
const userStoreValue = get(userStore);
@ -570,7 +550,7 @@ @@ -570,7 +550,7 @@
.sort((a, b) => (b.created_at || 0) - (a.created_at || 0))
.slice(0, 200);
authorProfiles = await fetchAuthorProfiles(publicMessages);
authorProfiles = await fetchAuthorProfiles(publicMessages, ndk);
} catch (err) {
console.error("[PublicMessages] Error fetching public messages:", err);
error = err instanceof Error ? err.message : "Failed to fetch public messages";
@ -579,8 +559,6 @@ @@ -579,8 +559,6 @@
}
}
// Check if user is viewing their own profile
$effect(() => {
if ($userStore.signedIn && $userStore.pubkey && event.pubkey) {
@ -606,8 +584,6 @@ @@ -606,8 +584,6 @@
}
});
// AI-NOTE: Refactored to avoid blocking $effect with async operations
// Calculate relay set when recipients change - non-blocking approach
$effect(() => {
@ -661,7 +637,6 @@ @@ -661,7 +637,6 @@
// If no relays found from NIP-65, use fallback relays
if (uniqueRelays.length === 0) {
console.log("[Relay Effect] No NIP-65 relays found, using fallback");
const ndk = get(ndkInstance);
if (ndk) {
const userStoreValue = get(userStore);
const user = userStoreValue.signedIn && userStoreValue.pubkey ? ndk.getUser({ pubkey: userStoreValue.pubkey }) : null;
@ -677,7 +652,6 @@ @@ -677,7 +652,6 @@
} catch (error) {
console.error("[Relay Effect] Error getting relay set:", error);
console.log("[Relay Effect] Using fallback relays due to error");
const ndk = get(ndkInstance);
if (ndk) {
const userStoreValue = get(userStore);
const user = userStoreValue.signedIn && userStoreValue.pubkey ? ndk.getUser({ pubkey: userStoreValue.pubkey }) : null;
@ -837,21 +811,13 @@ @@ -837,21 +811,13 @@
{#if message.getMatchingTags("q").length > 0}
<div class="text-sm text-gray-800 dark:text-gray-200 mb-2 leading-relaxed">
{#await renderQuotedContent(message, publicMessages) then quotedHtml}
{@html quotedHtml}
{:catch}
<!-- Fallback if quoted content fails to render -->
{/await}
{@render quotedContent(message, publicMessages, ndk)}
</div>
{/if}
{#if message.content}
<div class="text-sm text-gray-800 dark:text-gray-200 mb-2 leading-relaxed">
<div class="px-2">
{#await ((message.kind === 6 || message.kind === 16) ? parseRepostContent(message.content) : parseContent(message.content)) then parsedContent}
<EmbeddedEventRenderer content={parsedContent} nestingLevel={0} />
{:catch}
{@html message.content}
{/await}
<EmbeddedEvent nostrIdentifier={message.id} nestingLevel={0} />
</div>
</div>
{/if}
@ -928,11 +894,7 @@ @@ -928,11 +894,7 @@
{#if notification.content}
<div class="text-sm text-gray-800 dark:text-gray-200 mb-2 leading-relaxed">
<div class="px-2">
{#await ((notification.kind === 6 || notification.kind === 16) ? parseRepostContent(notification.content) : parseContent(notification.content)) then parsedContent}
<EmbeddedEventRenderer content={parsedContent} nestingLevel={0} />
{:catch}
{@html truncateContent(notification.content)}
{/await}
<EmbeddedEvent nostrIdentifier={notification.id} nestingLevel={0} />
</div>
</div>
{/if}
@ -963,15 +925,11 @@ @@ -963,15 +925,11 @@
</div>
<!-- Quoted Content Display -->
{#if quotedContent}
{#if replyToMessage}
<div class="quoted-content mb-4 p-3 rounded-r-lg">
<div class="text-sm text-gray-600 dark:text-gray-400 mb-1">Replying to:</div>
<div class="text-sm text-gray-800 dark:text-gray-200">
{#await parseContent(quotedContent) then parsedContent}
<EmbeddedEventRenderer content={parsedContent} nestingLevel={0} />
{:catch}
{@html quotedContent}
{/await}
<EmbeddedEvent nostrIdentifier={replyToMessage.id} nestingLevel={0} />
</div>
</div>
{/if}

22
src/lib/components/RelayActions.svelte

@ -1,35 +1,26 @@ @@ -1,35 +1,26 @@
<script lang="ts">
import { Button, Modal } from "flowbite-svelte";
import { ndkInstance, activeInboxRelays, activeOutboxRelays } from "$lib/ndk";
import { get } from "svelte/store";
import { Modal } from "flowbite-svelte";
import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
import type { NDKEvent } from "$lib/utils/nostrUtils";
import {
createRelaySetFromUrls,
createNDKEvent,
} from "$lib/utils/nostrUtils";
import RelayDisplay, {
getConnectedRelays,
getEventRelays,
} from "./RelayDisplay.svelte";
import { communityRelays, secondaryRelays } from "$lib/consts";
const { event } = $props<{
event: NDKEvent;
}>();
let searchingRelays = $state(false);
let foundRelays = $state<string[]>([]);
const ndk = getNdkContext();
let showRelayModal = $state(false);
let relaySearchResults = $state<
Record<string, "pending" | "found" | "notfound">
>({});
let allRelays = $state<string[]>([]);
// Magnifying glass icon SVG
const searchIcon = `<svg class="w-4 h-4 mr-2" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 20 20">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m19 19-4-4m0-7A7 7 0 1 1 1 8a7 7 0 0 1 14 0Z"/>
</svg>`;
function openRelayModal() {
showRelayModal = true;
relaySearchResults = {};
@ -39,7 +30,6 @@ @@ -39,7 +30,6 @@
async function searchAllRelaysLive() {
if (!event) return;
relaySearchResults = {};
const ndk = get(ndkInstance);
const userRelays = Array.from(ndk?.pool?.relays.values() || []).map(
(r) => r.url,
);
@ -66,10 +56,6 @@ @@ -66,10 +56,6 @@
}),
);
}
function closeRelayModal() {
showRelayModal = false;
}
</script>
<div class="mt-2">

9
src/lib/components/RelayDisplay.svelte

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
<script lang="ts" context="module">
import type { NDKEvent } from "$lib/utils/nostrUtils";
import { get } from "svelte/store";
import { activeInboxRelays, ndkInstance } from "$lib/ndk";
import { activeInboxRelays } from "$lib/ndk";
// Get relays from event (prefer event.relay or event.relays, fallback to active inbox relays)
export function getEventRelays(event: NDKEvent): string[] {
@ -17,13 +17,6 @@ @@ -17,13 +17,6 @@
// Use active inbox relays as fallback
return get(activeInboxRelays);
}
export function getConnectedRelays(): string[] {
const ndk = get(ndkInstance);
return Array.from(ndk?.pool?.relays.values() || [])
.filter((r) => r.status === 1) // Only use connected relays
.map((r) => r.url);
}
</script>
<script lang="ts">

8
src/lib/components/RelayStatus.svelte

@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
<script lang="ts">
import { Button, Alert } from "flowbite-svelte";
import {
ndkInstance,
ndkSignedIn,
testRelayConnection,
checkWebSocketSupport,
checkEnvironmentForWebSocketDowngrade,
} from "$lib/ndk";
import { onMount } from "svelte";
import { activeInboxRelays, activeOutboxRelays } from "$lib/ndk";
import { onMount } from "svelte";
import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
const ndk = getNdkContext();
interface RelayStatus {
url: string;
@ -30,7 +31,6 @@ import { activeInboxRelays, activeOutboxRelays } from "$lib/ndk"; @@ -30,7 +31,6 @@ import { activeInboxRelays, activeOutboxRelays } from "$lib/ndk";
async function runRelayTests() {
testing = true;
const ndk = $ndkInstance;
if (!ndk) {
testing = false;
return;

40
src/lib/components/EmbeddedEvent.svelte → src/lib/components/embedded_events/EmbeddedEvent.svelte

@ -1,19 +1,15 @@ @@ -1,19 +1,15 @@
<script lang="ts">
import { onMount } from "svelte";
import type { NDKEvent } from "$lib/utils/nostrUtils";
import { fetchEventWithFallback } from "$lib/utils/nostrUtils";
import { getUserMetadata, toNpub } from "$lib/utils/nostrUtils";
import { userBadge } from "$lib/snippets/UserSnippets.svelte";
import { parseBasicmarkup } from "$lib/utils/markup/basicMarkupParser";
import { parseEmbeddedMarkup } from "$lib/utils/markup/embeddedMarkupParser";
import { parseRepostContent } from "$lib/utils/notification_utils";
import EmbeddedEventRenderer from "./EmbeddedEventRenderer.svelte";
import { neventEncode, naddrEncode } from "$lib/utils";
import { activeInboxRelays, ndkInstance } from "$lib/ndk";
import { parsedContent } from "$lib/components/embedded_events/EmbeddedSnippets.svelte";
import { naddrEncode } from "$lib/utils";
import { activeInboxRelays, getNdkContext } from "$lib/ndk";
import { goto } from "$app/navigation";
import { getEventType } from "$lib/utils/mime";
import { nip19 } from "nostr-tools";
import { get } from "svelte/store";
import { repostKinds } from "$lib/consts";
const {
nostrIdentifier,
@ -23,6 +19,8 @@ @@ -23,6 +19,8 @@
nestingLevel?: number;
}>();
const ndk = getNdkContext();
let event = $state<NDKEvent | null>(null);
let profile = $state<{
name?: string;
@ -36,7 +34,6 @@ @@ -36,7 +34,6 @@
} | null>(null);
let loading = $state(true);
let error = $state<string | null>(null);
let parsedContent = $state("");
let authorDisplayName = $state<string | undefined>(undefined);
// Maximum nesting level allowed
@ -62,7 +59,6 @@ @@ -62,7 +59,6 @@
error = null;
try {
const ndk = get(ndkInstance);
if (!ndk) {
throw new Error("No NDK instance available");
}
@ -120,16 +116,6 @@ @@ -120,16 +116,6 @@
}
}
// Parse content if available
if (event?.content) {
if (event.kind === 6 || event.kind === 16) {
parsedContent = await parseRepostContent(event.content);
} else {
// Use embedded markup parser for nested events
parsedContent = await parseEmbeddedMarkup(event.content, nestingLevel + 1);
}
}
// Parse profile if it's a profile event
if (event?.kind === 0) {
try {
@ -196,10 +182,6 @@ @@ -196,10 +182,6 @@
}
}
function getNeventUrl(event: NDKEvent): string {
return neventEncode(event, $activeInboxRelays);
}
function getNaddrUrl(event: NDKEvent): string {
return naddrEncode(event, $activeInboxRelays);
}
@ -303,17 +285,15 @@ @@ -303,17 +285,15 @@
{/if}
<!-- Content for text events -->
{#if event.kind === 1 && parsedContent}
{#if event.kind === 1 || repostKinds.includes(event.kind)}
<div class="prose prose-sm dark:prose-invert max-w-none text-gray-900 dark:text-gray-100 min-w-0 overflow-hidden">
<EmbeddedEventRenderer content={parsedContent.slice(0, 300)} nestingLevel={nestingLevel + 1} />
{#if parsedContent.length > 300}
{@render parsedContent(event.content.slice(0, 300))}
{#if event.content.length > 300}
<span class="text-gray-500 dark:text-gray-400">...</span>
{/if}
</div>
{/if}
<!-- Profile content -->
{#if event.kind === 0 && profile}
{:else if event.kind === 0 && profile}
<div class="space-y-2 min-w-0 overflow-hidden">
{#if profile.picture}
<img

317
src/lib/components/embedded_events/EmbeddedSnippets.svelte

@ -0,0 +1,317 @@ @@ -0,0 +1,317 @@
<script module lang="ts">
import type { NDKEvent } from "$lib/utils/nostrUtils";
import { NDKRelaySetFromNDK, toNpub, getUserMetadata } from "$lib/utils/nostrUtils";
import { get } from "svelte/store";
import { searchRelays } from "$lib/consts";
import { userStore, type UserState } from "$lib/stores/userStore";
import { buildCompleteRelaySet } from "$lib/utils/relay_management";
import { nip19 } from "nostr-tools";
import { parseEmbeddedMarkup } from "$lib/utils/markup/embeddedMarkupParser";
import type NDK from "@nostr-dev-kit/ndk";
export {
parsedContent,
repostContent,
quotedContent,
truncateContent,
truncateRenderedContent,
getNotificationType,
fetchAuthorProfiles
};
/**
* Truncates content to a specified length
*/
function truncateContent(content: string, maxLength: number = 300): string {
if (content.length <= maxLength) return content;
return content.slice(0, maxLength) + "...";
}
/**
* Truncates rendered HTML content while preserving quote boxes
*/
function truncateRenderedContent(renderedHtml: string, maxLength: number = 300): string {
if (renderedHtml.length <= maxLength) return renderedHtml;
const hasQuoteBoxes = renderedHtml.includes('jump-to-message');
if (hasQuoteBoxes) {
const quoteBoxPattern = /<div class="block w-fit my-2 px-3 py-2 bg-gray-200[^>]*onclick="window\.dispatchEvent\(new CustomEvent\('jump-to-message'[^>]*>[^<]*<\/div>/g;
const quoteBoxes = renderedHtml.match(quoteBoxPattern) || [];
let textOnly = renderedHtml.replace(quoteBoxPattern, '|||QUOTEBOX|||');
if (textOnly.length > maxLength) {
const availableLength = maxLength - (quoteBoxes.join('').length);
if (availableLength > 50) {
textOnly = textOnly.slice(0, availableLength) + "...";
} else {
textOnly = textOnly.slice(0, 50) + "...";
}
}
let result = textOnly;
quoteBoxes.forEach(box => {
result = result.replace('|||QUOTEBOX|||', box);
});
return result;
} else {
if (renderedHtml.includes('<')) {
const truncated = renderedHtml.slice(0, maxLength);
const lastTagStart = truncated.lastIndexOf('<');
const lastTagEnd = truncated.lastIndexOf('>');
if (lastTagStart > lastTagEnd) {
return renderedHtml.slice(0, lastTagStart) + "...";
}
return truncated + "...";
} else {
return renderedHtml.slice(0, maxLength) + "...";
}
}
}
/**
* Gets notification type based on event kind
*/
function getNotificationType(event: NDKEvent): string {
switch (event.kind) {
case 1: return "Reply";
case 1111: return "Custom Reply";
case 9802: return "Highlight";
case 6: return "Repost";
case 16: return "Generic Repost";
case 24: return "Public Message";
default: return `Kind ${event.kind}`;
}
}
/**
* Fetches author profiles for a list of events
*/
async function fetchAuthorProfiles(events: NDKEvent[], ndk: NDK): Promise<Map<string, { name?: string; displayName?: string; picture?: string }>> {
const authorProfiles = new Map<string, { name?: string; displayName?: string; picture?: string }>();
const uniquePubkeys = new Set<string>();
events.forEach(event => {
if (event.pubkey) uniquePubkeys.add(event.pubkey);
});
const profilePromises = Array.from(uniquePubkeys).map(async (pubkey) => {
try {
const npub = toNpub(pubkey);
if (!npub) return;
// Try cache first
let profile = await getUserMetadata(npub, false);
if (profile && (profile.name || profile.displayName || profile.picture)) {
authorProfiles.set(pubkey, profile);
return;
}
// Try search relays
for (const relay of searchRelays) {
try {
if (!ndk) break;
const relaySet = NDKRelaySetFromNDK.fromRelayUrls([relay], ndk);
const profileEvent = await ndk.fetchEvent(
{ kinds: [0], authors: [pubkey] },
undefined,
relaySet
);
if (profileEvent) {
const profileData = JSON.parse(profileEvent.content);
authorProfiles.set(pubkey, {
name: profileData.name,
displayName: profileData.display_name || profileData.displayName,
picture: profileData.picture || profileData.image
});
return;
}
} catch (error) {
console.warn(`[fetchAuthorProfiles] Failed to fetch profile from ${relay}:`, error);
}
}
// Try all available relays as fallback
try {
if (!ndk) return;
const userStoreValue: UserState = get(userStore);
const user = userStoreValue.signedIn && userStoreValue.pubkey ? ndk.getUser({ pubkey: userStoreValue.pubkey }) : null;
const relaySet = await buildCompleteRelaySet(ndk, user);
const allRelays = [...relaySet.inboxRelays, ...relaySet.outboxRelays];
if (allRelays.length > 0) {
const ndkRelaySet = NDKRelaySetFromNDK.fromRelayUrls(allRelays, ndk);
const profileEvent = await ndk.fetchEvent(
{ kinds: [0], authors: [pubkey] },
undefined,
ndkRelaySet
);
if (profileEvent) {
const profileData = JSON.parse(profileEvent.content);
authorProfiles.set(pubkey, {
name: profileData.name,
displayName: profileData.display_name || profileData.displayName,
picture: profileData.picture || profileData.image
});
}
}
} catch (error) {
console.warn(`[fetchAuthorProfiles] Failed to fetch profile from all relays:`, error);
}
} catch (error) {
console.warn(`[fetchAuthorProfiles] Error processing profile for ${pubkey}:`, error);
}
});
await Promise.all(profilePromises);
return authorProfiles;
}
async function findQuotedMessage(eventId: string, publicMessages: NDKEvent[], ndk: NDK): Promise<NDKEvent | undefined> {
// Validate eventId format (should be 64 character hex string)
const isValidEventId = /^[a-fA-F0-9]{64}$/.test(eventId);
if (!isValidEventId) return undefined;
// First try to find in local messages
let quotedMessage = publicMessages.find(msg => msg.id === eventId);
// If not found locally, fetch from relays
if (!quotedMessage) {
try {
if (ndk) {
const userStoreValue: UserState = get(userStore);
const user = userStoreValue.signedIn && userStoreValue.pubkey ? ndk.getUser({ pubkey: userStoreValue.pubkey }) : null;
const relaySet = await buildCompleteRelaySet(ndk, user);
const allRelays = [...relaySet.inboxRelays, ...relaySet.outboxRelays, ...searchRelays];
if (allRelays.length > 0) {
const ndkRelaySet = NDKRelaySetFromNDK.fromRelayUrls(allRelays, ndk);
const fetchedEvent = await ndk.fetchEvent({ ids: [eventId], limit: 1 }, undefined, ndkRelaySet);
quotedMessage = fetchedEvent || undefined;
}
}
} catch (error) {
console.warn(`[findQuotedMessage] Failed to fetch quoted event ${eventId}:`, error);
}
}
return quotedMessage;
}
</script>
{#snippet parsedContent(content: string)}
{#await parseEmbeddedMarkup(content, 0) then parsed}
{@html parsed}
{/await}
{/snippet}
{#snippet repostContent(content: string)}
{@const originalEvent = (() => {
try {
return JSON.parse(content);
} catch {
return null;
}
})()}
{#if originalEvent}
{@const originalContent = originalEvent.content || ""}
{@const originalAuthor = originalEvent.pubkey || ""}
{@const originalCreatedAt = originalEvent.created_at || 0}
{@const originalKind = originalEvent.kind || 1}
{@const formattedDate = originalCreatedAt ? new Date(originalCreatedAt * 1000).toLocaleDateString() : "Unknown date"}
{@const shortAuthor = originalAuthor ? `${originalAuthor.slice(0, 8)}...${originalAuthor.slice(-4)}` : "Unknown"}
<div class="embedded-repost bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg p-4 my-2">
<!-- Event header -->
<div class="flex items-center justify-between mb-3 min-w-0">
<div class="flex items-center space-x-2 min-w-0">
<span class="text-xs text-gray-500 dark:text-gray-400 font-mono flex-shrink-0">
Kind {originalKind}
</span>
<span class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0">
(repost)
</span>
<span class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0"></span>
<span class="text-xs text-gray-600 dark:text-gray-400 flex-shrink-0">Author:</span>
<span class="text-xs text-gray-700 dark:text-gray-300 font-mono">
{shortAuthor}
</span>
<span class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0"></span>
<span class="text-xs text-gray-500 dark:text-gray-400">
{formattedDate}
</span>
</div>
<button
class="text-xs text-primary-600 dark:text-primary-500 hover:underline flex-shrink-0"
onclick={() => window.location.href=`/events?id=${originalEvent.id || 'unknown'}`}
>
View full event →
</button>
</div>
<!-- Reposted content -->
<div class="text-sm text-gray-800 dark:text-gray-200 leading-relaxed">
{#await parseEmbeddedMarkup(originalContent, 0) then parsedOriginalContent}
{@html parsedOriginalContent}
{/await}
</div>
</div>
{:else}
{#await parseEmbeddedMarkup(content, 0) then parsedContent}
{@html parsedContent}
{/await}
{/if}
{/snippet}
{#snippet quotedContent(message: NDKEvent, publicMessages: NDKEvent[], ndk: NDK)}
{@const qTags = message.getMatchingTags("q")}
{#if qTags.length > 0}
{@const qTag = qTags[0]}
{@const eventId = qTag[1]}
{#if eventId}
{#await findQuotedMessage(eventId, publicMessages, ndk) then quotedMessage}
{#if quotedMessage}
{@const quotedContent = quotedMessage.content ? quotedMessage.content.slice(0, 200) : "No content"}
{#await parseEmbeddedMarkup(quotedContent, 0) then parsedContent}
<button type="button" class="block text-left w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors text-sm text-gray-600 dark:text-gray-300" onclick={() => window.dispatchEvent(new CustomEvent('jump-to-message', { detail: eventId }))}>
{@html parsedContent}
</button>
{/await}
{:else}
{@const isValidEventId = /^[a-fA-F0-9]{64}$/.test(eventId)}
{#if isValidEventId}
{@const nevent = (() => {
try {
return nip19.neventEncode({ id: eventId });
} catch (error) {
console.warn(`[quotedContent] Failed to encode nevent for ${eventId}:`, error);
return null;
}
})()}
{#if nevent}
<button type="button" class="block text-left w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors text-sm text-gray-600 dark:text-gray-300" onclick={() => window.location.href=`/events?id=${nevent}`}>
Quoted message not found. Click to view event {eventId.slice(0, 8)}...
</button>
{:else}
<div class="block w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded text-sm text-gray-600 dark:text-gray-300">
Quoted message not found. Event ID: {eventId.slice(0, 8)}...
</div>
{/if}
{:else}
<div class="block w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded text-sm text-gray-600 dark:text-gray-300">
Invalid quoted message reference
</div>
{/if}
{/if}
{/await}
{/if}
{/if}
{/snippet}

7
src/lib/components/publications/PublicationFeed.svelte

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
<script lang="ts">
import { indexKind } from "$lib/consts";
import { ndkInstance, activeInboxRelays, activeOutboxRelays } from "$lib/ndk";
import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
import { filterValidIndexEvents, debounceAsync } from "$lib/utils";
import { Button, P, Skeleton, Spinner } from "flowbite-svelte";
import ArticleHeader from "./PublicationHeader.svelte";
@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
toNpub,
} from "$lib/utils/nostrUtils";
import { WebSocketPool } from "$lib/data_structures/websocket_pool";
import { NDKEvent } from "@nostr-dev-kit/ndk";
import NDK, { NDKEvent } from "@nostr-dev-kit/ndk";
import { searchCache } from "$lib/utils/searchCache";
import { indexEventCache } from "$lib/utils/indexEventCache";
import { isValidNip05Address } from "$lib/utils/search_utility";
@ -23,6 +23,8 @@ @@ -23,6 +23,8 @@
onEventCountUpdate?: (counts: { displayed: number; total: number }) => void;
}>();
const ndk = getNdkContext();
// Component state
let eventsInView: NDKEvent[] = $state([]);
let loadingMore: boolean = $state(false);
@ -35,7 +37,6 @@ @@ -35,7 +37,6 @@
// Relay management
let allRelays: string[] = $state([]);
let ndk = $derived($ndkInstance);
// Event management
let allIndexEvents: NDKEvent[] = $state([]);

1
src/lib/components/publications/PublicationSection.svelte

@ -1,5 +1,4 @@ @@ -1,5 +1,4 @@
<script lang="ts">
import type { PublicationTree } from "$lib/data_structures/publication_tree";
import {
contentParagraph,
sectionHeading,

10
src/lib/components/publications/table_of_contents.svelte.ts

@ -159,7 +159,7 @@ export class TableOfContents { @@ -159,7 +159,7 @@ export class TableOfContents {
// Handle any other nodes that have already been resolved in parallel.
await Promise.all(
Array.from(this.#publicationTree.resolvedAddresses).map((address) =>
this.#buildTocEntryFromResolvedNode(address),
this.#buildTocEntryFromResolvedNode(address)
),
);
@ -274,10 +274,10 @@ export class TableOfContents { @@ -274,10 +274,10 @@ export class TableOfContents {
});
entry.children.sort((a, b) => {
const aOrdinal =
addressToOrdinal.get(a.address) ?? Number.MAX_SAFE_INTEGER;
const bOrdinal =
addressToOrdinal.get(b.address) ?? Number.MAX_SAFE_INTEGER;
const aOrdinal = addressToOrdinal.get(a.address) ??
Number.MAX_SAFE_INTEGER;
const bOrdinal = addressToOrdinal.get(b.address) ??
Number.MAX_SAFE_INTEGER;
return aOrdinal - bOrdinal;
});
}

7
src/lib/components/util/Interactions.svelte

@ -8,15 +8,16 @@ @@ -8,15 +8,16 @@
import ZapOutline from "$components/util/ZapOutline.svelte";
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import { onMount } from "svelte";
import { ndkInstance } from "$lib/ndk";
import { publicationColumnVisibility } from "$lib/stores";
import { getNdkContext } from "$lib/ndk";
const {
rootId,
event,
direction = "row",
} = $props<{ rootId: string; event?: NDKEvent; direction?: string }>();
const ndk = getNdkContext();
// Reactive arrays to hold incoming events
let likes: NDKEvent[] = [];
let zaps: NDKEvent[] = [];
@ -38,7 +39,7 @@ @@ -38,7 +39,7 @@
* Returns the subscription for later cleanup.
*/
function subscribeCount(kind: number, targetArray: NDKEvent[]) {
const sub = $ndkInstance.subscribe({
const sub = ndk.subscribe({
kinds: [kind],
"#a": [rootId], // Will this work?
});

12
src/lib/components/util/Profile.svelte

@ -8,22 +8,21 @@ @@ -8,22 +8,21 @@
loginWithAmber,
loginWithNpub
} from "$lib/stores/userStore";
import { ndkInstance } from "$lib/ndk";
import {
ArrowRightToBracketOutline,
UserOutline,
FileSearchOutline,
} from "flowbite-svelte-icons";
import { Avatar, Popover } from "flowbite-svelte";
import type { NDKUserProfile } from "@nostr-dev-kit/ndk";
import { get } from "svelte/store";
import { goto } from "$app/navigation";
import NDK, { NDKNip46Signer, NDKPrivateKeySigner } from "@nostr-dev-kit/ndk";
import { onMount } from "svelte";
import { getUserMetadata } from "$lib/utils/nostrUtils";
import { activeInboxRelays, activeOutboxRelays } from "$lib/ndk";
import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
let { pubkey, isNav = false } = $props<{ pubkey?: string, isNav?: boolean }>();
const ndk = getNdkContext();
let { isNav = false } = $props<{ isNav?: boolean }>();
// UI state for login functionality
let isLoadingExtension: boolean = $state(false);
@ -205,7 +204,6 @@ @@ -205,7 +204,6 @@
}
// Try using NDK's built-in profile fetching first
const ndk = get(ndkInstance);
if (ndk && userState.ndkUser) {
console.log("Using NDK's built-in profile fetching");
const userProfile = await userState.ndkUser.fetchProfile();
@ -298,7 +296,7 @@ @@ -298,7 +296,7 @@
isLoadingExtension = true;
isLoadingAmber = false;
try {
await loginWithExtension();
await loginWithExtension(ndk);
} catch (err: unknown) {
showResultMessage(
`❌ Browser extension connection failed: ${err instanceof Error ? err.message : String(err)}`,

7
src/lib/consts.ts

@ -3,6 +3,7 @@ @@ -3,6 +3,7 @@
export const wikiKind = 30818;
export const indexKind = 30040;
export const zettelKinds = [30041, 30818, 30023];
export const repostKinds = [6, 16];
export const communityRelays = [
"wss://theforest.nostr1.com",
@ -16,7 +17,7 @@ export const searchRelays = [ @@ -16,7 +17,7 @@ export const searchRelays = [
"wss://nostr.wine",
"wss://relay.damus.io",
"wss://relay.nostr.band",
"wss://freelay.sovbit.host"
"wss://freelay.sovbit.host",
];
export const secondaryRelays = [
@ -32,7 +33,7 @@ export const secondaryRelays = [ @@ -32,7 +33,7 @@ export const secondaryRelays = [
export const anonymousRelays = [
"wss://freelay.sovbit.host",
"wss://thecitadel.nostr1.com"
"wss://thecitadel.nostr1.com",
];
export const lowbandwidthRelays = [
@ -44,7 +45,7 @@ export const lowbandwidthRelays = [ @@ -44,7 +45,7 @@ export const lowbandwidthRelays = [
export const localRelays: string[] = [
"ws://localhost:8080",
"ws://localhost:4869",
"ws://localhost:3334"
"ws://localhost:3334",
];
export enum FeedType {

85
src/lib/data_structures/docs/relay_selector_design.md

@ -1,6 +1,11 @@ @@ -1,6 +1,11 @@
# Relay Selector Class Design
The relay selector will be a singleton that tracks, rates, and ranks Nostr relays to help the application determine which relay should be used to handle each request. It will weight relays based on observed characteristics, then use these weights to implement a weighted round robin algorithm for selecting relays, with some additional modifications to account for domain-specific features of Nostr.
The relay selector will be a singleton that tracks, rates, and ranks Nostr
relays to help the application determine which relay should be used to handle
each request. It will weight relays based on observed characteristics, then use
these weights to implement a weighted round robin algorithm for selecting
relays, with some additional modifications to account for domain-specific
features of Nostr.
## Relay Weights
@ -9,63 +14,92 @@ The relay selector will be a singleton that tracks, rates, and ranks Nostr relay @@ -9,63 +14,92 @@ The relay selector will be a singleton that tracks, rates, and ranks Nostr relay
Relays are broadly divided into three categories:
1. **Public**: no authorization is required
2. **Private Write**: authorization is required to write to this relay, but not to read
3. **Private Read and Write**: authorization is required to use any features of this relay
2. **Private Write**: authorization is required to write to this relay, but not
to read
3. **Private Read and Write**: authorization is required to use any features of
this relay
The broadest level of relay selection is based on these categories.
- For users that are not logged in, public relays are used exclusively.
- For logged-in users, public and private read relays are initially rated equally for read operations.
- For logged-in users, private write relays are preferred above public relays for write operations.
- For logged-in users, public and private read relays are initially rated
equally for read operations.
- For logged-in users, private write relays are preferred above public relays
for write operations.
### User Preferences
The relay selector will respect user relay preferences while still attempting to optimize for responsiveness and success rate.
- User inbox relays will be stored in a separate list from general-purpose relays, and weighted and sorted separately using the same algorithm as the general-purpose relay list.
- Local relays (beginning with `wss://localhost` or `ws://localhost`) will be stored _unranked_ in a separate list, and used when the relay selector is operating on a web browser (as opposed to a server).
- When a caller requests relays from the relay selector, the selector will return:
The relay selector will respect user relay preferences while still attempting to
optimize for responsiveness and success rate.
- User inbox relays will be stored in a separate list from general-purpose
relays, and weighted and sorted separately using the same algorithm as the
general-purpose relay list.
- Local relays (beginning with `wss://localhost` or `ws://localhost`) will be
stored _unranked_ in a separate list, and used when the relay selector is
operating on a web browser (as opposed to a server).
- When a caller requests relays from the relay selector, the selector will
return:
- The highest-ranked general-purpose relay
- The highest-ranked user inbox relay
- (If on browser) any local relays
### Weighted Metrics
Several weighted metrics are used to compute a relay's score. The score is used to rank relays to determine which to prefer when fetching events.
Several weighted metrics are used to compute a relay's score. The score is used
to rank relays to determine which to prefer when fetching events.
#### Response Time
The response time weight of each relay is computed according to the logarithmic function $`r(t) = -log(t) + 1`$, where $`t`$ is the median response time in seconds. This function has a few features which make it useful:
The response time weight of each relay is computed according to the logarithmic
function $`r(t) = -log(t) + 1`$, where $`t`$ is the median response time in
seconds. This function has a few features which make it useful:
- $`r(1) = 1`$, making a response time of 1s the netural point. This causes the algorithm to prefer relays that respond in under 1s.
- $`r(0.3) \approx 1.5`$ and $`r(3) \approx 0.5`$. This clusters the 0.5 to 1.5 weight range in the 300ms to 3s response time range, which is a sufficiently rapid response time to keep user's from switching context.
- The function has a long tail, so it doesn't discount slower response times too heavily, too quickly.
- $`r(1) = 1`$, making a response time of 1s the netural point. This causes the
algorithm to prefer relays that respond in under 1s.
- $`r(0.3) \approx 1.5`$ and $`r(3) \approx 0.5`$. This clusters the 0.5 to 1.5
weight range in the 300ms to 3s response time range, which is a sufficiently
rapid response time to keep user's from switching context.
- The function has a long tail, so it doesn't discount slower response times too
heavily, too quickly.
#### Success Rate
The success rate $`s(x)`$ is computed as the fraction of total requests sent to the relay that returned at least one event in response. The optimal score is 1, meaning the relay successfully responds to 100% of requests.
The success rate $`s(x)`$ is computed as the fraction of total requests sent to
the relay that returned at least one event in response. The optimal score is 1,
meaning the relay successfully responds to 100% of requests.
#### Trust Level
Certain relays may be assigned a constant "trust level" score $`T`$. This modifier is a number in the range $`[-0.5, 0.5]`$ that indicates how much a relay is trusted by the GitCitadel organization.
Certain relays may be assigned a constant "trust level" score $`T`$. This
modifier is a number in the range $`[-0.5, 0.5]`$ that indicates how much a
relay is trusted by the GitCitadel organization.
A few factors contribute to a higher trust rating:
- Effective filtering of spam and abusive content.
- Good data transparency, including such policies as honoring deletion requests.
- Event aggregation policies that aim at synchronization with the broader relay network.
- Event aggregation policies that aim at synchronization with the broader relay
network.
#### Preferred Vendors
Certain relays may be assigned a constant "preferred vendor" score $`V`$. This modifier is a number in the range $`[0, 0.5]`$. It is used to increase the priority of GitCitadel's preferred relay vendors.
Certain relays may be assigned a constant "preferred vendor" score $`V`$. This
modifier is a number in the range $`[0, 0.5]`$. It is used to increase the
priority of GitCitadel's preferred relay vendors.
### Overall Weight
The overall weight of a relay is calculated as $`w(t, x) = r(t) \times s(x) + T + V`$. The `RelaySelector` class maintains a list of relays sorted by their overall weights. The weights may be updated at runtime when $`t`$ or $`x`$ change. On update, the relay list is re-sorted to account for the new weights.
The overall weight of a relay is calculated as
$`w(t, x) = r(t) \times s(x) + T + V`$. The `RelaySelector` class maintains a
list of relays sorted by their overall weights. The weights may be updated at
runtime when $`t`$ or $`x`$ change. On update, the relay list is re-sorted to
account for the new weights.
## Algorithm
The relay weights contribute to a weighted round robin (WRR) algorithm for relay selection. Pseudocode for the algorithm is given below:
The relay weights contribute to a weighted round robin (WRR) algorithm for relay
selection. Pseudocode for the algorithm is given below:
```pseudocode
Constants and Variables:
@ -86,11 +120,13 @@ Function getRelay: @@ -86,11 +120,13 @@ Function getRelay:
## Class Methods
The `RelaySelector` class should expose the following methods to support updates to relay weights. Pseudocode for each method is given below.
The `RelaySelector` class should expose the following methods to support updates
to relay weights. Pseudocode for each method is given below.
### Add Response Time Datum
This function updates the class state by side effect. Locking should be used in concurrent use cases.
This function updates the class state by side effect. Locking should be used in
concurrent use cases.
```pseudocode
Constants and Variables:
@ -123,7 +159,8 @@ Function addResponseTimeDatum: @@ -123,7 +159,8 @@ Function addResponseTimeDatum:
### Add Success Rate Datum
This function updates the class state by side effect. Locking should be used in concurrent use cases.
This function updates the class state by side effect. Locking should be used in
concurrent use cases.
```pseudocode
Constants and Variables:

310
src/lib/data_structures/publication_tree.ts

@ -2,7 +2,10 @@ import { Lazy } from "./lazy.ts"; @@ -2,7 +2,10 @@ import { Lazy } from "./lazy.ts";
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import type NDK from "@nostr-dev-kit/ndk";
import { fetchEventById } from "../utils/websocket_utils.ts";
import { fetchEventWithFallback, NDKRelaySetFromNDK } from "../utils/nostrUtils.ts";
import {
fetchEventWithFallback,
NDKRelaySetFromNDK,
} from "../utils/nostrUtils.ts";
import { get } from "svelte/store";
import { activeInboxRelays, activeOutboxRelays } from "../ndk.ts";
import { searchRelays, secondaryRelays } from "../consts.ts";
@ -50,7 +53,7 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -50,7 +53,7 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
* A map of addresses in the tree to their corresponding events.
*/
#events: Map<string, NDKEvent>;
/**
* Simple cache for fetched events to avoid re-fetching.
*/
@ -486,7 +489,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -486,7 +489,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
continue;
}
if (this.#cursor.target && this.#cursor.target.status === PublicationTreeNodeStatus.Error) {
if (
this.#cursor.target &&
this.#cursor.target.status === PublicationTreeNodeStatus.Error
) {
return { done: false, value: null };
}
@ -494,7 +500,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -494,7 +500,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
}
} while (this.#cursor.tryMoveToParent());
if (this.#cursor.target && this.#cursor.target.status === PublicationTreeNodeStatus.Error) {
if (
this.#cursor.target &&
this.#cursor.target.status === PublicationTreeNodeStatus.Error
) {
return { done: false, value: null };
}
@ -533,7 +542,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -533,7 +542,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
}
} while (this.#cursor.tryMoveToParent());
if (this.#cursor.target && this.#cursor.target.status === PublicationTreeNodeStatus.Error) {
if (
this.#cursor.target &&
this.#cursor.target.status === PublicationTreeNodeStatus.Error
) {
return { done: false, value: null };
}
@ -588,47 +600,84 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -588,47 +600,84 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
.filter((tag) => tag[0] === "a")
.map((tag) => tag[1]);
console.debug(`[PublicationTree] Current event ${currentEvent.id} has ${currentEvent.tags.length} tags:`, currentEvent.tags);
console.debug(`[PublicationTree] Found ${currentChildAddresses.length} a-tags in current event:`, currentChildAddresses);
console.debug(
`[PublicationTree] Current event ${currentEvent.id} has ${currentEvent.tags.length} tags:`,
currentEvent.tags,
);
console.debug(
`[PublicationTree] Found ${currentChildAddresses.length} a-tags in current event:`,
currentChildAddresses,
);
// If no a-tags found, try e-tags as fallback
if (currentChildAddresses.length === 0) {
const eTags = currentEvent.tags
.filter((tag) => tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1]));
console.debug(`[PublicationTree] Found ${eTags.length} e-tags for current event ${currentEvent.id}:`, eTags.map(tag => tag[1]));
.filter((tag) =>
tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1])
);
console.debug(
`[PublicationTree] Found ${eTags.length} e-tags for current event ${currentEvent.id}:`,
eTags.map((tag) => tag[1]),
);
// For e-tags with hex IDs, fetch the referenced events to get their addresses
const eTagPromises = eTags.map(async (tag) => {
try {
console.debug(`[PublicationTree] Fetching event for e-tag ${tag[1]} in depthFirstRetrieve`);
console.debug(
`[PublicationTree] Fetching event for e-tag ${
tag[1]
} in depthFirstRetrieve`,
);
const referencedEvent = await fetchEventById(tag[1]);
if (referencedEvent) {
// Construct the proper address format from the referenced event
const dTag = referencedEvent.tags.find(tag => tag[0] === "d")?.[1];
const dTag = referencedEvent.tags.find((tag) => tag[0] === "d")
?.[1];
if (dTag) {
const address = `${referencedEvent.kind}:${referencedEvent.pubkey}:${dTag}`;
console.debug(`[PublicationTree] Constructed address from e-tag in depthFirstRetrieve: ${address}`);
const address =
`${referencedEvent.kind}:${referencedEvent.pubkey}:${dTag}`;
console.debug(
`[PublicationTree] Constructed address from e-tag in depthFirstRetrieve: ${address}`,
);
return address;
} else {
console.debug(`[PublicationTree] Referenced event ${tag[1]} has no d-tag in depthFirstRetrieve`);
console.debug(
`[PublicationTree] Referenced event ${
tag[1]
} has no d-tag in depthFirstRetrieve`,
);
}
} else {
console.debug(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]} in depthFirstRetrieve - event not found`);
console.debug(
`[PublicationTree] Failed to fetch event for e-tag ${
tag[1]
} in depthFirstRetrieve - event not found`,
);
}
return null;
} catch (error) {
console.warn(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]} in depthFirstRetrieve:`, error);
console.warn(
`[PublicationTree] Failed to fetch event for e-tag ${
tag[1]
} in depthFirstRetrieve:`,
error,
);
return null;
}
});
const resolvedAddresses = await Promise.all(eTagPromises);
const validAddresses = resolvedAddresses.filter(addr => addr !== null) as string[];
console.debug(`[PublicationTree] Resolved ${validAddresses.length} valid addresses from e-tags in depthFirstRetrieve:`, validAddresses);
const validAddresses = resolvedAddresses.filter((addr) =>
addr !== null
) as string[];
console.debug(
`[PublicationTree] Resolved ${validAddresses.length} valid addresses from e-tags in depthFirstRetrieve:`,
validAddresses,
);
if (validAddresses.length > 0) {
currentChildAddresses.push(...validAddresses);
}
@ -646,9 +695,9 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -646,9 +695,9 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
// Augment the tree with the children of the current event.
const childPromises = currentChildAddresses
.filter(childAddress => !this.#nodes.has(childAddress))
.map(childAddress => this.#addNode(childAddress, currentNode!));
.filter((childAddress) => !this.#nodes.has(childAddress))
.map((childAddress) => this.#addNode(childAddress, currentNode!));
await Promise.all(childPromises);
// Push the popped address's children onto the stack for the next iteration.
@ -663,7 +712,7 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -663,7 +712,7 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
#addNode(address: string, parentNode: PublicationTreeNode) {
const lazyNode = new Lazy<PublicationTreeNode>(() =>
this.#resolveNode(address, parentNode),
this.#resolveNode(address, parentNode)
);
parentNode.children!.push(lazyNode);
this.#nodes.set(address, lazyNode);
@ -686,10 +735,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -686,10 +735,10 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
): Promise<PublicationTreeNode> {
// Check cache first
let event = this.#eventCache.get(address);
if (!event) {
const [kind, pubkey, dTag] = address.split(":");
// AI-NOTE: 2025-01-24 - Enhanced event fetching with comprehensive fallback
// First try to fetch using the enhanced fetchEventWithFallback function
// which includes search relay fallback logic
@ -698,33 +747,50 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -698,33 +747,50 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
authors: [pubkey],
"#d": [dTag],
}, 5000) // 5 second timeout for publication events
.then(fetchedEvent => {
.then((fetchedEvent) => {
if (fetchedEvent) {
// Cache the event if found
this.#eventCache.set(address, fetchedEvent);
event = fetchedEvent;
}
if (!event) {
console.warn(
`[PublicationTree] Event with address ${address} not found on primary relays, trying search relays.`,
);
// If still not found, try a more aggressive search using search relays
return this.#trySearchRelayFallback(address, kind, pubkey, dTag, parentNode);
// If still not found, try a more aggressive search using search relays
return this.#trySearchRelayFallback(
address,
kind,
pubkey,
dTag,
parentNode,
);
}
return this.#buildNodeFromEvent(event, address, parentNode);
})
.catch(error => {
console.warn(`[PublicationTree] Error fetching event for address ${address}:`, error);
// Try search relay fallback even on error
return this.#trySearchRelayFallback(address, kind, pubkey, dTag, parentNode);
.catch((error) => {
console.warn(
`[PublicationTree] Error fetching event for address ${address}:`,
error,
);
// Try search relay fallback even on error
return this.#trySearchRelayFallback(
address,
kind,
pubkey,
dTag,
parentNode,
);
});
}
return Promise.resolve(this.#buildNodeFromEvent(event, address, parentNode));
return Promise.resolve(
this.#buildNodeFromEvent(event, address, parentNode),
);
}
/**
@ -732,54 +798,75 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -732,54 +798,75 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
* This method tries to find events on search relays when they're not found on primary relays
*/
async #trySearchRelayFallback(
address: string,
kind: string,
pubkey: string,
address: string,
kind: string,
pubkey: string,
dTag: string,
parentNode: PublicationTreeNode
parentNode: PublicationTreeNode,
): Promise<PublicationTreeNode> {
try {
console.log(`[PublicationTree] Trying search relay fallback for address: ${address}`);
console.log(
`[PublicationTree] Trying search relay fallback for address: ${address}`,
);
// Get current relay configuration
const inboxRelays = get(activeInboxRelays);
const outboxRelays = get(activeOutboxRelays);
// Create a comprehensive relay set including search relays
const allRelays = [...inboxRelays, ...outboxRelays, ...searchRelays, ...secondaryRelays];
const allRelays = [
...inboxRelays,
...outboxRelays,
...searchRelays,
...secondaryRelays,
];
const uniqueRelays = [...new Set(allRelays)]; // Remove duplicates
console.log(`[PublicationTree] Trying ${uniqueRelays.length} relays for fallback search:`, uniqueRelays);
console.log(
`[PublicationTree] Trying ${uniqueRelays.length} relays for fallback search:`,
uniqueRelays,
);
// Try each relay individually with a shorter timeout
for (const relay of uniqueRelays) {
try {
const relaySet = NDKRelaySetFromNDK.fromRelayUrls([relay], this.#ndk);
const fetchedEvent = await this.#ndk.fetchEvent({
kinds: [parseInt(kind)],
authors: [pubkey],
"#d": [dTag],
}, undefined, relaySet).withTimeout(3000); // 3 second timeout per relay
const relaySet = NDKRelaySetFromNDK.fromRelayUrls([relay], this.#ndk);
const fetchedEvent = await this.#ndk.fetchEvent(
{
kinds: [parseInt(kind)],
authors: [pubkey],
"#d": [dTag],
},
undefined,
relaySet,
).withTimeout(3000); // 3 second timeout per relay
if (fetchedEvent) {
console.log(`[PublicationTree] Found event ${fetchedEvent.id} on search relay: ${relay}`);
console.log(
`[PublicationTree] Found event ${fetchedEvent.id} on search relay: ${relay}`,
);
// Cache the event
this.#eventCache.set(address, fetchedEvent);
this.#events.set(address, fetchedEvent);
return this.#buildNodeFromEvent(fetchedEvent, address, parentNode);
}
} catch (error) {
console.debug(`[PublicationTree] Failed to fetch from relay ${relay}:`, error);
console.debug(
`[PublicationTree] Failed to fetch from relay ${relay}:`,
error,
);
continue; // Try next relay
}
}
// If we get here, the event was not found on any relay
console.warn(`[PublicationTree] Event with address ${address} not found on any relay after fallback search.`);
console.warn(
`[PublicationTree] Event with address ${address} not found on any relay after fallback search.`,
);
return {
type: PublicationTreeNodeType.Leaf,
status: PublicationTreeNodeStatus.Error,
@ -787,10 +874,12 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -787,10 +874,12 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
parent: parentNode,
children: [],
};
} catch (error) {
console.error(`[PublicationTree] Error in search relay fallback for ${address}:`, error);
console.error(
`[PublicationTree] Error in search relay fallback for ${address}:`,
error,
);
return {
type: PublicationTreeNodeType.Leaf,
status: PublicationTreeNodeStatus.Error,
@ -806,9 +895,9 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -806,9 +895,9 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
* This extracts the common logic for building nodes from events
*/
#buildNodeFromEvent(
event: NDKEvent,
address: string,
parentNode: PublicationTreeNode
event: NDKEvent,
address: string,
parentNode: PublicationTreeNode,
): PublicationTreeNode {
this.#events.set(address, event);
@ -816,46 +905,68 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -816,46 +905,68 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
.filter((tag) => tag[0] === "a")
.map((tag) => tag[1]);
console.debug(`[PublicationTree] Event ${event.id} has ${event.tags.length} tags:`, event.tags);
console.debug(`[PublicationTree] Found ${childAddresses.length} a-tags:`, childAddresses);
console.debug(
`[PublicationTree] Event ${event.id} has ${event.tags.length} tags:`,
event.tags,
);
console.debug(
`[PublicationTree] Found ${childAddresses.length} a-tags:`,
childAddresses,
);
// If no a-tags found, try e-tags as fallback
if (childAddresses.length === 0) {
const eTags = event.tags
.filter((tag) => tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1]));
console.debug(`[PublicationTree] Found ${eTags.length} e-tags for event ${event.id}:`, eTags.map(tag => tag[1]));
.filter((tag) =>
tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1])
);
console.debug(
`[PublicationTree] Found ${eTags.length} e-tags for event ${event.id}:`,
eTags.map((tag) => tag[1]),
);
// For e-tags with hex IDs, fetch the referenced events to get their addresses
const eTagPromises = eTags.map(async (tag) => {
try {
console.debug(`[PublicationTree] Fetching event for e-tag ${tag[1]}`);
const referencedEvent = await fetchEventById(tag[1]);
if (referencedEvent) {
// Construct the proper address format from the referenced event
const dTag = referencedEvent.tags.find(tag => tag[0] === "d")?.[1];
const dTag = referencedEvent.tags.find((tag) => tag[0] === "d")
?.[1];
if (dTag) {
const address = `${referencedEvent.kind}:${referencedEvent.pubkey}:${dTag}`;
console.debug(`[PublicationTree] Constructed address from e-tag: ${address}`);
const address =
`${referencedEvent.kind}:${referencedEvent.pubkey}:${dTag}`;
console.debug(
`[PublicationTree] Constructed address from e-tag: ${address}`,
);
return address;
} else {
console.debug(`[PublicationTree] Referenced event ${tag[1]} has no d-tag`);
console.debug(
`[PublicationTree] Referenced event ${tag[1]} has no d-tag`,
);
}
} else {
console.debug(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]}`);
console.debug(
`[PublicationTree] Failed to fetch event for e-tag ${tag[1]}`,
);
}
return null;
} catch (error) {
console.warn(`[PublicationTree] Failed to fetch event for e-tag ${tag[1]}:`, error);
console.warn(
`[PublicationTree] Failed to fetch event for e-tag ${tag[1]}:`,
error,
);
return null;
}
});
// Note: We can't await here since this is a synchronous method
// The e-tag resolution will happen when the children are processed
// For now, we'll add the e-tags as potential child addresses
const eTagAddresses = eTags.map(tag => tag[1]);
const eTagAddresses = eTags.map((tag) => tag[1]);
childAddresses.push(...eTagAddresses);
}
@ -868,11 +979,14 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -868,11 +979,14 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
};
// Add children asynchronously
const childPromises = childAddresses.map(address =>
const childPromises = childAddresses.map((address) =>
this.addEventByAddress(address, event)
);
Promise.all(childPromises).catch(error => {
console.warn(`[PublicationTree] Error adding children for ${address}:`, error);
Promise.all(childPromises).catch((error) => {
console.warn(
`[PublicationTree] Error adding children for ${address}:`,
error,
);
});
this.#nodeResolvedObservers.forEach((observer) => observer(address));
@ -881,10 +995,14 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> { @@ -881,10 +995,14 @@ export class PublicationTree implements AsyncIterable<NDKEvent | null> {
}
#getNodeType(event: NDKEvent): PublicationTreeNodeType {
if (event.kind === 30040 && (
event.tags.some((tag) => tag[0] === "a") ||
event.tags.some((tag) => tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1]))
)) {
if (
event.kind === 30040 && (
event.tags.some((tag) => tag[0] === "a") ||
event.tags.some((tag) =>
tag[0] === "e" && tag[1] && /^[0-9a-fA-F]{64}$/.test(tag[1])
)
)
) {
return PublicationTreeNodeType.Branch;
}

65
src/lib/data_structures/websocket_pool.ts

@ -42,7 +42,10 @@ export class WebSocketPool { @@ -42,7 +42,10 @@ export class WebSocketPool {
* @param maxConnections - The maximum number of simultaneous WebSocket connections. Defaults to
* 16.
*/
private constructor(idleTimeoutMs: number = 60000, maxConnections: number = 16) {
private constructor(
idleTimeoutMs: number = 60000,
maxConnections: number = 16,
) {
this.#idleTimeoutMs = idleTimeoutMs;
this.#maxConnections = maxConnections;
}
@ -71,15 +74,17 @@ export class WebSocketPool { @@ -71,15 +74,17 @@ export class WebSocketPool {
}
if (limit == null || isNaN(limit)) {
throw new Error('[WebSocketPool] Connection limit must be a number.');
throw new Error("[WebSocketPool] Connection limit must be a number.");
}
if (limit <= 0) {
throw new Error('[WebSocketPool] Connection limit must be greater than 0.');
throw new Error(
"[WebSocketPool] Connection limit must be greater than 0.",
);
}
if (!Number.isInteger(limit)) {
throw new Error('[WebSocketPool] Connection limit must be an integer.');
throw new Error("[WebSocketPool] Connection limit must be an integer.");
}
this.#maxConnections = limit;
@ -106,15 +111,15 @@ export class WebSocketPool { @@ -106,15 +111,15 @@ export class WebSocketPool {
}
if (timeoutMs == null || isNaN(timeoutMs)) {
throw new Error('[WebSocketPool] Idle timeout must be a number.');
throw new Error("[WebSocketPool] Idle timeout must be a number.");
}
if (timeoutMs <= 0) {
throw new Error('[WebSocketPool] Idle timeout must be greater than 0.');
throw new Error("[WebSocketPool] Idle timeout must be greater than 0.");
}
if (!Number.isInteger(timeoutMs)) {
throw new Error('[WebSocketPool] Idle timeout must be an integer.');
throw new Error("[WebSocketPool] Idle timeout must be an integer.");
}
this.#idleTimeoutMs = timeoutMs;
@ -151,9 +156,9 @@ export class WebSocketPool { @@ -151,9 +156,9 @@ export class WebSocketPool {
if (this.#pool.size >= this.#maxConnections) {
return new Promise((resolve, reject) => {
this.#waitingQueue.push({
url: normalizedUrl,
resolve: (handle) => resolve(handle.ws),
this.#waitingQueue.push({
url: normalizedUrl,
resolve: (handle) => resolve(handle.ws),
reject,
});
});
@ -163,7 +168,7 @@ export class WebSocketPool { @@ -163,7 +168,7 @@ export class WebSocketPool {
return newHandle.ws;
} catch (error) {
throw new Error(
`[WebSocketPool] Failed to acquire connection for ${normalizedUrl}: ${error}`
`[WebSocketPool] Failed to acquire connection for ${normalizedUrl}: ${error}`,
);
}
}
@ -179,7 +184,9 @@ export class WebSocketPool { @@ -179,7 +184,9 @@ export class WebSocketPool {
const normalizedUrl = this.#normalizeUrl(ws.url);
const handle = this.#pool.get(normalizedUrl);
if (!handle) {
throw new Error('[WebSocketPool] Attempted to release an unmanaged WebSocket connection.');
throw new Error(
"[WebSocketPool] Attempted to release an unmanaged WebSocket connection.",
);
}
if (--handle.refCount === 0) {
@ -191,8 +198,10 @@ export class WebSocketPool { @@ -191,8 +198,10 @@ export class WebSocketPool {
* Closes all WebSocket connections and "drains" the pool.
*/
public drain(): void {
console.debug(`[WebSocketPool] Draining pool with ${this.#pool.size} connections and ${this.#waitingQueue.length} waiting requests`);
console.debug(
`[WebSocketPool] Draining pool with ${this.#pool.size} connections and ${this.#waitingQueue.length} waiting requests`,
);
// Clear all idle timers first
for (const handle of this.#pool.values()) {
this.#clearIdleTimer(handle);
@ -200,7 +209,7 @@ export class WebSocketPool { @@ -200,7 +209,7 @@ export class WebSocketPool {
// Reject all waiting requests
for (const { reject } of this.#waitingQueue) {
reject(new Error('[WebSocketPool] Draining pool.'));
reject(new Error("[WebSocketPool] Draining pool."));
}
this.#waitingQueue = [];
@ -211,8 +220,8 @@ export class WebSocketPool { @@ -211,8 +220,8 @@ export class WebSocketPool {
}
}
this.#pool.clear();
console.debug('[WebSocketPool] Pool drained successfully');
console.debug("[WebSocketPool] Pool drained successfully");
}
// #endregion
@ -239,7 +248,9 @@ export class WebSocketPool { @@ -239,7 +248,9 @@ export class WebSocketPool {
this.#removeSocket(handle);
this.#processWaitingQueue();
reject(
new Error(`[WebSocketPool] WebSocket connection failed for ${url}: ${event.type}`)
new Error(
`[WebSocketPool] WebSocket connection failed for ${url}: ${event.type}`,
),
);
};
} catch (error) {
@ -251,7 +262,7 @@ export class WebSocketPool { @@ -251,7 +262,7 @@ export class WebSocketPool {
#removeSocket(handle: WebSocketHandle): void {
this.#clearIdleTimer(handle);
// Clean up event listeners to prevent memory leaks
// AI-NOTE: Code that checks out connections should clean up its own listener callbacks before
// releasing the connection to the pool.
@ -261,11 +272,13 @@ export class WebSocketPool { @@ -261,11 +272,13 @@ export class WebSocketPool {
handle.ws.onclose = null;
handle.ws.onmessage = null;
}
const url = this.#normalizeUrl(handle.ws.url);
this.#pool.delete(url);
console.debug(`[WebSocketPool] Removed socket for ${url}, pool size: ${this.#pool.size}`);
console.debug(
`[WebSocketPool] Removed socket for ${url}, pool size: ${this.#pool.size}`,
);
this.#processWaitingQueue();
}
@ -283,7 +296,9 @@ export class WebSocketPool { @@ -283,7 +296,9 @@ export class WebSocketPool {
handle.idleTimer = setTimeout(() => {
const refCount = handle.refCount;
if (refCount === 0 && handle.ws.readyState === WebSocket.OPEN) {
console.debug(`[WebSocketPool] Closing idle connection to ${handle.ws.url}`);
console.debug(
`[WebSocketPool] Closing idle connection to ${handle.ws.url}`,
);
handle.ws.close();
this.#removeSocket(handle);
}
@ -331,7 +346,7 @@ export class WebSocketPool { @@ -331,7 +346,7 @@ export class WebSocketPool {
#checkOut(handle: WebSocketHandle): void {
if (handle.refCount == null) {
throw new Error('[WebSocketPool] Handle refCount unexpectedly null.');
throw new Error("[WebSocketPool] Handle refCount unexpectedly null.");
}
++handle.refCount;
@ -346,10 +361,10 @@ export class WebSocketPool { @@ -346,10 +361,10 @@ export class WebSocketPool {
// The logic to remove a trailing slash for connection coalescing can be kept,
// but should be done on the normalized string.
if (urlObj.pathname !== '/' && normalized.endsWith('/')) {
if (urlObj.pathname !== "/" && normalized.endsWith("/")) {
normalized = normalized.slice(0, -1);
}
return normalized;
} catch {
// If URL is invalid, return it as-is and let WebSocket constructor handle the error.

2
src/lib/navigator/EventNetwork/types.ts

@ -53,7 +53,7 @@ export interface NetworkNode extends SimulationNodeDatum { @@ -53,7 +53,7 @@ export interface NetworkNode extends SimulationNodeDatum {
tagType?: string; // Type of tag (t, p, e, etc.)
tagValue?: string; // The tag value
connectedNodes?: string[]; // IDs of nodes that have this tag
// Person anchor specific fields
isPersonAnchor?: boolean; // Whether this is a person anchor node
pubkey?: string; // The person's public key

2
src/lib/navigator/EventNetwork/utils/common.ts

@ -38,4 +38,4 @@ export function createDebugFunction(prefix: string) { @@ -38,4 +38,4 @@ export function createDebugFunction(prefix: string) {
console.log(`[${prefix}]`, ...args);
}
};
}
}

325
src/lib/navigator/EventNetwork/utils/forceSimulation.ts

@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
/**
* D3 Force Simulation Utilities
*
*
* This module provides utilities for creating and managing D3 force-directed
* graph simulations for the event network visualization.
*/
import type { NetworkNode, NetworkLink } from "../types";
import type { NetworkLink, NetworkNode } from "../types";
import * as d3 from "d3";
import { createDebugFunction } from "./common";
@ -21,18 +21,18 @@ const debug = createDebugFunction("ForceSimulation"); @@ -21,18 +21,18 @@ const debug = createDebugFunction("ForceSimulation");
* Provides type safety for simulation operations
*/
export interface Simulation<NodeType, LinkType> {
nodes(): NodeType[];
nodes(nodes: NodeType[]): this;
alpha(): number;
alpha(alpha: number): this;
alphaTarget(): number;
alphaTarget(target: number): this;
restart(): this;
stop(): this;
tick(): this;
on(type: string, listener: (this: this) => void): this;
force(name: string): any;
force(name: string, force: any): this;
nodes(): NodeType[];
nodes(nodes: NodeType[]): this;
alpha(): number;
alpha(alpha: number): this;
alphaTarget(): number;
alphaTarget(target: number): this;
restart(): this;
stop(): this;
tick(): this;
on(type: string, listener: (this: this) => void): this;
force(name: string): any;
force(name: string, force: any): this;
}
/**
@ -40,175 +40,192 @@ export interface Simulation<NodeType, LinkType> { @@ -40,175 +40,192 @@ export interface Simulation<NodeType, LinkType> {
* Provides type safety for drag operations
*/
export interface D3DragEvent<GElement extends Element, Datum, Subject> {
active: number;
sourceEvent: any;
subject: Subject;
x: number;
y: number;
dx: number;
dy: number;
identifier: string | number;
active: number;
sourceEvent: any;
subject: Subject;
x: number;
y: number;
dx: number;
dy: number;
identifier: string | number;
}
/**
* Updates a node's velocity by applying a force
*
*
* @param node - The node to update
* @param deltaVx - Change in x velocity
* @param deltaVy - Change in y velocity
*/
export function updateNodeVelocity(
node: NetworkNode,
deltaVx: number,
deltaVy: number
node: NetworkNode,
deltaVx: number,
deltaVy: number,
) {
debug("Updating node velocity", {
nodeId: node.id,
currentVx: node.vx,
currentVy: node.vy,
deltaVx,
deltaVy
});
if (typeof node.vx === "number" && typeof node.vy === "number") {
node.vx = node.vx - deltaVx;
node.vy = node.vy - deltaVy;
debug("New velocity", { nodeId: node.id, vx: node.vx, vy: node.vy });
} else {
debug("Node velocity not defined", { nodeId: node.id });
}
debug("Updating node velocity", {
nodeId: node.id,
currentVx: node.vx,
currentVy: node.vy,
deltaVx,
deltaVy,
});
if (typeof node.vx === "number" && typeof node.vy === "number") {
node.vx = node.vx - deltaVx;
node.vy = node.vy - deltaVy;
debug("New velocity", { nodeId: node.id, vx: node.vx, vy: node.vy });
} else {
debug("Node velocity not defined", { nodeId: node.id });
}
}
/**
* Applies a logarithmic gravity force pulling the node toward the center
*
*
* The logarithmic scale ensures that nodes far from the center experience
* stronger gravity, preventing them from drifting too far away.
*
*
* @param node - The node to apply gravity to
* @param centerX - X coordinate of the center
* @param centerY - Y coordinate of the center
* @param alpha - Current simulation alpha (cooling factor)
*/
export function applyGlobalLogGravity(
node: NetworkNode,
centerX: number,
centerY: number,
alpha: number,
node: NetworkNode,
centerX: number,
centerY: number,
alpha: number,
) {
// Tag anchors and person anchors should not be affected by gravity
if (node.isTagAnchor || node.isPersonAnchor) return;
const dx = (node.x ?? 0) - centerX;
const dy = (node.y ?? 0) - centerY;
const distance = Math.sqrt(dx * dx + dy * dy);
// Tag anchors and person anchors should not be affected by gravity
if (node.isTagAnchor || node.isPersonAnchor) return;
const dx = (node.x ?? 0) - centerX;
const dy = (node.y ?? 0) - centerY;
const distance = Math.sqrt(dx * dx + dy * dy);
if (distance === 0) return;
if (distance === 0) return;
const force = Math.log(distance + 1) * GRAVITY_STRENGTH * alpha;
updateNodeVelocity(node, (dx / distance) * force, (dy / distance) * force);
const force = Math.log(distance + 1) * GRAVITY_STRENGTH * alpha;
updateNodeVelocity(node, (dx / distance) * force, (dy / distance) * force);
}
/**
* Applies gravity between connected nodes
*
*
* This creates a cohesive force that pulls connected nodes toward their
* collective center of gravity, creating more meaningful clusters.
*
*
* @param node - The node to apply connected gravity to
* @param links - All links in the network
* @param alpha - Current simulation alpha (cooling factor)
*/
export function applyConnectedGravity(
node: NetworkNode,
links: NetworkLink[],
alpha: number,
node: NetworkNode,
links: NetworkLink[],
alpha: number,
) {
// Tag anchors and person anchors should not be affected by connected gravity
if (node.isTagAnchor || node.isPersonAnchor) return;
// Find all nodes connected to this node (excluding tag anchors and person anchors)
const connectedNodes = links
.filter(link => link.source.id === node.id || link.target.id === node.id)
.map(link => link.source.id === node.id ? link.target : link.source)
.filter(n => !n.isTagAnchor && !n.isPersonAnchor);
// Tag anchors and person anchors should not be affected by connected gravity
if (node.isTagAnchor || node.isPersonAnchor) return;
if (connectedNodes.length === 0) return;
// Find all nodes connected to this node (excluding tag anchors and person anchors)
const connectedNodes = links
.filter((link) => link.source.id === node.id || link.target.id === node.id)
.map((link) => link.source.id === node.id ? link.target : link.source)
.filter((n) => !n.isTagAnchor && !n.isPersonAnchor);
// Calculate center of gravity of connected nodes
const cogX = d3.mean(connectedNodes, (n: NetworkNode) => n.x);
const cogY = d3.mean(connectedNodes, (n: NetworkNode) => n.y);
if (connectedNodes.length === 0) return;
if (cogX === undefined || cogY === undefined) return;
// Calculate center of gravity of connected nodes
const cogX = d3.mean(connectedNodes, (n: NetworkNode) => n.x);
const cogY = d3.mean(connectedNodes, (n: NetworkNode) => n.y);
// Calculate force direction and magnitude
const dx = (node.x ?? 0) - cogX;
const dy = (node.y ?? 0) - cogY;
const distance = Math.sqrt(dx * dx + dy * dy);
if (cogX === undefined || cogY === undefined) return;
if (distance === 0) return;
// Calculate force direction and magnitude
const dx = (node.x ?? 0) - cogX;
const dy = (node.y ?? 0) - cogY;
const distance = Math.sqrt(dx * dx + dy * dy);
// Apply force proportional to distance
const force = distance * CONNECTED_GRAVITY_STRENGTH * alpha;
updateNodeVelocity(node, (dx / distance) * force, (dy / distance) * force);
if (distance === 0) return;
// Apply force proportional to distance
const force = distance * CONNECTED_GRAVITY_STRENGTH * alpha;
updateNodeVelocity(node, (dx / distance) * force, (dy / distance) * force);
}
/**
* Sets up drag behavior for nodes
*
*
* This enables interactive dragging of nodes in the visualization.
*
*
* @param simulation - The D3 force simulation
* @param warmupClickEnergy - Alpha target when dragging starts (0-1)
* @returns D3 drag behavior configured for the simulation
*/
export function setupDragHandlers(
simulation: Simulation<NetworkNode, NetworkLink>,
warmupClickEnergy: number = 0.9
simulation: Simulation<NetworkNode, NetworkLink>,
warmupClickEnergy: number = 0.9,
) {
return d3
.drag()
.on("start", (event: D3DragEvent<SVGGElement, NetworkNode, NetworkNode>, d: NetworkNode) => {
// Tag anchors and person anchors retain their anchor behavior
if (d.isTagAnchor || d.isPersonAnchor) {
// Still allow dragging but maintain anchor status
d.fx = d.x;
d.fy = d.y;
return;
}
// Warm up simulation if it's cooled down
if (!event.active) {
simulation.alphaTarget(warmupClickEnergy).restart();
}
// Fix node position at current location
d.fx = d.x;
d.fy = d.y;
})
.on("drag", (event: D3DragEvent<SVGGElement, NetworkNode, NetworkNode>, d: NetworkNode) => {
// Update position for all nodes including anchors
// Update fixed position to mouse position
d.fx = event.x;
d.fy = event.y;
})
.on("end", (event: D3DragEvent<SVGGElement, NetworkNode, NetworkNode>, d: NetworkNode) => {
// Cool down simulation when drag ends
if (!event.active) {
simulation.alphaTarget(0);
}
// Keep all nodes fixed after dragging
// This allows users to manually position any node type
d.fx = d.x;
d.fy = d.y;
});
return d3
.drag()
.on(
"start",
(
event: D3DragEvent<SVGGElement, NetworkNode, NetworkNode>,
d: NetworkNode,
) => {
// Tag anchors and person anchors retain their anchor behavior
if (d.isTagAnchor || d.isPersonAnchor) {
// Still allow dragging but maintain anchor status
d.fx = d.x;
d.fy = d.y;
return;
}
// Warm up simulation if it's cooled down
if (!event.active) {
simulation.alphaTarget(warmupClickEnergy).restart();
}
// Fix node position at current location
d.fx = d.x;
d.fy = d.y;
},
)
.on(
"drag",
(
event: D3DragEvent<SVGGElement, NetworkNode, NetworkNode>,
d: NetworkNode,
) => {
// Update position for all nodes including anchors
// Update fixed position to mouse position
d.fx = event.x;
d.fy = event.y;
},
)
.on(
"end",
(
event: D3DragEvent<SVGGElement, NetworkNode, NetworkNode>,
d: NetworkNode,
) => {
// Cool down simulation when drag ends
if (!event.active) {
simulation.alphaTarget(0);
}
// Keep all nodes fixed after dragging
// This allows users to manually position any node type
d.fx = d.x;
d.fy = d.y;
},
);
}
/**
* Creates a D3 force simulation for the network
*
*
* @param nodes - Array of network nodes
* @param links - Array of network links
* @param nodeRadius - Radius of node circles
@ -216,34 +233,34 @@ export function setupDragHandlers( @@ -216,34 +233,34 @@ export function setupDragHandlers(
* @returns Configured D3 force simulation
*/
export function createSimulation(
nodes: NetworkNode[],
links: NetworkLink[],
nodeRadius: number,
linkDistance: number
nodes: NetworkNode[],
links: NetworkLink[],
nodeRadius: number,
linkDistance: number,
): Simulation<NetworkNode, NetworkLink> {
debug("Creating simulation", {
nodeCount: nodes.length,
linkCount: links.length,
nodeRadius,
linkDistance
});
try {
// Create the simulation with nodes
const simulation = d3
.forceSimulation(nodes)
.force(
"link",
d3.forceLink(links)
.id((d: NetworkNode) => d.id)
.distance(linkDistance * 0.1)
)
.force("collide", d3.forceCollide().radius(nodeRadius * 4));
debug("Simulation created successfully");
return simulation;
} catch (error) {
console.error("Error creating simulation:", error);
throw error;
}
debug("Creating simulation", {
nodeCount: nodes.length,
linkCount: links.length,
nodeRadius,
linkDistance,
});
try {
// Create the simulation with nodes
const simulation = d3
.forceSimulation(nodes)
.force(
"link",
d3.forceLink(links)
.id((d: NetworkNode) => d.id)
.distance(linkDistance * 0.1),
)
.force("collide", d3.forceCollide().radius(nodeRadius * 4));
debug("Simulation created successfully");
return simulation;
} catch (error) {
console.error("Error creating simulation:", error);
throw error;
}
}

439
src/lib/navigator/EventNetwork/utils/networkBuilder.ts

@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
/**
* Network Builder Utilities
*
*
* This module provides utilities for building a network graph from Nostr events.
* It handles the creation of nodes and links, and the processing of event relationships.
*/
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import type { NetworkNode, NetworkLink, GraphData, GraphState } from "../types";
import type { GraphData, GraphState, NetworkLink, NetworkNode } from "../types";
import { nip19 } from "nostr-tools";
import { communityRelays } from "$lib/consts";
import { getMatchingTags } from '$lib/utils/nostrUtils';
import { getDisplayNameSync } from '$lib/utils/profileCache';
import { getMatchingTags } from "$lib/utils/nostrUtils";
import { getDisplayNameSync } from "$lib/utils/profileCache";
import { createDebugFunction } from "./common";
// Configuration
@ -22,165 +22,173 @@ const debug = createDebugFunction("NetworkBuilder"); @@ -22,165 +22,173 @@ const debug = createDebugFunction("NetworkBuilder");
/**
* Creates a NetworkNode from an NDKEvent
*
*
* Extracts relevant information from the event and creates a node representation
* for the visualization.
*
*
* @param event - The Nostr event to convert to a node
* @param level - The hierarchy level of the node (default: 0)
* @returns A NetworkNode object representing the event
*/
export function createNetworkNode(
event: NDKEvent,
level: number = 0
event: NDKEvent,
level: number = 0,
): NetworkNode {
debug("Creating network node", { eventId: event.id, kind: event.kind, level });
const isContainer = event.kind === INDEX_EVENT_KIND;
const nodeType = isContainer ? "Index" : event.kind === CONTENT_EVENT_KIND || event.kind === 30818 ? "Content" : `Kind ${event.kind}`;
debug("Creating network node", {
eventId: event.id,
kind: event.kind,
level,
});
// Create the base node with essential properties
const node: NetworkNode = {
const isContainer = event.kind === INDEX_EVENT_KIND;
const nodeType = isContainer
? "Index"
: event.kind === CONTENT_EVENT_KIND || event.kind === 30818
? "Content"
: `Kind ${event.kind}`;
// Create the base node with essential properties
const node: NetworkNode = {
id: event.id,
event,
isContainer,
level,
title: event.getMatchingTags("title")?.[0]?.[1] || "Untitled",
content: event.content || "",
author: event.pubkey ? getDisplayNameSync(event.pubkey) : "",
kind: event.kind !== undefined ? event.kind : CONTENT_EVENT_KIND, // Default to content event kind only if truly undefined
type: nodeType as "Index" | "Content" | "TagAnchor",
};
// Add NIP-19 identifiers if possible
if (event.kind && event.pubkey) {
try {
const dTag = event.getMatchingTags("d")?.[0]?.[1] || "";
// Create naddr (NIP-19 address) for the event
node.naddr = nip19.naddrEncode({
pubkey: event.pubkey,
identifier: dTag,
kind: event.kind,
relays: communityRelays,
});
// Create nevent (NIP-19 event reference) for the event
node.nevent = nip19.neventEncode({
id: event.id,
event,
isContainer,
level,
title: event.getMatchingTags("title")?.[0]?.[1] || "Untitled",
content: event.content || "",
author: event.pubkey ? getDisplayNameSync(event.pubkey) : "",
kind: event.kind !== undefined ? event.kind : CONTENT_EVENT_KIND, // Default to content event kind only if truly undefined
type: nodeType as "Index" | "Content" | "TagAnchor",
};
// Add NIP-19 identifiers if possible
if (event.kind && event.pubkey) {
try {
const dTag = event.getMatchingTags("d")?.[0]?.[1] || "";
// Create naddr (NIP-19 address) for the event
node.naddr = nip19.naddrEncode({
pubkey: event.pubkey,
identifier: dTag,
kind: event.kind,
relays: communityRelays,
});
// Create nevent (NIP-19 event reference) for the event
node.nevent = nip19.neventEncode({
id: event.id,
relays: communityRelays,
kind: event.kind,
});
} catch (error) {
console.warn("Failed to generate identifiers for node:", error);
}
relays: communityRelays,
kind: event.kind,
});
} catch (error) {
console.warn("Failed to generate identifiers for node:", error);
}
}
return node;
return node;
}
/**
* Creates a map of event IDs to events for quick lookup
*
*
* @param events - Array of Nostr events
* @returns Map of event IDs to events
*/
export function createEventMap(events: NDKEvent[]): Map<string, NDKEvent> {
debug("Creating event map", { eventCount: events.length });
const eventMap = new Map<string, NDKEvent>();
events.forEach((event) => {
if (event.id) {
eventMap.set(event.id, event);
}
});
debug("Event map created", { mapSize: eventMap.size });
return eventMap;
debug("Creating event map", { eventCount: events.length });
const eventMap = new Map<string, NDKEvent>();
events.forEach((event) => {
if (event.id) {
eventMap.set(event.id, event);
}
});
debug("Event map created", { mapSize: eventMap.size });
return eventMap;
}
/**
* Extracts an event ID from an 'a' tag
*
*
* @param tag - The tag array from a Nostr event
* @returns The event ID or null if not found
*/
export function extractEventIdFromATag(tag: string[]): string | null {
return tag[3] || null;
return tag[3] || null;
}
/**
* Generates a deterministic color for an event based on its ID
*
*
* This creates visually distinct colors for different index events
* while ensuring the same event always gets the same color.
*
*
* @param eventId - The event ID to generate a color for
* @returns An HSL color string
*/
export function getEventColor(eventId: string): string {
// Use first 4 characters of event ID as a hex number
const num = parseInt(eventId.slice(0, 4), 16);
// Convert to a hue value (0-359)
const hue = num % 360;
// Use fixed saturation and lightness for pastel colors
const saturation = 70;
const lightness = 75;
return `hsl(${hue}, ${saturation}%, ${lightness}%)`;
// Use first 4 characters of event ID as a hex number
const num = parseInt(eventId.slice(0, 4), 16);
// Convert to a hue value (0-359)
const hue = num % 360;
// Use fixed saturation and lightness for pastel colors
const saturation = 70;
const lightness = 75;
return `hsl(${hue}, ${saturation}%, ${lightness}%)`;
}
/**
* Initializes the graph state from a set of events
*
*
* Creates nodes for all events and identifies referenced events.
*
*
* @param events - Array of Nostr events
* @returns Initial graph state
*/
export function initializeGraphState(events: NDKEvent[]): GraphState {
debug("Initializing graph state", { eventCount: events.length });
const nodeMap = new Map<string, NetworkNode>();
const eventMap = createEventMap(events);
// Create initial nodes for all events
events.forEach((event) => {
if (!event.id) return;
const node = createNetworkNode(event);
nodeMap.set(event.id, node);
debug("Initializing graph state", { eventCount: events.length });
const nodeMap = new Map<string, NetworkNode>();
const eventMap = createEventMap(events);
// Create initial nodes for all events
events.forEach((event) => {
if (!event.id) return;
const node = createNetworkNode(event);
nodeMap.set(event.id, node);
});
debug("Node map created", { nodeCount: nodeMap.size });
// Build set of referenced event IDs to identify root events
const referencedIds = new Set<string>();
events.forEach((event) => {
const aTags = getMatchingTags(event, "a");
debug("Processing a-tags for event", {
eventId: event.id,
aTagCount: aTags.length,
});
debug("Node map created", { nodeCount: nodeMap.size });
// Build set of referenced event IDs to identify root events
const referencedIds = new Set<string>();
events.forEach((event) => {
const aTags = getMatchingTags(event, "a");
debug("Processing a-tags for event", {
eventId: event.id,
aTagCount: aTags.length
});
aTags.forEach((tag) => {
const id = extractEventIdFromATag(tag);
if (id) referencedIds.add(id);
});
aTags.forEach((tag) => {
const id = extractEventIdFromATag(tag);
if (id) referencedIds.add(id);
});
debug("Referenced IDs set created", { referencedCount: referencedIds.size });
return {
nodeMap,
links: [],
eventMap,
referencedIds,
};
});
debug("Referenced IDs set created", { referencedCount: referencedIds.size });
return {
nodeMap,
links: [],
eventMap,
referencedIds,
};
}
/**
* Processes a sequence of nodes referenced by an index event
*
*
* Creates links between the index and its content, and between sequential content nodes.
* Also processes nested indices recursively up to the maximum level.
*
*
* @param sequence - Array of nodes in the sequence
* @param indexEvent - The index event referencing the sequence
* @param level - Current hierarchy level
@ -188,156 +196,157 @@ export function initializeGraphState(events: NDKEvent[]): GraphState { @@ -188,156 +196,157 @@ export function initializeGraphState(events: NDKEvent[]): GraphState {
* @param maxLevel - Maximum hierarchy level to process
*/
export function processSequence(
sequence: NetworkNode[],
indexEvent: NDKEvent,
level: number,
state: GraphState,
maxLevel: number,
sequence: NetworkNode[],
indexEvent: NDKEvent,
level: number,
state: GraphState,
maxLevel: number,
): void {
// Stop if we've reached max level or have no nodes
if (level >= maxLevel || sequence.length === 0) return;
// Stop if we've reached max level or have no nodes
if (level >= maxLevel || sequence.length === 0) return;
// Set levels for all nodes in the sequence
sequence.forEach((node) => {
node.level = level + 1;
});
// Set levels for all nodes in the sequence
sequence.forEach((node) => {
node.level = level + 1;
// Create link from index to first content node
const indexNode = state.nodeMap.get(indexEvent.id);
if (indexNode && sequence[0]) {
state.links.push({
source: indexNode,
target: sequence[0],
isSequential: true,
});
}
// Create link from index to first content node
const indexNode = state.nodeMap.get(indexEvent.id);
if (indexNode && sequence[0]) {
state.links.push({
source: indexNode,
target: sequence[0],
isSequential: true,
});
}
// Create sequential links between content nodes
for (let i = 0; i < sequence.length - 1; i++) {
const currentNode = sequence[i];
const nextNode = sequence[i + 1];
// Create sequential links between content nodes
for (let i = 0; i < sequence.length - 1; i++) {
const currentNode = sequence[i];
const nextNode = sequence[i + 1];
state.links.push({
source: currentNode,
target: nextNode,
isSequential: true,
});
// Process nested indices recursively
if (currentNode.isContainer) {
processNestedIndex(currentNode, level + 1, state, maxLevel);
}
}
state.links.push({
source: currentNode,
target: nextNode,
isSequential: true,
});
// Process the last node if it's an index
const lastNode = sequence[sequence.length - 1];
if (lastNode?.isContainer) {
processNestedIndex(lastNode, level + 1, state, maxLevel);
// Process nested indices recursively
if (currentNode.isContainer) {
processNestedIndex(currentNode, level + 1, state, maxLevel);
}
}
// Process the last node if it's an index
const lastNode = sequence[sequence.length - 1];
if (lastNode?.isContainer) {
processNestedIndex(lastNode, level + 1, state, maxLevel);
}
}
/**
* Processes a nested index node
*
*
* @param node - The index node to process
* @param level - Current hierarchy level
* @param state - Current graph state
* @param maxLevel - Maximum hierarchy level to process
*/
export function processNestedIndex(
node: NetworkNode,
level: number,
state: GraphState,
maxLevel: number,
node: NetworkNode,
level: number,
state: GraphState,
maxLevel: number,
): void {
if (!node.isContainer || level >= maxLevel) return;
if (!node.isContainer || level >= maxLevel) return;
const nestedEvent = state.eventMap.get(node.id);
if (nestedEvent) {
processIndexEvent(nestedEvent, level, state, maxLevel);
}
const nestedEvent = state.eventMap.get(node.id);
if (nestedEvent) {
processIndexEvent(nestedEvent, level, state, maxLevel);
}
}
/**
* Processes an index event and its referenced content
*
*
* @param indexEvent - The index event to process
* @param level - Current hierarchy level
* @param state - Current graph state
* @param maxLevel - Maximum hierarchy level to process
*/
export function processIndexEvent(
indexEvent: NDKEvent,
level: number,
state: GraphState,
maxLevel: number,
indexEvent: NDKEvent,
level: number,
state: GraphState,
maxLevel: number,
): void {
if (level >= maxLevel) return;
if (level >= maxLevel) return;
// Extract the sequence of nodes referenced by this index
const sequence = getMatchingTags(indexEvent, "a")
.map((tag) => extractEventIdFromATag(tag))
.filter((id): id is string => id !== null)
.map((id) => state.nodeMap.get(id))
.filter((node): node is NetworkNode => node !== undefined);
// Extract the sequence of nodes referenced by this index
const sequence = getMatchingTags(indexEvent, "a")
.map((tag) => extractEventIdFromATag(tag))
.filter((id): id is string => id !== null)
.map((id) => state.nodeMap.get(id))
.filter((node): node is NetworkNode => node !== undefined);
processSequence(sequence, indexEvent, level, state, maxLevel);
processSequence(sequence, indexEvent, level, state, maxLevel);
}
/**
* Generates a complete graph from a set of events
*
*
* This is the main entry point for building the network visualization.
*
*
* @param events - Array of Nostr events
* @param maxLevel - Maximum hierarchy level to process
* @returns Complete graph data for visualization
*/
export function generateGraph(
events: NDKEvent[],
maxLevel: number
events: NDKEvent[],
maxLevel: number,
): GraphData {
debug("Generating graph", { eventCount: events.length, maxLevel });
// Initialize the graph state
const state = initializeGraphState(events);
// Find root events (index events not referenced by others, and all non-publication events)
const publicationKinds = [30040, 30041, 30818];
const rootEvents = events.filter(
(e) => e.id && (
// Index events not referenced by others
(e.kind === INDEX_EVENT_KIND && !state.referencedIds.has(e.id)) ||
// All non-publication events are treated as roots
(e.kind !== undefined && !publicationKinds.includes(e.kind))
)
);
debug("Found root events", {
rootCount: rootEvents.length,
rootIds: rootEvents.map(e => e.id)
});
// Process each root event
rootEvents.forEach((rootEvent) => {
debug("Processing root event", {
rootId: rootEvent.id,
kind: rootEvent.kind,
aTags: getMatchingTags(rootEvent, "a").length
});
processIndexEvent(rootEvent, 0, state, maxLevel);
});
debug("Generating graph", { eventCount: events.length, maxLevel });
// Create the final graph data
const result = {
nodes: Array.from(state.nodeMap.values()),
links: state.links,
};
debug("Graph generation complete", {
nodeCount: result.nodes.length,
linkCount: result.links.length
// Initialize the graph state
const state = initializeGraphState(events);
// Find root events (index events not referenced by others, and all non-publication events)
const publicationKinds = [30040, 30041, 30818];
const rootEvents = events.filter(
(e) =>
e.id && (
// Index events not referenced by others
(e.kind === INDEX_EVENT_KIND && !state.referencedIds.has(e.id)) ||
// All non-publication events are treated as roots
(e.kind !== undefined && !publicationKinds.includes(e.kind))
),
);
debug("Found root events", {
rootCount: rootEvents.length,
rootIds: rootEvents.map((e) => e.id),
});
// Process each root event
rootEvents.forEach((rootEvent) => {
debug("Processing root event", {
rootId: rootEvent.id,
kind: rootEvent.kind,
aTags: getMatchingTags(rootEvent, "a").length,
});
return result;
processIndexEvent(rootEvent, 0, state, maxLevel);
});
// Create the final graph data
const result = {
nodes: Array.from(state.nodeMap.values()),
links: state.links,
};
debug("Graph generation complete", {
nodeCount: result.nodes.length,
linkCount: result.links.length,
});
return result;
}

115
src/lib/navigator/EventNetwork/utils/personNetworkBuilder.ts

@ -5,9 +5,9 @@ @@ -5,9 +5,9 @@
*/
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import type { NetworkNode, NetworkLink } from "../types";
import { getDisplayNameSync, batchFetchProfiles } from "$lib/utils/profileCache";
import { SeededRandom, createDebugFunction } from "./common";
import type { NetworkLink, NetworkNode } from "../types";
import { getDisplayNameSync } from "$lib/utils/profileCache";
import { createDebugFunction, SeededRandom } from "./common";
const PERSON_ANCHOR_RADIUS = 15;
const PERSON_ANCHOR_PLACEMENT_RADIUS = 1000;
@ -16,7 +16,6 @@ const MAX_PERSON_NODES = 20; // Default limit for person nodes @@ -16,7 +16,6 @@ const MAX_PERSON_NODES = 20; // Default limit for person nodes
// Debug function
const debug = createDebugFunction("PersonNetworkBuilder");
/**
* Creates a deterministic seed from a string
*/
@ -42,13 +41,16 @@ export interface PersonConnection { @@ -42,13 +41,16 @@ export interface PersonConnection {
*/
export function extractUniquePersons(
events: NDKEvent[],
followListEvents?: NDKEvent[]
followListEvents?: NDKEvent[],
): Map<string, PersonConnection> {
// Map of pubkey -> PersonConnection
const personMap = new Map<string, PersonConnection>();
debug("Extracting unique persons", { eventCount: events.length, followListCount: followListEvents?.length || 0 });
debug("Extracting unique persons", {
eventCount: events.length,
followListCount: followListEvents?.length || 0,
});
// First collect pubkeys from follow list events
const followListPubkeys = new Set<string>();
if (followListEvents && followListEvents.length > 0) {
@ -60,10 +62,10 @@ export function extractUniquePersons( @@ -60,10 +62,10 @@ export function extractUniquePersons(
// People in follow lists (p tags)
if (event.tags) {
event.tags
.filter(tag => {
tag[0] === 'p'
.filter((tag) => {
tag[0] === "p";
})
.forEach(tag => {
.forEach((tag) => {
followListPubkeys.add(tag[1]);
});
}
@ -79,7 +81,7 @@ export function extractUniquePersons( @@ -79,7 +81,7 @@ export function extractUniquePersons(
personMap.set(event.pubkey, {
signedByEventIds: new Set(),
referencedInEventIds: new Set(),
isFromFollowList: followListPubkeys.has(event.pubkey)
isFromFollowList: followListPubkeys.has(event.pubkey),
});
}
personMap.get(event.pubkey)!.signedByEventIds.add(event.id);
@ -87,14 +89,14 @@ export function extractUniquePersons( @@ -87,14 +89,14 @@ export function extractUniquePersons(
// Track referenced connections from "p" tags
if (event.tags) {
event.tags.forEach(tag => {
event.tags.forEach((tag) => {
if (tag[0] === "p" && tag[1]) {
const referencedPubkey = tag[1];
if (!personMap.has(referencedPubkey)) {
personMap.set(referencedPubkey, {
signedByEventIds: new Set(),
referencedInEventIds: new Set(),
isFromFollowList: followListPubkeys.has(referencedPubkey)
isFromFollowList: followListPubkeys.has(referencedPubkey),
});
}
personMap.get(referencedPubkey)!.referencedInEventIds.add(event.id);
@ -102,7 +104,7 @@ export function extractUniquePersons( @@ -102,7 +104,7 @@ export function extractUniquePersons(
});
}
});
debug("Extracted persons", { personCount: personMap.size });
return personMap;
@ -115,7 +117,7 @@ function buildEligiblePerson( @@ -115,7 +117,7 @@ function buildEligiblePerson(
pubkey: string,
connection: PersonConnection,
showSignedBy: boolean,
showReferenced: boolean
showReferenced: boolean,
): {
pubkey: string;
connection: PersonConnection;
@ -125,11 +127,11 @@ function buildEligiblePerson( @@ -125,11 +127,11 @@ function buildEligiblePerson(
const connectedEventIds = new Set<string>();
if (showSignedBy) {
connection.signedByEventIds.forEach(id => connectedEventIds.add(id));
connection.signedByEventIds.forEach((id) => connectedEventIds.add(id));
}
if (showReferenced) {
connection.referencedInEventIds.forEach(id => connectedEventIds.add(id));
connection.referencedInEventIds.forEach((id) => connectedEventIds.add(id));
}
if (connectedEventIds.size === 0) {
@ -140,7 +142,7 @@ function buildEligiblePerson( @@ -140,7 +142,7 @@ function buildEligiblePerson(
pubkey,
connection,
connectedEventIds,
totalConnections: connectedEventIds.size
totalConnections: connectedEventIds.size,
};
}
@ -155,7 +157,7 @@ function getEligiblePersons( @@ -155,7 +157,7 @@ function getEligiblePersons(
personMap: Map<string, PersonConnection>,
showSignedBy: boolean,
showReferenced: boolean,
limit: number
limit: number,
): EligiblePerson[] {
// Build eligible persons and keep only top N using a min-heap or partial sort
const eligible: EligiblePerson[] = [];
@ -163,16 +165,20 @@ function getEligiblePersons( @@ -163,16 +165,20 @@ function getEligiblePersons(
for (const [pubkey, connection] of personMap) {
let totalConnections = 0;
if (showSignedBy) totalConnections += connection.signedByEventIds.size;
if (showReferenced) totalConnections += connection.referencedInEventIds.size;
if (showReferenced) {
totalConnections += connection.referencedInEventIds.size;
}
if (totalConnections === 0) continue;
// Only build the set if this person is eligible
const connectedEventIds = new Set<string>();
if (showSignedBy) {
connection.signedByEventIds.forEach(id => connectedEventIds.add(id));
connection.signedByEventIds.forEach((id) => connectedEventIds.add(id));
}
if (showReferenced) {
connection.referencedInEventIds.forEach(id => connectedEventIds.add(id));
connection.referencedInEventIds.forEach((id) =>
connectedEventIds.add(id)
);
}
eligible.push({ pubkey, connection, totalConnections, connectedEventIds });
@ -186,39 +192,33 @@ function getEligiblePersons( @@ -186,39 +192,33 @@ function getEligiblePersons(
/**
* Creates person anchor nodes
*/
export async function createPersonAnchorNodes(
export function createPersonAnchorNodes(
personMap: Map<string, PersonConnection>,
width: number,
height: number,
showSignedBy: boolean,
showReferenced: boolean,
limit: number = MAX_PERSON_NODES
): Promise<{ nodes: NetworkNode[], totalCount: number }> {
limit: number = MAX_PERSON_NODES,
): { nodes: NetworkNode[]; totalCount: number } {
const anchorNodes: NetworkNode[] = [];
const centerX = width / 2;
const centerY = height / 2;
// Calculate eligible persons and their connection counts
const eligiblePersons = getEligiblePersons(personMap, showSignedBy, showReferenced, limit);
// Cache profiles for person anchor nodes
const personPubkeys = eligiblePersons.map(p => p.pubkey);
if (personPubkeys.length > 0) {
debug("Caching profiles for person anchor nodes", { count: personPubkeys.length });
try {
await batchFetchProfiles(personPubkeys);
} catch (error) {
debug("Failed to cache profiles for person anchor nodes", error);
}
}
const eligiblePersons = getEligiblePersons(
personMap,
showSignedBy,
showReferenced,
limit,
);
// Create nodes for the limited set
debug("Creating person anchor nodes", {
eligibleCount: eligiblePersons.length,
debug("Creating person anchor nodes", {
eligibleCount: eligiblePersons.length,
limitedCount: eligiblePersons.length,
showSignedBy,
showReferenced
showReferenced,
});
eligiblePersons.forEach(({ pubkey, connection, connectedEventIds }) => {
@ -237,7 +237,8 @@ export async function createPersonAnchorNodes( @@ -237,7 +237,8 @@ export async function createPersonAnchorNodes(
const anchorNode: NetworkNode = {
id: `person-anchor-${pubkey}`,
title: displayName,
content: `${connection.signedByEventIds.size} signed, ${connection.referencedInEventIds.size} referenced`,
content:
`${connection.signedByEventIds.size} signed, ${connection.referencedInEventIds.size} referenced`,
author: "",
kind: 0, // Special kind for anchors
type: "PersonAnchor",
@ -256,11 +257,14 @@ export async function createPersonAnchorNodes( @@ -256,11 +257,14 @@ export async function createPersonAnchorNodes(
anchorNodes.push(anchorNode);
});
debug("Created person anchor nodes", { count: anchorNodes.length, totalEligible: eligiblePersons.length });
debug("Created person anchor nodes", {
count: anchorNodes.length,
totalEligible: eligiblePersons.length,
});
return {
nodes: anchorNodes,
totalCount: eligiblePersons.length
totalCount: eligiblePersons.length,
};
}
@ -275,10 +279,13 @@ export interface PersonLink extends NetworkLink { @@ -275,10 +279,13 @@ export interface PersonLink extends NetworkLink {
export function createPersonLinks(
personAnchors: NetworkNode[],
nodes: NetworkNode[],
personMap: Map<string, PersonConnection>
personMap: Map<string, PersonConnection>,
): PersonLink[] {
debug("Creating person links", { anchorCount: personAnchors.length, nodeCount: nodes.length });
debug("Creating person links", {
anchorCount: personAnchors.length,
nodeCount: nodes.length,
});
const nodeMap = new Map(nodes.map((n) => [n.id, n]));
const links: PersonLink[] = personAnchors.flatMap((anchor) => {
@ -297,11 +304,11 @@ export function createPersonLinks( @@ -297,11 +304,11 @@ export function createPersonLinks(
return undefined;
}
let connectionType: 'signed-by' | 'referenced' | undefined;
let connectionType: "signed-by" | "referenced" | undefined;
if (connection.signedByEventIds.has(nodeId)) {
connectionType = 'signed-by';
connectionType = "signed-by";
} else if (connection.referencedInEventIds.has(nodeId)) {
connectionType = 'referenced';
connectionType = "referenced";
}
const link: PersonLink = {
@ -310,7 +317,7 @@ export function createPersonLinks( @@ -310,7 +317,7 @@ export function createPersonLinks(
isSequential: false,
connectionType,
};
return link;
}).filter((link): link is PersonLink => link !== undefined); // Remove undefineds and type guard
});
@ -335,9 +342,9 @@ export interface PersonAnchorInfo { @@ -335,9 +342,9 @@ export interface PersonAnchorInfo {
*/
export function extractPersonAnchorInfo(
personAnchors: NetworkNode[],
personMap: Map<string, PersonConnection>
personMap: Map<string, PersonConnection>,
): PersonAnchorInfo[] {
return personAnchors.map(anchor => {
return personAnchors.map((anchor) => {
const connection = personMap.get(anchor.pubkey || "");
return {
pubkey: anchor.pubkey || "",
@ -347,4 +354,4 @@ export function extractPersonAnchorInfo( @@ -347,4 +354,4 @@ export function extractPersonAnchorInfo(
isFromFollowList: connection?.isFromFollowList || false,
};
});
}
}

83
src/lib/navigator/EventNetwork/utils/starForceSimulation.ts

@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
/**
* Star Network Force Simulation
*
*
* Custom force simulation optimized for star network layouts.
* Provides stronger connections between star centers and their content nodes,
* with specialized forces to maintain hierarchical structure.
*/
import * as d3 from "d3";
import type { NetworkNode, NetworkLink } from "../types";
import type { NetworkLink, NetworkNode } from "../types";
import type { Simulation } from "./forceSimulation";
import { createTagGravityForce } from "./tagNetworkBuilder";
// Configuration for star network forces
const STAR_CENTER_CHARGE = -300; // Stronger repulsion between star centers
const CONTENT_NODE_CHARGE = -50; // Weaker repulsion for content nodes
const STAR_LINK_STRENGTH = 0.5; // Moderate connection to star center
const STAR_CENTER_CHARGE = -300; // Stronger repulsion between star centers
const CONTENT_NODE_CHARGE = -50; // Weaker repulsion for content nodes
const STAR_LINK_STRENGTH = 0.5; // Moderate connection to star center
const INTER_STAR_LINK_STRENGTH = 0.2; // Weaker connection between stars
const STAR_LINK_DISTANCE = 80; // Fixed distance from center to content
const INTER_STAR_DISTANCE = 200; // Distance between star centers
const CENTER_GRAVITY = 0.02; // Gentle pull toward canvas center
const STAR_CENTER_WEIGHT = 10; // Weight multiplier for star centers
const STAR_LINK_DISTANCE = 80; // Fixed distance from center to content
const INTER_STAR_DISTANCE = 200; // Distance between star centers
const CENTER_GRAVITY = 0.02; // Gentle pull toward canvas center
const STAR_CENTER_WEIGHT = 10; // Weight multiplier for star centers
/**
* Creates a custom force simulation for star networks
@ -28,15 +28,18 @@ export function createStarSimulation( @@ -28,15 +28,18 @@ export function createStarSimulation(
nodes: NetworkNode[],
links: NetworkLink[],
width: number,
height: number
height: number,
): Simulation<NetworkNode, NetworkLink> {
// Create the simulation
const simulation = d3.forceSimulation(nodes) as any
const simulation = d3.forceSimulation(nodes) as any;
simulation
.force("center", d3.forceCenter(width / 2, height / 2).strength(CENTER_GRAVITY))
.force(
"center",
d3.forceCenter(width / 2, height / 2).strength(CENTER_GRAVITY),
)
.velocityDecay(0.2) // Lower decay for more responsive simulation
.alphaDecay(0.0001) // Much slower alpha decay to prevent freezing
.alphaMin(0.001); // Keep minimum energy to prevent complete freeze
.alphaDecay(0.0001) // Much slower alpha decay to prevent freezing
.alphaMin(0.001); // Keep minimum energy to prevent complete freeze
// Custom charge force that varies by node type
const chargeForce = d3.forceManyBody()
@ -91,9 +94,9 @@ export function createStarSimulation( @@ -91,9 +94,9 @@ export function createStarSimulation(
// Custom radial force to keep content nodes around their star center
simulation.force("radial", createRadialForce(nodes, links));
// Add tag gravity force if there are tag anchors
const hasTagAnchors = nodes.some(n => n.isTagAnchor);
const hasTagAnchors = nodes.some((n) => n.isTagAnchor);
if (hasTagAnchors) {
simulation.force("tagGravity", createTagGravityForce(nodes, links));
}
@ -122,9 +125,9 @@ function applyRadialForce( @@ -122,9 +125,9 @@ function applyRadialForce(
nodes: NetworkNode[],
nodeToCenter: Map<string, NetworkNode>,
targetDistance: number,
alpha: number
alpha: number,
): void {
nodes.forEach(node => {
nodes.forEach((node) => {
if (node.kind === 30041) {
const center = nodeToCenter.get(node.id);
if (
@ -157,7 +160,7 @@ function createRadialForce(nodes: NetworkNode[], links: NetworkLink[]): any { @@ -157,7 +160,7 @@ function createRadialForce(nodes: NetworkNode[], links: NetworkLink[]): any {
// Build a map of content nodes to their star centers
const nodeToCenter = new Map<string, NetworkNode>();
links.forEach(link => {
links.forEach((link) => {
const source = link.source as NetworkNode;
const target = link.target as NetworkNode;
if (source.kind === 30040 && target.kind === 30041) {
@ -169,7 +172,7 @@ function createRadialForce(nodes: NetworkNode[], links: NetworkLink[]): any { @@ -169,7 +172,7 @@ function createRadialForce(nodes: NetworkNode[], links: NetworkLink[]): any {
applyRadialForce(nodes, nodeToCenter, STAR_LINK_DISTANCE, alpha);
}
force.initialize = function(_: NetworkNode[]) {
force.initialize = function (_: NetworkNode[]) {
nodes = _;
};
@ -183,14 +186,14 @@ export function applyInitialStarPositions( @@ -183,14 +186,14 @@ export function applyInitialStarPositions(
nodes: NetworkNode[],
links: NetworkLink[],
width: number,
height: number
height: number,
): void {
// Group nodes by their star centers
const starGroups = new Map<string, NetworkNode[]>();
const starCenters: NetworkNode[] = [];
// Identify star centers
nodes.forEach(node => {
nodes.forEach((node) => {
if (node.isContainer && node.kind === 30040) {
starCenters.push(node);
starGroups.set(node.id, []);
@ -198,7 +201,7 @@ export function applyInitialStarPositions( @@ -198,7 +201,7 @@ export function applyInitialStarPositions(
});
// Assign content nodes to their star centers
links.forEach(link => {
links.forEach((link) => {
const source = link.source as NetworkNode;
const target = link.target as NetworkNode;
if (source.kind === 30040 && target.kind === 30041) {
@ -222,7 +225,7 @@ export function applyInitialStarPositions( @@ -222,7 +225,7 @@ export function applyInitialStarPositions(
const centerY = height / 2;
const radius = Math.min(width, height) * 0.3;
const angleStep = (2 * Math.PI) / starCenters.length;
starCenters.forEach((center, i) => {
const angle = i * angleStep;
center.x = centerX + radius * Math.cos(angle);
@ -233,9 +236,9 @@ export function applyInitialStarPositions( @@ -233,9 +236,9 @@ export function applyInitialStarPositions(
// Position content nodes around their star centers
starGroups.forEach((contentNodes, centerId) => {
const center = nodes.find(n => n.id === centerId);
const center = nodes.find((n) => n.id === centerId);
if (!center) return;
const angleStep = (2 * Math.PI) / Math.max(contentNodes.length, 1);
contentNodes.forEach((node, i) => {
const angle = i * angleStep;
@ -252,7 +255,11 @@ export function applyInitialStarPositions( @@ -252,7 +255,11 @@ export function applyInitialStarPositions(
* @param d - The node being dragged
* @param simulation - The d3 force simulation instance
*/
function dragstarted(event: any, d: NetworkNode, simulation: Simulation<NetworkNode, NetworkLink>) {
function dragstarted(
event: any,
d: NetworkNode,
simulation: Simulation<NetworkNode, NetworkLink>,
) {
// If no other drag is active, set a low alpha target to keep the simulation running smoothly
if (!event.active) {
simulation.alphaTarget(0.1).restart();
@ -281,7 +288,11 @@ function dragged(event: any, d: NetworkNode) { @@ -281,7 +288,11 @@ function dragged(event: any, d: NetworkNode) {
* @param d - The node being dragged
* @param simulation - The d3 force simulation instance
*/
function dragended(event: any, d: NetworkNode, simulation: Simulation<NetworkNode, NetworkLink>) {
function dragended(
event: any,
d: NetworkNode,
simulation: Simulation<NetworkNode, NetworkLink>,
) {
// If no other drag is active, lower the alpha target to let the simulation cool down
if (!event.active) {
simulation.alphaTarget(0);
@ -297,12 +308,16 @@ function dragended(event: any, d: NetworkNode, simulation: Simulation<NetworkNod @@ -297,12 +308,16 @@ function dragended(event: any, d: NetworkNode, simulation: Simulation<NetworkNod
* @returns The d3 drag behavior
*/
export function createStarDragHandler(
simulation: Simulation<NetworkNode, NetworkLink>
simulation: Simulation<NetworkNode, NetworkLink>,
): any {
// These handlers are now top-level functions, so we use closures to pass simulation to them.
// This is a common pattern in JavaScript/TypeScript when you need to pass extra arguments to event handlers.
return d3.drag()
.on('start', function(event: any, d: NetworkNode) { dragstarted(event, d, simulation); })
.on('drag', dragged)
.on('end', function(event: any, d: NetworkNode) { dragended(event, d, simulation); });
}
.on("start", function (event: any, d: NetworkNode) {
dragstarted(event, d, simulation);
})
.on("drag", dragged)
.on("end", function (event: any, d: NetworkNode) {
dragended(event, d, simulation);
});
}

186
src/lib/navigator/EventNetwork/utils/starNetworkBuilder.ts

@ -1,19 +1,23 @@ @@ -1,19 +1,23 @@
/**
* Star Network Builder for NKBIP-01 Events
*
*
* This module provides utilities for building star network visualizations specifically
* for NKBIP-01 events (kinds 30040 and 30041). Unlike the sequential network builder,
* this creates star formations where index events (30040) are central nodes with
* this creates star formations where index events (30040) are central nodes with
* content events (30041) arranged around them.
*/
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import type { NetworkNode, NetworkLink, GraphData, GraphState } from "../types";
import { getMatchingTags } from '$lib/utils/nostrUtils';
import { createNetworkNode, createEventMap, extractEventIdFromATag, getEventColor } from './networkBuilder';
import { createDebugFunction } from './common';
import { wikiKind, indexKind, zettelKinds } from '$lib/consts';
import type { GraphData, GraphState, NetworkLink, NetworkNode } from "../types";
import { getMatchingTags } from "$lib/utils/nostrUtils";
import {
createEventMap,
createNetworkNode,
extractEventIdFromATag,
getEventColor,
} from "./networkBuilder";
import { createDebugFunction } from "./common";
import { indexKind, wikiKind, zettelKinds } from "$lib/consts";
// Debug function
const debug = createDebugFunction("StarNetworkBuilder");
@ -22,14 +26,14 @@ const debug = createDebugFunction("StarNetworkBuilder"); @@ -22,14 +26,14 @@ const debug = createDebugFunction("StarNetworkBuilder");
* Represents a star network with a central index node and peripheral content nodes
*/
export interface StarNetwork {
center: NetworkNode; // Central index node (30040)
center: NetworkNode; // Central index node (30040)
peripheralNodes: NetworkNode[]; // Content nodes (30041) and connected indices (30040)
links: NetworkLink[]; // Links within this star
links: NetworkLink[]; // Links within this star
}
/**
* Creates a star network from an index event and its references
*
*
* @param indexEvent - The central index event (30040)
* @param state - Current graph state
* @param level - Hierarchy level for this star
@ -38,10 +42,10 @@ export interface StarNetwork { @@ -38,10 +42,10 @@ export interface StarNetwork {
export function createStarNetwork(
indexEvent: NDKEvent,
state: GraphState,
level: number = 0
level: number = 0,
): StarNetwork | null {
debug("Creating star network", { indexId: indexEvent.id, level });
const centerNode = state.nodeMap.get(indexEvent.id);
if (!centerNode) {
debug("Center node not found for index event", indexEvent.id);
@ -50,32 +54,35 @@ export function createStarNetwork( @@ -50,32 +54,35 @@ export function createStarNetwork(
// Set the center node level
centerNode.level = level;
// Extract referenced event IDs from 'a' tags
const referencedIds = getMatchingTags(indexEvent, "a")
.map(tag => extractEventIdFromATag(tag))
.map((tag) => extractEventIdFromATag(tag))
.filter((id): id is string => id !== null);
debug("Found referenced IDs", { count: referencedIds.length, ids: referencedIds });
debug("Found referenced IDs", {
count: referencedIds.length,
ids: referencedIds,
});
// Get peripheral nodes (both content and nested indices)
const peripheralNodes: NetworkNode[] = [];
const links: NetworkLink[] = [];
referencedIds.forEach(id => {
referencedIds.forEach((id) => {
const node = state.nodeMap.get(id);
if (node) {
// Set the peripheral node level
node.level += 1;
peripheralNodes.push(node);
// Create link from center to peripheral node
links.push({
source: centerNode,
target: node,
isSequential: false // Star links are not sequential
isSequential: false, // Star links are not sequential
});
debug("Added peripheral node", { nodeId: id, nodeType: node.type });
}
});
@ -83,13 +90,13 @@ export function createStarNetwork( @@ -83,13 +90,13 @@ export function createStarNetwork(
return {
center: centerNode,
peripheralNodes,
links
links,
};
}
/**
* Processes all index events to create star networks
*
*
* @param events - Array of all events
* @param maxLevel - Maximum nesting level to process
* @returns Array of star networks
@ -97,17 +104,17 @@ export function createStarNetwork( @@ -97,17 +104,17 @@ export function createStarNetwork(
export function createStarNetworks(
events: NDKEvent[],
maxLevel: number,
existingNodeMap?: Map<string, NetworkNode>
existingNodeMap?: Map<string, NetworkNode>,
): StarNetwork[] {
debug("Creating star networks", { eventCount: events.length, maxLevel });
// Use existing node map or create new one
const nodeMap = existingNodeMap || new Map<string, NetworkNode>();
const eventMap = createEventMap(events);
// Create nodes for all events if not using existing map
if (!existingNodeMap) {
events.forEach(event => {
events.forEach((event) => {
if (!event.id) return;
const node = createNetworkNode(event);
nodeMap.set(event.id, node);
@ -118,16 +125,16 @@ export function createStarNetworks( @@ -118,16 +125,16 @@ export function createStarNetworks(
nodeMap,
links: [],
eventMap,
referencedIds: new Set<string>()
referencedIds: new Set<string>(),
};
// Find all index events and non-publication events
const publicationKinds = [wikiKind, indexKind, ...zettelKinds];
const indexEvents = events.filter(event => event.kind === indexKind);
const nonPublicationEvents = events.filter(event =>
const indexEvents = events.filter((event) => event.kind === indexKind);
const nonPublicationEvents = events.filter((event) =>
event.kind !== undefined && !publicationKinds.includes(event.kind)
);
debug("Found index events", { count: indexEvents.length });
debug("Found non-publication events", { count: nonPublicationEvents.length });
@ -135,34 +142,34 @@ export function createStarNetworks( @@ -135,34 +142,34 @@ export function createStarNetworks(
const processedIndices = new Set<string>();
// Process all index events regardless of level
indexEvents.forEach(indexEvent => {
indexEvents.forEach((indexEvent) => {
if (!indexEvent.id || processedIndices.has(indexEvent.id)) return;
const star = createStarNetwork(indexEvent, state, 0);
if (star && star.peripheralNodes.length > 0) {
starNetworks.push(star);
processedIndices.add(indexEvent.id);
debug("Created star network", {
centerId: star.center.id,
peripheralCount: star.peripheralNodes.length
debug("Created star network", {
centerId: star.center.id,
peripheralCount: star.peripheralNodes.length,
});
}
});
// Add non-publication events as standalone nodes (stars with no peripherals)
nonPublicationEvents.forEach(event => {
nonPublicationEvents.forEach((event) => {
if (!event.id || !nodeMap.has(event.id)) return;
const node = nodeMap.get(event.id)!;
const star: StarNetwork = {
center: node,
peripheralNodes: [],
links: []
links: [],
};
starNetworks.push(star);
debug("Created standalone star for non-publication event", {
debug("Created standalone star for non-publication event", {
eventId: event.id,
kind: event.kind
kind: event.kind,
});
});
@ -171,36 +178,40 @@ export function createStarNetworks( @@ -171,36 +178,40 @@ export function createStarNetworks(
/**
* Creates inter-star connections between star networks
*
*
* @param starNetworks - Array of star networks
* @returns Additional links connecting different star networks
*/
export function createInterStarConnections(starNetworks: StarNetwork[]): NetworkLink[] {
export function createInterStarConnections(
starNetworks: StarNetwork[],
): NetworkLink[] {
debug("Creating inter-star connections", { starCount: starNetworks.length });
const interStarLinks: NetworkLink[] = [];
// Create a map of center nodes for quick lookup
const centerNodeMap = new Map<string, NetworkNode>();
starNetworks.forEach(star => {
starNetworks.forEach((star) => {
centerNodeMap.set(star.center.id, star.center);
});
// For each star, check if any of its peripheral nodes are centers of other stars
starNetworks.forEach(star => {
star.peripheralNodes.forEach(peripheralNode => {
starNetworks.forEach((star) => {
star.peripheralNodes.forEach((peripheralNode) => {
// If this peripheral node is the center of another star, create an inter-star link
if (peripheralNode.isContainer && centerNodeMap.has(peripheralNode.id)) {
const targetStar = starNetworks.find(s => s.center.id === peripheralNode.id);
const targetStar = starNetworks.find((s) =>
s.center.id === peripheralNode.id
);
if (targetStar) {
interStarLinks.push({
source: star.center,
target: targetStar.center,
isSequential: false
isSequential: false,
});
debug("Created inter-star connection", {
from: star.center.id,
to: targetStar.center.id
debug("Created inter-star connection", {
from: star.center.id,
to: targetStar.center.id,
});
}
}
@ -212,7 +223,7 @@ export function createInterStarConnections(starNetworks: StarNetwork[]): Network @@ -212,7 +223,7 @@ export function createInterStarConnections(starNetworks: StarNetwork[]): Network
/**
* Applies star-specific positioning to nodes using a radial layout
*
*
* @param starNetworks - Array of star networks
* @param width - Canvas width
* @param height - Canvas height
@ -220,61 +231,62 @@ export function createInterStarConnections(starNetworks: StarNetwork[]): Network @@ -220,61 +231,62 @@ export function createInterStarConnections(starNetworks: StarNetwork[]): Network
export function applyStarLayout(
starNetworks: StarNetwork[],
width: number,
height: number
height: number,
): void {
debug("Applying star layout", {
starCount: starNetworks.length,
dimensions: { width, height }
debug("Applying star layout", {
starCount: starNetworks.length,
dimensions: { width, height },
});
const centerX = width / 2;
const centerY = height / 2;
// If only one star, center it
if (starNetworks.length === 1) {
const star = starNetworks[0];
// Position center node
star.center.x = centerX;
star.center.y = centerY;
star.center.fx = centerX; // Fix center position
star.center.fy = centerY;
// Position peripheral nodes in a circle around center
const radius = Math.min(width, height) * 0.25;
const angleStep = (2 * Math.PI) / star.peripheralNodes.length;
star.peripheralNodes.forEach((node, index) => {
const angle = index * angleStep;
node.x = centerX + radius * Math.cos(angle);
node.y = centerY + radius * Math.sin(angle);
});
return;
}
// For multiple stars, arrange them in a grid or circle
const starsPerRow = Math.ceil(Math.sqrt(starNetworks.length));
const starSpacingX = width / (starsPerRow + 1);
const starSpacingY = height / (Math.ceil(starNetworks.length / starsPerRow) + 1);
const starSpacingY = height /
(Math.ceil(starNetworks.length / starsPerRow) + 1);
starNetworks.forEach((star, index) => {
const row = Math.floor(index / starsPerRow);
const col = index % starsPerRow;
const starCenterX = (col + 1) * starSpacingX;
const starCenterY = (row + 1) * starSpacingY;
// Position center node
star.center.x = starCenterX;
star.center.y = starCenterY;
star.center.fx = starCenterX; // Fix center position
star.center.fy = starCenterY;
// Position peripheral nodes around this star's center
const radius = Math.min(starSpacingX, starSpacingY) * 0.3;
const angleStep = (2 * Math.PI) / Math.max(star.peripheralNodes.length, 1);
star.peripheralNodes.forEach((node, nodeIndex) => {
const angle = nodeIndex * angleStep;
node.x = starCenterX + radius * Math.cos(angle);
@ -285,69 +297,69 @@ export function applyStarLayout( @@ -285,69 +297,69 @@ export function applyStarLayout(
/**
* Generates a complete star network graph from events
*
*
* @param events - Array of Nostr events
* @param maxLevel - Maximum hierarchy level to process
* @returns Complete graph data with star network layout
*/
export function generateStarGraph(
events: NDKEvent[],
maxLevel: number
maxLevel: number,
): GraphData {
debug("Generating star graph", { eventCount: events.length, maxLevel });
// Guard against empty events
if (!events || events.length === 0) {
return { nodes: [], links: [] };
}
// Initialize all nodes first
const nodeMap = new Map<string, NetworkNode>();
events.forEach(event => {
events.forEach((event) => {
if (!event.id) return;
const node = createNetworkNode(event);
nodeMap.set(event.id, node);
});
// Create star networks with the existing node map
const starNetworks = createStarNetworks(events, maxLevel, nodeMap);
// Create inter-star connections
const interStarLinks = createInterStarConnections(starNetworks);
// Collect nodes that are part of stars
const nodesInStars = new Set<string>();
const allLinks: NetworkLink[] = [];
// Add nodes and links from all stars
starNetworks.forEach(star => {
starNetworks.forEach((star) => {
nodesInStars.add(star.center.id);
star.peripheralNodes.forEach(node => {
star.peripheralNodes.forEach((node) => {
nodesInStars.add(node.id);
});
allLinks.push(...star.links);
});
// Add inter-star links
allLinks.push(...interStarLinks);
// Include orphaned nodes (those not in any star)
const allNodes: NetworkNode[] = [];
nodeMap.forEach((node, id) => {
allNodes.push(node);
});
const result = {
nodes: allNodes,
links: allLinks
links: allLinks,
};
debug("Star graph generation complete", {
nodeCount: result.nodes.length,
debug("Star graph generation complete", {
nodeCount: result.nodes.length,
linkCount: result.links.length,
starCount: starNetworks.length,
orphanedNodes: allNodes.length - nodesInStars.size
orphanedNodes: allNodes.length - nodesInStars.size,
});
return result;
}
}

29
src/lib/navigator/EventNetwork/utils/tagNetworkBuilder.ts

@ -6,9 +6,9 @@ @@ -6,9 +6,9 @@
*/
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import type { NetworkNode, NetworkLink, GraphData } from "../types";
import type { GraphData, NetworkLink, NetworkNode } from "../types";
import { getDisplayNameSync } from "$lib/utils/profileCache";
import { SeededRandom, createDebugFunction } from "./common";
import { createDebugFunction, SeededRandom } from "./common";
// Configuration
const TAG_ANCHOR_RADIUS = 15;
@ -18,7 +18,6 @@ const TAG_ANCHOR_PLACEMENT_RADIUS = 1250; // Radius from center within which to @@ -18,7 +18,6 @@ const TAG_ANCHOR_PLACEMENT_RADIUS = 1250; // Radius from center within which to
// Debug function
const debug = createDebugFunction("TagNetworkBuilder");
/**
* Creates a deterministic seed from a string
*/
@ -63,7 +62,10 @@ export function extractUniqueTagsForType( @@ -63,7 +62,10 @@ export function extractUniqueTagsForType(
): Map<string, Set<string>> {
// Map of tagValue -> Set of event IDs
const tagMap = new Map<string, Set<string>>();
debug("Extracting unique tags for type", { tagType, eventCount: events.length });
debug("Extracting unique tags for type", {
tagType,
eventCount: events.length,
});
events.forEach((event) => {
if (!event.tags || !event.id) return;
@ -83,7 +85,7 @@ export function extractUniqueTagsForType( @@ -83,7 +85,7 @@ export function extractUniqueTagsForType(
tagMap.get(tagValue)!.add(event.id);
});
});
debug("Extracted tags", { tagCount: tagMap.size });
return tagMap;
@ -110,7 +112,7 @@ export function createTagAnchorNodes( @@ -110,7 +112,7 @@ export function createTagAnchorNodes(
);
if (validTags.length === 0) return [];
// Sort all tags by number of connections (events) descending
validTags.sort((a, b) => b[1].size - a[1].size);
@ -172,8 +174,11 @@ export function createTagLinks( @@ -172,8 +174,11 @@ export function createTagLinks(
tagAnchors: NetworkNode[],
nodes: NetworkNode[],
): NetworkLink[] {
debug("Creating tag links", { anchorCount: tagAnchors.length, nodeCount: nodes.length });
debug("Creating tag links", {
anchorCount: tagAnchors.length,
nodeCount: nodes.length,
});
const links: NetworkLink[] = [];
const nodeMap = new Map(nodes.map((n) => [n.id, n]));
@ -208,13 +213,13 @@ export function enhanceGraphWithTags( @@ -208,13 +213,13 @@ export function enhanceGraphWithTags(
displayLimit?: number,
): GraphData {
debug("Enhancing graph with tags", { tagType, displayLimit });
// Extract unique tags for the specified type
const tagMap = extractUniqueTagsForType(events, tagType);
// Create tag anchor nodes
let tagAnchors = createTagAnchorNodes(tagMap, tagType, width, height);
// Apply display limit if provided
if (displayLimit && displayLimit > 0 && tagAnchors.length > displayLimit) {
// Sort by connection count (already done in createTagAnchorNodes)
@ -242,7 +247,7 @@ export function enhanceGraphWithTags( @@ -242,7 +247,7 @@ export function enhanceGraphWithTags(
export function applyTagGravity(
nodes: NetworkNode[],
nodeToAnchors: Map<string, NetworkNode[]>,
alpha: number
alpha: number,
): void {
nodes.forEach((node) => {
if (node.isTagAnchor) return; // Tag anchors don't move
@ -301,7 +306,7 @@ export function createTagGravityForce( @@ -301,7 +306,7 @@ export function createTagGravityForce(
});
debug("Creating tag gravity force");
function force(alpha: number) {
applyTagGravity(nodes, nodeToAnchors, alpha);
}

331
src/lib/ndk.ts

@ -1,30 +1,32 @@ @@ -1,30 +1,32 @@
import NDK, {
NDKEvent,
NDKNip07Signer,
NDKRelay,
NDKRelayAuthPolicies,
NDKRelaySet,
NDKUser,
NDKEvent,
} from "@nostr-dev-kit/ndk";
import { writable, get, type Writable } from "svelte/store";
import {
loginStorageKey,
anonymousRelays,
} from "./consts.ts";
import { get, type Writable, writable } from "svelte/store";
import { anonymousRelays, loginStorageKey } from "./consts.ts";
import {
buildCompleteRelaySet,
testRelayConnection,
deduplicateRelayUrls,
testRelayConnection,
} from "./utils/relay_management.ts";
import { userStore } from "./stores/userStore.ts";
import { userPubkey } from "./stores/authStore.Svelte.ts";
import {
startNetworkStatusMonitoring,
stopNetworkStatusMonitoring,
} from "./stores/networkStore.ts";
import { WebSocketPool } from "./data_structures/websocket_pool.ts";
import { getContext, setContext } from "svelte";
// Re-export testRelayConnection for components that need it
export { testRelayConnection };
import { userStore } from "./stores/userStore.ts";
import { startNetworkStatusMonitoring, stopNetworkStatusMonitoring } from "./stores/networkStore.ts";
import { WebSocketPool } from "./data_structures/websocket_pool.ts";
export const ndkInstance: Writable<NDK> = writable();
export const ndkSignedIn = writable(false);
export const activePubkey = writable<string | null>(null);
export const inboxRelays = writable<string[]>([]);
export const outboxRelays = writable<string[]>([]);
@ -32,35 +34,50 @@ export const outboxRelays = writable<string[]>([]); @@ -32,35 +34,50 @@ export const outboxRelays = writable<string[]>([]);
export const activeInboxRelays = writable<string[]>([]);
export const activeOutboxRelays = writable<string[]>([]);
const NDK_CONTEXT_KEY = "ndk";
export function getNdkContext(): NDK {
return getContext(NDK_CONTEXT_KEY) as NDK;
}
export function setNdkContext(ndk: NDK): void {
setContext(NDK_CONTEXT_KEY, ndk);
}
// AI-NOTE: 2025-01-08 - Persistent relay storage to avoid recalculation
let persistentRelaySet: { inboxRelays: string[]; outboxRelays: string[] } | null = null;
let persistentRelaySet:
| { inboxRelays: string[]; outboxRelays: string[] }
| null = null;
let relaySetLastUpdated: number = 0;
const RELAY_SET_CACHE_DURATION = 5 * 60 * 1000; // 5 minutes
const RELAY_SET_STORAGE_KEY = 'alexandria/relay_set_cache';
const RELAY_SET_STORAGE_KEY = "alexandria/relay_set_cache";
/**
* Load persistent relay set from localStorage
*/
function loadPersistentRelaySet(): { relaySet: { inboxRelays: string[]; outboxRelays: string[] } | null; lastUpdated: number } {
function loadPersistentRelaySet(): {
relaySet: { inboxRelays: string[]; outboxRelays: string[] } | null;
lastUpdated: number;
} {
// Only load from localStorage on client-side
if (typeof window === 'undefined') return { relaySet: null, lastUpdated: 0 };
if (typeof window === "undefined") return { relaySet: null, lastUpdated: 0 };
try {
const stored = localStorage.getItem(RELAY_SET_STORAGE_KEY);
if (!stored) return { relaySet: null, lastUpdated: 0 };
const data = JSON.parse(stored);
const now = Date.now();
// Check if cache is expired
if (now - data.timestamp > RELAY_SET_CACHE_DURATION) {
localStorage.removeItem(RELAY_SET_STORAGE_KEY);
return { relaySet: null, lastUpdated: 0 };
}
return { relaySet: data.relaySet, lastUpdated: data.timestamp };
} catch (error) {
console.warn('[NDK.ts] Failed to load persistent relay set:', error);
console.warn("[NDK.ts] Failed to load persistent relay set:", error);
localStorage.removeItem(RELAY_SET_STORAGE_KEY);
return { relaySet: null, lastUpdated: 0 };
}
@ -69,18 +86,20 @@ function loadPersistentRelaySet(): { relaySet: { inboxRelays: string[]; outboxRe @@ -69,18 +86,20 @@ function loadPersistentRelaySet(): { relaySet: { inboxRelays: string[]; outboxRe
/**
* Save persistent relay set to localStorage
*/
function savePersistentRelaySet(relaySet: { inboxRelays: string[]; outboxRelays: string[] }): void {
function savePersistentRelaySet(
relaySet: { inboxRelays: string[]; outboxRelays: string[] },
): void {
// Only save to localStorage on client-side
if (typeof window === 'undefined') return;
if (typeof window === "undefined") return;
try {
const data = {
relaySet,
timestamp: Date.now()
timestamp: Date.now(),
};
localStorage.setItem(RELAY_SET_STORAGE_KEY, JSON.stringify(data));
} catch (error) {
console.warn('[NDK.ts] Failed to save persistent relay set:', error);
console.warn("[NDK.ts] Failed to save persistent relay set:", error);
}
}
@ -89,12 +108,12 @@ function savePersistentRelaySet(relaySet: { inboxRelays: string[]; outboxRelays: @@ -89,12 +108,12 @@ function savePersistentRelaySet(relaySet: { inboxRelays: string[]; outboxRelays:
*/
function clearPersistentRelaySet(): void {
// Only clear from localStorage on client-side
if (typeof window === 'undefined') return;
if (typeof window === "undefined") return;
try {
localStorage.removeItem(RELAY_SET_STORAGE_KEY);
} catch (error) {
console.warn('[NDK.ts] Failed to clear persistent relay set:', error);
console.warn("[NDK.ts] Failed to clear persistent relay set:", error);
}
}
@ -228,8 +247,7 @@ class CustomRelayAuthPolicy { @@ -228,8 +247,7 @@ class CustomRelayAuthPolicy {
export function checkEnvironmentForWebSocketDowngrade(): void {
console.debug("[NDK.ts] Environment Check for WebSocket Protocol:");
const isLocalhost =
globalThis.location.hostname === "localhost" ||
const isLocalhost = globalThis.location.hostname === "localhost" ||
globalThis.location.hostname === "127.0.0.1";
const isHttp = globalThis.location.protocol === "http:";
const isHttps = globalThis.location.protocol === "https:";
@ -279,8 +297,6 @@ export function checkWebSocketSupport(): void { @@ -279,8 +297,6 @@ export function checkWebSocketSupport(): void {
}
}
/**
* Gets the user's pubkey from local storage, if it exists.
* @returns The user's pubkey, or null if there is no logged-in user.
@ -289,8 +305,8 @@ export function checkWebSocketSupport(): void { @@ -289,8 +305,8 @@ export function checkWebSocketSupport(): void {
*/
export function getPersistedLogin(): string | null {
// Only access localStorage on client-side
if (typeof window === 'undefined') return null;
if (typeof window === "undefined") return null;
const pubkey = localStorage.getItem(loginStorageKey);
return pubkey;
}
@ -303,8 +319,8 @@ export function getPersistedLogin(): string | null { @@ -303,8 +319,8 @@ export function getPersistedLogin(): string | null {
*/
export function persistLogin(user: NDKUser): void {
// Only access localStorage on client-side
if (typeof window === 'undefined') return;
if (typeof window === "undefined") return;
localStorage.setItem(loginStorageKey, user.pubkey);
}
@ -314,8 +330,8 @@ export function persistLogin(user: NDKUser): void { @@ -314,8 +330,8 @@ export function persistLogin(user: NDKUser): void {
*/
export function clearLogin(): void {
// Only access localStorage on client-side
if (typeof window === 'undefined') return;
if (typeof window === "undefined") return;
localStorage.removeItem(loginStorageKey);
}
@ -331,8 +347,8 @@ function getRelayStorageKey(user: NDKUser, type: "inbox" | "outbox"): string { @@ -331,8 +347,8 @@ function getRelayStorageKey(user: NDKUser, type: "inbox" | "outbox"): string {
export function clearPersistedRelays(user: NDKUser): void {
// Only access localStorage on client-side
if (typeof window === 'undefined') return;
if (typeof window === "undefined") return;
localStorage.removeItem(getRelayStorageKey(user, "inbox"));
localStorage.removeItem(getRelayStorageKey(user, "outbox"));
}
@ -344,11 +360,11 @@ export function clearPersistedRelays(user: NDKUser): void { @@ -344,11 +360,11 @@ export function clearPersistedRelays(user: NDKUser): void {
*/
function ensureSecureWebSocket(url: string): string {
// For localhost, always use ws:// (never wss://)
if (url.includes('localhost') || url.includes('127.0.0.1')) {
if (url.includes("localhost") || url.includes("127.0.0.1")) {
// Convert any wss://localhost to ws://localhost
return url.replace(/^wss:\/\//, "ws://");
}
// Replace ws:// with wss:// for remote relays
const secureUrl = url.replace(/^ws:\/\//, "wss://");
@ -367,7 +383,7 @@ function ensureSecureWebSocket(url: string): string { @@ -367,7 +383,7 @@ function ensureSecureWebSocket(url: string): string {
function createRelayWithAuth(url: string, ndk: NDK): NDKRelay {
try {
// Reduce verbosity in development - only log relay creation if debug mode is enabled
if (process.env.NODE_ENV === 'development' && process.env.DEBUG_RELAYS) {
if (process.env.NODE_ENV === "development" && process.env.DEBUG_RELAYS) {
console.debug(`[NDK.ts] Creating relay with URL: ${url}`);
}
@ -385,7 +401,9 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay { @@ -385,7 +401,9 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay {
const connectionTimeout = setTimeout(() => {
try {
// Only log connection timeouts if debug mode is enabled
if (process.env.NODE_ENV === 'development' && process.env.DEBUG_RELAYS) {
if (
process.env.NODE_ENV === "development" && process.env.DEBUG_RELAYS
) {
console.debug(`[NDK.ts] Connection timeout for ${secureUrl}`);
}
relay.disconnect();
@ -400,7 +418,9 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay { @@ -400,7 +418,9 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay {
relay.on("connect", () => {
try {
// Only log successful connections if debug mode is enabled
if (process.env.NODE_ENV === 'development' && process.env.DEBUG_RELAYS) {
if (
process.env.NODE_ENV === "development" && process.env.DEBUG_RELAYS
) {
console.debug(`[NDK.ts] Relay connected: ${secureUrl}`);
}
clearTimeout(connectionTimeout);
@ -413,7 +433,9 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay { @@ -413,7 +433,9 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay {
relay.on("connect", () => {
try {
// Only log successful connections if debug mode is enabled
if (process.env.NODE_ENV === 'development' && process.env.DEBUG_RELAYS) {
if (
process.env.NODE_ENV === "development" && process.env.DEBUG_RELAYS
) {
console.debug(`[NDK.ts] Relay connected: ${secureUrl}`);
}
clearTimeout(connectionTimeout);
@ -436,46 +458,66 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay { @@ -436,46 +458,66 @@ function createRelayWithAuth(url: string, ndk: NDK): NDKRelay {
return relay;
} catch (error) {
// If relay creation fails, try to use an anonymous relay as fallback
console.debug(`[NDK.ts] Failed to create relay for ${url}, trying anonymous relay fallback`);
console.debug(
`[NDK.ts] Failed to create relay for ${url}, trying anonymous relay fallback`,
);
// Find an anonymous relay that's not the same as the failed URL
const fallbackUrl = anonymousRelays.find(relay => relay !== url) || anonymousRelays[0];
const fallbackUrl = anonymousRelays.find((relay) => relay !== url) ||
anonymousRelays[0];
if (fallbackUrl) {
console.debug(`[NDK.ts] Using anonymous relay as fallback: ${fallbackUrl}`);
console.debug(
`[NDK.ts] Using anonymous relay as fallback: ${fallbackUrl}`,
);
try {
const fallbackRelay = new NDKRelay(fallbackUrl, NDKRelayAuthPolicies.signIn({ ndk }), ndk);
const fallbackRelay = new NDKRelay(
fallbackUrl,
NDKRelayAuthPolicies.signIn({ ndk }),
ndk,
);
return fallbackRelay;
} catch (fallbackError) {
console.debug(`[NDK.ts] Fallback relay creation also failed: ${fallbackError}`);
console.debug(
`[NDK.ts] Fallback relay creation also failed: ${fallbackError}`,
);
}
}
// If all else fails, create a minimal relay that will fail gracefully
console.debug(`[NDK.ts] All fallback attempts failed, creating minimal relay for ${url}`);
console.debug(
`[NDK.ts] All fallback attempts failed, creating minimal relay for ${url}`,
);
const minimalRelay = new NDKRelay(url, undefined, ndk);
return minimalRelay;
}
}
/**
* Gets the active relay set for the current user
* @param ndk NDK instance
* @returns Promise that resolves to object with inbox and outbox relay arrays
*/
export async function getActiveRelaySet(ndk: NDK): Promise<{ inboxRelays: string[]; outboxRelays: string[] }> {
export async function getActiveRelaySet(
ndk: NDK,
): Promise<{ inboxRelays: string[]; outboxRelays: string[] }> {
const user = get(userStore);
console.debug('[NDK.ts] getActiveRelaySet: User state:', { signedIn: user.signedIn, hasNdkUser: !!user.ndkUser, pubkey: user.pubkey });
console.debug("[NDK.ts] getActiveRelaySet: User state:", {
signedIn: user.signedIn,
hasNdkUser: !!user.ndkUser,
pubkey: user.pubkey,
});
if (user.signedIn && user.ndkUser) {
console.debug('[NDK.ts] getActiveRelaySet: Building relay set for authenticated user:', user.ndkUser.pubkey);
console.debug(
"[NDK.ts] getActiveRelaySet: Building relay set for authenticated user:",
user.ndkUser.pubkey,
);
return await buildCompleteRelaySet(ndk, user.ndkUser);
} else {
console.debug('[NDK.ts] getActiveRelaySet: Building relay set for anonymous user');
console.debug(
"[NDK.ts] getActiveRelaySet: Building relay set for anonymous user",
);
return await buildCompleteRelaySet(ndk, null);
}
}
@ -485,61 +527,88 @@ export async function getActiveRelaySet(ndk: NDK): Promise<{ inboxRelays: string @@ -485,61 +527,88 @@ export async function getActiveRelaySet(ndk: NDK): Promise<{ inboxRelays: string
* @param ndk NDK instance
* @param forceUpdate Force update even if cached (default: false)
*/
export async function updateActiveRelayStores(ndk: NDK, forceUpdate: boolean = false): Promise<void> {
export async function updateActiveRelayStores(
ndk: NDK,
forceUpdate: boolean = false,
): Promise<void> {
try {
// AI-NOTE: 2025-01-08 - Use persistent relay set to avoid recalculation
const now = Date.now();
const cacheExpired = now - relaySetLastUpdated > RELAY_SET_CACHE_DURATION;
// Load from persistent storage if not already loaded
if (!persistentRelaySet) {
const loaded = loadPersistentRelaySet();
persistentRelaySet = loaded.relaySet;
relaySetLastUpdated = loaded.lastUpdated;
}
if (!forceUpdate && persistentRelaySet && !cacheExpired) {
console.debug('[NDK.ts] updateActiveRelayStores: Using cached relay set');
console.debug("[NDK.ts] updateActiveRelayStores: Using cached relay set");
activeInboxRelays.set(persistentRelaySet.inboxRelays);
activeOutboxRelays.set(persistentRelaySet.outboxRelays);
return;
}
console.debug('[NDK.ts] updateActiveRelayStores: Starting relay store update');
console.debug(
"[NDK.ts] updateActiveRelayStores: Starting relay store update",
);
// Get the active relay set from the relay management system
const relaySet = await getActiveRelaySet(ndk);
console.debug('[NDK.ts] updateActiveRelayStores: Got relay set:', relaySet);
console.debug("[NDK.ts] updateActiveRelayStores: Got relay set:", relaySet);
// Cache the relay set
persistentRelaySet = relaySet;
relaySetLastUpdated = now;
savePersistentRelaySet(relaySet); // Save to persistent storage
// Update the stores with the new relay configuration
activeInboxRelays.set(relaySet.inboxRelays);
activeOutboxRelays.set(relaySet.outboxRelays);
console.debug('[NDK.ts] updateActiveRelayStores: Updated stores with inbox:', relaySet.inboxRelays.length, 'outbox:', relaySet.outboxRelays.length);
console.debug(
"[NDK.ts] updateActiveRelayStores: Updated stores with inbox:",
relaySet.inboxRelays.length,
"outbox:",
relaySet.outboxRelays.length,
);
// Add relays to NDK pool (deduplicated)
const allRelayUrls = deduplicateRelayUrls([...relaySet.inboxRelays, ...relaySet.outboxRelays]);
const allRelayUrls = deduplicateRelayUrls([
...relaySet.inboxRelays,
...relaySet.outboxRelays,
]);
// Reduce verbosity in development - only log relay addition if debug mode is enabled
if (process.env.NODE_ENV === 'development' && process.env.DEBUG_RELAYS) {
console.debug('[NDK.ts] updateActiveRelayStores: Adding', allRelayUrls.length, 'relays to NDK pool');
if (process.env.NODE_ENV === "development" && process.env.DEBUG_RELAYS) {
console.debug(
"[NDK.ts] updateActiveRelayStores: Adding",
allRelayUrls.length,
"relays to NDK pool",
);
}
for (const url of allRelayUrls) {
try {
const relay = createRelayWithAuth(url, ndk);
ndk.pool?.addRelay(relay);
} catch (error) {
console.debug('[NDK.ts] updateActiveRelayStores: Failed to add relay', url, ':', error);
console.debug(
"[NDK.ts] updateActiveRelayStores: Failed to add relay",
url,
":",
error,
);
}
}
console.debug('[NDK.ts] updateActiveRelayStores: Relay store update completed');
console.debug(
"[NDK.ts] updateActiveRelayStores: Relay store update completed",
);
} catch (error) {
console.warn('[NDK.ts] updateActiveRelayStores: Error updating relay stores:', error);
console.warn(
"[NDK.ts] updateActiveRelayStores: Error updating relay stores:",
error,
);
}
}
@ -549,23 +618,25 @@ export async function updateActiveRelayStores(ndk: NDK, forceUpdate: boolean = f @@ -549,23 +618,25 @@ export async function updateActiveRelayStores(ndk: NDK, forceUpdate: boolean = f
export function logCurrentRelayConfiguration(): void {
const inboxRelays = get(activeInboxRelays);
const outboxRelays = get(activeOutboxRelays);
console.log('🔌 Current Relay Configuration:');
console.log('📥 Inbox Relays:', inboxRelays);
console.log('📤 Outbox Relays:', outboxRelays);
console.log(`📊 Total: ${inboxRelays.length} inbox, ${outboxRelays.length} outbox`);
console.log("🔌 Current Relay Configuration:");
console.log("📥 Inbox Relays:", inboxRelays);
console.log("📤 Outbox Relays:", outboxRelays);
console.log(
`📊 Total: ${inboxRelays.length} inbox, ${outboxRelays.length} outbox`,
);
}
/**
* Clears the relay set cache to force a rebuild
*/
export function clearRelaySetCache(): void {
console.debug('[NDK.ts] Clearing relay set cache');
console.debug("[NDK.ts] Clearing relay set cache");
persistentRelaySet = null;
relaySetLastUpdated = 0;
// Clear from localStorage as well (client-side only)
if (typeof window !== 'undefined') {
localStorage.removeItem('alexandria/relay_set_cache');
if (typeof window !== "undefined") {
localStorage.removeItem("alexandria/relay_set_cache");
}
}
@ -574,7 +645,7 @@ export function clearRelaySetCache(): void { @@ -574,7 +645,7 @@ export function clearRelaySetCache(): void {
* @param ndk NDK instance
*/
export async function refreshRelayStores(ndk: NDK): Promise<void> {
console.debug('[NDK.ts] Refreshing relay stores due to user state change');
console.debug("[NDK.ts] Refreshing relay stores due to user state change");
clearRelaySetCache(); // Clear cache when user state changes
await updateActiveRelayStores(ndk, true); // Force update
}
@ -583,8 +654,12 @@ export async function refreshRelayStores(ndk: NDK): Promise<void> { @@ -583,8 +654,12 @@ export async function refreshRelayStores(ndk: NDK): Promise<void> {
* Updates relay stores when network condition changes
* @param ndk NDK instance
*/
export async function refreshRelayStoresOnNetworkChange(ndk: NDK): Promise<void> {
console.debug('[NDK.ts] Refreshing relay stores due to network condition change');
export async function refreshRelayStoresOnNetworkChange(
ndk: NDK,
): Promise<void> {
console.debug(
"[NDK.ts] Refreshing relay stores due to network condition change",
);
await updateActiveRelayStores(ndk);
}
@ -604,10 +679,10 @@ export function startNetworkMonitoringForRelays(): void { @@ -604,10 +679,10 @@ export function startNetworkMonitoringForRelays(): void {
* @returns NDKRelaySet
*/
function createRelaySetFromUrls(relayUrls: string[], ndk: NDK): NDKRelaySet {
const relays = relayUrls.map(url =>
const relays = relayUrls.map((url) =>
new NDKRelay(url, NDKRelayAuthPolicies.signIn({ ndk }), ndk)
);
return new NDKRelaySet(new Set(relays), ndk);
}
@ -619,11 +694,11 @@ function createRelaySetFromUrls(relayUrls: string[], ndk: NDK): NDKRelaySet { @@ -619,11 +694,11 @@ function createRelaySetFromUrls(relayUrls: string[], ndk: NDK): NDKRelaySet {
*/
export async function getActiveRelaySetAsNDKRelaySet(
ndk: NDK,
useInbox: boolean = true
useInbox: boolean = true,
): Promise<NDKRelaySet> {
const relaySet = await getActiveRelaySet(ndk);
const urls = useInbox ? relaySet.inboxRelays : relaySet.outboxRelays;
return createRelaySetFromUrls(urls, ndk);
}
@ -648,11 +723,11 @@ export function initNdk(): NDK { @@ -648,11 +723,11 @@ export function initNdk(): NDK {
const attemptConnection = async () => {
// Only attempt connection on client-side
if (typeof window === 'undefined') {
if (typeof window === "undefined") {
console.debug("[NDK.ts] Skipping NDK connection during SSR");
return;
}
try {
await ndk.connect();
console.debug("[NDK.ts] NDK connected successfully");
@ -662,17 +737,21 @@ export function initNdk(): NDK { @@ -662,17 +737,21 @@ export function initNdk(): NDK {
startNetworkMonitoringForRelays();
} catch (error) {
console.warn("[NDK.ts] Failed to connect NDK:", error);
// Only retry a limited number of times
if (retryCount < maxRetries) {
retryCount++;
console.debug(`[NDK.ts] Attempting to reconnect (${retryCount}/${maxRetries})...`);
console.debug(
`[NDK.ts] Attempting to reconnect (${retryCount}/${maxRetries})...`,
);
// Use a more reasonable retry delay and prevent memory leaks
setTimeout(() => {
attemptConnection();
}, 2000 * retryCount); // Exponential backoff
} else {
console.warn("[NDK.ts] Max retries reached, continuing with limited functionality");
console.warn(
"[NDK.ts] Max retries reached, continuing with limited functionality",
);
// Still try to update relay stores even if connection failed
try {
await updateActiveRelayStores(ndk);
@ -685,21 +764,23 @@ export function initNdk(): NDK { @@ -685,21 +764,23 @@ export function initNdk(): NDK {
};
// Only attempt connection on client-side
if (typeof window !== 'undefined') {
if (typeof window !== "undefined") {
attemptConnection();
}
// AI-NOTE: Set up userStore subscription after NDK initialization to prevent initialization errors
userStore.subscribe(async (userState) => {
ndkSignedIn.set(userState.signedIn);
// Refresh relay stores when user state changes
const ndk = get(ndkInstance);
if (ndk) {
try {
await refreshRelayStores(ndk);
} catch (error) {
console.warn('[NDK.ts] Failed to refresh relay stores on user state change:', error);
console.warn(
"[NDK.ts] Failed to refresh relay stores on user state change:",
error,
);
}
}
});
@ -713,8 +794,8 @@ export function initNdk(): NDK { @@ -713,8 +794,8 @@ export function initNdk(): NDK {
*/
export function cleanupNdk(): void {
console.debug("[NDK.ts] Cleaning up NDK resources");
const ndk = get(ndkInstance);
const ndk = getNdkContext();
if (ndk) {
try {
// Disconnect from all relays
@ -723,13 +804,13 @@ export function cleanupNdk(): void { @@ -723,13 +804,13 @@ export function cleanupNdk(): void {
relay.disconnect();
}
}
// Drain the WebSocket pool
WebSocketPool.instance.drain();
// Stop network monitoring
stopNetworkStatusMonitoring();
console.debug("[NDK.ts] NDK cleanup completed");
} catch (error) {
console.warn("[NDK.ts] Error during NDK cleanup:", error);
@ -746,7 +827,7 @@ export async function loginWithExtension( @@ -746,7 +827,7 @@ export async function loginWithExtension(
pubkey?: string,
): Promise<NDKUser | null> {
try {
const ndk = get(ndkInstance);
const ndk = getNdkContext();
const signer = new NDKNip07Signer();
const signerUser = await signer.user();
@ -755,17 +836,18 @@ export async function loginWithExtension( @@ -755,17 +836,18 @@ export async function loginWithExtension(
console.debug("[NDK.ts] Switching pubkeys from last login.");
}
activePubkey.set(signerUser.pubkey);
userPubkey.set(signerUser.pubkey);
const user = ndk.getUser({ pubkey: signerUser.pubkey });
// Update relay stores with the new system
await updateActiveRelayStores(ndk);
ndk.signer = signer;
ndk.activeUser = user;
ndkInstance.set(ndk);
setNdkContext(ndk);
ndkSignedIn.set(true);
return user;
@ -781,24 +863,23 @@ export async function loginWithExtension( @@ -781,24 +863,23 @@ export async function loginWithExtension(
export function logout(user: NDKUser): void {
clearLogin();
clearPersistedRelays(user);
activePubkey.set(null);
userPubkey.set(null);
ndkSignedIn.set(false);
// Clear relay stores
activeInboxRelays.set([]);
activeOutboxRelays.set([]);
// AI-NOTE: 2025-01-08 - Clear persistent relay set on logout
persistentRelaySet = null;
relaySetLastUpdated = 0;
clearPersistentRelaySet(); // Clear persistent storage
// Stop network monitoring
stopNetworkStatusMonitoring();
// Re-initialize with anonymous instance
const newNdk = initNdk();
ndkInstance.set(newNdk);
setNdkContext(newNdk);
}

8
src/lib/parser.ts

@ -7,11 +7,11 @@ import type { @@ -7,11 +7,11 @@ import type {
Block,
Document,
Extensions,
Section,
ProcessorOptions,
Section,
} from "asciidoctor";
import he from "he";
import { writable, type Writable } from "svelte/store";
import { type Writable, writable } from "svelte/store";
import { zettelKinds } from "./consts.ts";
import { getMatchingTags } from "./utils/nostrUtils.ts";
@ -906,13 +906,13 @@ export default class Pharos { @@ -906,13 +906,13 @@ export default class Pharos {
["#d", nodeId],
...this.extractAndNormalizeWikilinks(content!),
];
// Extract image from content if present
const imageUrl = this.extractImageFromContent(content!);
if (imageUrl) {
event.tags.push(["image", imageUrl]);
}
event.created_at = Date.now();
event.pubkey = pubkey;

28
src/lib/services/event_search_service.ts

@ -8,33 +8,37 @@ export class EventSearchService { @@ -8,33 +8,37 @@ export class EventSearchService {
*/
getSearchType(query: string): { type: string; term: string } | null {
const lowerQuery = query.toLowerCase();
if (lowerQuery.startsWith("d:")) {
const dTag = query.slice(2).trim().toLowerCase();
return dTag ? { type: "d", term: dTag } : null;
}
if (lowerQuery.startsWith("t:")) {
const searchTerm = query.slice(2).trim();
return searchTerm ? { type: "t", term: searchTerm } : null;
}
if (lowerQuery.startsWith("n:")) {
const searchTerm = query.slice(2).trim();
return searchTerm ? { type: "n", term: searchTerm } : null;
}
if (query.includes("@")) {
return { type: "nip05", term: query };
}
return null;
}
/**
* Checks if a search value matches the current event
*/
isCurrentEventMatch(searchValue: string, event: any, relays: string[]): boolean {
isCurrentEventMatch(
searchValue: string,
event: any,
relays: string[],
): boolean {
const currentEventId = event.id;
let currentNaddr = null;
let currentNevent = null;
@ -42,21 +46,23 @@ export class EventSearchService { @@ -42,21 +46,23 @@ export class EventSearchService {
let currentNprofile = null;
try {
const { neventEncode, naddrEncode, nprofileEncode } = require("$lib/utils");
const { neventEncode, naddrEncode, nprofileEncode } = require(
"$lib/utils",
);
const { getMatchingTags, toNpub } = require("$lib/utils/nostrUtils");
currentNevent = neventEncode(event, relays);
} catch {}
try {
const { naddrEncode } = require("$lib/utils");
const { getMatchingTags } = require("$lib/utils/nostrUtils");
currentNaddr = getMatchingTags(event, "d")[0]?.[1]
? naddrEncode(event, relays)
: null;
} catch {}
try {
const { toNpub } = require("$lib/utils/nostrUtils");
currentNpub = event.kind === 0 ? toNpub(event.pubkey) : null;

65
src/lib/services/publisher.ts

@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
import { get } from "svelte/store";
import { ndkInstance } from "../ndk.ts";
import { getMimeTags } from "../utils/mime.ts";
import { parseAsciiDocWithMetadata, metadataToTags } from "../utils/asciidoc_metadata.ts";
import { NDKRelaySet, NDKEvent } from "@nostr-dev-kit/ndk";
import {
metadataToTags,
parseAsciiDocWithMetadata,
} from "../utils/asciidoc_metadata.ts";
import NDK, { NDKEvent, NDKRelaySet } from "@nostr-dev-kit/ndk";
import { nip19 } from "nostr-tools";
export interface PublishResult {
@ -25,6 +26,7 @@ export interface PublishOptions { @@ -25,6 +26,7 @@ export interface PublishOptions {
*/
export async function publishZettel(
options: PublishOptions,
ndk: NDK,
): Promise<PublishResult> {
const { content, kind = 30041, onSuccess, onError } = options;
@ -34,9 +36,6 @@ export async function publishZettel( @@ -34,9 +36,6 @@ export async function publishZettel(
return { success: false, error };
}
// Get the current NDK instance from the store
const ndk = get(ndkInstance);
if (!ndk?.activeUser) {
const error = "Please log in first";
onError?.(error);
@ -97,8 +96,9 @@ export async function publishZettel( @@ -97,8 +96,9 @@ export async function publishZettel(
throw new Error("Failed to publish to any relays");
}
} catch (error) {
const errorMessage =
error instanceof Error ? error.message : "Unknown error";
const errorMessage = error instanceof Error
? error.message
: "Unknown error";
onError?.(errorMessage);
return { success: false, error: errorMessage };
}
@ -111,18 +111,18 @@ export async function publishZettel( @@ -111,18 +111,18 @@ export async function publishZettel(
*/
export async function publishMultipleZettels(
options: PublishOptions,
ndk: NDK,
): Promise<PublishResult[]> {
const { content, kind = 30041, onError } = options;
if (!content.trim()) {
const error = 'Please enter some content';
const error = "Please enter some content";
onError?.(error);
return [{ success: false, error }];
}
const ndk = get(ndkInstance);
if (!ndk?.activeUser) {
const error = 'Please log in first';
const error = "Please log in first";
onError?.(error);
return [{ success: false, error }];
}
@ -130,12 +130,14 @@ export async function publishMultipleZettels( @@ -130,12 +130,14 @@ export async function publishMultipleZettels(
try {
const parsed = parseAsciiDocWithMetadata(content);
if (parsed.sections.length === 0) {
throw new Error('No valid sections found in content');
throw new Error("No valid sections found in content");
}
const allRelayUrls = Array.from(ndk.pool?.relays.values() || []).map((r) => r.url);
const allRelayUrls = Array.from(ndk.pool?.relays.values() || []).map((r) =>
r.url
);
if (allRelayUrls.length === 0) {
throw new Error('No relays available in NDK pool');
throw new Error("No relays available in NDK pool");
}
const relaySet = NDKRelaySet.fromRelayUrls(allRelayUrls, ndk);
@ -164,31 +166,42 @@ export async function publishMultipleZettels( @@ -164,31 +166,42 @@ export async function publishMultipleZettels(
results.push({ success: true, eventId: ndkEvent.id });
publishedEvents.push(ndkEvent);
} else {
results.push({ success: false, error: 'Failed to publish to any relays' });
results.push({
success: false,
error: "Failed to publish to any relays",
});
}
} catch (err) {
const errorMessage = err instanceof Error ? err.message : 'Unknown error';
const errorMessage = err instanceof Error
? err.message
: "Unknown error";
results.push({ success: false, error: errorMessage });
}
}
// Debug: extract and log 'e' and 'a' tags from all published events
publishedEvents.forEach(ev => {
publishedEvents.forEach((ev) => {
// Extract d-tag from tags
const dTagEntry = ev.tags.find(t => t[0] === 'd');
const dTag = dTagEntry ? dTagEntry[1] : '';
const dTagEntry = ev.tags.find((t) => t[0] === "d");
const dTag = dTagEntry ? dTagEntry[1] : "";
const aTag = `${ev.kind}:${ev.pubkey}:${dTag}`;
console.log(`Event ${ev.id} tags:`);
console.log(' e:', ev.id);
console.log(' a:', aTag);
console.log(" e:", ev.id);
console.log(" a:", aTag);
// Print nevent and naddr using nip19
const nevent = nip19.neventEncode({ id: ev.id });
const naddr = nip19.naddrEncode({ kind: ev.kind, pubkey: ev.pubkey, identifier: dTag });
console.log(' nevent:', nevent);
console.log(' naddr:', naddr);
const naddr = nip19.naddrEncode({
kind: ev.kind,
pubkey: ev.pubkey,
identifier: dTag,
});
console.log(" nevent:", nevent);
console.log(" naddr:", naddr);
});
return results;
} catch (error) {
const errorMessage = error instanceof Error ? error.message : 'Unknown error';
const errorMessage = error instanceof Error
? error.message
: "Unknown error";
onError?.(errorMessage);
return [{ success: false, error: errorMessage }];
}

20
src/lib/services/search_state_manager.ts

@ -13,7 +13,7 @@ export class SearchStateManager { @@ -13,7 +13,7 @@ export class SearchStateManager {
searchResultCount: number | null;
searchResultType: string | null;
},
onLoadingChange?: (loading: boolean) => void
onLoadingChange?: (loading: boolean) => void,
): void {
if (onLoadingChange) {
onLoadingChange(state.searching);
@ -25,10 +25,16 @@ export class SearchStateManager { @@ -25,10 +25,16 @@ export class SearchStateManager {
*/
resetSearchState(
callbacks: {
onSearchResults: (events: any[], secondOrder: any[], tTagEvents: any[], eventIds: Set<string>, addresses: Set<string>) => void;
onSearchResults: (
events: any[],
secondOrder: any[],
tTagEvents: any[],
eventIds: Set<string>,
addresses: Set<string>,
) => void;
cleanupSearch: () => void;
clearTimeout: () => void;
}
},
): void {
callbacks.cleanupSearch();
callbacks.onSearchResults([], [], [], new Set(), new Set());
@ -46,16 +52,18 @@ export class SearchStateManager { @@ -46,16 +52,18 @@ export class SearchStateManager {
cleanupSearch: () => void;
updateSearchState: (state: any) => void;
resetProcessingFlags: () => void;
}
},
): void {
const errorMessage = error instanceof Error ? error.message : defaultMessage;
const errorMessage = error instanceof Error
? error.message
: defaultMessage;
callbacks.setLocalError(errorMessage);
callbacks.cleanupSearch();
callbacks.updateSearchState({
searching: false,
searchCompleted: false,
searchResultCount: null,
searchResultType: null
searchResultType: null,
});
callbacks.resetProcessingFlags();
}

2
src/lib/state.ts

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
import { browser } from "$app/environment";
import { writable, type Writable } from "svelte/store";
import { type Writable, writable } from "svelte/store";
import type { Tab } from "./types.ts";
export const pathLoaded: Writable<boolean> = writable(false);

11
src/lib/stores/authStore.Svelte.ts

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
import { derived, writable } from "svelte/store";
/**
* Stores the user's public key if logged in, or null otherwise.
*/
export const userPubkey = writable<string | null>(null);
/**
* Derived store indicating if the user is logged in.
*/
export const isLoggedIn = derived(userPubkey, ($userPubkey) => !!$userPubkey);

26
src/lib/stores/networkStore.ts

@ -1,8 +1,14 @@ @@ -1,8 +1,14 @@
import { writable } from "svelte/store";
import { detectNetworkCondition, NetworkCondition, startNetworkMonitoring } from '../utils/network_detection.ts';
import {
detectNetworkCondition,
NetworkCondition,
startNetworkMonitoring,
} from "../utils/network_detection.ts";
// Network status store
export const networkCondition = writable<NetworkCondition>(NetworkCondition.ONLINE);
export const networkCondition = writable<NetworkCondition>(
NetworkCondition.ONLINE,
);
export const isNetworkChecking = writable<boolean>(false);
// Network monitoring state
@ -16,14 +22,16 @@ export function startNetworkStatusMonitoring(): void { @@ -16,14 +22,16 @@ export function startNetworkStatusMonitoring(): void {
return; // Already monitoring
}
console.debug('[networkStore.ts] Starting network status monitoring');
console.debug("[networkStore.ts] Starting network status monitoring");
stopNetworkMonitoring = startNetworkMonitoring(
(condition: NetworkCondition) => {
console.debug(`[networkStore.ts] Network condition changed to: ${condition}`);
console.debug(
`[networkStore.ts] Network condition changed to: ${condition}`,
);
networkCondition.set(condition);
},
60000 // Check every 60 seconds to reduce spam
60000, // Check every 60 seconds to reduce spam
);
}
@ -32,7 +40,7 @@ export function startNetworkStatusMonitoring(): void { @@ -32,7 +40,7 @@ export function startNetworkStatusMonitoring(): void {
*/
export function stopNetworkStatusMonitoring(): void {
if (stopNetworkMonitoring) {
console.debug('[networkStore.ts] Stopping network status monitoring');
console.debug("[networkStore.ts] Stopping network status monitoring");
stopNetworkMonitoring();
stopNetworkMonitoring = null;
}
@ -47,9 +55,9 @@ export async function checkNetworkStatus(): Promise<void> { @@ -47,9 +55,9 @@ export async function checkNetworkStatus(): Promise<void> {
const condition = await detectNetworkCondition();
networkCondition.set(condition);
} catch (error) {
console.warn('[networkStore.ts] Failed to check network status:', error);
console.warn("[networkStore.ts] Failed to check network status:", error);
networkCondition.set(NetworkCondition.OFFLINE);
} finally {
isNetworkChecking.set(false);
}
}
}

643
src/lib/stores/userStore.ts

@ -1,36 +1,34 @@ @@ -1,36 +1,34 @@
import { writable, get } from 'svelte/store';
import type { NostrProfile } from '../utils/search_types.ts';
import type { NDKUser, NDKSigner } from '@nostr-dev-kit/ndk';
import { get, writable } from "svelte/store";
import type { NostrProfile } from "../utils/nostrUtils.ts";
import type { NDKSigner, NDKUser } from "@nostr-dev-kit/ndk";
import NDK, {
NDKNip07Signer,
NDKRelay,
NDKRelayAuthPolicies,
NDKRelaySet,
NDKRelay,
} from '@nostr-dev-kit/ndk';
import { getUserMetadata } from '../utils/nostrUtils.ts';
import { ndkInstance, activeInboxRelays, activeOutboxRelays, updateActiveRelayStores } from '../ndk.ts';
import { loginStorageKey } from '../consts.ts';
import { nip19 } from 'nostr-tools';
import { fetchCurrentUserLists } from '../utils/user_lists.ts';
import { npubCache } from '../utils/npubCache.ts';
// AI-NOTE: UserStore consolidation - This file contains all user-related state management
// including authentication, profile management, relay preferences, and user lists caching.
export type LoginMethod = 'extension' | 'amber' | 'npub';
} from "@nostr-dev-kit/ndk";
import { getUserMetadata } from "../utils/nostrUtils.ts";
import {
activeInboxRelays,
activeOutboxRelays,
updateActiveRelayStores,
} from "../ndk.ts";
import { loginStorageKey } from "../consts.ts";
import { nip19 } from "nostr-tools";
import { userPubkey } from "../stores/authStore.Svelte.ts";
export interface UserState {
pubkey: string | null;
npub: string | null;
profile: NostrProfile | null;
relays: { inbox: string[]; outbox: string[] };
loginMethod: LoginMethod | null;
loginMethod: "extension" | "amber" | "npub" | null;
ndkUser: NDKUser | null;
signer: NDKSigner | null;
signedIn: boolean;
}
const initialUserState: UserState = {
export const userStore = writable<UserState>({
pubkey: null,
npub: null,
profile: null,
@ -39,87 +37,56 @@ const initialUserState: UserState = { @@ -39,87 +37,56 @@ const initialUserState: UserState = {
ndkUser: null,
signer: null,
signedIn: false,
};
export const userStore = writable<UserState>(initialUserState);
});
// Storage keys
export const loginMethodStorageKey = 'alexandria/login/method';
const LOGOUT_FLAG_KEY = 'alexandria/logout/flag';
// Performance optimization: Cache for relay storage keys
const relayStorageKeyCache = new Map<string, { inbox: string; outbox: string }>();
/**
* Get relay storage key for a user, with caching for performance
*/
function getRelayStorageKey(user: NDKUser, type: 'inbox' | 'outbox'): string {
const cacheKey = user.pubkey;
let cached = relayStorageKeyCache.get(cacheKey);
if (!cached) {
const baseKey = `${loginStorageKey}/${user.pubkey}`;
cached = {
inbox: `${baseKey}/inbox`,
outbox: `${baseKey}/outbox`,
};
relayStorageKeyCache.set(cacheKey, cached);
}
return type === 'inbox' ? cached.inbox : cached.outbox;
}
/**
* Safely access localStorage (client-side only)
*/
function safeLocalStorage(): Storage | null {
return typeof window !== 'undefined' ? window.localStorage : null;
// Helper functions for relay management
function getRelayStorageKey(user: NDKUser, type: "inbox" | "outbox"): string {
return `${loginStorageKey}/${user.pubkey}/${type}`;
}
/**
* Persist relay preferences to localStorage
*/
function persistRelays(
user: NDKUser,
inboxes: Set<NDKRelay>,
outboxes: Set<NDKRelay>,
): void {
const storage = safeLocalStorage();
if (!storage) return;
const inboxUrls = Array.from(inboxes).map((relay) => relay.url);
const outboxUrls = Array.from(outboxes).map((relay) => relay.url);
storage.setItem(getRelayStorageKey(user, 'inbox'), JSON.stringify(inboxUrls));
storage.setItem(getRelayStorageKey(user, 'outbox'), JSON.stringify(outboxUrls));
// Only access localStorage on client-side
if (typeof window === "undefined") return;
localStorage.setItem(
getRelayStorageKey(user, "inbox"),
JSON.stringify(Array.from(inboxes).map((relay) => relay.url)),
);
localStorage.setItem(
getRelayStorageKey(user, "outbox"),
JSON.stringify(Array.from(outboxes).map((relay) => relay.url)),
);
}
/**
* Get persisted relay preferences from localStorage
*/
function getPersistedRelays(user: NDKUser): [Set<string>, Set<string>] {
const storage = safeLocalStorage();
if (!storage) {
// Only access localStorage on client-side
if (typeof window === "undefined") {
return [new Set<string>(), new Set<string>()];
}
const inboxes = new Set<string>(
JSON.parse(storage.getItem(getRelayStorageKey(user, 'inbox')) ?? '[]'),
JSON.parse(localStorage.getItem(getRelayStorageKey(user, "inbox")) ?? "[]"),
);
const outboxes = new Set<string>(
JSON.parse(storage.getItem(getRelayStorageKey(user, 'outbox')) ?? '[]'),
JSON.parse(
localStorage.getItem(getRelayStorageKey(user, "outbox")) ?? "[]",
),
);
return [inboxes, outboxes];
}
/**
* Fetch user's preferred relays from Nostr network
*/
async function getUserPreferredRelays(
ndk: NDK,
user: NDKUser,
fallbacks: readonly string[] = [...get(activeInboxRelays), ...get(activeOutboxRelays)],
fallbacks: readonly string[] = [
...get(activeInboxRelays),
...get(activeOutboxRelays),
],
): Promise<[Set<NDKRelay>, Set<NDKRelay>]> {
const relayList = await ndk.fetchEvent(
{
@ -137,38 +104,39 @@ async function getUserPreferredRelays( @@ -137,38 +104,39 @@ async function getUserPreferredRelays(
const inboxRelays = new Set<NDKRelay>();
const outboxRelays = new Set<NDKRelay>();
if (!relayList) {
// Fallback to extension relays if available
if (relayList == null) {
const relayMap = await globalThis.nostr?.getRelays?.();
if (relayMap) {
Object.entries(relayMap).forEach(
([url, relayType]: [string, Record<string, boolean | undefined>]) => {
const relay = new NDKRelay(
url,
NDKRelayAuthPolicies.signIn({ ndk }),
ndk,
);
if (relayType.read) inboxRelays.add(relay);
if (relayType.write) outboxRelays.add(relay);
},
);
}
Object.entries(relayMap ?? {}).forEach(
([url, relayType]: [string, Record<string, boolean | undefined>]) => {
const relay = new NDKRelay(
url,
NDKRelayAuthPolicies.signIn({ ndk }),
ndk,
);
if (relayType.read) inboxRelays.add(relay);
if (relayType.write) outboxRelays.add(relay);
},
);
} else {
// Parse relay list from event
relayList.tags.forEach((tag: string[]) => {
const relay = new NDKRelay(tag[1], NDKRelayAuthPolicies.signIn({ ndk }), ndk);
switch (tag[0]) {
case 'r':
inboxRelays.add(relay);
case "r":
inboxRelays.add(
new NDKRelay(tag[1], NDKRelayAuthPolicies.signIn({ ndk }), ndk),
);
break;
case 'w':
outboxRelays.add(relay);
case "w":
outboxRelays.add(
new NDKRelay(tag[1], NDKRelayAuthPolicies.signIn({ ndk }), ndk),
);
break;
default:
// Default: add to both
inboxRelays.add(relay);
outboxRelays.add(relay);
inboxRelays.add(
new NDKRelay(tag[1], NDKRelayAuthPolicies.signIn({ ndk }), ndk),
);
outboxRelays.add(
new NDKRelay(tag[1], NDKRelayAuthPolicies.signIn({ ndk }), ndk),
);
break;
}
});
@ -177,358 +145,337 @@ async function getUserPreferredRelays( @@ -177,358 +145,337 @@ async function getUserPreferredRelays(
return [inboxRelays, outboxRelays];
}
/**
* Persist login information to localStorage
*/
function persistLogin(user: NDKUser, method: LoginMethod): void {
const storage = safeLocalStorage();
if (!storage) return;
storage.setItem(loginStorageKey, user.pubkey);
storage.setItem(loginMethodStorageKey, method);
// --- Unified login/logout helpers ---
export const loginMethodStorageKey = "alexandria/login/method";
function persistLogin(user: NDKUser, method: "extension" | "amber" | "npub") {
// Only access localStorage on client-side
if (typeof window === "undefined") return;
localStorage.setItem(loginStorageKey, user.pubkey);
localStorage.setItem(loginMethodStorageKey, method);
}
/**
* Clear login information from localStorage
*/
function clearLogin(): void {
const storage = safeLocalStorage();
if (!storage) return;
storage.removeItem(loginStorageKey);
storage.removeItem(loginMethodStorageKey);
function clearLogin() {
localStorage.removeItem(loginStorageKey);
localStorage.removeItem(loginMethodStorageKey);
}
/**
* Fetch user profile with fallback
* Login with NIP-07 browser extension
*/
async function fetchUserProfile(npub: string): Promise<NostrProfile> {
export async function loginWithExtension(ndk: NDK) {
if (!ndk) throw new Error("NDK not initialized");
// Only clear previous login state after successful login
const signer = new NDKNip07Signer();
const user = await signer.user();
const npub = user.npub;
console.log("Login with extension - fetching profile for npub:", npub);
// Try to fetch user metadata, but don't fail if it times out
let profile: NostrProfile | null = null;
try {
return await getUserMetadata(npub, true);
console.log("Login with extension - attempting to fetch profile...");
profile = await getUserMetadata(npub, true); // Force fresh fetch
console.log("Login with extension - fetched profile:", profile);
} catch (error) {
console.warn('Failed to fetch user metadata:', error);
// Fallback profile
return {
name: npub.slice(0, 8) + '...' + npub.slice(-4),
displayName: npub.slice(0, 8) + '...' + npub.slice(-4),
console.warn("Failed to fetch user metadata during login:", error);
// Continue with login even if metadata fetch fails
profile = {
name: npub.slice(0, 8) + "..." + npub.slice(-4),
displayName: npub.slice(0, 8) + "..." + npub.slice(-4),
};
console.log("Login with extension - using fallback profile:", profile);
}
}
/**
* Fetch and cache user lists in background
*/
async function fetchUserListsAndUpdateCache(userPubkey: string): Promise<void> {
// Fetch user's preferred relays
const [persistedInboxes, persistedOutboxes] = getPersistedRelays(user);
for (const relay of persistedInboxes) {
ndk.addExplicitRelay(relay);
}
const [inboxes, outboxes] = await getUserPreferredRelays(ndk, user);
persistRelays(user, inboxes, outboxes);
ndk.signer = signer;
ndk.activeUser = user;
const userState = {
pubkey: user.pubkey,
npub,
profile,
relays: {
inbox: Array.from(inboxes ?? persistedInboxes).map((relay) => relay.url),
outbox: Array.from(outboxes ?? persistedOutboxes).map(
(relay) => relay.url,
),
},
loginMethod: "extension" as const,
ndkUser: user,
signer,
signedIn: true,
};
console.log("Login with extension - setting userStore with:", userState);
userStore.set(userState);
userPubkey.set(user.pubkey);
// Update relay stores with the new user's relays
try {
console.log('Fetching user lists and updating profile cache for:', userPubkey);
const userLists = await fetchCurrentUserLists();
console.log(`Found ${userLists.length} user lists`);
// Collect all unique pubkeys
const allPubkeys = new Set<string>();
userLists.forEach(list => {
list.pubkeys.forEach(pubkey => allPubkeys.add(pubkey));
});
console.log(`Found ${allPubkeys.size} unique pubkeys in user lists`);
// Batch fetch profiles for performance
const batchSize = 20;
const pubkeyArray = Array.from(allPubkeys);
const ndk = get(ndkInstance);
if (!ndk) return;
for (let i = 0; i < pubkeyArray.length; i += batchSize) {
const batch = pubkeyArray.slice(i, i + batchSize);
try {
const events = await ndk.fetchEvents({
kinds: [0],
authors: batch,
});
// Cache profiles
for (const event of events) {
if (event.content) {
try {
const profileData = JSON.parse(event.content);
const npub = nip19.npubEncode(event.pubkey);
npubCache.set(npub, profileData);
} catch (e) {
console.warn('Failed to parse profile data:', e);
}
}
}
} catch (error) {
console.warn('Failed to fetch batch of profiles:', error);
}
}
console.log('User lists and profile cache update completed');
console.debug(
"[userStore.ts] loginWithExtension: Updating relay stores for authenticated user",
);
await updateActiveRelayStores(ndk, true); // Force update to rebuild relay set for authenticated user
} catch (error) {
console.warn('Failed to fetch user lists and update cache:', error);
console.warn(
"[userStore.ts] loginWithExtension: Failed to update relay stores:",
error,
);
}
clearLogin();
// Only access localStorage on client-side
if (typeof window !== "undefined") {
localStorage.removeItem("alexandria/logout/flag");
}
persistLogin(user, "extension");
}
/**
* Common login logic to reduce code duplication
* Login with Amber (NIP-46)
*/
async function performLogin(
user: NDKUser,
signer: NDKSigner | null,
method: LoginMethod,
): Promise<void> {
const ndk = get(ndkInstance);
if (!ndk) throw new Error('NDK not initialized');
export async function loginWithAmber(amberSigner: NDKSigner, user: NDKUser, ndk: NDK) {
if (!ndk) throw new Error("NDK not initialized");
// Only clear previous login state after successful login
const npub = user.npub;
console.log(`Login with ${method} - fetching profile for npub:`, npub);
// Fetch profile
const profile = await fetchUserProfile(npub);
console.log(`Login with ${method} - fetched profile:`, profile);
// Handle relays
console.log("Login with Amber - fetching profile for npub:", npub);
let profile: NostrProfile | null = null;
try {
profile = await getUserMetadata(npub, true); // Force fresh fetch
console.log("Login with Amber - fetched profile:", profile);
} catch (error) {
console.warn("Failed to fetch user metadata during Amber login:", error);
// Continue with login even if metadata fetch fails
profile = {
name: npub.slice(0, 8) + "..." + npub.slice(-4),
displayName: npub.slice(0, 8) + "..." + npub.slice(-4),
};
console.log("Login with Amber - using fallback profile:", profile);
}
const [persistedInboxes, persistedOutboxes] = getPersistedRelays(user);
persistedInboxes.forEach(relay => ndk.addExplicitRelay(relay));
for (const relay of persistedInboxes) {
ndk.addExplicitRelay(relay);
}
const [inboxes, outboxes] = await getUserPreferredRelays(ndk, user);
persistRelays(user, inboxes, outboxes);
// Set NDK state
ndk.signer = signer || undefined;
ndk.signer = amberSigner;
ndk.activeUser = user;
// Create user state
const userState: UserState = {
const userState = {
pubkey: user.pubkey,
npub,
profile,
relays: {
inbox: Array.from(inboxes || persistedInboxes).map((relay) => relay.url),
outbox: Array.from(outboxes || persistedOutboxes).map((relay) => relay.url),
inbox: Array.from(inboxes ?? persistedInboxes).map((relay) => relay.url),
outbox: Array.from(outboxes ?? persistedOutboxes).map(
(relay) => relay.url,
),
},
loginMethod: method,
loginMethod: "amber" as const,
ndkUser: user,
signer,
signer: amberSigner,
signedIn: true,
};
console.log(`Login with ${method} - setting userStore with:`, userState);
console.log("Login with Amber - setting userStore with:", userState);
userStore.set(userState);
// Update relay stores
userPubkey.set(user.pubkey);
// Update relay stores with the new user's relays
try {
console.debug(`[userStore.ts] loginWith${method.charAt(0).toUpperCase() + method.slice(1)}: Updating relay stores`);
await updateActiveRelayStores(ndk, true);
console.debug(
"[userStore.ts] loginWithAmber: Updating relay stores for authenticated user",
);
await updateActiveRelayStores(ndk, true); // Force update to rebuild relay set for authenticated user
} catch (error) {
console.warn(`[userStore.ts] loginWith${method.charAt(0).toUpperCase() + method.slice(1)}: Failed to update relay stores:`, error);
console.warn(
"[userStore.ts] loginWithAmber: Failed to update relay stores:",
error,
);
}
// Background tasks
fetchUserListsAndUpdateCache(user.pubkey).catch(error => {
console.warn(`[userStore.ts] loginWith${method.charAt(0).toUpperCase() + method.slice(1)}: Failed to fetch user lists:`, error);
});
// Cleanup and persist
clearLogin();
const storage = safeLocalStorage();
if (storage) {
storage.removeItem(LOGOUT_FLAG_KEY);
// Only access localStorage on client-side
if (typeof window !== "undefined") {
localStorage.removeItem("alexandria/logout/flag");
}
persistLogin(user, method);
}
/**
* Login with NIP-07 browser extension
*/
export async function loginWithExtension(): Promise<void> {
const ndk = get(ndkInstance);
if (!ndk) throw new Error('NDK not initialized');
const signer = new NDKNip07Signer();
const user = await signer.user();
await performLogin(user, signer, 'extension');
}
/**
* Login with Amber (NIP-46)
*/
export async function loginWithAmber(amberSigner: NDKSigner, user: NDKUser): Promise<void> {
await performLogin(user, amberSigner, 'amber');
persistLogin(user, "amber");
}
/**
* Login with npub (read-only)
*/
export async function loginWithNpub(pubkeyOrNpub: string): Promise<void> {
const ndk = get(ndkInstance);
if (!ndk) throw new Error('NDK not initialized');
export async function loginWithNpub(pubkeyOrNpub: string, ndk: NDK) {
if (!ndk) {
throw new Error("NDK not initialized");
}
// Decode pubkey
let hexPubkey: string;
if (pubkeyOrNpub.startsWith('npub1')) {
if (pubkeyOrNpub.startsWith("npub1")) {
try {
const decoded = nip19.decode(pubkeyOrNpub);
if (decoded.type !== 'npub') {
throw new Error('Invalid npub format');
if (decoded.type !== "npub") {
throw new Error("Invalid npub format");
}
hexPubkey = decoded.data;
} catch (e) {
console.error('Failed to decode npub:', pubkeyOrNpub, e);
console.error("Failed to decode npub:", pubkeyOrNpub, e);
throw e;
}
} else {
hexPubkey = pubkeyOrNpub;
}
// Encode npub
let npub: string;
try {
npub = nip19.npubEncode(hexPubkey);
} catch (e) {
console.error('Failed to encode npub from hex pubkey:', hexPubkey, e);
console.error("Failed to encode npub from hex pubkey:", hexPubkey, e);
throw e;
}
console.log('Login with npub - fetching profile for npub:', npub);
console.log("Login with npub - fetching profile for npub:", npub);
const user = ndk.getUser({ npub });
// Update relay stores first
let profile: NostrProfile | null = null;
// First, update relay stores to ensure we have relays available
try {
console.debug('[userStore.ts] loginWithNpub: Updating relay stores');
console.debug(
"[userStore.ts] loginWithNpub: Updating relay stores for authenticated user",
);
await updateActiveRelayStores(ndk);
} catch (error) {
console.warn('[userStore.ts] loginWithNpub: Failed to update relay stores:', error);
console.warn(
"[userStore.ts] loginWithNpub: Failed to update relay stores:",
error,
);
}
// Wait a moment for relay stores to be properly initialized
await new Promise((resolve) => setTimeout(resolve, 500));
try {
profile = await getUserMetadata(npub, true); // Force fresh fetch
console.log("Login with npub - fetched profile:", profile);
} catch (error) {
console.warn("Failed to fetch user metadata during npub login:", error);
// Continue with login even if metadata fetch fails
profile = {
name: npub.slice(0, 8) + "..." + npub.slice(-4),
displayName: npub.slice(0, 8) + "..." + npub.slice(-4),
};
console.log("Login with npub - using fallback profile:", profile);
}
// Wait for relay stores to initialize
await new Promise(resolve => setTimeout(resolve, 500));
// Fetch profile
const profile = await fetchUserProfile(npub);
// Set NDK state (no signer for read-only)
ndk.signer = undefined;
ndk.activeUser = user;
// Create user state
const userState: UserState = {
const userState = {
pubkey: user.pubkey,
npub,
profile,
relays: { inbox: [], outbox: [] },
loginMethod: 'npub',
loginMethod: "npub" as const,
ndkUser: user,
signer: null,
signedIn: true,
};
console.log('Login with npub - setting userStore with:', userState);
console.log("Login with npub - setting userStore with:", userState);
userStore.set(userState);
// Background tasks
fetchUserListsAndUpdateCache(user.pubkey).catch(error => {
console.warn('[userStore.ts] loginWithNpub: Failed to fetch user lists:', error);
});
// Cleanup and persist
userPubkey.set(user.pubkey);
clearLogin();
const storage = safeLocalStorage();
if (storage) {
storage.removeItem(LOGOUT_FLAG_KEY);
// Only access localStorage on client-side
if (typeof window !== "undefined") {
localStorage.removeItem("alexandria/logout/flag");
}
persistLogin(user, 'npub');
persistLogin(user, "npub");
}
/**
* Logout and clear all user state
*/
export function logoutUser(): void {
console.log('Logging out user...');
export function logoutUser(ndk: NDK) {
console.log("Logging out user...");
const currentUser = get(userStore);
// Clear localStorage
const storage = safeLocalStorage();
if (storage) {
// Only access localStorage on client-side
if (typeof window !== "undefined") {
if (currentUser.ndkUser) {
// Clear persisted relays
storage.removeItem(getRelayStorageKey(currentUser.ndkUser, 'inbox'));
storage.removeItem(getRelayStorageKey(currentUser.ndkUser, 'outbox'));
// Clear persisted relays for the user
localStorage.removeItem(getRelayStorageKey(currentUser.ndkUser, "inbox"));
localStorage.removeItem(
getRelayStorageKey(currentUser.ndkUser, "outbox"),
);
}
// Clear login data
// Clear all possible login states from localStorage
clearLogin();
// Clear any other potential login keys
const keysToRemove: string[] = [];
for (let i = 0; i < storage.length; i++) {
const key = storage.key(i);
if (key && (
key.includes('login') ||
key.includes('nostr') ||
key.includes('user') ||
key.includes('alexandria') ||
key === 'pubkey'
)) {
// Also clear any other potential login keys that might exist
const keysToRemove = [];
for (let i = 0; i < localStorage.length; i++) {
const key = localStorage.key(i);
if (
key &&
(key.includes("login") ||
key.includes("nostr") ||
key.includes("user") ||
key.includes("alexandria") ||
key === "pubkey")
) {
keysToRemove.push(key);
}
}
// Clear specific keys
keysToRemove.push('alexandria/login/pubkey', 'alexandria/login/method');
keysToRemove.forEach(key => {
console.log('Removing localStorage key:', key);
storage.removeItem(key);
// Specifically target the login storage key
keysToRemove.push("alexandria/login/pubkey");
keysToRemove.push("alexandria/login/method");
keysToRemove.forEach((key) => {
console.log("Removing localStorage key:", key);
localStorage.removeItem(key);
});
// Clear Amber-specific flags
storage.removeItem('alexandria/amber/fallback');
localStorage.removeItem("alexandria/amber/fallback");
// Set logout flag
storage.setItem(LOGOUT_FLAG_KEY, 'true');
// Set a flag to prevent auto-login on next page load
localStorage.setItem("alexandria/logout/flag", "true");
console.log('Cleared all login data from localStorage');
console.log("Cleared all login data from localStorage");
}
// Clear cache
relayStorageKeyCache.clear();
// Reset user store
userStore.set(initialUserState);
userStore.set({
pubkey: null,
npub: null,
profile: null,
relays: { inbox: [], outbox: [] },
loginMethod: null,
ndkUser: null,
signer: null,
signedIn: false,
});
userPubkey.set(null);
// Clear NDK state
const ndk = get(ndkInstance);
if (ndk) {
ndk.activeUser = undefined;
ndk.signer = undefined;
}
console.log('Logout complete');
}
/**
* Reset user store to initial state
*/
export function resetUserStore(): void {
userStore.set(initialUserState);
relayStorageKeyCache.clear();
}
/**
* Get current user state
*/
export function getCurrentUser(): UserState {
return get(userStore);
}
/**
* Check if user is signed in
*/
export function isUserSignedIn(): boolean {
return get(userStore).signedIn;
console.log("Logout complete");
}

43
src/lib/stores/visualizationConfig.ts

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { writable, derived, get } from "svelte/store";
import { derived, get, writable } from "svelte/store";
export interface EventKindConfig {
kind: number;
@ -39,8 +39,10 @@ function createVisualizationConfig() { @@ -39,8 +39,10 @@ function createVisualizationConfig() {
eventConfigs: DEFAULT_EVENT_CONFIGS,
searchThroughFetched: true,
};
const { subscribe, set, update } = writable<VisualizationConfig>(initialConfig);
const { subscribe, set, update } = writable<VisualizationConfig>(
initialConfig,
);
function reset() {
set(initialConfig);
@ -52,19 +54,19 @@ function createVisualizationConfig() { @@ -52,19 +54,19 @@ function createVisualizationConfig() {
if (config.eventConfigs.some((ec) => ec.kind === kind)) {
return config;
}
const newConfig: EventKindConfig = { kind, limit, enabled: true };
// Add nestedLevels for 30040
if (kind === 30040) {
newConfig.nestedLevels = 1;
}
// Add depth for kind 3
if (kind === 3) {
newConfig.depth = 0;
}
return {
...config,
eventConfigs: [...config.eventConfigs, newConfig],
@ -83,7 +85,7 @@ function createVisualizationConfig() { @@ -83,7 +85,7 @@ function createVisualizationConfig() {
update((config) => ({
...config,
eventConfigs: config.eventConfigs.map((ec) =>
ec.kind === kind ? { ...ec, limit } : ec,
ec.kind === kind ? { ...ec, limit } : ec
),
}));
}
@ -92,7 +94,7 @@ function createVisualizationConfig() { @@ -92,7 +94,7 @@ function createVisualizationConfig() {
update((config) => ({
...config,
eventConfigs: config.eventConfigs.map((ec) =>
ec.kind === 30040 ? { ...ec, nestedLevels: levels } : ec,
ec.kind === 30040 ? { ...ec, nestedLevels: levels } : ec
),
}));
}
@ -101,7 +103,7 @@ function createVisualizationConfig() { @@ -101,7 +103,7 @@ function createVisualizationConfig() {
update((config) => ({
...config,
eventConfigs: config.eventConfigs.map((ec) =>
ec.kind === 3 ? { ...ec, depth: depth } : ec,
ec.kind === 3 ? { ...ec, depth: depth } : ec
),
}));
}
@ -110,7 +112,7 @@ function createVisualizationConfig() { @@ -110,7 +112,7 @@ function createVisualizationConfig() {
update((config) => ({
...config,
eventConfigs: config.eventConfigs.map((ec) =>
ec.kind === kind ? { ...ec, showAll: !ec.showAll } : ec,
ec.kind === kind ? { ...ec, showAll: !ec.showAll } : ec
),
}));
}
@ -134,7 +136,7 @@ function createVisualizationConfig() { @@ -134,7 +136,7 @@ function createVisualizationConfig() {
update((config) => ({
...config,
eventConfigs: config.eventConfigs.map((ec) =>
ec.kind === kind ? { ...ec, enabled: !ec.enabled } : ec,
ec.kind === kind ? { ...ec, enabled: !ec.enabled } : ec
),
}));
}
@ -158,10 +160,12 @@ function createVisualizationConfig() { @@ -158,10 +160,12 @@ function createVisualizationConfig() {
export const visualizationConfig = createVisualizationConfig();
// Helper to get all enabled event kinds
export const enabledEventKinds = derived(visualizationConfig, ($config) =>
$config.eventConfigs
.filter((ec) => ec.enabled !== false)
.map((ec) => ec.kind),
export const enabledEventKinds = derived(
visualizationConfig,
($config) =>
$config.eventConfigs
.filter((ec) => ec.enabled !== false)
.map((ec) => ec.kind),
);
/**
@ -169,7 +173,10 @@ export const enabledEventKinds = derived(visualizationConfig, ($config) => @@ -169,7 +173,10 @@ export const enabledEventKinds = derived(visualizationConfig, ($config) =>
* @param config - The VisualizationConfig object.
* @param kind - The event kind number to check.
*/
export function isKindEnabledFn(config: VisualizationConfig, kind: number): boolean {
export function isKindEnabledFn(
config: VisualizationConfig,
kind: number,
): boolean {
const eventConfig = config.eventConfigs.find((ec) => ec.kind === kind);
// If not found, return false. Otherwise, return true unless explicitly disabled.
return !!eventConfig && eventConfig.enabled !== false;
@ -178,5 +185,5 @@ export function isKindEnabledFn(config: VisualizationConfig, kind: number): bool @@ -178,5 +185,5 @@ export function isKindEnabledFn(config: VisualizationConfig, kind: number): bool
// Derived store: returns a function that checks if a kind is enabled in the current config.
export const isKindEnabledStore = derived(
visualizationConfig,
($config) => (kind: number) => isKindEnabledFn($config, kind)
($config) => (kind: number) => isKindEnabledFn($config, kind),
);

24
src/lib/utils.ts

@ -26,7 +26,7 @@ export function neventEncode(event: NDKEvent, relays: string[]) { @@ -26,7 +26,7 @@ export function neventEncode(event: NDKEvent, relays: string[]) {
relays,
author: event.pubkey,
});
return nevent;
} catch (error) {
console.error(`[neventEncode] Error encoding nevent:`, error);
@ -54,7 +54,10 @@ export function naddrEncode(event: NDKEvent, relays: string[]) { @@ -54,7 +54,10 @@ export function naddrEncode(event: NDKEvent, relays: string[]) {
* @param relays Optional relay list for the address
* @returns A tag address string
*/
export function createTagAddress(event: NostrEvent, relays: string[] = []): string {
export function createTagAddress(
event: NostrEvent,
relays: string[] = [],
): string {
const dTag = event.tags.find((tag: string[]) => tag[0] === "d")?.[1];
if (!dTag) {
throw new Error("Event does not have a d tag");
@ -144,10 +147,9 @@ export function next(): number { @@ -144,10 +147,9 @@ export function next(): number {
export function scrollTabIntoView(el: string | HTMLElement, wait: boolean) {
function scrollTab() {
const element =
typeof el === "string"
? document.querySelector(`[id^="wikitab-v0-${el}"]`)
: el;
const element = typeof el === "string"
? document.querySelector(`[id^="wikitab-v0-${el}"]`)
: el;
if (!element) return;
element.scrollIntoView({
@ -166,10 +168,9 @@ export function scrollTabIntoView(el: string | HTMLElement, wait: boolean) { @@ -166,10 +168,9 @@ export function scrollTabIntoView(el: string | HTMLElement, wait: boolean) {
}
export function isElementInViewport(el: string | HTMLElement) {
const element =
typeof el === "string"
? document.querySelector(`[id^="wikitab-v0-${el}"]`)
: el;
const element = typeof el === "string"
? document.querySelector(`[id^="wikitab-v0-${el}"]`)
: el;
if (!element) return;
const rect = element.getBoundingClientRect();
@ -179,7 +180,8 @@ export function isElementInViewport(el: string | HTMLElement) { @@ -179,7 +180,8 @@ export function isElementInViewport(el: string | HTMLElement) {
rect.left >= 0 &&
rect.bottom <=
(globalThis.innerHeight || document.documentElement.clientHeight) &&
rect.right <= (globalThis.innerWidth || document.documentElement.clientWidth)
rect.right <=
(globalThis.innerWidth || document.documentElement.clientWidth)
);
}

10
src/lib/utils/ZettelParser.ts

@ -41,7 +41,7 @@ export function parseZettelSection(section: string): ZettelSection { @@ -41,7 +41,7 @@ export function parseZettelSection(section: string): ZettelSection {
const trimmed = line.trim();
if (trimmed.startsWith("==")) {
title = trimmed.replace(/^==+/, "").trim();
// Process header metadata (everything after title until blank line)
let j = i + 1;
while (j < lines.length && lines[j].trim() !== "") {
@ -54,12 +54,12 @@ export function parseZettelSection(section: string): ZettelSection { @@ -54,12 +54,12 @@ export function parseZettelSection(section: string): ZettelSection {
j++;
}
}
// Skip the blank line
if (j < lines.length && lines[j].trim() === "") {
j++;
}
// Everything after the blank line is content
for (let k = j; k < lines.length; k++) {
contentLines.push(lines[k]);
@ -100,13 +100,13 @@ export function extractTags(content: string): string[][] { @@ -100,13 +100,13 @@ export function extractTags(content: string): string[][] {
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
const trimmed = line.trim();
if (trimmed.startsWith("==")) {
// Process header metadata (everything after title until blank line)
let j = i + 1;
while (j < lines.length && lines[j].trim() !== "") {
const headerLine = lines[j].trim();
if (headerLine.startsWith(":")) {
// Parse AsciiDoc attribute format: :tagname: value
const match = headerLine.match(/^:([^:]+):\s*(.*)$/);

273
src/lib/utils/asciidoc_metadata.ts

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
/**
* AsciiDoc Metadata Extraction Service using Asciidoctor
*
*
* Thin wrapper around Asciidoctor's built-in metadata extraction capabilities.
* Leverages the existing Pharos parser to avoid duplication.
*/
@ -23,7 +23,7 @@ export interface AsciiDocMetadata { @@ -23,7 +23,7 @@ export interface AsciiDocMetadata {
source?: string;
publishedBy?: string;
type?: string;
autoUpdate?: 'yes' | 'ask' | 'no';
autoUpdate?: "yes" | "ask" | "no";
}
export type SectionMetadata = AsciiDocMetadata;
@ -41,29 +41,29 @@ export interface ParsedAsciiDoc { @@ -41,29 +41,29 @@ export interface ParsedAsciiDoc {
// Shared attribute mapping based on Asciidoctor standard attributes
const ATTRIBUTE_MAP: Record<string, keyof AsciiDocMetadata> = {
// Standard Asciidoctor attributes
'author': 'authors',
'description': 'summary',
'keywords': 'tags',
'revnumber': 'version',
'revdate': 'publicationDate',
'revremark': 'edition',
'title': 'title',
"author": "authors",
"description": "summary",
"keywords": "tags",
"revnumber": "version",
"revdate": "publicationDate",
"revremark": "edition",
"title": "title",
// Custom attributes for Alexandria
'published_by': 'publishedBy',
'publisher': 'publisher',
'summary': 'summary',
'image': 'coverImage',
'cover': 'coverImage',
'isbn': 'isbn',
'source': 'source',
'type': 'type',
'auto-update': 'autoUpdate',
'version': 'version',
'edition': 'edition',
'published_on': 'publicationDate',
'date': 'publicationDate',
'version-label': 'version',
"published_by": "publishedBy",
"publisher": "publisher",
"summary": "summary",
"image": "coverImage",
"cover": "coverImage",
"isbn": "isbn",
"source": "source",
"type": "type",
"auto-update": "autoUpdate",
"version": "version",
"edition": "edition",
"published_on": "publicationDate",
"date": "publicationDate",
"version-label": "version",
};
/**
@ -78,37 +78,41 @@ function createProcessor() { @@ -78,37 +78,41 @@ function createProcessor() {
*/
function extractTagsFromAttributes(attributes: Record<string, any>): string[] {
const tags: string[] = [];
const attrTags = attributes['tags'];
const attrKeywords = attributes['keywords'];
if (attrTags && typeof attrTags === 'string') {
tags.push(...attrTags.split(',').map(tag => tag.trim()));
const attrTags = attributes["tags"];
const attrKeywords = attributes["keywords"];
if (attrTags && typeof attrTags === "string") {
tags.push(...attrTags.split(",").map((tag) => tag.trim()));
}
if (attrKeywords && typeof attrKeywords === 'string') {
tags.push(...attrKeywords.split(',').map(tag => tag.trim()));
if (attrKeywords && typeof attrKeywords === "string") {
tags.push(...attrKeywords.split(",").map((tag) => tag.trim()));
}
return [...new Set(tags)]; // Remove duplicates
}
/**
* Maps attributes to metadata with special handling for authors and tags
*/
function mapAttributesToMetadata(attributes: Record<string, any>, metadata: AsciiDocMetadata, isDocument: boolean = false): void {
function mapAttributesToMetadata(
attributes: Record<string, any>,
metadata: AsciiDocMetadata,
isDocument: boolean = false,
): void {
for (const [key, value] of Object.entries(attributes)) {
const metadataKey = ATTRIBUTE_MAP[key.toLowerCase()];
if (metadataKey && value && typeof value === 'string') {
if (metadataKey === 'authors' && isDocument) {
if (metadataKey && value && typeof value === "string") {
if (metadataKey === "authors" && isDocument) {
// Skip author mapping for documents since it's handled manually
continue;
} else if (metadataKey === 'authors' && !isDocument) {
} else if (metadataKey === "authors" && !isDocument) {
// For sections, append author to existing authors array
if (!metadata.authors) {
metadata.authors = [];
}
metadata.authors.push(value);
} else if (metadataKey === 'tags') {
} else if (metadataKey === "tags") {
// Skip tags mapping since it's handled by extractTagsFromAttributes
continue;
} else {
@ -121,11 +125,14 @@ function mapAttributesToMetadata(attributes: Record<string, any>, metadata: Asci @@ -121,11 +125,14 @@ function mapAttributesToMetadata(attributes: Record<string, any>, metadata: Asci
/**
* Extracts authors from header line (document or section)
*/
function extractAuthorsFromHeader(sourceContent: string, isSection: boolean = false): string[] {
function extractAuthorsFromHeader(
sourceContent: string,
isSection: boolean = false,
): string[] {
const authors: string[] = [];
const lines = sourceContent.split(/\r?\n/);
const headerPattern = isSection ? /^==\s+/ : /^=\s+/;
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
if (line.match(headerPattern)) {
@ -133,51 +140,60 @@ function extractAuthorsFromHeader(sourceContent: string, isSection: boolean = fa @@ -133,51 +140,60 @@ function extractAuthorsFromHeader(sourceContent: string, isSection: boolean = fa
let j = i + 1;
while (j < lines.length) {
const authorLine = lines[j];
// Stop if we hit a blank line or content that's not an author
if (authorLine.trim() === '') {
if (authorLine.trim() === "") {
break;
}
if (authorLine.includes('<') && !authorLine.startsWith(':')) {
if (authorLine.includes("<") && !authorLine.startsWith(":")) {
// This is an author line like "John Doe <john@example.com>"
const authorName = authorLine.split('<')[0].trim();
const authorName = authorLine.split("<")[0].trim();
if (authorName) {
authors.push(authorName);
}
} else if (isSection && authorLine.match(/^[A-Za-z\s]+$/) && authorLine.trim() !== '' && authorLine.trim().split(/\s+/).length <= 2) {
} else if (
isSection && authorLine.match(/^[A-Za-z\s]+$/) &&
authorLine.trim() !== "" && authorLine.trim().split(/\s+/).length <= 2
) {
// This is a simple author name without email (for sections)
authors.push(authorLine.trim());
} else if (authorLine.startsWith(':')) {
} else if (authorLine.startsWith(":")) {
// This is an attribute line, skip it - attributes are handled by mapAttributesToMetadata
// Don't break here, continue to next line
} else {
// Not an author line, stop looking
break;
}
j++;
}
break;
}
}
return authors;
}
/**
* Strips header and attribute lines from content
*/
function stripHeaderAndAttributes(content: string, isSection: boolean = false): string {
function stripHeaderAndAttributes(
content: string,
isSection: boolean = false,
): string {
const lines = content.split(/\r?\n/);
let contentStart = 0;
const headerPattern = isSection ? /^==\s+/ : /^=\s+/;
for (let i = 0; i < lines.length; i++) {
const line = lines[i];
// Skip title line, author line, revision line, and attribute lines
if (!line.match(headerPattern) && !line.includes('<') && !line.match(/^.+,\s*.+:\s*.+$/) &&
!line.match(/^:[^:]+:\s*.+$/) && line.trim() !== '') {
if (
!line.match(headerPattern) && !line.includes("<") &&
!line.match(/^.+,\s*.+:\s*.+$/) &&
!line.match(/^:[^:]+:\s*.+$/) && line.trim() !== ""
) {
contentStart = i;
break;
}
@ -185,20 +201,26 @@ function stripHeaderAndAttributes(content: string, isSection: boolean = false): @@ -185,20 +201,26 @@ function stripHeaderAndAttributes(content: string, isSection: boolean = false):
// Filter out all attribute lines and author lines from the content
const contentLines = lines.slice(contentStart);
const filteredLines = contentLines.filter(line => {
const filteredLines = contentLines.filter((line) => {
// Skip attribute lines
if (line.match(/^:[^:]+:\s*.+$/)) {
return false;
}
// Skip author lines (simple names without email)
if (isSection && line.match(/^[A-Za-z\s]+$/) && line.trim() !== '' && line.trim().split(/\s+/).length <= 2) {
if (
isSection && line.match(/^[A-Za-z\s]+$/) && line.trim() !== "" &&
line.trim().split(/\s+/).length <= 2
) {
return false;
}
return true;
});
// Remove extra blank lines and normalize newlines
return filteredLines.join('\n').replace(/\n\s*\n\s*\n/g, '\n\n').replace(/\n\s*\n/g, '\n').trim();
return filteredLines.join("\n").replace(/\n\s*\n\s*\n/g, "\n\n").replace(
/\n\s*\n/g,
"\n",
).trim();
}
/**
@ -207,7 +229,7 @@ function stripHeaderAndAttributes(content: string, isSection: boolean = false): @@ -207,7 +229,7 @@ function stripHeaderAndAttributes(content: string, isSection: boolean = false):
function parseSectionAttributes(sectionContent: string): Record<string, any> {
const attributes: Record<string, any> = {};
const lines = sectionContent.split(/\r?\n/);
for (const line of lines) {
const match = line.match(/^:([^:]+):\s*(.+)$/);
if (match) {
@ -215,14 +237,10 @@ function parseSectionAttributes(sectionContent: string): Record<string, any> { @@ -215,14 +237,10 @@ function parseSectionAttributes(sectionContent: string): Record<string, any> {
attributes[key.trim()] = value.trim();
}
}
return attributes;
}
/**
* Extracts metadata from AsciiDoc document using Asciidoctor
*/
@ -231,7 +249,9 @@ export function extractDocumentMetadata(inputContent: string): { @@ -231,7 +249,9 @@ export function extractDocumentMetadata(inputContent: string): {
content: string;
} {
const asciidoctor = createProcessor();
const document = asciidoctor.load(inputContent, { standalone: false }) as Document;
const document = asciidoctor.load(inputContent, {
standalone: false,
}) as Document;
const metadata: AsciiDocMetadata = {};
const attributes = document.getAttributes();
@ -242,13 +262,16 @@ export function extractDocumentMetadata(inputContent: string): { @@ -242,13 +262,16 @@ export function extractDocumentMetadata(inputContent: string): {
// Handle multiple authors - combine header line and attributes
const authors = extractAuthorsFromHeader(document.getSource());
// Get authors from attributes (but avoid duplicates)
const attrAuthor = attributes['author'];
if (attrAuthor && typeof attrAuthor === 'string' && !authors.includes(attrAuthor)) {
const attrAuthor = attributes["author"];
if (
attrAuthor && typeof attrAuthor === "string" &&
!authors.includes(attrAuthor)
) {
authors.push(attrAuthor);
}
if (authors.length > 0) {
metadata.authors = [...new Set(authors)]; // Remove duplicates
}
@ -265,12 +288,12 @@ export function extractDocumentMetadata(inputContent: string): { @@ -265,12 +288,12 @@ export function extractDocumentMetadata(inputContent: string): {
// Map attributes to metadata (but skip version and publishedBy if we already have them from revision)
mapAttributesToMetadata(attributes, metadata, true);
// If we got version from revision, don't override it with attribute
if (revisionNumber) {
metadata.version = revisionNumber;
}
// If we got publishedBy from revision, don't override it with attribute
if (revisionRemark) {
metadata.publishedBy = revisionRemark;
@ -295,17 +318,19 @@ export function extractSectionMetadata(inputSectionContent: string): { @@ -295,17 +318,19 @@ export function extractSectionMetadata(inputSectionContent: string): {
title: string;
} {
const asciidoctor = createProcessor();
const document = asciidoctor.load(`= Temp\n\n${inputSectionContent}`, { standalone: false }) as Document;
const document = asciidoctor.load(`= Temp\n\n${inputSectionContent}`, {
standalone: false,
}) as Document;
const sections = document.getSections();
if (sections.length === 0) {
return { metadata: {}, content: inputSectionContent, title: '' };
return { metadata: {}, content: inputSectionContent, title: "" };
}
const section = sections[0];
const title = section.getTitle() || '';
const title = section.getTitle() || "";
const metadata: SectionMetadata = { title };
// Parse attributes from the section content
const attributes = parseSectionAttributes(inputSectionContent);
@ -335,7 +360,7 @@ export function parseAsciiDocWithMetadata(content: string): ParsedAsciiDoc { @@ -335,7 +360,7 @@ export function parseAsciiDocWithMetadata(content: string): ParsedAsciiDoc {
const asciidoctor = createProcessor();
const document = asciidoctor.load(content, { standalone: false }) as Document;
const { metadata: docMetadata } = extractDocumentMetadata(content);
// Parse the original content to find section attributes
const lines = content.split(/\r?\n/);
const sectionsWithMetadata: Array<{
@ -345,15 +370,15 @@ export function parseAsciiDocWithMetadata(content: string): ParsedAsciiDoc { @@ -345,15 +370,15 @@ export function parseAsciiDocWithMetadata(content: string): ParsedAsciiDoc {
}> = [];
let currentSection: string | null = null;
let currentSectionContent: string[] = [];
for (const line of lines) {
if (line.match(/^==\s+/)) {
// Save previous section if exists
if (currentSection) {
const sectionContent = currentSectionContent.join('\n');
const sectionContent = currentSectionContent.join("\n");
sectionsWithMetadata.push(extractSectionMetadata(sectionContent));
}
// Start new section
currentSection = line;
currentSectionContent = [line];
@ -361,42 +386,46 @@ export function parseAsciiDocWithMetadata(content: string): ParsedAsciiDoc { @@ -361,42 +386,46 @@ export function parseAsciiDocWithMetadata(content: string): ParsedAsciiDoc {
currentSectionContent.push(line);
}
}
// Save the last section
if (currentSection) {
const sectionContent = currentSectionContent.join('\n');
const sectionContent = currentSectionContent.join("\n");
sectionsWithMetadata.push(extractSectionMetadata(sectionContent));
}
return {
metadata: docMetadata,
content: document.getSource(),
sections: sectionsWithMetadata
sections: sectionsWithMetadata,
};
}
/**
* Converts metadata to Nostr event tags
*/
export function metadataToTags(metadata: AsciiDocMetadata | SectionMetadata): [string, string][] {
export function metadataToTags(
metadata: AsciiDocMetadata | SectionMetadata,
): [string, string][] {
const tags: [string, string][] = [];
if (metadata.title) tags.push(['title', metadata.title]);
if (metadata.title) tags.push(["title", metadata.title]);
if (metadata.authors?.length) {
metadata.authors.forEach(author => tags.push(['author', author]));
metadata.authors.forEach((author) => tags.push(["author", author]));
}
if (metadata.version) tags.push(["version", metadata.version]);
if (metadata.edition) tags.push(["edition", metadata.edition]);
if (metadata.publicationDate) {
tags.push(["published_on", metadata.publicationDate]);
}
if (metadata.version) tags.push(['version', metadata.version]);
if (metadata.edition) tags.push(['edition', metadata.edition]);
if (metadata.publicationDate) tags.push(['published_on', metadata.publicationDate]);
if (metadata.publishedBy) tags.push(['published_by', metadata.publishedBy]);
if (metadata.summary) tags.push(['summary', metadata.summary]);
if (metadata.coverImage) tags.push(['image', metadata.coverImage]);
if (metadata.isbn) tags.push(['i', metadata.isbn]);
if (metadata.source) tags.push(['source', metadata.source]);
if (metadata.type) tags.push(['type', metadata.type]);
if (metadata.autoUpdate) tags.push(['auto-update', metadata.autoUpdate]);
if (metadata.publishedBy) tags.push(["published_by", metadata.publishedBy]);
if (metadata.summary) tags.push(["summary", metadata.summary]);
if (metadata.coverImage) tags.push(["image", metadata.coverImage]);
if (metadata.isbn) tags.push(["i", metadata.isbn]);
if (metadata.source) tags.push(["source", metadata.source]);
if (metadata.type) tags.push(["type", metadata.type]);
if (metadata.autoUpdate) tags.push(["auto-update", metadata.autoUpdate]);
if (metadata.tags?.length) {
metadata.tags.forEach(tag => tags.push(['t', tag]));
metadata.tags.forEach((tag) => tags.push(["t", tag]));
}
return tags;
@ -408,7 +437,7 @@ export function metadataToTags(metadata: AsciiDocMetadata | SectionMetadata): [s @@ -408,7 +437,7 @@ export function metadataToTags(metadata: AsciiDocMetadata | SectionMetadata): [s
export function removeMetadataFromContent(content: string): string {
const { content: cleanedContent } = extractDocumentMetadata(content);
return cleanedContent;
}
}
/**
* Extracts metadata from content that only contains sections (no document header)
@ -424,19 +453,19 @@ export function extractMetadataFromSectionsOnly(content: string): { @@ -424,19 +453,19 @@ export function extractMetadataFromSectionsOnly(content: string): {
content: string;
title: string;
}> = [];
let currentSection: string | null = null;
let currentSectionContent: string[] = [];
// Parse sections from the content
for (const line of lines) {
if (line.match(/^==\s+/)) {
// Save previous section if exists
if (currentSection) {
const sectionContent = currentSectionContent.join('\n');
const sectionContent = currentSectionContent.join("\n");
sections.push(extractSectionMetadata(sectionContent));
}
// Start new section
currentSection = line;
currentSectionContent = [line];
@ -444,20 +473,20 @@ export function extractMetadataFromSectionsOnly(content: string): { @@ -444,20 +473,20 @@ export function extractMetadataFromSectionsOnly(content: string): {
currentSectionContent.push(line);
}
}
// Save the last section
if (currentSection) {
const sectionContent = currentSectionContent.join('\n');
const sectionContent = currentSectionContent.join("\n");
sections.push(extractSectionMetadata(sectionContent));
}
// For section-only content, we don't have document metadata
// Return the first section's title as the document title if available
const metadata: AsciiDocMetadata = {};
if (sections.length > 0 && sections[0].title) {
metadata.title = sections[0].title;
}
return { metadata, content };
}
@ -470,31 +499,31 @@ export function extractSmartMetadata(content: string): { @@ -470,31 +499,31 @@ export function extractSmartMetadata(content: string): {
} {
// Check if content has a document header
const hasDocumentHeader = content.match(/^=\s+/m);
if (hasDocumentHeader) {
// Check if it's a minimal document header (just title, no other metadata)
const lines = content.split(/\r?\n/);
const titleLine = lines.find(line => line.match(/^=\s+/));
const hasOtherMetadata = lines.some(line =>
line.includes('<') || // author line
const titleLine = lines.find((line) => line.match(/^=\s+/));
const hasOtherMetadata = lines.some((line) =>
line.includes("<") || // author line
line.match(/^.+,\s*.+:\s*.+$/) // revision line
);
if (hasOtherMetadata) {
// Full document with metadata - use standard extraction
return extractDocumentMetadata(content);
} else {
// Minimal document header (just title) - preserve the title line for 30040 events
const title = titleLine?.replace(/^=\s+/, '').trim();
const metadata: AsciiDocMetadata = {};
if (title) {
metadata.title = title;
}
// Keep the title line in content for 30040 events
return { metadata, content };
}
} else {
// Minimal document header (just title) - preserve the title line for 30040 events
const title = titleLine?.replace(/^=\s+/, "").trim();
const metadata: AsciiDocMetadata = {};
if (title) {
metadata.title = title;
}
// Keep the title line in content for 30040 events
return { metadata, content };
}
} else {
return extractMetadataFromSectionsOnly(content);
}
}
}

4
src/lib/utils/community_checker.ts

@ -43,7 +43,7 @@ export async function checkCommunity(pubkey: string): Promise<boolean> { @@ -43,7 +43,7 @@ export async function checkCommunity(pubkey: string): Promise<boolean> {
}
};
});
if (result) {
return true;
}
@ -52,7 +52,7 @@ export async function checkCommunity(pubkey: string): Promise<boolean> { @@ -52,7 +52,7 @@ export async function checkCommunity(pubkey: string): Promise<boolean> {
continue;
}
}
// If we get here, no relay found the user
communityCache.set(pubkey, false);
return false;

59
src/lib/utils/displayLimits.ts

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
import type { NDKEvent } from '@nostr-dev-kit/ndk';
import type { VisualizationConfig } from '$lib/stores/visualizationConfig';
import { isEventId, isCoordinate, parseCoordinate } from './nostr_identifiers';
import type { NostrEventId } from './nostr_identifiers';
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import type { VisualizationConfig } from "$lib/stores/visualizationConfig";
import { isCoordinate, isEventId, parseCoordinate } from "./nostr_identifiers";
import type { NostrEventId } from "./nostr_identifiers";
/**
* Filters events based on visualization configuration
@ -9,7 +9,10 @@ import type { NostrEventId } from './nostr_identifiers'; @@ -9,7 +9,10 @@ import type { NostrEventId } from './nostr_identifiers';
* @param config - Visualization configuration
* @returns Filtered events that should be displayed
*/
export function filterByDisplayLimits(events: NDKEvent[], config: VisualizationConfig): NDKEvent[] {
export function filterByDisplayLimits(
events: NDKEvent[],
config: VisualizationConfig,
): NDKEvent[] {
const result: NDKEvent[] = [];
const kindCounts = new Map<number, number>();
@ -18,13 +21,13 @@ export function filterByDisplayLimits(events: NDKEvent[], config: VisualizationC @@ -18,13 +21,13 @@ export function filterByDisplayLimits(events: NDKEvent[], config: VisualizationC
if (kind === undefined) continue;
// Get the config for this event kind
const eventConfig = config.eventConfigs.find(ec => ec.kind === kind);
const eventConfig = config.eventConfigs.find((ec) => ec.kind === kind);
// Skip if the kind is disabled
if (eventConfig && eventConfig.enabled === false) {
continue;
}
const limit = eventConfig?.limit;
// Special handling for content kinds (30041, 30818) with showAll option
@ -58,48 +61,48 @@ export function filterByDisplayLimits(events: NDKEvent[], config: VisualizationC @@ -58,48 +61,48 @@ export function filterByDisplayLimits(events: NDKEvent[], config: VisualizationC
* @returns Set of missing event identifiers
*/
export function detectMissingEvents(
events: NDKEvent[],
events: NDKEvent[],
existingIds: Set<NostrEventId>,
existingCoordinates?: Map<string, NDKEvent>
existingCoordinates?: Map<string, NDKEvent>,
): Set<string> {
const missing = new Set<string>();
for (const event of events) {
// Check 'e' tags for direct event references (hex IDs)
const eTags = event.getMatchingTags('e');
const eTags = event.getMatchingTags("e");
for (const eTag of eTags) {
if (eTag.length < 2) continue;
const eventId = eTag[1];
// Type check: ensure it's a valid hex event ID
if (!isEventId(eventId)) {
console.warn('Invalid event ID in e tag:', eventId);
console.warn("Invalid event ID in e tag:", eventId);
continue;
}
if (!existingIds.has(eventId)) {
missing.add(eventId);
}
}
// Check 'a' tags for NIP-33 references (kind:pubkey:d-tag)
const aTags = event.getMatchingTags('a');
const aTags = event.getMatchingTags("a");
for (const aTag of aTags) {
if (aTag.length < 2) continue;
const identifier = aTag[1];
// Type check: ensure it's a valid coordinate
if (!isCoordinate(identifier)) {
console.warn('Invalid coordinate in a tag:', identifier);
console.warn("Invalid coordinate in a tag:", identifier);
continue;
}
// Parse the coordinate
const parsed = parseCoordinate(identifier);
if (!parsed) continue;
// If we have existing coordinates, check if this one exists
if (existingCoordinates) {
if (!existingCoordinates.has(identifier)) {
@ -108,7 +111,10 @@ export function detectMissingEvents( @@ -108,7 +111,10 @@ export function detectMissingEvents(
} else {
// Without coordinate map, we can't detect missing NIP-33 events
// This is a limitation when we only have hex IDs
console.debug('Cannot detect missing NIP-33 events without coordinate map:', identifier);
console.debug(
"Cannot detect missing NIP-33 events without coordinate map:",
identifier,
);
}
}
}
@ -123,20 +129,19 @@ export function detectMissingEvents( @@ -123,20 +129,19 @@ export function detectMissingEvents(
*/
export function buildCoordinateMap(events: NDKEvent[]): Map<string, NDKEvent> {
const coordinateMap = new Map<string, NDKEvent>();
for (const event of events) {
// Only process replaceable events (kinds 30000-39999)
if (event.kind && event.kind >= 30000 && event.kind < 40000) {
const dTag = event.tagValue('d');
const dTag = event.tagValue("d");
const author = event.pubkey;
if (dTag && author) {
const coordinate = `${event.kind}:${author}:${dTag}`;
coordinateMap.set(coordinate, event);
}
}
}
return coordinateMap;
}

103
src/lib/utils/eventColors.ts

@ -13,11 +13,11 @@ const GOLDEN_RATIO = (1 + Math.sqrt(5)) / 2; @@ -13,11 +13,11 @@ const GOLDEN_RATIO = (1 + Math.sqrt(5)) / 2;
export function getEventKindColor(kind: number): string {
// Use golden ratio for better distribution
const hue = (kind * GOLDEN_RATIO * 360) % 360;
// Use different saturation/lightness for better visibility
const saturation = 65 + (kind % 20); // 65-85%
const lightness = 55 + ((kind * 3) % 15); // 55-70%
return `hsl(${Math.round(hue)}, ${saturation}%, ${lightness}%)`;
}
@ -28,57 +28,54 @@ export function getEventKindColor(kind: number): string { @@ -28,57 +28,54 @@ export function getEventKindColor(kind: number): string {
*/
export function getEventKindName(kind: number): string {
const kindNames: Record<number, string> = {
0: 'Metadata',
1: 'Text Note',
2: 'Recommend Relay',
3: 'Contact List',
4: 'Encrypted DM',
5: 'Event Deletion',
6: 'Repost',
7: 'Reaction',
8: 'Badge Award',
16: 'Generic Repost',
40: 'Channel Creation',
41: 'Channel Metadata',
42: 'Channel Message',
43: 'Channel Hide Message',
44: 'Channel Mute User',
1984: 'Reporting',
9734: 'Zap Request',
9735: 'Zap',
10000: 'Mute List',
10001: 'Pin List',
10002: 'Relay List',
22242: 'Client Authentication',
24133: 'Nostr Connect',
27235: 'HTTP Auth',
30000: 'Categorized People List',
30001: 'Categorized Bookmark List',
30008: 'Profile Badges',
30009: 'Badge Definition',
39089: 'Starter packs',
39092: 'Media starter packs',
30017: 'Create or update a stall',
30018: 'Create or update a product',
30023: 'Long-form Content',
30024: 'Draft Long-form Content',
30040: 'Publication Index',
30041: 'Publication Content',
30078: 'Application-specific Data',
30311: 'Live Event',
30402: 'Classified Listing',
30403: 'Draft Classified Listing',
30617: 'Repository',
30818: 'Wiki Page',
31922: 'Date-Based Calendar Event',
31923: 'Time-Based Calendar Event',
31924: 'Calendar',
31925: 'Calendar Event RSVP',
31989: 'Handler recommendation',
31990: 'Handler information',
34550: 'Community Definition',
0: "Metadata",
1: "Text Note",
2: "Recommend Relay",
3: "Contact List",
4: "Encrypted DM",
5: "Event Deletion",
6: "Repost",
7: "Reaction",
8: "Badge Award",
16: "Generic Repost",
40: "Channel Creation",
41: "Channel Metadata",
42: "Channel Message",
43: "Channel Hide Message",
44: "Channel Mute User",
1984: "Reporting",
9734: "Zap Request",
9735: "Zap",
10000: "Mute List",
10001: "Pin List",
10002: "Relay List",
22242: "Client Authentication",
24133: "Nostr Connect",
27235: "HTTP Auth",
30000: "Categorized People List",
30001: "Categorized Bookmark List",
30008: "Profile Badges",
30009: "Badge Definition",
30017: "Create or update a stall",
30018: "Create or update a product",
30023: "Long-form Content",
30024: "Draft Long-form Content",
30040: "Publication Index",
30041: "Publication Content",
30078: "Application-specific Data",
30311: "Live Event",
30402: "Classified Listing",
30403: "Draft Classified Listing",
30617: "Repository",
30818: "Wiki Page",
31922: "Date-Based Calendar Event",
31923: "Time-Based Calendar Event",
31924: "Calendar",
31925: "Calendar Event RSVP",
31989: "Handler recommendation",
31990: "Handler information",
34550: "Community Definition",
};
return kindNames[kind] || `Kind ${kind}`;
}

152
src/lib/utils/eventDeduplication.ts

@ -1,69 +1,88 @@ @@ -1,69 +1,88 @@
import type { NDKEvent } from '@nostr-dev-kit/ndk';
import type { NDKEvent } from "@nostr-dev-kit/ndk";
/**
* Deduplicate content events by keeping only the most recent version
* @param contentEventSets Array of event sets from different sources
* @returns Map of coordinate to most recent event
*/
export function deduplicateContentEvents(contentEventSets: Set<NDKEvent>[]): Map<string, NDKEvent> {
export function deduplicateContentEvents(
contentEventSets: Set<NDKEvent>[],
): Map<string, NDKEvent> {
const eventsByCoordinate = new Map<string, NDKEvent>();
// Track statistics for debugging
let totalEvents = 0;
let duplicateCoordinates = 0;
const duplicateDetails: Array<{ coordinate: string; count: number; events: string[] }> = [];
const duplicateDetails: Array<
{ coordinate: string; count: number; events: string[] }
> = [];
contentEventSets.forEach((eventSet) => {
eventSet.forEach(event => {
eventSet.forEach((event) => {
totalEvents++;
const dTag = event.tagValue("d");
const author = event.pubkey;
const kind = event.kind;
if (dTag && author && kind) {
const coordinate = `${kind}:${author}:${dTag}`;
const existing = eventsByCoordinate.get(coordinate);
if (existing) {
// We found a duplicate coordinate
duplicateCoordinates++;
// Track details for the first few duplicates
if (duplicateDetails.length < 5) {
const existingDetails = duplicateDetails.find(d => d.coordinate === coordinate);
const existingDetails = duplicateDetails.find((d) =>
d.coordinate === coordinate
);
if (existingDetails) {
existingDetails.count++;
existingDetails.events.push(`${event.id} (created_at: ${event.created_at})`);
existingDetails.events.push(
`${event.id} (created_at: ${event.created_at})`,
);
} else {
duplicateDetails.push({
coordinate,
count: 2, // existing + current
events: [
`${existing.id} (created_at: ${existing.created_at})`,
`${event.id} (created_at: ${event.created_at})`
]
`${event.id} (created_at: ${event.created_at})`,
],
});
}
}
}
// Keep the most recent event (highest created_at)
if (!existing || (event.created_at !== undefined && existing.created_at !== undefined && event.created_at > existing.created_at)) {
if (
!existing ||
(event.created_at !== undefined &&
existing.created_at !== undefined &&
event.created_at > existing.created_at)
) {
eventsByCoordinate.set(coordinate, event);
}
}
});
});
// Log deduplication results if any duplicates were found
if (duplicateCoordinates > 0) {
console.log(`[eventDeduplication] Found ${duplicateCoordinates} duplicate events out of ${totalEvents} total events`);
console.log(`[eventDeduplication] Reduced to ${eventsByCoordinate.size} unique coordinates`);
console.log(
`[eventDeduplication] Found ${duplicateCoordinates} duplicate events out of ${totalEvents} total events`,
);
console.log(
`[eventDeduplication] Reduced to ${eventsByCoordinate.size} unique coordinates`,
);
console.log(`[eventDeduplication] Duplicate details:`, duplicateDetails);
} else if (totalEvents > 0) {
console.log(`[eventDeduplication] No duplicates found in ${totalEvents} events`);
console.log(
`[eventDeduplication] No duplicates found in ${totalEvents} events`,
);
}
return eventsByCoordinate;
}
@ -77,83 +96,95 @@ export function deduplicateContentEvents(contentEventSets: Set<NDKEvent>[]): Map @@ -77,83 +96,95 @@ export function deduplicateContentEvents(contentEventSets: Set<NDKEvent>[]): Map
export function deduplicateAndCombineEvents(
nonPublicationEvents: NDKEvent[],
validIndexEvents: Set<NDKEvent>,
contentEvents: Set<NDKEvent>
contentEvents: Set<NDKEvent>,
): NDKEvent[] {
// Track statistics for debugging
const initialCount = nonPublicationEvents.length + validIndexEvents.size + contentEvents.size;
const initialCount = nonPublicationEvents.length + validIndexEvents.size +
contentEvents.size;
let replaceableEventsProcessed = 0;
let duplicateCoordinatesFound = 0;
const duplicateDetails: Array<{ coordinate: string; count: number; events: string[] }> = [];
const duplicateDetails: Array<
{ coordinate: string; count: number; events: string[] }
> = [];
// First, build coordinate map for replaceable events
const coordinateMap = new Map<string, NDKEvent>();
const allEventsToProcess = [
...nonPublicationEvents, // Non-publication events fetched earlier
...Array.from(validIndexEvents),
...Array.from(contentEvents)
...Array.from(validIndexEvents),
...Array.from(contentEvents),
];
// First pass: identify the most recent version of each replaceable event
allEventsToProcess.forEach(event => {
allEventsToProcess.forEach((event) => {
if (!event.id) return;
// For replaceable events (30000-39999), track by coordinate
if (event.kind && event.kind >= 30000 && event.kind < 40000) {
replaceableEventsProcessed++;
const dTag = event.tagValue("d");
const author = event.pubkey;
if (dTag && author) {
const coordinate = `${event.kind}:${author}:${dTag}`;
const existing = coordinateMap.get(coordinate);
if (existing) {
// We found a duplicate coordinate
duplicateCoordinatesFound++;
// Track details for the first few duplicates
if (duplicateDetails.length < 5) {
const existingDetails = duplicateDetails.find(d => d.coordinate === coordinate);
const existingDetails = duplicateDetails.find((d) =>
d.coordinate === coordinate
);
if (existingDetails) {
existingDetails.count++;
existingDetails.events.push(`${event.id} (created_at: ${event.created_at})`);
existingDetails.events.push(
`${event.id} (created_at: ${event.created_at})`,
);
} else {
duplicateDetails.push({
coordinate,
count: 2, // existing + current
events: [
`${existing.id} (created_at: ${existing.created_at})`,
`${event.id} (created_at: ${event.created_at})`
]
`${event.id} (created_at: ${event.created_at})`,
],
});
}
}
}
// Keep the most recent version
if (!existing || (event.created_at !== undefined && existing.created_at !== undefined && event.created_at > existing.created_at)) {
if (
!existing ||
(event.created_at !== undefined &&
existing.created_at !== undefined &&
event.created_at > existing.created_at)
) {
coordinateMap.set(coordinate, event);
}
}
}
});
// Second pass: build final event map
const finalEventMap = new Map<string, NDKEvent>();
const seenCoordinates = new Set<string>();
allEventsToProcess.forEach(event => {
allEventsToProcess.forEach((event) => {
if (!event.id) return;
// For replaceable events, only add if it's the chosen version
if (event.kind && event.kind >= 30000 && event.kind < 40000) {
const dTag = event.tagValue("d");
const author = event.pubkey;
if (dTag && author) {
const coordinate = `${event.kind}:${author}:${dTag}`;
const chosenEvent = coordinateMap.get(coordinate);
// Only add this event if it's the chosen one for this coordinate
if (chosenEvent && chosenEvent.id === event.id) {
if (!seenCoordinates.has(coordinate)) {
@ -164,23 +195,32 @@ export function deduplicateAndCombineEvents( @@ -164,23 +195,32 @@ export function deduplicateAndCombineEvents(
return;
}
}
// Non-replaceable events are added directly
finalEventMap.set(event.id, event);
});
const finalCount = finalEventMap.size;
const reduction = initialCount - finalCount;
// Log deduplication results if any duplicates were found
if (duplicateCoordinatesFound > 0) {
console.log(`[eventDeduplication] deduplicateAndCombineEvents: Found ${duplicateCoordinatesFound} duplicate coordinates out of ${replaceableEventsProcessed} replaceable events`);
console.log(`[eventDeduplication] deduplicateAndCombineEvents: Reduced from ${initialCount} to ${finalCount} events (${reduction} removed)`);
console.log(`[eventDeduplication] deduplicateAndCombineEvents: Duplicate details:`, duplicateDetails);
console.log(
`[eventDeduplication] deduplicateAndCombineEvents: Found ${duplicateCoordinatesFound} duplicate coordinates out of ${replaceableEventsProcessed} replaceable events`,
);
console.log(
`[eventDeduplication] deduplicateAndCombineEvents: Reduced from ${initialCount} to ${finalCount} events (${reduction} removed)`,
);
console.log(
`[eventDeduplication] deduplicateAndCombineEvents: Duplicate details:`,
duplicateDetails,
);
} else if (replaceableEventsProcessed > 0) {
console.log(`[eventDeduplication] deduplicateAndCombineEvents: No duplicates found in ${replaceableEventsProcessed} replaceable events`);
console.log(
`[eventDeduplication] deduplicateAndCombineEvents: No duplicates found in ${replaceableEventsProcessed} replaceable events`,
);
}
return Array.from(finalEventMap.values());
}
@ -202,13 +242,13 @@ export function getEventCoordinate(event: NDKEvent): string | null { @@ -202,13 +242,13 @@ export function getEventCoordinate(event: NDKEvent): string | null {
if (!isReplaceableEvent(event)) {
return null;
}
const dTag = event.tagValue("d");
const author = event.pubkey;
if (!dTag || !author) {
return null;
}
return `${event.kind}:${author}:${dTag}`;
}
}

95
src/lib/utils/event_input_utils.ts

@ -1,15 +1,11 @@ @@ -1,15 +1,11 @@
import type { NDKEvent } from "./nostrUtils.ts";
import { get } from "svelte/store";
import { ndkInstance } from "../ndk.ts";
import { NDKEvent as NDKEventClass } from "@nostr-dev-kit/ndk";
import NDK, { NDKEvent as NDKEventClass } from "@nostr-dev-kit/ndk";
import { EVENT_KINDS } from "./search_constants";
import {
extractDocumentMetadata,
extractSectionMetadata,
parseAsciiDocWithMetadata,
import {
extractDocumentMetadata,
metadataToTags,
removeMetadataFromContent
} from "./asciidoc_metadata";
parseAsciiDocWithMetadata,
} from "./asciidoc_metadata.ts";
// =========================
// Validation
@ -92,12 +88,14 @@ export function validate30040EventSet(content: string): { @@ -92,12 +88,14 @@ export function validate30040EventSet(content: string): {
const lines = content.split(/\r?\n/);
const { metadata } = extractDocumentMetadata(content);
const documentTitle = metadata.title;
const nonEmptyLines = lines.filter(line => line.trim() !== "").map(line => line.trim());
const isIndexCardFormat = documentTitle &&
nonEmptyLines.length === 2 &&
nonEmptyLines[0].startsWith("=") &&
const nonEmptyLines = lines.filter((line) => line.trim() !== "").map((line) =>
line.trim()
);
const isIndexCardFormat = documentTitle &&
nonEmptyLines.length === 2 &&
nonEmptyLines[0].startsWith("=") &&
nonEmptyLines[1].toLowerCase() === "index card";
if (isIndexCardFormat) {
return { valid: true };
}
@ -125,18 +123,20 @@ export function validate30040EventSet(content: string): { @@ -125,18 +123,20 @@ export function validate30040EventSet(content: string): {
if (documentHeaderMatches && documentHeaderMatches.length > 1) {
return {
valid: false,
reason: '30040 events must have exactly one document title ("="). Found multiple document headers.',
reason:
'30040 events must have exactly one document title ("="). Found multiple document headers.',
};
}
// Parse the content to check sections
const parsed = parseAsciiDocWithMetadata(content);
const hasSections = parsed.sections.length > 0;
if (!hasSections) {
return {
valid: true,
warning: "No section headers (==) found. This will create a 30040 index event and a single 30041 preamble section. Continue?",
warning:
"No section headers (==) found. This will create a 30040 index event and a single 30041 preamble section. Continue?",
};
}
@ -147,7 +147,9 @@ export function validate30040EventSet(content: string): { @@ -147,7 +147,9 @@ export function validate30040EventSet(content: string): {
}
// Check for empty sections
const emptySections = parsed.sections.filter(section => section.content.trim() === "");
const emptySections = parsed.sections.filter((section: any) =>
section.content.trim() === ""
);
if (emptySections.length > 0) {
return {
valid: true,
@ -194,12 +196,6 @@ function extractMarkdownTopHeader(content: string): string | null { @@ -194,12 +196,6 @@ function extractMarkdownTopHeader(content: string): string | null {
// Event Construction
// =========================
/**
* Returns the current NDK instance from the store.
*/
function getNdk() {
return get(ndkInstance);
}
/**
* Builds a set of events for a 30040 publication: one 30040 index event and one 30041 event per section.
@ -210,15 +206,8 @@ export function build30040EventSet( @@ -210,15 +206,8 @@ export function build30040EventSet(
content: string,
tags: [string, string][],
baseEvent: Partial<NDKEvent> & { pubkey: string; created_at: number },
ndk: NDK,
): { indexEvent: NDKEvent; sectionEvents: NDKEvent[] } {
console.log("=== build30040EventSet called ===");
console.log("Input content:", content);
console.log("Input tags:", tags);
console.log("Input baseEvent:", baseEvent);
const ndk = getNdk();
console.log("NDK instance:", ndk);
// Parse the AsciiDoc content with metadata extraction
const parsed = parseAsciiDocWithMetadata(content);
console.log("Parsed AsciiDoc:", parsed);
@ -226,21 +215,23 @@ export function build30040EventSet( @@ -226,21 +215,23 @@ export function build30040EventSet(
// Check if this is an "index card" format (no sections, just title + "index card")
const lines = content.split(/\r?\n/);
const documentTitle = parsed.metadata.title;
// For index card format, the content should be exactly: title + "index card"
const nonEmptyLines = lines.filter(line => line.trim() !== "").map(line => line.trim());
const isIndexCardFormat = documentTitle &&
nonEmptyLines.length === 2 &&
nonEmptyLines[0].startsWith("=") &&
const nonEmptyLines = lines.filter((line) => line.trim() !== "").map((line) =>
line.trim()
);
const isIndexCardFormat = documentTitle &&
nonEmptyLines.length === 2 &&
nonEmptyLines[0].startsWith("=") &&
nonEmptyLines[1].toLowerCase() === "index card";
if (isIndexCardFormat) {
console.log("Creating index card format (no sections)");
const indexDTag = normalizeDTagValue(documentTitle);
// Convert document metadata to tags
const metadataTags = metadataToTags(parsed.metadata);
const indexEvent: NDKEvent = new NDKEventClass(ndk, {
kind: 30040,
content: "",
@ -253,9 +244,7 @@ export function build30040EventSet( @@ -253,9 +244,7 @@ export function build30040EventSet(
pubkey: baseEvent.pubkey,
created_at: baseEvent.created_at,
});
console.log("Final index event (index card):", indexEvent);
console.log("=== build30040EventSet completed (index card) ===");
return { indexEvent, sectionEvents: [] };
}
@ -264,26 +253,26 @@ export function build30040EventSet( @@ -264,26 +253,26 @@ export function build30040EventSet(
console.log("Index event:", { documentTitle, indexDTag });
// Create section events with their metadata
const sectionEvents: NDKEvent[] = parsed.sections.map((section, i) => {
const sectionEvents: NDKEvent[] = parsed.sections.map((section: any, i: number) => {
const sectionDTag = `${indexDTag}-${normalizeDTagValue(section.title)}`;
console.log(`Creating section ${i}:`, {
title: section.title,
dTag: sectionDTag,
console.log(`Creating section ${i}:`, {
title: section.title,
dTag: sectionDTag,
content: section.content,
metadata: section.metadata
metadata: section.metadata,
});
// Convert section metadata to tags
const sectionMetadataTags = metadataToTags(section.metadata);
return new NDKEventClass(ndk, {
kind: 30041,
content: section.content,
tags: [
...tags,
...sectionMetadataTags,
["d", sectionDTag],
["title", section.title]
["d", sectionDTag],
["title", section.title],
],
pubkey: baseEvent.pubkey,
created_at: baseEvent.created_at,
@ -291,7 +280,7 @@ export function build30040EventSet( @@ -291,7 +280,7 @@ export function build30040EventSet(
});
// Create proper a tags with format: kind:pubkey:d-tag
const aTags = sectionEvents.map(event => {
const aTags = sectionEvents.map((event) => {
const dTag = event.tags.find(([k]) => k === "d")?.[1];
return ["a", `30041:${baseEvent.pubkey}:${dTag}`] as [string, string];
});

71
src/lib/utils/event_kind_utils.ts

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import type { EventKindConfig } from '$lib/stores/visualizationConfig';
import type { EventKindConfig } from "$lib/stores/visualizationConfig";
/**
* Validates an event kind input value.
@ -7,29 +7,29 @@ import type { EventKindConfig } from '$lib/stores/visualizationConfig'; @@ -7,29 +7,29 @@ import type { EventKindConfig } from '$lib/stores/visualizationConfig';
* @returns The validated kind number, or null if validation fails.
*/
export function validateEventKind(
value: string | number,
existingKinds: number[]
value: string | number,
existingKinds: number[],
): { kind: number | null; error: string } {
// Convert to string for consistent handling
const strValue = String(value);
if (strValue === null || strValue === undefined || strValue.trim() === '') {
return { kind: null, error: '' };
if (strValue === null || strValue === undefined || strValue.trim() === "") {
return { kind: null, error: "" };
}
const kind = parseInt(strValue.trim());
if (isNaN(kind)) {
return { kind: null, error: 'Must be a number' };
return { kind: null, error: "Must be a number" };
}
if (kind < 0) {
return { kind: null, error: 'Must be non-negative' };
return { kind: null, error: "Must be non-negative" };
}
if (existingKinds.includes(kind)) {
return { kind: null, error: 'Already added' };
return { kind: null, error: "Already added" };
}
return { kind, error: '' };
return { kind, error: "" };
}
/**
@ -44,20 +44,20 @@ export function handleAddEventKind( @@ -44,20 +44,20 @@ export function handleAddEventKind(
newKind: string,
existingKinds: number[],
addKindFunction: (kind: number) => void,
resetStateFunction: () => void
resetStateFunction: () => void,
): { success: boolean; error: string } {
console.log('[handleAddEventKind] called with:', newKind);
console.log("[handleAddEventKind] called with:", newKind);
const validation = validateEventKind(newKind, existingKinds);
console.log('[handleAddEventKind] Validation result:', validation);
console.log("[handleAddEventKind] Validation result:", validation);
if (validation.kind !== null) {
console.log('[handleAddEventKind] Adding event kind:', validation.kind);
console.log("[handleAddEventKind] Adding event kind:", validation.kind);
addKindFunction(validation.kind);
resetStateFunction();
return { success: true, error: '' };
return { success: true, error: "" };
} else {
console.log('[handleAddEventKind] Validation failed:', validation.error);
console.log("[handleAddEventKind] Validation failed:", validation.error);
return { success: false, error: validation.error };
}
}
@ -71,11 +71,11 @@ export function handleAddEventKind( @@ -71,11 +71,11 @@ export function handleAddEventKind(
export function handleEventKindKeydown(
e: KeyboardEvent,
onEnter: () => void,
onEscape: () => void
onEscape: () => void,
): void {
if (e.key === 'Enter') {
if (e.key === "Enter") {
onEnter();
} else if (e.key === 'Escape') {
} else if (e.key === "Escape") {
onEscape();
}
}
@ -87,12 +87,19 @@ export function handleEventKindKeydown( @@ -87,12 +87,19 @@ export function handleEventKindKeydown(
*/
export function getEventKindDisplayName(kind: number): string {
switch (kind) {
case 30040: return 'Publication Index';
case 30041: return 'Publication Content';
case 30818: return 'Wiki';
case 1: return 'Text Note';
case 0: return 'Metadata';
case 3: return 'Follow List';
default: return `Kind ${kind}`;
case 30040:
return "Publication Index";
case 30041:
return "Publication Content";
case 30818:
return "Wiki";
case 1:
return "Text Note";
case 0:
return "Metadata";
case 3:
return "Follow List";
default:
return `Kind ${kind}`;
}
}
}

96
src/lib/utils/event_search.ts

@ -1,18 +1,16 @@ @@ -1,18 +1,16 @@
import { ndkInstance } from "../ndk.ts";
import { fetchEventWithFallback, NDKRelaySetFromNDK } from "./nostrUtils.ts";
import { nip19 } from "nostr-tools";
import { NDKEvent } from "@nostr-dev-kit/ndk";
import NDK, { NDKEvent } from "@nostr-dev-kit/ndk";
import type { Filter } from "./search_types.ts";
import { get } from "svelte/store";
import { wellKnownUrl, isValidNip05Address } from "./search_utils.ts";
import { isValidNip05Address, wellKnownUrl } from "./search_utils.ts";
import { TIMEOUTS, VALIDATION } from "./search_constants.ts";
import { activeInboxRelays, activeOutboxRelays } from "../ndk.ts";
/**
* Search for a single event by ID or filter
*/
export async function searchEvent(query: string): Promise<NDKEvent | null> {
const ndk = get(ndkInstance);
export async function searchEvent(query: string, ndk: NDK): Promise<NDKEvent | null> {
if (!ndk) {
console.warn("[Search] No NDK instance available");
return null;
@ -22,31 +20,39 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> { @@ -22,31 +20,39 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> {
// This ensures searches can proceed even if some relay types are not available
let attempts = 0;
const maxAttempts = 5; // Reduced since we'll use fallback relays
while (attempts < maxAttempts) {
// Check if we have any relays in the pool
if (ndk.pool.relays.size > 0) {
console.log(`[Search] Found ${ndk.pool.relays.size} relays in NDK pool`);
break;
}
// Also check if we have any active relays
const inboxRelays = get(activeInboxRelays);
const outboxRelays = get(activeOutboxRelays);
if (inboxRelays.length > 0 || outboxRelays.length > 0) {
console.log(`[Search] Found active relays - inbox: ${inboxRelays.length}, outbox: ${outboxRelays.length}`);
console.log(
`[Search] Found active relays - inbox: ${inboxRelays.length}, outbox: ${outboxRelays.length}`,
);
break;
}
console.log(`[Search] Waiting for relays to be available (attempt ${attempts + 1}/${maxAttempts})`);
await new Promise(resolve => setTimeout(resolve, 500));
console.log(
`[Search] Waiting for relays to be available (attempt ${
attempts + 1
}/${maxAttempts})`,
);
await new Promise((resolve) => setTimeout(resolve, 500));
attempts++;
}
// AI-NOTE: 2025-01-24 - Don't fail if no relays are available, let fetchEventWithFallback handle fallbacks
// The fetchEventWithFallback function will use all available relays including fallback relays
if (ndk.pool.relays.size === 0) {
console.warn("[Search] No relays in pool, but proceeding with search - fallback relays will be used");
console.warn(
"[Search] No relays in pool, but proceeding with search - fallback relays will be used",
);
}
// Clean the query and normalize to lowercase
@ -60,14 +66,14 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> { @@ -60,14 +66,14 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> {
// Try as event id
filterOrId = cleanedQuery;
const eventResult = await fetchEventWithFallback(
get(ndkInstance),
ndk,
filterOrId,
TIMEOUTS.EVENT_FETCH,
);
// Always try as pubkey (profile event) as well
const profileFilter = { kinds: [0], authors: [cleanedQuery] };
const profileEvent = await fetchEventWithFallback(
get(ndkInstance),
ndk,
profileFilter,
TIMEOUTS.EVENT_FETCH,
);
@ -89,50 +95,70 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> { @@ -89,50 +95,70 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> {
try {
const decoded = nip19.decode(cleanedQuery);
if (!decoded) throw new Error("Invalid identifier");
console.log(`[Search] Decoded identifier:`, {
type: decoded.type,
data: decoded.data,
query: cleanedQuery
query: cleanedQuery,
});
switch (decoded.type) {
case "nevent":
console.log(`[Search] Processing nevent:`, {
id: decoded.data.id,
kind: decoded.data.kind,
relays: decoded.data.relays
relays: decoded.data.relays,
});
// Use the relays from the nevent if available
if (decoded.data.relays && decoded.data.relays.length > 0) {
console.log(`[Search] Using relays from nevent:`, decoded.data.relays);
console.log(
`[Search] Using relays from nevent:`,
decoded.data.relays,
);
// Try to fetch the event using the nevent's relays
try {
// Create a temporary relay set for this search
const neventRelaySet = NDKRelaySetFromNDK.fromRelayUrls(decoded.data.relays, ndk);
const neventRelaySet = NDKRelaySetFromNDK.fromRelayUrls(
decoded.data.relays,
ndk,
);
if (neventRelaySet.relays.size > 0) {
console.log(`[Search] Created relay set with ${neventRelaySet.relays.size} relays from nevent`);
console.log(
`[Search] Created relay set with ${neventRelaySet.relays.size} relays from nevent`,
);
// Try to fetch the event using the nevent's relays
const event = await ndk
.fetchEvent({ ids: [decoded.data.id] }, undefined, neventRelaySet)
.fetchEvent(
{ ids: [decoded.data.id] },
undefined,
neventRelaySet,
)
.withTimeout(TIMEOUTS.EVENT_FETCH);
if (event) {
console.log(`[Search] Found event using nevent relays:`, event.id);
console.log(
`[Search] Found event using nevent relays:`,
event.id,
);
return event;
} else {
console.log(`[Search] Event not found on nevent relays, trying default relays`);
console.log(
`[Search] Event not found on nevent relays, trying default relays`,
);
}
}
} catch (error) {
console.warn(`[Search] Error fetching from nevent relays:`, error);
console.warn(
`[Search] Error fetching from nevent relays:`,
error,
);
}
}
filterOrId = decoded.data.id;
break;
case "note":
@ -168,7 +194,7 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> { @@ -168,7 +194,7 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> {
try {
const event = await fetchEventWithFallback(
get(ndkInstance),
ndk,
filterOrId,
TIMEOUTS.EVENT_FETCH,
);
@ -190,6 +216,7 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> { @@ -190,6 +216,7 @@ export async function searchEvent(query: string): Promise<NDKEvent | null> {
*/
export async function searchNip05(
nip05Address: string,
ndk: NDK,
): Promise<NDKEvent | null> {
// NIP-05 address pattern: user@domain
if (!isValidNip05Address(nip05Address)) {
@ -227,7 +254,7 @@ export async function searchNip05( @@ -227,7 +254,7 @@ export async function searchNip05(
if (pubkey) {
const profileFilter = { kinds: [0], authors: [pubkey] };
const profileEvent = await fetchEventWithFallback(
get(ndkInstance),
ndk,
profileFilter,
TIMEOUTS.EVENT_FETCH,
);
@ -258,6 +285,7 @@ export async function searchNip05( @@ -258,6 +285,7 @@ export async function searchNip05(
*/
export async function findContainingIndexEvents(
contentEvent: NDKEvent,
ndk: NDK,
): Promise<NDKEvent[]> {
// Support all content event kinds that can be contained in indexes
const contentEventKinds = [30041, 30818, 30040, 30023];
@ -266,8 +294,6 @@ export async function findContainingIndexEvents( @@ -266,8 +294,6 @@ export async function findContainingIndexEvents(
}
try {
const ndk = get(ndkInstance);
// Search for 30040 events that reference this content event
// We need to search for events that have an 'a' tag or 'e' tag referencing this event
const contentEventId = contentEvent.id;

12
src/lib/utils/image_utils.ts

@ -11,14 +11,16 @@ export function generateDarkPastelColor(seed: string): string { @@ -11,14 +11,16 @@ export function generateDarkPastelColor(seed: string): string {
hash = ((hash << 5) - hash) + char;
hash = hash & hash; // Convert to 32-bit integer
}
// Use the hash to generate lighter pastel colors
// Keep values in the 120-200 range for better pastel effect
const r = Math.abs(hash) % 80 + 120; // 120-200 range
const g = Math.abs(hash >> 8) % 80 + 120; // 120-200 range
const g = Math.abs(hash >> 8) % 80 + 120; // 120-200 range
const b = Math.abs(hash >> 16) % 80 + 120; // 120-200 range
return `#${r.toString(16).padStart(2, '0')}${g.toString(16).padStart(2, '0')}${b.toString(16).padStart(2, '0')}`;
return `#${r.toString(16).padStart(2, "0")}${
g.toString(16).padStart(2, "0")
}${b.toString(16).padStart(2, "0")}`;
}
/**
@ -28,4 +30,4 @@ export function generateDarkPastelColor(seed: string): string { @@ -28,4 +30,4 @@ export function generateDarkPastelColor(seed: string): string {
*/
export function testColorGeneration(eventId: string): string {
return generateDarkPastelColor(eventId);
}
}

96
src/lib/utils/kind24_utils.ts

@ -1,12 +1,7 @@ @@ -1,12 +1,7 @@
import { get } from "svelte/store";
import { ndkInstance } from "../ndk";
import { userStore } from "../stores/userStore";
import { NDKEvent, NDKRelaySet, NDKUser } from "@nostr-dev-kit/ndk";
import type NDK from "@nostr-dev-kit/ndk";
import { nip19 } from "nostr-tools";
import NDK, { NDKEvent, NDKRelaySet } from "@nostr-dev-kit/ndk";
import { createSignedEvent } from "./nostrEventService.ts";
import { anonymousRelays } from "../consts";
import { buildCompleteRelaySet } from "./relay_management";
import { anonymousRelays } from "../consts.ts";
import { buildCompleteRelaySet } from "./relay_management.ts";
// AI-NOTE: Using existing relay utilities from relay_management.ts instead of duplicating functionality
@ -18,23 +13,21 @@ import { buildCompleteRelaySet } from "./relay_management"; @@ -18,23 +13,21 @@ import { buildCompleteRelaySet } from "./relay_management";
*/
export async function getKind24RelaySet(
senderPubkey: string,
recipientPubkey: string
recipientPubkey: string,
ndk: NDK,
): Promise<string[]> {
const ndk = get(ndkInstance);
if (!ndk) {
throw new Error("NDK not available");
}
const senderPrefix = senderPubkey.slice(0, 8);
const recipientPrefix = recipientPubkey.slice(0, 8);
console.log(`[getKind24RelaySet] Getting relays for ${senderPrefix} -> ${recipientPrefix}`);
console.log(
`[getKind24RelaySet] Getting relays for ${senderPrefix} -> ${recipientPrefix}`,
);
try {
// Fetch both users' complete relay sets using existing utilities
const [senderRelaySet, recipientRelaySet] = await Promise.all([
buildCompleteRelaySet(ndk, ndk.getUser({ pubkey: senderPubkey })),
buildCompleteRelaySet(ndk, ndk.getUser({ pubkey: recipientPubkey }))
buildCompleteRelaySet(ndk, ndk.getUser({ pubkey: recipientPubkey })),
]);
// Use sender's outbox relays and recipient's inbox relays
@ -42,24 +35,33 @@ export async function getKind24RelaySet( @@ -42,24 +35,33 @@ export async function getKind24RelaySet(
const recipientInboxRelays = recipientRelaySet.inboxRelays;
// Prioritize common relays for better privacy
const commonRelays = senderOutboxRelays.filter(relay =>
const commonRelays = senderOutboxRelays.filter((relay: any) =>
recipientInboxRelays.includes(relay)
);
const senderOnlyRelays = senderOutboxRelays.filter(relay =>
const senderOnlyRelays = senderOutboxRelays.filter((relay: any) =>
!recipientInboxRelays.includes(relay)
);
const recipientOnlyRelays = recipientInboxRelays.filter(relay =>
const recipientOnlyRelays = recipientInboxRelays.filter((relay: any) =>
!senderOutboxRelays.includes(relay)
);
// Prioritize: common relays first, then sender outbox, then recipient inbox
const finalRelays = [...commonRelays, ...senderOnlyRelays, ...recipientOnlyRelays];
console.log(`[getKind24RelaySet] ${senderPrefix}->${recipientPrefix} - Common: ${commonRelays.length}, Sender-only: ${senderOnlyRelays.length}, Recipient-only: ${recipientOnlyRelays.length}, Total: ${finalRelays.length}`);
const finalRelays = [
...commonRelays,
...senderOnlyRelays,
...recipientOnlyRelays,
];
console.log(
`[getKind24RelaySet] ${senderPrefix}->${recipientPrefix} - Common: ${commonRelays.length}, Sender-only: ${senderOnlyRelays.length}, Recipient-only: ${recipientOnlyRelays.length}, Total: ${finalRelays.length}`,
);
return finalRelays;
} catch (error) {
console.error(`[getKind24RelaySet] Error getting relay set for ${senderPrefix}->${recipientPrefix}:`, error);
console.error(
`[getKind24RelaySet] Error getting relay set for ${senderPrefix}->${recipientPrefix}:`,
error,
);
throw error;
}
}
@ -74,9 +76,11 @@ export async function getKind24RelaySet( @@ -74,9 +76,11 @@ export async function getKind24RelaySet(
export async function createKind24Reply(
content: string,
recipientPubkey: string,
originalEvent?: NDKEvent
): Promise<{ success: boolean; eventId?: string; error?: string; relays?: string[] }> {
const ndk = get(ndkInstance);
ndk: NDK,
originalEvent?: NDKEvent,
): Promise<
{ success: boolean; eventId?: string; error?: string; relays?: string[] }
> {
if (!ndk?.activeUser) {
return { success: false, error: "Not logged in" };
}
@ -87,49 +91,57 @@ export async function createKind24Reply( @@ -87,49 +91,57 @@ export async function createKind24Reply(
try {
// Get optimal relay set for this sender-recipient pair
const targetRelays = await getKind24RelaySet(ndk.activeUser.pubkey, recipientPubkey);
const targetRelays = await getKind24RelaySet(
ndk.activeUser.pubkey,
recipientPubkey,
ndk,
);
if (targetRelays.length === 0) {
return { success: false, error: "No relays available for publishing" };
}
// Build tags for the kind 24 event
const tags: string[][] = [
["p", recipientPubkey, targetRelays[0]] // Use first relay as primary
["p", recipientPubkey, targetRelays[0]], // Use first relay as primary
];
// Add q tag if replying to an original event
if (originalEvent) {
tags.push(["q", originalEvent.id, targetRelays[0] || anonymousRelays[0]]);
}
// Create and sign the event
const { event: signedEventData } = await createSignedEvent(
content,
ndk.activeUser.pubkey,
24,
tags
tags,
);
// Create NDKEvent and publish
const event = new NDKEvent(ndk, signedEventData);
const relaySet = NDKRelaySet.fromRelayUrls(targetRelays, ndk);
const publishedToRelays = await event.publish(relaySet);
if (publishedToRelays.size > 0) {
console.log(`[createKind24Reply] Successfully published to ${publishedToRelays.size} relays`);
console.log(
`[createKind24Reply] Successfully published to ${publishedToRelays.size} relays`,
);
return { success: true, eventId: event.id, relays: targetRelays };
} else {
console.warn(`[createKind24Reply] Failed to publish to any relays`);
return { success: false, error: "Failed to publish to any relays", relays: targetRelays };
return {
success: false,
error: "Failed to publish to any relays",
relays: targetRelays,
};
}
} catch (error) {
console.error("[createKind24Reply] Error creating kind 24 reply:", error);
return {
success: false,
error: error instanceof Error ? error.message : "Unknown error"
return {
success: false,
error: error instanceof Error ? error.message : "Unknown error",
};
}
}

58
src/lib/utils/markup/MarkupInfo.md

@ -1,10 +1,14 @@ @@ -1,10 +1,14 @@
# Markup Support in Alexandria
Alexandria supports multiple markup formats for different use cases. Below is a summary of the supported tags and features for each parser, as well as the formats used for publications and wikis.
Alexandria supports multiple markup formats for different use cases. Below is a
summary of the supported tags and features for each parser, as well as the
formats used for publications and wikis.
## Basic Markup Parser
The **basic markup parser** follows the [Nostr best-practice guidelines](https://github.com/nostrability/nostrability/issues/146) and supports:
The **basic markup parser** follows the
[Nostr best-practice guidelines](https://github.com/nostrability/nostrability/issues/146)
and supports:
- **Headers:**
- ATX-style: `# H1` through `###### H6`
@ -18,7 +22,8 @@ The **basic markup parser** follows the [Nostr best-practice guidelines](https:/ @@ -18,7 +22,8 @@ The **basic markup parser** follows the [Nostr best-practice guidelines](https:/
- **Links:** `[text](url)`
- **Images:** `![alt](url)`
- **Hashtags:** `#hashtag`
- **Nostr identifiers:** npub, nprofile, nevent, naddr, note, with or without `nostr:` prefix (note is deprecated)
- **Nostr identifiers:** npub, nprofile, nevent, naddr, note, with or without
`nostr:` prefix (note is deprecated)
- **Emoji shortcodes:** `:smile:` will render as 😄
## Advanced Markup Parser
@ -26,17 +31,25 @@ The **basic markup parser** follows the [Nostr best-practice guidelines](https:/ @@ -26,17 +31,25 @@ The **basic markup parser** follows the [Nostr best-practice guidelines](https:/
The **advanced markup parser** includes all features of the basic parser, plus:
- **Inline code:** `` `code` ``
- **Syntax highlighting:** for code blocks in many programming languages (from [highlight.js](https://highlightjs.org/))
- **Syntax highlighting:** for code blocks in many programming languages (from
[highlight.js](https://highlightjs.org/))
- **Tables:** Pipe-delimited tables with or without headers
- **Footnotes:** `[^1]` or `[^Smith]`, which should appear where the footnote shall be placed, and will be displayed as unique, consecutive numbers
- **Footnote References:** `[^1]: footnote text` or `[^Smith]: Smith, Adam. 1984 "The Wiggle Mysteries`, which will be listed in order, at the bottom of the event, with back-reference links to the footnote, and text footnote labels appended
- **Wikilinks:** `[[NIP-54]]` will render as a hyperlink and goes to [NIP-54](./events?d=nip-54)
- **Footnotes:** `[^1]` or `[^Smith]`, which should appear where the footnote
shall be placed, and will be displayed as unique, consecutive numbers
- **Footnote References:** `[^1]: footnote text` or
`[^Smith]: Smith, Adam. 1984 "The Wiggle Mysteries`, which will be listed in
order, at the bottom of the event, with back-reference links to the footnote,
and text footnote labels appended
- **Wikilinks:** `[[NIP-54]]` will render as a hyperlink and goes to
[NIP-54](./events?d=nip-54)
## Publications and Wikis
**Publications** and **wikis** in Alexandria use **AsciiDoc** as their primary markup language, not Markdown.
**Publications** and **wikis** in Alexandria use **AsciiDoc** as their primary
markup language, not Markdown.
AsciiDoc supports a much broader set of formatting, semantic, and structural features, including:
AsciiDoc supports a much broader set of formatting, semantic, and structural
features, including:
- Section and document structure
- Advanced tables, callouts, admonitions
@ -48,7 +61,8 @@ AsciiDoc supports a much broader set of formatting, semantic, and structural fea @@ -48,7 +61,8 @@ AsciiDoc supports a much broader set of formatting, semantic, and structural fea
### Advanced Content Types
Alexandria supports rendering of advanced content types commonly used in academic, technical, and business documents:
Alexandria supports rendering of advanced content types commonly used in
academic, technical, and business documents:
#### Math Rendering
@ -113,18 +127,26 @@ TikZ diagrams for mathematical illustrations: @@ -113,18 +127,26 @@ TikZ diagrams for mathematical illustrations:
### Rendering Features
- **Automatic Detection**: Content types are automatically detected based on syntax
- **Fallback Display**: If rendering fails, the original source code is displayed
- **Automatic Detection**: Content types are automatically detected based on
syntax
- **Fallback Display**: If rendering fails, the original source code is
displayed
- **Source Code**: Click "Show source" to view the original code
- **Responsive Design**: All rendered content is responsive and works on mobile devices
- **Responsive Design**: All rendered content is responsive and works on mobile
devices
For more information on AsciiDoc, see the [AsciiDoc documentation](https://asciidoc.org/).
For more information on AsciiDoc, see the
[AsciiDoc documentation](https://asciidoc.org/).
---
**Note:**
- The markdown parsers are primarily used for comments, issues, and other user-generated content.
- Publications and wikis are rendered using AsciiDoc for maximum expressiveness and compatibility.
- All URLs are sanitized to remove tracking parameters, and YouTube links are presented in a clean, privacy-friendly format.
- [Here is a test markup file](/tests/integration/markupTestfile.md) that you can use to test out the parser and see how things should be formatted.
- The markdown parsers are primarily used for comments, issues, and other
user-generated content.
- Publications and wikis are rendered using AsciiDoc for maximum expressiveness
and compatibility.
- All URLs are sanitized to remove tracking parameters, and YouTube links are
presented in a clean, privacy-friendly format.
- [Here is a test markup file](/tests/integration/markupTestfile.md) that you
can use to test out the parser and see how things should be formatted.

3
src/lib/utils/markup/advancedAsciidoctorPostProcessor.ts

@ -188,7 +188,8 @@ function processPlantUMLBlocks(html: string): string { @@ -188,7 +188,8 @@ function processPlantUMLBlocks(html: string): string {
try {
const rawContent = decodeHTMLEntities(content);
const encoded = plantumlEncoder.encode(rawContent);
const plantUMLUrl = `https://www.plantuml.com/plantuml/svg/${encoded}`;
const plantUMLUrl =
`https://www.plantuml.com/plantuml/svg/${encoded}`;
return `<div class="plantuml-block my-4">
<img src="${plantUMLUrl}" alt="PlantUML diagram"
class="plantuml-diagram max-w-full h-auto rounded-lg shadow-lg"

44
src/lib/utils/markup/advancedMarkupParser.ts

@ -10,8 +10,9 @@ hljs.configure({ @@ -10,8 +10,9 @@ hljs.configure({
// Escapes HTML characters for safe display
function escapeHtml(text: string): string {
const div =
typeof document !== "undefined" ? document.createElement("div") : null;
const div = typeof document !== "undefined"
? document.createElement("div")
: null;
if (div) {
div.textContent = text;
return div.innerHTML;
@ -100,8 +101,8 @@ function processTables(content: string): string { @@ -100,8 +101,8 @@ function processTables(content: string): string {
};
// Check if second row is a delimiter row (only hyphens)
const hasHeader =
rows.length > 1 && rows[1].trim().match(/^\|[-\s|]+\|$/);
const hasHeader = rows.length > 1 &&
rows[1].trim().match(/^\|[-\s|]+\|$/);
// Extract header and body rows
let headerCells: string[] = [];
@ -124,7 +125,8 @@ function processTables(content: string): string { @@ -124,7 +125,8 @@ function processTables(content: string): string {
if (hasHeader) {
html += "<thead>\n<tr>\n";
headerCells.forEach((cell) => {
html += `<th class="py-2 px-4 text-left border-b-2 border-gray-200 dark:border-gray-700 font-semibold">${cell}</th>\n`;
html +=
`<th class="py-2 px-4 text-left border-b-2 border-gray-200 dark:border-gray-700 font-semibold">${cell}</th>\n`;
});
html += "</tr>\n</thead>\n";
}
@ -135,7 +137,8 @@ function processTables(content: string): string { @@ -135,7 +137,8 @@ function processTables(content: string): string {
const cells = processCells(row);
html += "<tr>\n";
cells.forEach((cell) => {
html += `<td class="py-2 px-4 text-left border-b border-gray-200 dark:border-gray-700">${cell}</td>\n`;
html +=
`<td class="py-2 px-4 text-left border-b border-gray-200 dark:border-gray-700">${cell}</td>\n`;
});
html += "</tr>\n";
});
@ -197,7 +200,9 @@ function processFootnotes(content: string): string { @@ -197,7 +200,9 @@ function processFootnotes(content: string): string {
if (!referenceMap.has(id)) referenceMap.set(id, []);
referenceMap.get(id)!.push(refNum);
referenceOrder.push({ id, refNum, label: id });
return `<sup><a href="#fn-${id}" id="fnref-${id}-${referenceMap.get(id)!.length}" class="text-primary-600 hover:underline">[${refNum}]</a></sup>`;
return `<sup><a href="#fn-${id}" id="fnref-${id}-${
referenceMap.get(id)!.length
}" class="text-primary-600 hover:underline">[${refNum}]</a></sup>`;
},
);
@ -216,12 +221,15 @@ function processFootnotes(content: string): string { @@ -216,12 +221,15 @@ function processFootnotes(content: string): string {
const backrefs = refs
.map(
(num, i) =>
`<a href=\"#fnref-${id}-${i + 1}\" class=\"text-primary-600 hover:underline footnote-backref\">↩${num}</a>`,
`<a href=\"#fnref-${id}-${
i + 1
}\" class=\"text-primary-600 hover:underline footnote-backref\">${num}</a>`,
)
.join(" ");
// If label is not a number, show it after all backrefs
const labelSuffix = isNaN(Number(label)) ? ` ${label}` : "";
processedContent += `<li id=\"fn-${id}\"><span class=\"marker\">${text}</span> ${backrefs}${labelSuffix}</li>\n`;
processedContent +=
`<li id=\"fn-${id}\"><span class=\"marker\">${text}</span> ${backrefs}${labelSuffix}</li>\n`;
}
processedContent += "</ol>";
}
@ -233,8 +241,6 @@ function processFootnotes(content: string): string { @@ -233,8 +241,6 @@ function processFootnotes(content: string): string {
}
}
/**
* Process code blocks by finding consecutive code lines and preserving their content
*/
@ -357,13 +363,17 @@ function restoreCodeBlocks(text: string, blocks: Map<string, string>): string { @@ -357,13 +363,17 @@ function restoreCodeBlocks(text: string, blocks: Map<string, string>): string {
language,
ignoreIllegals: true,
}).value;
html = `<pre class="code-block"><code class="hljs language-${language}">${highlighted}</code></pre>`;
html =
`<pre class="code-block"><code class="hljs language-${language}">${highlighted}</code></pre>`;
} catch (e: unknown) {
console.warn("Failed to highlight code block:", e);
html = `<pre class="code-block"><code class="hljs ${language ? `language-${language}` : ""}">${code}</code></pre>`;
html = `<pre class="code-block"><code class="hljs ${
language ? `language-${language}` : ""
}">${code}</code></pre>`;
}
} else {
html = `<pre class="code-block"><code class="hljs">${code}</code></pre>`;
html =
`<pre class="code-block"><code class="hljs">${code}</code></pre>`;
}
result = result.replace(id, html);
@ -672,8 +682,6 @@ function isLaTeXContent(content: string): boolean { @@ -672,8 +682,6 @@ function isLaTeXContent(content: string): boolean {
return latexPatterns.some((pattern) => pattern.test(trimmed));
}
/**
* Parse markup text with advanced formatting
*/
@ -711,6 +719,8 @@ export async function parseAdvancedmarkup(text: string): Promise<string> { @@ -711,6 +719,8 @@ export async function parseAdvancedmarkup(text: string): Promise<string> {
return processedText;
} catch (e: unknown) {
console.error("Error in parseAdvancedmarkup:", e);
return `<div class="text-red-500">Error processing markup: ${(e as Error)?.message ?? "Unknown error"}</div>`;
return `<div class="text-red-500">Error processing markup: ${
(e as Error)?.message ?? "Unknown error"
}</div>`;
}
}

24
src/lib/utils/markup/asciidoctorPostProcessor.ts

@ -1,6 +1,9 @@ @@ -1,6 +1,9 @@
import { processImageWithReveal, processNostrIdentifiersInText, processWikilinks, processAsciiDocAnchors } from "./markupServices";
import {
processAsciiDocAnchors,
processImageWithReveal,
processNostrIdentifiersInText,
processWikilinks,
} from "./markupServices.ts";
/**
* Processes nostr addresses in HTML content, but skips addresses that are
@ -41,8 +44,7 @@ async function processNostrAddresses(html: string): Promise<string> { @@ -41,8 +44,7 @@ async function processNostrAddresses(html: string): Promise<string> {
const processedMatch = await processNostrIdentifiersInText(fullMatch);
// Replace the match in the HTML
processedHtml =
processedHtml.slice(0, matchIndex) +
processedHtml = processedHtml.slice(0, matchIndex) +
processedMatch +
processedHtml.slice(matchIndex + fullMatch.length);
}
@ -61,18 +63,18 @@ function processImageBlocks(html: string): string { @@ -61,18 +63,18 @@ function processImageBlocks(html: string): string {
// Extract src and alt from img attributes
const srcMatch = imgAttributes.match(/src="([^"]+)"/);
const altMatch = imgAttributes.match(/alt="([^"]*)"/);
const src = srcMatch ? srcMatch[1] : '';
const alt = altMatch ? altMatch[1] : '';
const titleHtml = title ? `<div class="title">${title}</div>` : '';
const src = srcMatch ? srcMatch[1] : "";
const alt = altMatch ? altMatch[1] : "";
const titleHtml = title ? `<div class="title">${title}</div>` : "";
return `<div class="imageblock">
<div class="content">
${processImageWithReveal(src, alt)}
</div>
${titleHtml}
</div>`;
}
},
);
}

54
src/lib/utils/markup/basicMarkupParser.ts

@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
import * as emoji from "node-emoji";
import { nip19 } from "nostr-tools";
import {
processImageWithReveal,
processMediaUrl,
processNostrIdentifiersInText,
processEmojiShortcodes,
processWebSocketUrls,
processHashtags,
import {
processBasicTextFormatting,
processBlockquotes,
processEmojiShortcodes,
processHashtags,
processImageWithReveal,
processMediaUrl,
processNostrIdentifiersInText,
processWebSocketUrls,
processWikilinks,
stripTrackingParams
} from "./markupServices";
stripTrackingParams,
} from "./markupServices.ts";
/* Regex constants for basic markup parsing */
@ -21,8 +20,6 @@ const MARKUP_IMAGE = /!\[([^\]]*)\]\(([^)]+)\)/g; @@ -21,8 +20,6 @@ const MARKUP_IMAGE = /!\[([^\]]*)\]\(([^)]+)\)/g;
// AI-NOTE: 2025-01-24 - Added negative lookbehind (?<!\]\() to prevent processing URLs in markdown syntax
const DIRECT_LINK = /(?<!["'=])(?<!\]\()(https?:\/\/[^\s<>"]+)(?!["'])/g;
// Add this helper function near the top:
function replaceAlexandriaNostrLinks(text: string): string {
// Regex for Alexandria/localhost URLs
@ -82,12 +79,6 @@ function replaceAlexandriaNostrLinks(text: string): string { @@ -82,12 +79,6 @@ function replaceAlexandriaNostrLinks(text: string): string {
return text;
}
function renderListGroup(lines: string[], typeHint?: "ol" | "ul"): string {
function parseList(
start: number,
@ -96,7 +87,9 @@ function renderListGroup(lines: string[], typeHint?: "ol" | "ul"): string { @@ -96,7 +87,9 @@ function renderListGroup(lines: string[], typeHint?: "ol" | "ul"): string {
): [string, number] {
let html = "";
let i = start;
html += `<${type} class="${type === "ol" ? "list-decimal" : "list-disc"} ml-6 mb-2">`;
html += `<${type} class="${
type === "ol" ? "list-decimal" : "list-disc"
} ml-6 mb-2">`;
while (i < lines.length) {
const line = lines[i];
const match = line.match(/^([ \t]*)([*+-]|\d+\.)[ \t]+(.*)$/);
@ -168,7 +161,9 @@ function processBasicFormatting(content: string): string { @@ -168,7 +161,9 @@ function processBasicFormatting(content: string): string {
processedText = processedText.replace(
MARKUP_LINK,
(_match, text, url) =>
`<a href="${stripTrackingParams(url)}" class="text-primary-600 dark:text-primary-500 hover:underline" target="_blank" rel="noopener noreferrer">${text}</a>`,
`<a href="${
stripTrackingParams(url)
}" class="text-primary-600 dark:text-primary-500 hover:underline" target="_blank" rel="noopener noreferrer">${text}</a>`,
);
// Process WebSocket URLs using shared services
@ -181,7 +176,7 @@ function processBasicFormatting(content: string): string { @@ -181,7 +176,7 @@ function processBasicFormatting(content: string): string {
// Process text formatting using shared services
processedText = processBasicTextFormatting(processedText);
// Process hashtags using shared services
processedText = processHashtags(processedText);
@ -220,12 +215,6 @@ function processBasicFormatting(content: string): string { @@ -220,12 +215,6 @@ function processBasicFormatting(content: string): string {
return processedText;
}
export async function parseBasicmarkup(text: string): Promise<string> {
if (!text) return "";
@ -249,9 +238,10 @@ export async function parseBasicmarkup(text: string): Promise<string> { @@ -249,9 +238,10 @@ export async function parseBasicmarkup(text: string): Promise<string> {
// AI-NOTE: 2025-01-24 - Added img tag to skip wrapping to prevent image rendering issues
// Skip wrapping if para already contains block-level elements, math blocks, or images
if (
/(<div[^>]*class=["'][^"']*math-block[^"']*["'])|<(div|h[1-6]|blockquote|table|pre|ul|ol|hr|img)/i.test(
para,
)
/(<div[^>]*class=["'][^"']*math-block[^"']*["'])|<(div|h[1-6]|blockquote|table|pre|ul|ol|hr|img)/i
.test(
para,
)
) {
return para;
}
@ -268,6 +258,8 @@ export async function parseBasicmarkup(text: string): Promise<string> { @@ -268,6 +258,8 @@ export async function parseBasicmarkup(text: string): Promise<string> {
return processedText;
} catch (e: unknown) {
console.error("Error in parseBasicmarkup:", e);
return `<div class="text-red-500">Error processing markup: ${(e as Error)?.message ?? "Unknown error"}</div>`;
return `<div class="text-red-500">Error processing markup: ${
(e as Error)?.message ?? "Unknown error"
}</div>`;
}
}

57
src/lib/utils/markup/embeddedMarkupParser.ts

@ -1,18 +1,17 @@ @@ -1,18 +1,17 @@
import * as emoji from "node-emoji";
import { nip19 } from "nostr-tools";
import {
processImageWithReveal,
processMediaUrl,
processNostrIdentifiersInText,
processEmojiShortcodes,
processWebSocketUrls,
processHashtags,
import {
processBasicTextFormatting,
processBlockquotes,
processWikilinks,
processEmojiShortcodes,
processHashtags,
processImageWithReveal,
processMediaUrl,
processNostrIdentifiersInText,
processNostrIdentifiersWithEmbeddedEvents,
stripTrackingParams
} from "./markupServices";
processWebSocketUrls,
processWikilinks,
stripTrackingParams,
} from "./markupServices.ts";
/* Regex constants for basic markup parsing */
@ -89,7 +88,9 @@ function renderListGroup(lines: string[], typeHint?: "ol" | "ul"): string { @@ -89,7 +88,9 @@ function renderListGroup(lines: string[], typeHint?: "ol" | "ul"): string {
): [string, number] {
let html = "";
let i = start;
html += `<${type} class="${type === "ol" ? "list-decimal" : "list-disc"} ml-6 mb-2">`;
html += `<${type} class="${
type === "ol" ? "list-decimal" : "list-disc"
} ml-6 mb-2">`;
while (i < lines.length) {
const line = lines[i];
const match = line.match(/^([ \t]*)([*+-]|\d+\.)[ \t]+(.*)$/);
@ -161,7 +162,9 @@ function processBasicFormatting(content: string): string { @@ -161,7 +162,9 @@ function processBasicFormatting(content: string): string {
processedText = processedText.replace(
MARKUP_LINK,
(_match, text, url) =>
`<a href="${stripTrackingParams(url)}" class="text-primary-600 dark:text-primary-500 hover:underline" target="_blank" rel="noopener noreferrer">${text}</a>`,
`<a href="${
stripTrackingParams(url)
}" class="text-primary-600 dark:text-primary-500 hover:underline" target="_blank" rel="noopener noreferrer">${text}</a>`,
);
// Process WebSocket URLs using shared services
@ -174,7 +177,7 @@ function processBasicFormatting(content: string): string { @@ -174,7 +177,7 @@ function processBasicFormatting(content: string): string {
// Process text formatting using shared services
processedText = processBasicTextFormatting(processedText);
// Process hashtags using shared services
processedText = processHashtags(processedText);
@ -218,7 +221,10 @@ function processBasicFormatting(content: string): string { @@ -218,7 +221,10 @@ function processBasicFormatting(content: string): string {
* AI-NOTE: 2025-01-24 - Enhanced markup parser that supports nested Nostr event embedding
* Up to 3 levels of nesting are supported, after which events are shown as links
*/
export async function parseEmbeddedMarkup(text: string, nestingLevel: number = 0): Promise<string> {
export async function parseEmbeddedMarkup(
text: string,
nestingLevel: number = 0,
): Promise<string> {
if (!text) return "";
try {
@ -233,29 +239,30 @@ export async function parseEmbeddedMarkup(text: string, nestingLevel: number = 0 @@ -233,29 +239,30 @@ export async function parseEmbeddedMarkup(text: string, nestingLevel: number = 0
// Process paragraphs - split by double newlines and wrap in p tags
// Skip wrapping if content already contains block-level elements
const blockLevelEls =
/(<div[^>]*class=["'][^"']*math-block[^"']*["'])|<(div|h[1-6]|blockquote|table|pre|ul|ol|hr|img)/i;
processedText = processedText
.split(/\n\n+/)
.map((para) => para.trim())
.filter((para) => para.length > 0)
.map((para) => {
// AI-NOTE: 2025-01-24 - Added img tag to skip wrapping to prevent image rendering issues
// Skip wrapping if para already contains block-level elements, math blocks, or images
if (
/(<div[^>]*class=["'][^"']*math-block[^"']*["'])|<(div|h[1-6]|blockquote|table|pre|ul|ol|hr|img)/i.test(
para,
)
) {
if (blockLevelEls.test(para)) {
return para;
}
return `<p class="my-1">${para}</p>`;
})
.join("\n");
// Process profile identifiers (npub, nprofile) first using the regular processor
processedText = await processNostrIdentifiersInText(processedText);
// Then process event identifiers with embedded events (only event-related identifiers)
processedText = processNostrIdentifiersWithEmbeddedEvents(processedText, nestingLevel);
processedText = processNostrIdentifiersWithEmbeddedEvents(
processedText,
nestingLevel,
);
// Replace wikilinks
processedText = processWikilinks(processedText);
@ -263,6 +270,8 @@ export async function parseEmbeddedMarkup(text: string, nestingLevel: number = 0 @@ -263,6 +270,8 @@ export async function parseEmbeddedMarkup(text: string, nestingLevel: number = 0
return processedText;
} catch (e: unknown) {
console.error("Error in parseEmbeddedMarkup:", e);
return `<div class="text-red-500">Error processing markup: ${(e as Error)?.message ?? "Unknown error"}</div>`;
return `<div class="text-red-500">Error processing markup: ${
(e as Error)?.message ?? "Unknown error"
}</div>`;
}
}

147
src/lib/utils/markup/markupServices.ts

@ -1,18 +1,25 @@ @@ -1,18 +1,25 @@
import { processNostrIdentifiers, NOSTR_PROFILE_REGEX } from "../nostrUtils.ts";
import {
createProfileLink,
getUserMetadata,
NOSTR_PROFILE_REGEX,
} from "../nostrUtils.ts";
import * as emoji from "node-emoji";
// Media URL patterns
const IMAGE_EXTENSIONS = /\.(jpg|jpeg|gif|png|webp|svg)$/i;
const VIDEO_URL_REGEX = /https?:\/\/[^\s<]+\.(?:mp4|webm|mov|avi)(?:[^\s<]*)?/i;
const AUDIO_URL_REGEX = /https?:\/\/[^\s<]+\.(?:mp3|wav|ogg|m4a)(?:[^\s<]*)?/i;
const YOUTUBE_URL_REGEX = /https?:\/\/(?:www\.)?(?:youtube\.com\/(?:watch\?v=|embed\/)|youtu\.be\/|youtube-nocookie\.com\/embed\/)([a-zA-Z0-9_-]{11})(?:[^\s<]*)?/;
const YOUTUBE_URL_REGEX =
/https?:\/\/(?:www\.)?(?:youtube\.com\/(?:watch\?v=|embed\/)|youtu\.be\/|youtube-nocookie\.com\/embed\/)([a-zA-Z0-9_-]{11})(?:[^\s<]*)?/;
/**
* Shared service for processing images with expand functionality
*/
export function processImageWithReveal(src: string, alt: string = "Image"): string {
export function processImageWithReveal(
src: string,
alt: string = "Image",
): string {
if (!src || !IMAGE_EXTENSIONS.test(src.split("?")[0])) {
return `<img src="${src}" alt="${alt}">`;
}
@ -43,26 +50,32 @@ export function processImageWithReveal(src: string, alt: string = "Image"): stri @@ -43,26 +50,32 @@ export function processImageWithReveal(src: string, alt: string = "Image"): stri
*/
export function processMediaUrl(url: string, alt?: string): string {
const clean = stripTrackingParams(url);
if (YOUTUBE_URL_REGEX.test(clean)) {
const videoId = extractYouTubeVideoId(clean);
if (videoId) {
return `<iframe class="w-full aspect-video rounded-lg shadow-lg my-2" src="https://www.youtube-nocookie.com/embed/${videoId}" title="${alt || "YouTube video"}" frameborder="0" allow="fullscreen" sandbox="allow-scripts allow-same-origin allow-presentation"></iframe>`;
return `<iframe class="w-full aspect-video rounded-lg shadow-lg my-2" src="https://www.youtube-nocookie.com/embed/${videoId}" title="${
alt || "YouTube video"
}" frameborder="0" allow="fullscreen" sandbox="allow-scripts allow-same-origin allow-presentation"></iframe>`;
}
}
if (VIDEO_URL_REGEX.test(clean)) {
return `<video controls class="max-w-full rounded-lg shadow-lg my-2" preload="none" playsinline><source src="${clean}">${alt || "Video"}</video>`;
return `<video controls class="max-w-full rounded-lg shadow-lg my-2" preload="none" playsinline><source src="${clean}">${
alt || "Video"
}</video>`;
}
if (AUDIO_URL_REGEX.test(clean)) {
return `<audio controls class="w-full my-2" preload="none"><source src="${clean}">${alt || "Audio"}</audio>`;
return `<audio controls class="w-full my-2" preload="none"><source src="${clean}">${
alt || "Audio"
}</audio>`;
}
if (IMAGE_EXTENSIONS.test(clean.split("?")[0])) {
return processImageWithReveal(clean, alt || "Embedded media");
}
// Default to clickable link
return `<a href="${clean}" target="_blank" rel="noopener noreferrer" class="text-blue-500 hover:text-blue-600 dark:text-blue-400 dark:hover:text-blue-300">${clean}</a>`;
}
@ -70,40 +83,45 @@ export function processMediaUrl(url: string, alt?: string): string { @@ -70,40 +83,45 @@ export function processMediaUrl(url: string, alt?: string): string {
/**
* Shared service for processing nostr identifiers
*/
export async function processNostrIdentifiersInText(text: string): Promise<string> {
export async function processNostrIdentifiersInText(
text: string,
): Promise<string> {
let processedText = text;
// Find all profile-related nostr addresses (only npub and nprofile)
const matches = Array.from(processedText.matchAll(NOSTR_PROFILE_REGEX));
// Process them in reverse order to avoid index shifting issues
for (let i = matches.length - 1; i >= 0; i--) {
const match = matches[i];
const [fullMatch] = match;
const matchIndex = match.index ?? 0;
// Skip if part of a URL
const before = processedText.slice(Math.max(0, matchIndex - 12), matchIndex);
const before = processedText.slice(
Math.max(0, matchIndex - 12),
matchIndex,
);
if (/https?:\/\/$|www\.$/i.test(before)) {
continue;
}
// Process the nostr identifier directly
let identifier = fullMatch;
if (!identifier.startsWith("nostr:")) {
identifier = "nostr:" + identifier;
}
// Get user metadata and create link
const { getUserMetadata, createProfileLink } = await import("../nostrUtils.ts");
const metadata = await getUserMetadata(identifier);
const displayText = metadata.displayName || metadata.name;
const link = createProfileLink(identifier, displayText);
// Replace the match in the text
processedText = processedText.slice(0, matchIndex) + link + processedText.slice(matchIndex + fullMatch.length);
processedText = processedText.slice(0, matchIndex) + link +
processedText.slice(matchIndex + fullMatch.length);
}
return processedText;
}
@ -112,37 +130,45 @@ export async function processNostrIdentifiersInText(text: string): Promise<strin @@ -112,37 +130,45 @@ export async function processNostrIdentifiersInText(text: string): Promise<strin
* Replaces nostr: links with embedded event placeholders
* Only processes event-related identifiers (nevent, naddr, note), not profile identifiers (npub, nprofile)
*/
export function processNostrIdentifiersWithEmbeddedEvents(text: string, nestingLevel: number = 0): string {
export function processNostrIdentifiersWithEmbeddedEvents(
text: string,
nestingLevel: number = 0,
): string {
const eventPattern = /nostr:(note|nevent|naddr)[a-zA-Z0-9]{20,}/g;
let processedText = text;
// Maximum nesting level allowed
const MAX_NESTING_LEVEL = 3;
// Find all event-related nostr addresses
const matches = Array.from(processedText.matchAll(eventPattern));
// Process them in reverse order to avoid index shifting issues
for (let i = matches.length - 1; i >= 0; i--) {
const match = matches[i];
const [fullMatch] = match;
const matchIndex = match.index ?? 0;
let replacement: string;
if (nestingLevel >= MAX_NESTING_LEVEL) {
// At max nesting level, just show the link
replacement = `<a href="/events?id=${fullMatch}" class="text-primary-600 dark:text-primary-500 hover:underline break-all">${fullMatch}</a>`;
replacement =
`<a href="/events?id=${fullMatch}" class="text-primary-600 dark:text-primary-500 hover:underline break-all">${fullMatch}</a>`;
} else {
// Create a placeholder for embedded event
const componentId = `embedded-event-${Math.random().toString(36).substr(2, 9)}`;
replacement = `<div class="embedded-event-placeholder" data-nostr-id="${fullMatch}" data-nesting-level="${nestingLevel}" id="${componentId}"></div>`;
const componentId = `embedded-event-${
Math.random().toString(36).substr(2, 9)
}`;
replacement =
`<div class="embedded-event-placeholder" data-nostr-id="${fullMatch}" data-nesting-level="${nestingLevel}" id="${componentId}"></div>`;
}
// Replace the match in the text
processedText = processedText.slice(0, matchIndex) + replacement + processedText.slice(matchIndex + fullMatch.length);
processedText = processedText.slice(0, matchIndex) + replacement +
processedText.slice(matchIndex + fullMatch.length);
}
return processedText;
}
@ -169,7 +195,10 @@ export function processWebSocketUrls(text: string): string { @@ -169,7 +195,10 @@ export function processWebSocketUrls(text: string): string {
*/
export function processHashtags(text: string): string {
const hashtagRegex = /(?<![^\s])#([a-zA-Z0-9_]+)(?!\w)/g;
return text.replace(hashtagRegex, '<button class="text-primary-600 dark:text-primary-500 hover:underline cursor-pointer" onclick="window.location.href=\'/events?t=$1\'">#$1</button>');
return text.replace(
hashtagRegex,
'<button class="text-primary-600 dark:text-primary-500 hover:underline cursor-pointer" onclick="window.location.href=\'/events?t=$1\'">#$1</button>',
);
}
/**
@ -177,20 +206,26 @@ export function processHashtags(text: string): string { @@ -177,20 +206,26 @@ export function processHashtags(text: string): string {
*/
export function processBasicTextFormatting(text: string): string {
// Bold: **text** or *text*
text = text.replace(/(\*\*|[*])((?:[^*\n]|\*(?!\*))+)\1/g, "<strong>$2</strong>");
text = text.replace(
/(\*\*|[*])((?:[^*\n]|\*(?!\*))+)\1/g,
"<strong>$2</strong>",
);
// Italic: _text_ or __text__
text = text.replace(/\b(_[^_\n]+_|\b__[^_\n]+__)\b/g, (match) => {
const text = match.replace(/^_+|_+$/g, "");
return `<em>${text}</em>`;
});
// Strikethrough: ~~text~~ or ~text~
text = text.replace(/~~([^~\n]+)~~|~([^~\n]+)~/g, (_match, doubleText, singleText) => {
const text = doubleText || singleText;
return `<del class="line-through">${text}</del>`;
});
text = text.replace(
/~~([^~\n]+)~~|~([^~\n]+)~/g,
(_match, doubleText, singleText) => {
const text = doubleText || singleText;
return `<del class="line-through">${text}</del>`;
},
);
return text;
}
@ -203,7 +238,9 @@ export function processBlockquotes(text: string): string { @@ -203,7 +238,9 @@ export function processBlockquotes(text: string): string {
const lines = match.split("\n").map((line) => {
return line.replace(/^[ \t]*>[ \t]?/, "").trim();
});
return `<blockquote class="pl-4 border-l-4 border-gray-300 dark:border-gray-600 my-4">${lines.join("\n")}</blockquote>`;
return `<blockquote class="pl-4 border-l-4 border-gray-300 dark:border-gray-600 my-4">${
lines.join("\n")
}</blockquote>`;
});
}
@ -212,8 +249,16 @@ export function stripTrackingParams(url: string): string { @@ -212,8 +249,16 @@ export function stripTrackingParams(url: string): string {
try {
const urlObj = new URL(url);
// Remove common tracking parameters
const trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid'];
trackingParams.forEach(param => urlObj.searchParams.delete(param));
const trackingParams = [
"utm_source",
"utm_medium",
"utm_campaign",
"utm_term",
"utm_content",
"fbclid",
"gclid",
];
trackingParams.forEach((param) => urlObj.searchParams.delete(param));
return urlObj.toString();
} catch {
return url;
@ -221,7 +266,9 @@ export function stripTrackingParams(url: string): string { @@ -221,7 +266,9 @@ export function stripTrackingParams(url: string): string {
}
function extractYouTubeVideoId(url: string): string | null {
const match = url.match(/(?:youtube\.com\/(?:watch\?v=|embed\/)|youtu\.be\/|youtube-nocookie\.com\/embed\/)([a-zA-Z0-9_-]{11})/);
const match = url.match(
/(?:youtube\.com\/(?:watch\?v=|embed\/)|youtu\.be\/|youtube-nocookie\.com\/embed\/)([a-zA-Z0-9_-]{11})/,
);
return match ? match[1] : null;
}
@ -263,4 +310,4 @@ export function processAsciiDocAnchors(text: string): string { @@ -263,4 +310,4 @@ export function processAsciiDocAnchors(text: string): string {
const url = `/events?d=${normalized}`;
return `<a class="wikilink text-primary-600 dark:text-primary-500 hover:underline" data-dtag="${normalized}" data-url="${url}" href="${url}">${id}</a>`;
});
}
}

4
src/lib/utils/markup/tikzRenderer.ts

@ -44,7 +44,9 @@ function createBasicSVG(tikzCode: string): string { @@ -44,7 +44,9 @@ function createBasicSVG(tikzCode: string): string {
</text>
<foreignObject x="10" y="60" width="${width - 20}" height="${height - 70}">
<div xmlns="http://www.w3.org/1999/xhtml" style="font-family: monospace; font-size: 10px; color: #666; overflow: hidden;">
<pre style="margin: 0; white-space: pre-wrap; word-break: break-all;">${escapeHtml(tikzCode)}</pre>
<pre style="margin: 0; white-space: pre-wrap; word-break: break-all;">${
escapeHtml(tikzCode)
}</pre>
</div>
</foreignObject>
</svg>`;

2
src/lib/utils/mime.ts

@ -104,7 +104,7 @@ export function getMimeTags(kind: number): [string, string][] { @@ -104,7 +104,7 @@ export function getMimeTags(kind: number): [string, string][] {
MTag = ["M", `article/long-form/${replaceability}`];
break;
// Add more cases as needed...
// Add more cases as needed...
}
return [mTag, MTag];

106
src/lib/utils/network_detection.ts

@ -4,18 +4,18 @@ import { deduplicateRelayUrls } from "./relay_management.ts"; @@ -4,18 +4,18 @@ import { deduplicateRelayUrls } from "./relay_management.ts";
* Network conditions for relay selection
*/
export enum NetworkCondition {
ONLINE = 'online',
SLOW = 'slow',
OFFLINE = 'offline'
ONLINE = "online",
SLOW = "slow",
OFFLINE = "offline",
}
/**
* Network connectivity test endpoints
*/
const NETWORK_ENDPOINTS = [
'https://www.google.com/favicon.ico',
'https://httpbin.org/status/200',
'https://api.github.com/zen'
"https://www.google.com/favicon.ico",
"https://httpbin.org/status/200",
"https://api.github.com/zen",
];
/**
@ -27,20 +27,23 @@ export async function isNetworkOnline(): Promise<boolean> { @@ -27,20 +27,23 @@ export async function isNetworkOnline(): Promise<boolean> {
try {
// Use a simple fetch without HEAD method to avoid CORS issues
await fetch(endpoint, {
method: 'GET',
cache: 'no-cache',
method: "GET",
cache: "no-cache",
signal: AbortSignal.timeout(3000),
mode: 'no-cors' // Use no-cors mode to avoid CORS issues
mode: "no-cors", // Use no-cors mode to avoid CORS issues
});
// With no-cors mode, we can't check response.ok, so we assume success if no error
return true;
} catch (error) {
console.debug(`[network_detection.ts] Failed to reach ${endpoint}:`, error);
console.debug(
`[network_detection.ts] Failed to reach ${endpoint}:`,
error,
);
continue;
}
}
console.debug('[network_detection.ts] All network endpoints failed');
console.debug("[network_detection.ts] All network endpoints failed");
return false;
}
@ -50,25 +53,30 @@ export async function isNetworkOnline(): Promise<boolean> { @@ -50,25 +53,30 @@ export async function isNetworkOnline(): Promise<boolean> {
*/
export async function testNetworkSpeed(): Promise<number> {
const startTime = performance.now();
for (const endpoint of NETWORK_ENDPOINTS) {
try {
await fetch(endpoint, {
method: 'GET',
cache: 'no-cache',
method: "GET",
cache: "no-cache",
signal: AbortSignal.timeout(5000),
mode: 'no-cors' // Use no-cors mode to avoid CORS issues
mode: "no-cors", // Use no-cors mode to avoid CORS issues
});
const endTime = performance.now();
return endTime - startTime;
} catch (error) {
console.debug(`[network_detection.ts] Speed test failed for ${endpoint}:`, error);
console.debug(
`[network_detection.ts] Speed test failed for ${endpoint}:`,
error,
);
continue;
}
}
console.debug('[network_detection.ts] Network speed test failed for all endpoints');
console.debug(
"[network_detection.ts] Network speed test failed for all endpoints",
);
return Infinity; // Very slow if it fails
}
@ -78,21 +86,25 @@ export async function testNetworkSpeed(): Promise<number> { @@ -78,21 +86,25 @@ export async function testNetworkSpeed(): Promise<number> {
*/
export async function detectNetworkCondition(): Promise<NetworkCondition> {
const isOnline = await isNetworkOnline();
if (!isOnline) {
console.debug('[network_detection.ts] Network condition: OFFLINE');
console.debug("[network_detection.ts] Network condition: OFFLINE");
return NetworkCondition.OFFLINE;
}
const speed = await testNetworkSpeed();
// Consider network slow if response time > 2000ms
if (speed > 2000) {
console.debug(`[network_detection.ts] Network condition: SLOW (${speed.toFixed(0)}ms)`);
console.debug(
`[network_detection.ts] Network condition: SLOW (${speed.toFixed(0)}ms)`,
);
return NetworkCondition.SLOW;
}
console.debug(`[network_detection.ts] Network condition: ONLINE (${speed.toFixed(0)}ms)`);
console.debug(
`[network_detection.ts] Network condition: ONLINE (${speed.toFixed(0)}ms)`,
);
return NetworkCondition.ONLINE;
}
@ -108,39 +120,49 @@ export function getRelaySetForNetworkCondition( @@ -108,39 +120,49 @@ export function getRelaySetForNetworkCondition(
networkCondition: NetworkCondition,
discoveredLocalRelays: string[],
lowbandwidthRelays: string[],
fullRelaySet: { inboxRelays: string[]; outboxRelays: string[] }
fullRelaySet: { inboxRelays: string[]; outboxRelays: string[] },
): { inboxRelays: string[]; outboxRelays: string[] } {
switch (networkCondition) {
case NetworkCondition.OFFLINE:
// When offline, use local relays if available, otherwise rely on cache
// This will be improved when IndexedDB local relay is implemented
if (discoveredLocalRelays.length > 0) {
console.debug('[network_detection.ts] Using local relays (offline)');
console.debug("[network_detection.ts] Using local relays (offline)");
return {
inboxRelays: discoveredLocalRelays,
outboxRelays: discoveredLocalRelays
outboxRelays: discoveredLocalRelays,
};
} else {
console.debug('[network_detection.ts] No local relays available, will rely on cache (offline)');
console.debug(
"[network_detection.ts] No local relays available, will rely on cache (offline)",
);
return {
inboxRelays: [],
outboxRelays: []
outboxRelays: [],
};
}
case NetworkCondition.SLOW: {
// Local relays + low bandwidth relays when slow (deduplicated)
console.debug('[network_detection.ts] Using local + low bandwidth relays (slow network)');
const slowInboxRelays = deduplicateRelayUrls([...discoveredLocalRelays, ...lowbandwidthRelays]);
const slowOutboxRelays = deduplicateRelayUrls([...discoveredLocalRelays, ...lowbandwidthRelays]);
console.debug(
"[network_detection.ts] Using local + low bandwidth relays (slow network)",
);
const slowInboxRelays = deduplicateRelayUrls([
...discoveredLocalRelays,
...lowbandwidthRelays,
]);
const slowOutboxRelays = deduplicateRelayUrls([
...discoveredLocalRelays,
...lowbandwidthRelays,
]);
return {
inboxRelays: slowInboxRelays,
outboxRelays: slowOutboxRelays
outboxRelays: slowOutboxRelays,
};
}
case NetworkCondition.ONLINE:
default:
// Full relay set when online
console.debug('[network_detection.ts] Using full relay set (online)');
console.debug("[network_detection.ts] Using full relay set (online)");
return fullRelaySet;
}
}
@ -161,14 +183,16 @@ export function startNetworkMonitoring( @@ -161,14 +183,16 @@ export function startNetworkMonitoring(
const checkNetwork = async () => {
try {
const currentCondition = await detectNetworkCondition();
if (currentCondition !== lastCondition) {
console.debug(`[network_detection.ts] Network condition changed: ${lastCondition} -> ${currentCondition}`);
console.debug(
`[network_detection.ts] Network condition changed: ${lastCondition} -> ${currentCondition}`,
);
lastCondition = currentCondition;
onNetworkChange(currentCondition);
}
} catch (error) {
console.warn('[network_detection.ts] Network monitoring error:', error);
console.warn("[network_detection.ts] Network monitoring error:", error);
}
};
@ -185,4 +209,4 @@ export function startNetworkMonitoring( @@ -185,4 +209,4 @@ export function startNetworkMonitoring(
intervalId = null;
}
};
}
}

47
src/lib/utils/nostrEventService.ts

@ -1,11 +1,9 @@ @@ -1,11 +1,9 @@
import { nip19 } from "nostr-tools";
import { getEventHash, signEvent, prefixNostrAddresses } from "./nostrUtils.ts";
import { get } from "svelte/store";
import { getEventHash, prefixNostrAddresses, signEvent } from "./nostrUtils.ts";
import { goto } from "$app/navigation";
import { EVENT_KINDS, TIME_CONSTANTS } from "./search_constants.ts";
import { EXPIRATION_DURATION } from "../consts.ts";
import { ndkInstance } from "../ndk.ts";
import { NDKRelaySet, NDKEvent } from "@nostr-dev-kit/ndk";
import NDK, { NDKEvent, NDKRelaySet } from "@nostr-dev-kit/ndk";
export interface RootEventInfo {
rootId: string;
@ -96,21 +94,21 @@ export function extractRootEventInfo(parent: NDKEvent): RootEventInfo { @@ -96,21 +94,21 @@ export function extractRootEventInfo(parent: NDKEvent): RootEventInfo {
rootInfo.rootId = rootE[1];
rootInfo.rootRelay = getRelayString(rootE[2]);
rootInfo.rootPubkey = getPubkeyString(rootE[3] || rootInfo.rootPubkey);
rootInfo.rootKind =
Number(getTagValue(parent.tags, "K")) || rootInfo.rootKind;
rootInfo.rootKind = Number(getTagValue(parent.tags, "K")) ||
rootInfo.rootKind;
} else if (rootA) {
rootInfo.rootAddress = rootA[1];
rootInfo.rootRelay = getRelayString(rootA[2]);
rootInfo.rootPubkey = getPubkeyString(
getTagValue(parent.tags, "P") || rootInfo.rootPubkey,
);
rootInfo.rootKind =
Number(getTagValue(parent.tags, "K")) || rootInfo.rootKind;
rootInfo.rootKind = Number(getTagValue(parent.tags, "K")) ||
rootInfo.rootKind;
} else if (rootI) {
rootInfo.rootIValue = rootI[1];
rootInfo.rootIRelay = getRelayString(rootI[2]);
rootInfo.rootKind =
Number(getTagValue(parent.tags, "K")) || rootInfo.rootKind;
rootInfo.rootKind = Number(getTagValue(parent.tags, "K")) ||
rootInfo.rootKind;
}
return rootInfo;
@ -224,7 +222,8 @@ export function buildReplyTags( @@ -224,7 +222,8 @@ export function buildReplyTags(
if (isParentReplaceable) {
const dTag = getTagValue(parent.tags || [], "d");
if (dTag) {
const parentAddress = `${parentInfo.parentKind}:${parentInfo.parentPubkey}:${dTag}`;
const parentAddress =
`${parentInfo.parentKind}:${parentInfo.parentPubkey}:${dTag}`;
addTags(tags, createTag("a", parentAddress, "", "root"));
}
}
@ -233,7 +232,8 @@ export function buildReplyTags( @@ -233,7 +232,8 @@ export function buildReplyTags(
if (isParentReplaceable) {
const dTag = getTagValue(parent.tags || [], "d");
if (dTag) {
const parentAddress = `${parentInfo.parentKind}:${parentInfo.parentPubkey}:${dTag}`;
const parentAddress =
`${parentInfo.parentKind}:${parentInfo.parentPubkey}:${dTag}`;
if (isReplyToComment) {
// Root scope (uppercase) - use the original article
@ -317,14 +317,16 @@ export async function createSignedEvent( @@ -317,14 +317,16 @@ export async function createSignedEvent(
pubkey: string,
kind: number,
tags: string[][],
// deno-lint-ignore no-explicit-any
// deno-lint-ignore no-explicit-any
): Promise<{ id: string; sig: string; event: any }> {
const prefixedContent = prefixNostrAddresses(content);
// Add expiration tag for kind 24 events (NIP-40)
const finalTags = [...tags];
if (kind === 24) {
const expirationTimestamp = Math.floor(Date.now() / TIME_CONSTANTS.UNIX_TIMESTAMP_FACTOR) + EXPIRATION_DURATION;
const expirationTimestamp =
Math.floor(Date.now() / TIME_CONSTANTS.UNIX_TIMESTAMP_FACTOR) +
EXPIRATION_DURATION;
finalTags.push(["expiration", String(expirationTimestamp)]);
}
@ -333,7 +335,7 @@ export async function createSignedEvent( @@ -333,7 +335,7 @@ export async function createSignedEvent(
created_at: Number(
Math.floor(Date.now() / TIME_CONSTANTS.UNIX_TIMESTAMP_FACTOR),
),
tags: finalTags.map((tag) => [
tags: finalTags.map((tag: any) => [
String(tag[0]),
String(tag[1]),
String(tag[2] || ""),
@ -344,7 +346,10 @@ export async function createSignedEvent( @@ -344,7 +346,10 @@ export async function createSignedEvent(
};
let sig, id;
if (typeof window !== "undefined" && globalThis.nostr && globalThis.nostr.signEvent) {
if (
typeof window !== "undefined" && globalThis.nostr &&
globalThis.nostr.signEvent
) {
const signed = await globalThis.nostr.signEvent(eventToSign);
sig = signed.sig as string;
id = "id" in signed ? (signed.id as string) : getEventHash(eventToSign);
@ -373,9 +378,9 @@ export async function createSignedEvent( @@ -373,9 +378,9 @@ export async function createSignedEvent(
export async function publishEvent(
event: NDKEvent,
relayUrls: string[],
ndk: NDK,
): Promise<string[]> {
const successfulRelays: string[] = [];
const ndk = get(ndkInstance);
if (!ndk) {
throw new Error("NDK instance not available");
@ -387,7 +392,7 @@ export async function publishEvent( @@ -387,7 +392,7 @@ export async function publishEvent(
try {
// If event is a plain object, create an NDKEvent from it
let ndkEvent: NDKEvent;
if (event.publish && typeof event.publish === 'function') {
if (event.publish && typeof event.publish === "function") {
// It's already an NDKEvent
ndkEvent = event;
} else {
@ -397,15 +402,15 @@ export async function publishEvent( @@ -397,15 +402,15 @@ export async function publishEvent(
// Publish with timeout
await ndkEvent.publish(relaySet).withTimeout(5000);
// For now, assume all relays were successful
// In a more sophisticated implementation, you'd track individual relay responses
successfulRelays.push(...relayUrls);
console.debug("[nostrEventService] Published event successfully:", {
eventId: ndkEvent.id,
relayCount: relayUrls.length,
successfulRelays
successfulRelays,
});
} catch (error) {
console.error("[nostrEventService] Failed to publish event:", error);

148
src/lib/utils/nostrUtils.ts

@ -1,11 +1,15 @@ @@ -1,11 +1,15 @@
import { get } from "svelte/store";
import { nip19 } from "nostr-tools";
import { ndkInstance } from "../ndk.ts";
import { npubCache } from "./npubCache.ts";
import NDK, { NDKEvent, NDKRelaySet, NDKUser } from "@nostr-dev-kit/ndk";
import type { NDKKind, NostrEvent } from "@nostr-dev-kit/ndk";
import type { Filter, NostrProfile } from "./search_types.ts";
import { communityRelays, secondaryRelays, searchRelays, anonymousRelays } from "../consts.ts";
import type { NostrEvent } from "@nostr-dev-kit/ndk";
import type { Filter } from "./search_types.ts";
import {
anonymousRelays,
communityRelays,
searchRelays,
secondaryRelays,
} from "../consts.ts";
import { activeInboxRelays, activeOutboxRelays } from "../ndk.ts";
import { NDKRelaySet as NDKRelaySetFromNDK } from "@nostr-dev-kit/ndk";
import { sha256 } from "@noble/hashes/sha2.js";
@ -26,7 +30,16 @@ export const NOSTR_PROFILE_REGEX = @@ -26,7 +30,16 @@ export const NOSTR_PROFILE_REGEX =
export const NOSTR_NOTE_REGEX =
/(?<![\w/])((nostr:)?(note|nevent|naddr)[a-zA-Z0-9]{20,})(?![\w/])/g;
// AI-NOTE: 2025-01-24 - NostrProfile interface moved to search_types.ts for consistency
export interface NostrProfile {
name?: string;
displayName?: string;
nip05?: string;
picture?: string;
about?: string;
banner?: string;
website?: string;
lud16?: string;
}
/**
* HTML escape a string
@ -46,7 +59,7 @@ function escapeHtml(text: string): string { @@ -46,7 +59,7 @@ function escapeHtml(text: string): string {
* Escape regex special characters
*/
function escapeRegExp(string: string): string {
return string.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
return string.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
}
/**
@ -54,12 +67,18 @@ function escapeRegExp(string: string): string { @@ -54,12 +67,18 @@ function escapeRegExp(string: string): string {
*/
export async function getUserMetadata(
identifier: string,
ndk: NDK,
force = false,
): Promise<NostrProfile> {
// Remove nostr: prefix if present
const cleanId = identifier.replace(/^nostr:/, "");
console.log("getUserMetadata called with identifier:", identifier, "force:", force);
console.log(
"getUserMetadata called with identifier:",
identifier,
"force:",
force,
);
if (!force && npubCache.has(cleanId)) {
const cached = npubCache.get(cleanId)!;
@ -70,7 +89,6 @@ export async function getUserMetadata( @@ -70,7 +89,6 @@ export async function getUserMetadata(
const fallback = { name: `${cleanId.slice(0, 8)}...${cleanId.slice(-4)}` };
try {
const ndk = get(ndkInstance);
if (!ndk) {
console.warn("getUserMetadata: No NDK instance available");
npubCache.set(cleanId, fallback);
@ -91,7 +109,10 @@ export async function getUserMetadata( @@ -91,7 +109,10 @@ export async function getUserMetadata(
} else if (decoded.type === "nprofile") {
pubkey = decoded.data.pubkey;
} else {
console.warn("getUserMetadata: Unsupported identifier type:", decoded.type);
console.warn(
"getUserMetadata: Unsupported identifier type:",
decoded.type,
);
npubCache.set(cleanId, fallback);
return fallback;
}
@ -102,13 +123,12 @@ export async function getUserMetadata( @@ -102,13 +123,12 @@ export async function getUserMetadata(
kinds: [0],
authors: [pubkey],
});
console.log("getUserMetadata: Profile event found:", profileEvent);
const profile =
profileEvent && profileEvent.content
? JSON.parse(profileEvent.content)
: null;
const profile = profileEvent && profileEvent.content
? JSON.parse(profileEvent.content)
: null;
console.log("getUserMetadata: Parsed profile:", profile);
@ -121,7 +141,6 @@ export async function getUserMetadata( @@ -121,7 +141,6 @@ export async function getUserMetadata(
banner: profile?.banner,
website: profile?.website,
lud16: profile?.lud16,
created_at: profileEvent?.created_at, // AI-NOTE: 2025-01-24 - Preserve timestamp for proper date display
};
console.log("getUserMetadata: Final metadata:", metadata);
@ -156,8 +175,8 @@ export function createProfileLink( @@ -156,8 +175,8 @@ export function createProfileLink(
export async function createProfileLinkWithVerification(
identifier: string,
displayText: string | undefined,
ndk: NDK,
): Promise<string> {
const ndk = get(ndkInstance) as NDK;
if (!ndk) {
return createProfileLink(identifier, displayText);
}
@ -191,7 +210,7 @@ export async function createProfileLinkWithVerification( @@ -191,7 +210,7 @@ export async function createProfileLinkWithVerification(
};
const allRelays = [
...searchRelays, // Include search relays for profile searches
...searchRelays, // Include search relays for profile searches
...communityRelays,
...userRelays,
...secondaryRelays,
@ -215,8 +234,7 @@ export async function createProfileLinkWithVerification( @@ -215,8 +234,7 @@ export async function createProfileLinkWithVerification(
const defaultText = `${cleanId.slice(0, 8)}...${cleanId.slice(-4)}`;
const escapedText = escapeHtml(displayText || defaultText);
const displayIdentifier =
profile?.displayName ??
const displayIdentifier = profile?.displayName ??
profile?.display_name ??
profile?.name ??
escapedText;
@ -253,6 +271,7 @@ function createNoteLink(identifier: string): string { @@ -253,6 +271,7 @@ function createNoteLink(identifier: string): string {
*/
export async function processNostrIdentifiers(
content: string,
ndk: NDK,
): Promise<string> {
let processedContent = content;
@ -275,11 +294,14 @@ export async function processNostrIdentifiers( @@ -275,11 +294,14 @@ export async function processNostrIdentifiers(
if (!identifier.startsWith("nostr:")) {
identifier = "nostr:" + identifier;
}
const metadata = await getUserMetadata(identifier);
const metadata = await getUserMetadata(identifier, ndk);
const displayText = metadata.displayName || metadata.name;
const link = createProfileLink(identifier, displayText);
// Replace all occurrences of this exact match
processedContent = processedContent.replace(new RegExp(escapeRegExp(fullMatch), 'g'), link);
processedContent = processedContent.replace(
new RegExp(escapeRegExp(fullMatch), "g"),
link,
);
}
// Process notes (nevent, note, naddr)
@ -296,7 +318,10 @@ export async function processNostrIdentifiers( @@ -296,7 +318,10 @@ export async function processNostrIdentifiers(
}
const link = createNoteLink(identifier);
// Replace all occurrences of this exact match
processedContent = processedContent.replace(new RegExp(escapeRegExp(fullMatch), 'g'), link);
processedContent = processedContent.replace(
new RegExp(escapeRegExp(fullMatch), "g"),
link,
);
}
return processedContent;
@ -401,7 +426,7 @@ export function withTimeout<T>( @@ -401,7 +426,7 @@ export function withTimeout<T>(
return Promise.race([
promise,
new Promise<T>((_, reject) =>
setTimeout(() => reject(new Error("Timeout")), timeoutMs),
setTimeout(() => reject(new Error("Timeout")), timeoutMs)
),
]);
}
@ -412,7 +437,7 @@ export function withTimeout<T>( @@ -412,7 +437,7 @@ export function withTimeout<T>(
return Promise.race([
promise,
new Promise<T>((_, reject) =>
setTimeout(() => reject(new Error("Timeout")), timeoutMs),
setTimeout(() => reject(new Error("Timeout")), timeoutMs)
),
]);
}
@ -447,40 +472,54 @@ export async function fetchEventWithFallback( @@ -447,40 +472,54 @@ export async function fetchEventWithFallback(
): Promise<NDKEvent | null> {
// AI-NOTE: 2025-01-24 - Use ALL available relays for comprehensive event discovery
// This ensures we don't miss events that might be on any available relay
// Get all relays from NDK pool first (most comprehensive)
const poolRelays = Array.from(ndk.pool.relays.values()).map((r: any) => r.url);
const poolRelays = Array.from(ndk.pool.relays.values()).map((r: any) =>
r.url
);
const inboxRelays = get(activeInboxRelays);
const outboxRelays = get(activeOutboxRelays);
// Combine all available relays, prioritizing pool relays
let allRelays = [...new Set([...poolRelays, ...inboxRelays, ...outboxRelays])];
let allRelays = [
...new Set([...poolRelays, ...inboxRelays, ...outboxRelays]),
];
console.log("fetchEventWithFallback: Using pool relays:", poolRelays);
console.log("fetchEventWithFallback: Using inbox relays:", inboxRelays);
console.log("fetchEventWithFallback: Using outbox relays:", outboxRelays);
console.log("fetchEventWithFallback: Total unique relays:", allRelays.length);
// Check if we have any relays available
if (allRelays.length === 0) {
console.warn("fetchEventWithFallback: No relays available for event fetch, using fallback relays");
console.warn(
"fetchEventWithFallback: No relays available for event fetch, using fallback relays",
);
// Use fallback relays when no relays are available
allRelays = [...secondaryRelays, ...searchRelays, ...anonymousRelays];
console.log("fetchEventWithFallback: Using fallback relays:", allRelays);
}
// Create relay set from all available relays
const relaySet = NDKRelaySetFromNDK.fromRelayUrls(allRelays, ndk);
try {
if (relaySet.relays.size === 0) {
console.warn("fetchEventWithFallback: No relays in relay set for event fetch");
console.warn(
"fetchEventWithFallback: No relays in relay set for event fetch",
);
return null;
}
console.log("fetchEventWithFallback: Relay set size:", relaySet.relays.size);
console.log(
"fetchEventWithFallback: Relay set size:",
relaySet.relays.size,
);
console.log("fetchEventWithFallback: Filter:", filterOrId);
console.log("fetchEventWithFallback: Relay URLs:", Array.from(relaySet.relays).map((r) => r.url));
console.log(
"fetchEventWithFallback: Relay URLs:",
Array.from(relaySet.relays).map((r) => r.url),
);
let found: NDKEvent | null = null;
@ -492,8 +531,9 @@ export async function fetchEventWithFallback( @@ -492,8 +531,9 @@ export async function fetchEventWithFallback(
.fetchEvent({ ids: [filterOrId] }, undefined, relaySet)
.withTimeout(timeoutMs);
} else {
const filter =
typeof filterOrId === "string" ? { ids: [filterOrId] } : filterOrId;
const filter = typeof filterOrId === "string"
? { ids: [filterOrId] }
: filterOrId;
const results = await ndk
.fetchEvents(filter, undefined, relaySet)
.withTimeout(timeoutMs);
@ -504,7 +544,9 @@ export async function fetchEventWithFallback( @@ -504,7 +544,9 @@ export async function fetchEventWithFallback(
if (!found) {
const timeoutSeconds = timeoutMs / 1000;
const relayUrls = Array.from(relaySet.relays).map((r) => r.url).join(", ");
const relayUrls = Array.from(relaySet.relays).map((r) => r.url).join(
", ",
);
console.warn(
`fetchEventWithFallback: Event not found after ${timeoutSeconds}s timeout. Tried inbox relays: ${relayUrls}. Some relays may be offline or slow.`,
);
@ -515,14 +557,19 @@ export async function fetchEventWithFallback( @@ -515,14 +557,19 @@ export async function fetchEventWithFallback(
// Always wrap as NDKEvent
return found instanceof NDKEvent ? found : new NDKEvent(ndk, found);
} catch (err) {
if (err instanceof Error && err.message === 'Timeout') {
if (err instanceof Error && err.message === "Timeout") {
const timeoutSeconds = timeoutMs / 1000;
const relayUrls = Array.from(relaySet.relays).map((r) => r.url).join(", ");
const relayUrls = Array.from(relaySet.relays).map((r) => r.url).join(
", ",
);
console.warn(
`fetchEventWithFallback: Event fetch timed out after ${timeoutSeconds}s. Tried inbox relays: ${relayUrls}. Some relays may be offline or slow.`,
);
} else {
console.error("fetchEventWithFallback: Error in fetchEventWithFallback:", err);
console.error(
"fetchEventWithFallback: Error in fetchEventWithFallback:",
err,
);
}
return null;
}
@ -537,20 +584,22 @@ export function toNpub(pubkey: string | undefined): string | null { @@ -537,20 +584,22 @@ export function toNpub(pubkey: string | undefined): string | null {
try {
// If it's already an npub, return it
if (pubkey.startsWith("npub")) return pubkey;
// If it's a hex pubkey, convert to npub
if (new RegExp(`^[a-f0-9]{${VALIDATION.HEX_LENGTH}}$`, "i").test(pubkey)) {
return nip19.npubEncode(pubkey);
}
// If it's an nprofile, decode and extract npub
if (pubkey.startsWith("nprofile")) {
const decoded = nip19.decode(pubkey);
if (decoded.type === 'nprofile') {
return decoded.data.pubkey ? nip19.npubEncode(decoded.data.pubkey) : null;
if (decoded.type === "nprofile") {
return decoded.data.pubkey
? nip19.npubEncode(decoded.data.pubkey)
: null;
}
}
return null;
} catch {
return null;
@ -565,7 +614,10 @@ export function createRelaySetFromUrls(relayUrls: string[], ndk: NDK) { @@ -565,7 +614,10 @@ export function createRelaySetFromUrls(relayUrls: string[], ndk: NDK) {
return NDKRelaySetFromNDK.fromRelayUrls(relayUrls, ndk);
}
export function createNDKEvent(ndk: NDK, rawEvent: NDKEvent | NostrEvent | undefined) {
export function createNDKEvent(
ndk: NDK,
rawEvent: NDKEvent | NostrEvent | undefined,
) {
return new NDKEvent(ndk, rawEvent);
}

40
src/lib/utils/nostr_identifiers.ts

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
import { VALIDATION } from './search_constants';
import { VALIDATION } from "./search_constants";
/**
* Nostr identifier types
@ -22,7 +22,7 @@ export interface ParsedCoordinate { @@ -22,7 +22,7 @@ export interface ParsedCoordinate {
* @returns True if it's a valid hex event ID
*/
export function isEventId(id: string): id is NostrEventId {
return new RegExp(`^[a-f0-9]{${VALIDATION.HEX_LENGTH}}$`, 'i').test(id);
return new RegExp(`^[a-f0-9]{${VALIDATION.HEX_LENGTH}}$`, "i").test(id);
}
/**
@ -30,22 +30,24 @@ export function isEventId(id: string): id is NostrEventId { @@ -30,22 +30,24 @@ export function isEventId(id: string): id is NostrEventId {
* @param coordinate The string to check
* @returns True if it's a valid coordinate
*/
export function isCoordinate(coordinate: string): coordinate is NostrCoordinate {
const parts = coordinate.split(':');
export function isCoordinate(
coordinate: string,
): coordinate is NostrCoordinate {
const parts = coordinate.split(":");
if (parts.length < 3) return false;
const [kindStr, pubkey, ...dTagParts] = parts;
// Check if kind is a valid number
const kind = parseInt(kindStr, 10);
if (isNaN(kind) || kind < 0) return false;
// Check if pubkey is a valid hex string
if (!isEventId(pubkey)) return false;
// Check if d-tag exists (can contain colons)
if (dTagParts.length === 0) return false;
return true;
}
@ -56,14 +58,14 @@ export function isCoordinate(coordinate: string): coordinate is NostrCoordinate @@ -56,14 +58,14 @@ export function isCoordinate(coordinate: string): coordinate is NostrCoordinate
*/
export function parseCoordinate(coordinate: string): ParsedCoordinate | null {
if (!isCoordinate(coordinate)) return null;
const parts = coordinate.split(':');
const parts = coordinate.split(":");
const [kindStr, pubkey, ...dTagParts] = parts;
return {
kind: parseInt(kindStr, 10),
pubkey,
dTag: dTagParts.join(':') // Rejoin in case d-tag contains colons
dTag: dTagParts.join(":"), // Rejoin in case d-tag contains colons
};
}
@ -74,7 +76,11 @@ export function parseCoordinate(coordinate: string): ParsedCoordinate | null { @@ -74,7 +76,11 @@ export function parseCoordinate(coordinate: string): ParsedCoordinate | null {
* @param dTag The d-tag value
* @returns The coordinate string
*/
export function createCoordinate(kind: number, pubkey: string, dTag: string): NostrCoordinate {
export function createCoordinate(
kind: number,
pubkey: string,
dTag: string,
): NostrCoordinate {
return `${kind}:${pubkey}:${dTag}`;
}
@ -83,6 +89,8 @@ export function createCoordinate(kind: number, pubkey: string, dTag: string): No @@ -83,6 +89,8 @@ export function createCoordinate(kind: number, pubkey: string, dTag: string): No
* @param identifier The string to check
* @returns True if it's a valid Nostr identifier
*/
export function isNostrIdentifier(identifier: string): identifier is NostrIdentifier {
export function isNostrIdentifier(
identifier: string,
): identifier is NostrIdentifier {
return isEventId(identifier) || isCoordinate(identifier);
}
}

306
src/lib/utils/notification_utils.ts

@ -1,306 +0,0 @@ @@ -1,306 +0,0 @@
import type { NDKEvent } from "$lib/utils/nostrUtils";
import { getUserMetadata, NDKRelaySetFromNDK, toNpub } from "$lib/utils/nostrUtils";
import { get } from "svelte/store";
import { ndkInstance } from "$lib/ndk";
import { searchRelays } from "$lib/consts";
import { userStore, type UserState } from "$lib/stores/userStore";
import { buildCompleteRelaySet } from "$lib/utils/relay_management";
import { neventEncode } from "$lib/utils";
import { nip19 } from "nostr-tools";
import type NDK from "@nostr-dev-kit/ndk";
import { parseEmbeddedMarkup } from "./markup/embeddedMarkupParser";
// AI-NOTE: Notification-specific utility functions that don't exist elsewhere
/**
* Truncates content to a specified length
*/
export function truncateContent(content: string, maxLength: number = 300): string {
if (content.length <= maxLength) return content;
return content.slice(0, maxLength) + "...";
}
/**
* Truncates rendered HTML content while preserving quote boxes
*/
export function truncateRenderedContent(renderedHtml: string, maxLength: number = 300): string {
if (renderedHtml.length <= maxLength) return renderedHtml;
const hasQuoteBoxes = renderedHtml.includes('jump-to-message');
if (hasQuoteBoxes) {
const quoteBoxPattern = /<div class="block w-fit my-2 px-3 py-2 bg-gray-200[^>]*onclick="window\.dispatchEvent\(new CustomEvent\('jump-to-message'[^>]*>[^<]*<\/div>/g;
const quoteBoxes = renderedHtml.match(quoteBoxPattern) || [];
let textOnly = renderedHtml.replace(quoteBoxPattern, '|||QUOTEBOX|||');
if (textOnly.length > maxLength) {
const availableLength = maxLength - (quoteBoxes.join('').length);
if (availableLength > 50) {
textOnly = textOnly.slice(0, availableLength) + "...";
} else {
textOnly = textOnly.slice(0, 50) + "...";
}
}
let result = textOnly;
quoteBoxes.forEach(box => {
result = result.replace('|||QUOTEBOX|||', box);
});
return result;
} else {
if (renderedHtml.includes('<')) {
const truncated = renderedHtml.slice(0, maxLength);
const lastTagStart = truncated.lastIndexOf('<');
const lastTagEnd = truncated.lastIndexOf('>');
if (lastTagStart > lastTagEnd) {
return renderedHtml.slice(0, lastTagStart) + "...";
}
return truncated + "...";
} else {
return renderedHtml.slice(0, maxLength) + "...";
}
}
}
/**
* Parses content with support for embedded events
*/
export async function parseContent(content: string): Promise<string> {
if (!content) return "";
return await parseEmbeddedMarkup(content, 0);
}
/**
* Parses repost content and renders it as an embedded event
*/
export async function parseRepostContent(content: string): Promise<string> {
if (!content) return "";
try {
// Try to parse the content as JSON (repost events contain the original event as JSON)
const originalEvent = JSON.parse(content);
// Extract the original event's content
const originalContent = originalEvent.content || "";
const originalAuthor = originalEvent.pubkey || "";
const originalCreatedAt = originalEvent.created_at || 0;
const originalKind = originalEvent.kind || 1;
// Parse the original content with embedded markup support
const parsedOriginalContent = await parseEmbeddedMarkup(originalContent, 0);
// Create an embedded event display with proper structure
const formattedDate = originalCreatedAt ? new Date(originalCreatedAt * 1000).toLocaleDateString() : "Unknown date";
const shortAuthor = originalAuthor ? `${originalAuthor.slice(0, 8)}...${originalAuthor.slice(-4)}` : "Unknown";
return `
<div class="embedded-repost bg-gray-50 dark:bg-gray-800 border border-gray-200 dark:border-gray-700 rounded-lg p-4 my-2">
<!-- Event header -->
<div class="flex items-center justify-between mb-3 min-w-0">
<div class="flex items-center space-x-2 min-w-0">
<span class="text-xs text-gray-500 dark:text-gray-400 font-mono flex-shrink-0">
Kind ${originalKind}
</span>
<span class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0">
(repost)
</span>
<span class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0"></span>
<span class="text-xs text-gray-600 dark:text-gray-400 flex-shrink-0">Author:</span>
<span class="text-xs text-gray-700 dark:text-gray-300 font-mono">
${shortAuthor}
</span>
<span class="text-xs text-gray-500 dark:text-gray-400 flex-shrink-0"></span>
<span class="text-xs text-gray-500 dark:text-gray-400">
${formattedDate}
</span>
</div>
<button
class="text-xs text-primary-600 dark:text-primary-500 hover:underline flex-shrink-0"
onclick="window.location.href='/events?id=${originalEvent.id || 'unknown'}'"
>
View full event
</button>
</div>
<!-- Reposted content -->
<div class="text-sm text-gray-800 dark:text-gray-200 leading-relaxed">
${parsedOriginalContent}
</div>
</div>
`;
} catch (error) {
// If JSON parsing fails, fall back to embedded markup
console.warn("Failed to parse repost content as JSON, falling back to embedded markup:", error);
return await parseEmbeddedMarkup(content, 0);
}
}
/**
* Renders quoted content for a message
*/
export async function renderQuotedContent(message: NDKEvent, publicMessages: NDKEvent[]): Promise<string> {
const qTags = message.getMatchingTags("q");
if (qTags.length === 0) return "";
const qTag = qTags[0];
const eventId = qTag[1];
if (eventId) {
// Validate eventId format (should be 64 character hex string)
const isValidEventId = /^[a-fA-F0-9]{64}$/.test(eventId);
// First try to find in local messages
let quotedMessage = publicMessages.find(msg => msg.id === eventId);
// If not found locally, fetch from relays
if (!quotedMessage) {
try {
const ndk: NDK | undefined = get(ndkInstance);
if (ndk) {
const userStoreValue: UserState = get(userStore);
const user = userStoreValue.signedIn && userStoreValue.pubkey ? ndk.getUser({ pubkey: userStoreValue.pubkey }) : null;
const relaySet = await buildCompleteRelaySet(ndk, user);
const allRelays = [...relaySet.inboxRelays, ...relaySet.outboxRelays, ...searchRelays];
if (allRelays.length > 0) {
const ndkRelaySet = NDKRelaySetFromNDK.fromRelayUrls(allRelays, ndk);
const fetchedEvent = await ndk.fetchEvent({ ids: [eventId], limit: 1 }, undefined, ndkRelaySet);
quotedMessage = fetchedEvent || undefined;
}
}
} catch (error) {
console.warn(`[renderQuotedContent] Failed to fetch quoted event ${eventId}:`, error);
}
}
if (quotedMessage) {
const quotedContent = quotedMessage.content ? quotedMessage.content.slice(0, 200) : "No content";
const parsedContent = await parseEmbeddedMarkup(quotedContent, 0);
return `<div class="block w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors text-sm text-gray-600 dark:text-gray-300" onclick="window.dispatchEvent(new CustomEvent('jump-to-message', { detail: '${eventId}' }))">${parsedContent}</div>`;
} else {
// Fallback to nevent link - only if eventId is valid
if (isValidEventId) {
try {
const nevent = nip19.neventEncode({ id: eventId });
return `<div class="block w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded cursor-pointer hover:bg-gray-300 dark:hover:bg-gray-600 transition-colors text-sm text-gray-600 dark:text-gray-300" onclick="window.location.href='/events?id=${nevent}'">Quoted message not found. Click to view event ${eventId.slice(0, 8)}...</div>`;
} catch (error) {
console.warn(`[renderQuotedContent] Failed to encode nevent for ${eventId}:`, error);
// Fall back to just showing the event ID without a link
return `<div class="block w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded text-sm text-gray-600 dark:text-gray-300">Quoted message not found. Event ID: ${eventId.slice(0, 8)}...</div>`;
}
} else {
// Invalid event ID format
return `<div class="block w-fit my-2 px-3 py-2 bg-gray-200 dark:bg-gray-700 border-l-2 border-gray-400 dark:border-gray-500 rounded text-sm text-gray-600 dark:text-gray-300">Invalid quoted message reference</div>`;
}
}
}
return "";
}
/**
* Gets notification type based on event kind
*/
export function getNotificationType(event: NDKEvent): string {
switch (event.kind) {
case 1: return "Reply";
case 1111: return "Custom Reply";
case 9802: return "Highlight";
case 6: return "Repost";
case 16: return "Generic Repost";
case 24: return "Public Message";
default: return `Kind ${event.kind}`;
}
}
/**
* Fetches author profiles for a list of events
*/
export async function fetchAuthorProfiles(events: NDKEvent[]): Promise<Map<string, { name?: string; displayName?: string; picture?: string }>> {
const authorProfiles = new Map<string, { name?: string; displayName?: string; picture?: string }>();
const uniquePubkeys = new Set<string>();
events.forEach(event => {
if (event.pubkey) uniquePubkeys.add(event.pubkey);
});
const profilePromises = Array.from(uniquePubkeys).map(async (pubkey) => {
try {
const npub = toNpub(pubkey);
if (!npub) return;
// Try cache first
let profile = await getUserMetadata(npub, false);
if (profile && (profile.name || profile.displayName || profile.picture)) {
authorProfiles.set(pubkey, profile);
return;
}
// Try search relays
for (const relay of searchRelays) {
try {
const ndk: NDK | undefined = get(ndkInstance);
if (!ndk) break;
const relaySet = NDKRelaySetFromNDK.fromRelayUrls([relay], ndk);
const profileEvent = await ndk.fetchEvent(
{ kinds: [0], authors: [pubkey] },
undefined,
relaySet
);
if (profileEvent) {
const profileData = JSON.parse(profileEvent.content);
authorProfiles.set(pubkey, {
name: profileData.name,
displayName: profileData.display_name || profileData.displayName,
picture: profileData.picture || profileData.image
});
return;
}
} catch (error) {
console.warn(`[fetchAuthorProfiles] Failed to fetch profile from ${relay}:`, error);
}
}
// Try all available relays as fallback
try {
const ndk: NDK | undefined = get(ndkInstance);
if (!ndk) return;
const userStoreValue: UserState = get(userStore);
const user = userStoreValue.signedIn && userStoreValue.pubkey ? ndk.getUser({ pubkey: userStoreValue.pubkey }) : null;
const relaySet = await buildCompleteRelaySet(ndk, user);
const allRelays = [...relaySet.inboxRelays, ...relaySet.outboxRelays];
if (allRelays.length > 0) {
const ndkRelaySet = NDKRelaySetFromNDK.fromRelayUrls(allRelays, ndk);
const profileEvent = await ndk.fetchEvent(
{ kinds: [0], authors: [pubkey] },
undefined,
ndkRelaySet
);
if (profileEvent) {
const profileData = JSON.parse(profileEvent.content);
authorProfiles.set(pubkey, {
name: profileData.name,
displayName: profileData.display_name || profileData.displayName,
picture: profileData.picture || profileData.image
});
}
}
} catch (error) {
console.warn(`[fetchAuthorProfiles] Failed to fetch profile from all relays:`, error);
}
} catch (error) {
console.warn(`[fetchAuthorProfiles] Error processing profile for ${pubkey}:`, error);
}
});
await Promise.all(profilePromises);
return authorProfiles;
}

22
src/lib/utils/npubCache.ts

@ -4,7 +4,7 @@ export type NpubMetadata = NostrProfile; @@ -4,7 +4,7 @@ export type NpubMetadata = NostrProfile;
class NpubCache {
private cache: Record<string, NpubMetadata> = {};
private readonly storageKey = 'alexandria_npub_cache';
private readonly storageKey = "alexandria_npub_cache";
private readonly maxAge = 24 * 60 * 60 * 1000; // 24 hours in milliseconds
constructor() {
@ -13,12 +13,15 @@ class NpubCache { @@ -13,12 +13,15 @@ class NpubCache {
private loadFromStorage(): void {
try {
if (typeof window !== 'undefined') {
if (typeof window !== "undefined") {
const stored = localStorage.getItem(this.storageKey);
if (stored) {
const data = JSON.parse(stored) as Record<string, { profile: NpubMetadata; timestamp: number }>;
const data = JSON.parse(stored) as Record<
string,
{ profile: NpubMetadata; timestamp: number }
>;
const now = Date.now();
// Filter out expired entries
for (const [key, entry] of Object.entries(data)) {
if (entry.timestamp && (now - entry.timestamp) < this.maxAge) {
@ -28,21 +31,24 @@ class NpubCache { @@ -28,21 +31,24 @@ class NpubCache {
}
}
} catch (error) {
console.warn('Failed to load npub cache from storage:', error);
console.warn("Failed to load npub cache from storage:", error);
}
}
private saveToStorage(): void {
try {
if (typeof window !== 'undefined') {
const data: Record<string, { profile: NpubMetadata; timestamp: number }> = {};
if (typeof window !== "undefined") {
const data: Record<
string,
{ profile: NpubMetadata; timestamp: number }
> = {};
for (const [key, profile] of Object.entries(this.cache)) {
data[key] = { profile, timestamp: Date.now() };
}
localStorage.setItem(this.storageKey, JSON.stringify(data));
}
} catch (error) {
console.warn('Failed to save npub cache to storage:', error);
console.warn("Failed to save npub cache to storage:", error);
}
}

81
src/lib/utils/profileCache.ts

@ -1,6 +1,4 @@ @@ -1,6 +1,4 @@
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import { ndkInstance } from "$lib/ndk";
import { get } from "svelte/store";
import NDK, { type NDKEvent } from "@nostr-dev-kit/ndk";
import { nip19 } from "nostr-tools";
import { toNpub } from "./nostrUtils";
@ -19,13 +17,12 @@ const profileCache = new Map<string, ProfileData>(); @@ -19,13 +17,12 @@ const profileCache = new Map<string, ProfileData>();
* @param pubkey - The public key to fetch profile for
* @returns Profile data or null if not found
*/
async function fetchProfile(pubkey: string): Promise<ProfileData | null> {
async function fetchProfile(pubkey: string, ndk: NDK): Promise<ProfileData | null> {
try {
const ndk = get(ndkInstance);
const profileEvents = await ndk.fetchEvents({
kinds: [0],
authors: [pubkey],
limit: 1
limit: 1,
});
if (profileEvents.size === 0) {
@ -34,7 +31,7 @@ async function fetchProfile(pubkey: string): Promise<ProfileData | null> { @@ -34,7 +31,7 @@ async function fetchProfile(pubkey: string): Promise<ProfileData | null> {
// Get the most recent profile event
const profileEvent = Array.from(profileEvents)[0];
try {
const content = JSON.parse(profileEvent.content);
return content as ProfileData;
@ -53,7 +50,7 @@ async function fetchProfile(pubkey: string): Promise<ProfileData | null> { @@ -53,7 +50,7 @@ async function fetchProfile(pubkey: string): Promise<ProfileData | null> {
* @param pubkey - The public key to get display name for
* @returns Display name, name, or shortened npub (never hex ID)
*/
export async function getDisplayName(pubkey: string): Promise<string> {
export async function getDisplayName(pubkey: string, ndk: NDK): Promise<string> {
// Check cache first
if (profileCache.has(pubkey)) {
const profile = profileCache.get(pubkey)!;
@ -62,7 +59,7 @@ export async function getDisplayName(pubkey: string): Promise<string> { @@ -62,7 +59,7 @@ export async function getDisplayName(pubkey: string): Promise<string> {
}
// Fetch profile
const profile = await fetchProfile(pubkey);
const profile = await fetchProfile(pubkey, ndk);
if (profile) {
profileCache.set(pubkey, profile);
const npub = toNpub(pubkey);
@ -81,36 +78,38 @@ export async function getDisplayName(pubkey: string): Promise<string> { @@ -81,36 +78,38 @@ export async function getDisplayName(pubkey: string): Promise<string> {
* @returns Array of profile events
*/
export async function batchFetchProfiles(
pubkeys: string[],
onProgress?: (fetched: number, total: number) => void
pubkeys: string[],
ndk: NDK,
onProgress?: (fetched: number, total: number) => void,
): Promise<NDKEvent[]> {
const allProfileEvents: NDKEvent[] = [];
// Filter out already cached pubkeys
const uncachedPubkeys = pubkeys.filter(pk => !profileCache.has(pk));
const uncachedPubkeys = pubkeys.filter((pk) => !profileCache.has(pk));
if (uncachedPubkeys.length === 0) {
if (onProgress) onProgress(pubkeys.length, pubkeys.length);
return allProfileEvents;
}
try {
const ndk = get(ndkInstance);
// Report initial progress
const cachedCount = pubkeys.length - uncachedPubkeys.length;
if (onProgress) onProgress(cachedCount, pubkeys.length);
// Batch fetch in chunks to avoid overwhelming relays
const CHUNK_SIZE = 50;
let fetchedCount = cachedCount;
for (let i = 0; i < uncachedPubkeys.length; i += CHUNK_SIZE) {
const chunk = uncachedPubkeys.slice(i, Math.min(i + CHUNK_SIZE, uncachedPubkeys.length));
const chunk = uncachedPubkeys.slice(
i,
Math.min(i + CHUNK_SIZE, uncachedPubkeys.length),
);
const profileEvents = await ndk.fetchEvents({
kinds: [0],
authors: chunk
authors: chunk,
});
// Process each profile event
@ -124,19 +123,19 @@ export async function batchFetchProfiles( @@ -124,19 +123,19 @@ export async function batchFetchProfiles(
console.error("Failed to parse profile content:", e);
}
});
// Update progress
if (onProgress) {
onProgress(fetchedCount, pubkeys.length);
}
}
// Final progress update
if (onProgress) onProgress(pubkeys.length, pubkeys.length);
} catch (e) {
console.error("Failed to batch fetch profiles:", e);
}
return allProfileEvents;
}
@ -179,29 +178,29 @@ export function clearProfileCache(): void { @@ -179,29 +178,29 @@ export function clearProfileCache(): void {
*/
export function extractPubkeysFromEvents(events: NDKEvent[]): Set<string> {
const pubkeys = new Set<string>();
events.forEach(event => {
events.forEach((event) => {
// Add author pubkey
if (event.pubkey) {
pubkeys.add(event.pubkey);
}
// Add pubkeys from p tags
const pTags = event.getMatchingTags("p");
pTags.forEach(tag => {
pTags.forEach((tag) => {
if (tag[1]) {
pubkeys.add(tag[1]);
}
});
// Extract pubkeys from content (nostr:npub1... format)
const npubPattern = /nostr:npub1[a-z0-9]{58}/g;
const matches = event.content?.match(npubPattern) || [];
matches.forEach(match => {
matches.forEach((match) => {
try {
const npub = match.replace('nostr:', '');
const npub = match.replace("nostr:", "");
const decoded = nip19.decode(npub);
if (decoded.type === 'npub') {
if (decoded.type === "npub") {
pubkeys.add(decoded.data as string);
}
} catch (e) {
@ -209,7 +208,7 @@ export function extractPubkeysFromEvents(events: NDKEvent[]): Set<string> { @@ -209,7 +208,7 @@ export function extractPubkeysFromEvents(events: NDKEvent[]): Set<string> {
}
});
});
return pubkeys;
}
@ -220,17 +219,17 @@ export function extractPubkeysFromEvents(events: NDKEvent[]): Set<string> { @@ -220,17 +219,17 @@ export function extractPubkeysFromEvents(events: NDKEvent[]): Set<string> {
*/
export function replaceContentPubkeys(content: string): string {
if (!content) return content;
// Replace nostr:npub1... references
const npubPattern = /nostr:npub[a-z0-9]{58}/g;
let result = content;
const matches = content.match(npubPattern) || [];
matches.forEach(match => {
matches.forEach((match) => {
try {
const npub = match.replace('nostr:', '');
const npub = match.replace("nostr:", "");
const decoded = nip19.decode(npub);
if (decoded.type === 'npub') {
if (decoded.type === "npub") {
const pubkey = decoded.data as string;
const displayName = getDisplayNameSync(pubkey);
result = result.replace(match, `@${displayName}`);
@ -239,7 +238,7 @@ export function replaceContentPubkeys(content: string): string { @@ -239,7 +238,7 @@ export function replaceContentPubkeys(content: string): string {
// Invalid npub, leave as is
}
});
return result;
}
@ -251,8 +250,8 @@ export function replaceContentPubkeys(content: string): string { @@ -251,8 +250,8 @@ export function replaceContentPubkeys(content: string): string {
export function replacePubkeysWithDisplayNames(text: string): string {
// Match hex pubkeys (64 characters)
const pubkeyRegex = /\b[0-9a-fA-F]{64}\b/g;
return text.replace(pubkeyRegex, (match) => {
return getDisplayNameSync(match);
});
}
}

822
src/lib/utils/profile_search.ts

@ -1,428 +1,149 @@ @@ -1,428 +1,149 @@
import { ndkInstance, activeInboxRelays, activeOutboxRelays } from "../ndk.ts";
import { getUserMetadata, getNpubFromNip05 } from "./nostrUtils.ts";
import NDK, { NDKRelaySet, NDKEvent } from "@nostr-dev-kit/ndk";
import { activeInboxRelays } from "../ndk.ts";
import { getNpubFromNip05, getUserMetadata } from "./nostrUtils.ts";
import NDK, { NDKEvent, NDKRelaySet } from "@nostr-dev-kit/ndk";
import { searchCache } from "./searchCache.ts";
import { searchRelays, communityRelays, secondaryRelays, localRelays } from "../consts.ts";
import { communityRelays, searchRelays, secondaryRelays } from "../consts.ts";
import { get } from "svelte/store";
import type { NostrProfile, ProfileSearchResult } from "./search_types.ts";
import {
createProfileFromEvent,
fieldMatches,
nip05Matches,
normalizeSearchTerm,
createProfileFromEvent,
} from "./search_utils.ts";
import {
fetchCurrentUserLists,
getPubkeysFromUserLists,
isPubkeyInUserLists,
getListKindsForPubkey,
updateProfileCacheForPubkeys,
PEOPLE_LIST_KINDS
} from "./user_lists.ts";
import { nip19 } from "nostr-tools";
import { TIMEOUTS, SEARCH_LIMITS, CACHE_DURATIONS } from "./search_constants.ts";
// AI-NOTE: 2025-01-24 - User list cache with stale-while-revalidate for performance
// This prevents redundant relay queries by caching user lists for 5 minutes
// Fresh cache: Return immediately
// Stale cache: Return stale data immediately, update in background
// No cache: Wait for fresh data
/**
* User list cache interface
*/
interface UserListCache {
lists: any[];
pubkeys: Set<string>;
lastUpdated: number;
isUpdating: boolean;
}
/**
* Search strategy types
*/
type SearchStrategy = 'npub' | 'nip05' | 'userLists' | 'nip05Domains' | 'relaySearch';
/**
* Global user list cache instance
*/
let userListCache: UserListCache | null = null;
/**
* Get user lists with stale-while-revalidate caching
* Returns cached data immediately if available, updates in background if stale
*/
async function getUserListsWithCache(): Promise<{ lists: any[]; pubkeys: Set<string> }> {
const now = Date.now();
// If we have fresh cache, return it immediately
if (userListCache && (now - userListCache.lastUpdated) < CACHE_DURATIONS.SEARCH_CACHE) {
console.log("profile_search: Using fresh user list cache");
return {
lists: userListCache.lists,
pubkeys: userListCache.pubkeys
};
}
// If we have stale cache and no update in progress, return stale data and update in background
if (userListCache && !userListCache.isUpdating) {
console.log("profile_search: Using stale user list cache, updating in background");
// Start background update
userListCache.isUpdating = true;
updateUserListCacheInBackground().catch(error => {
console.warn("profile_search: Background user list cache update failed:", error);
if (userListCache) {
userListCache.isUpdating = false;
}
});
return {
lists: userListCache.lists,
pubkeys: userListCache.pubkeys
};
}
// If no cache or update in progress, wait for fresh data
console.log("profile_search: Fetching fresh user lists");
return await updateUserListCache();
}
/**
* Update user list cache in background
*/
async function updateUserListCacheInBackground(): Promise<void> {
try {
const { lists, pubkeys } = await updateUserListCache();
console.log("profile_search: Background user list cache update completed");
} catch (error) {
console.warn("profile_search: Background user list cache update failed:", error);
} finally {
if (userListCache) {
userListCache.isUpdating = false;
}
}
}
/**
* Update user list cache with fresh data
* Search for profiles by various criteria (display name, name, NIP-05, npub)
*/
async function updateUserListCache(): Promise<{ lists: any[]; pubkeys: Set<string> }> {
const lists = await fetchCurrentUserLists([...PEOPLE_LIST_KINDS]);
const pubkeys = getPubkeysFromUserLists(lists);
userListCache = {
lists,
pubkeys,
lastUpdated: Date.now(),
isUpdating: false
};
console.log(`profile_search: Updated user list cache with ${lists.length} lists and ${pubkeys.size} pubkeys`);
// Update profile cache for all user list pubkeys to ensure follows are cached
if (pubkeys.size > 0) {
updateProfileCacheForPubkeys(Array.from(pubkeys)).catch(error => {
console.warn("profile_search: Failed to update profile cache:", error);
});
}
return { lists, pubkeys };
}
export async function searchProfiles(
searchTerm: string,
ndk: NDK,
): Promise<ProfileSearchResult> {
const normalizedSearchTerm = normalizeSearchTerm(searchTerm);
/**
* Clear user list cache (useful for logout or force refresh)
*/
export function clearUserListCache(): void {
userListCache = null;
console.log("profile_search: User list cache cleared");
}
console.log(
"searchProfiles called with:",
searchTerm,
"normalized:",
normalizedSearchTerm,
);
/**
* Force refresh user list cache (useful when user follows/unfollows someone)
*/
export async function refreshUserListCache(): Promise<void> {
console.log("profile_search: Forcing user list cache refresh");
userListCache = null;
await updateUserListCache();
}
// Check cache first
const cachedResult = searchCache.get("profile", normalizedSearchTerm);
if (cachedResult) {
console.log("Found cached result for:", normalizedSearchTerm);
const profiles = cachedResult.events
.map((event) => {
try {
const profileData = JSON.parse(event.content);
return createProfileFromEvent(event, profileData);
} catch {
return null;
}
})
.filter(Boolean) as NostrProfile[];
/**
* Get user list cache status for debugging
*/
export function getUserListCacheStatus(): {
hasCache: boolean;
isStale: boolean;
isUpdating: boolean;
ageMinutes: number | null;
listCount: number | null;
pubkeyCount: number | null;
} {
if (!userListCache) {
return {
hasCache: false,
isStale: false,
isUpdating: false,
ageMinutes: null,
listCount: null,
pubkeyCount: null
};
console.log("Cached profiles found:", profiles.length);
return { profiles, Status: {} };
}
const now = Date.now();
const ageMs = now - userListCache.lastUpdated;
const ageMinutes = Math.round(ageMs / (60 * 1000));
const isStale = ageMs > CACHE_DURATIONS.SEARCH_CACHE;
return {
hasCache: true,
isStale,
isUpdating: userListCache.isUpdating,
ageMinutes,
listCount: userListCache.lists.length,
pubkeyCount: userListCache.pubkeys.size
};
}
/**
* Wait for NDK to be properly initialized
*/
async function waitForNdk(): Promise<NDK> {
let ndk = get(ndkInstance);
if (!ndk) {
console.log("profile_search: Waiting for NDK initialization...");
let retryCount = 0;
const maxRetries = 10;
const retryDelay = 500; // milliseconds
while (retryCount < maxRetries && !ndk) {
await new Promise(resolve => setTimeout(resolve, retryDelay));
ndk = get(ndkInstance);
retryCount++;
}
if (!ndk) {
console.error("profile_search: NDK not initialized after waiting");
throw new Error("NDK not initialized");
}
console.error("NDK not initialized");
throw new Error("NDK not initialized");
}
return ndk;
}
/**
* Check if search term is a valid npub/nprofile identifier
*/
function isNostrIdentifier(searchTerm: string): boolean {
return searchTerm.startsWith("npub") || searchTerm.startsWith("nprofile");
}
/**
* Check if search term is a NIP-05 address
*/
function isNip05Address(searchTerm: string): boolean {
return searchTerm.includes("@");
}
console.log("NDK initialized, starting search logic");
/**
* Determine search strategy based on search term
*/
function determineSearchStrategy(searchTerm: string): SearchStrategy {
if (isNostrIdentifier(searchTerm)) {
return 'npub';
}
if (isNip05Address(searchTerm)) {
return 'nip05';
}
return 'userLists'; // Default to user lists first, then other strategies
}
let foundProfiles: NostrProfile[] = [];
/**
* Search for profiles by npub/nprofile identifier
*/
async function searchByNostrIdentifier(searchTerm: string, ndk: NDK): Promise<NostrProfile[]> {
try {
const cleanId = searchTerm.replace(/^nostr:/, "");
const decoded = nip19.decode(cleanId);
if (!decoded) {
return [];
}
let pubkey: string;
if (decoded.type === "npub") {
pubkey = decoded.data;
} else if (decoded.type === "nprofile") {
pubkey = decoded.data.pubkey;
} else {
console.warn("Unsupported identifier type:", decoded.type);
return [];
}
// AI-NOTE: 2025-01-24 - For npub/nprofile searches, fetch the actual event to preserve timestamp
const events = await ndk.fetchEvents({
kinds: [0],
authors: [pubkey],
});
if (events.size > 0) {
// Get the most recent profile event
const event = Array.from(events).sort((a, b) =>
(b.created_at || 0) - (a.created_at || 0)
)[0];
if (event && event.content) {
try {
const profileData = JSON.parse(event.content);
const profile = createProfileFromEvent(event, profileData);
return [profile];
} catch (error) {
console.error("Error parsing profile content for npub:", error);
// Check if it's a valid npub/nprofile first
if (
normalizedSearchTerm.startsWith("npub") ||
normalizedSearchTerm.startsWith("nprofile")
) {
try {
const metadata = await getUserMetadata(normalizedSearchTerm, ndk);
if (metadata) {
foundProfiles = [metadata];
}
} catch (error) {
console.error("Error fetching metadata for npub:", error);
}
}
// Fallback to metadata
const metadata = await getUserMetadata(searchTerm);
const profileWithPubkey: NostrProfile = {
...metadata,
pubkey: pubkey,
};
return [profileWithPubkey];
} catch (error) {
console.error("Error fetching metadata for npub:", error);
return [];
}
}
/**
* Search for profiles by NIP-05 address
*/
async function searchByNip05Address(searchTerm: string): Promise<NostrProfile[]> {
try {
const normalizedNip05 = searchTerm.toLowerCase();
const npub = await getNpubFromNip05(normalizedNip05);
if (npub) {
const metadata = await getUserMetadata(npub);
const profile: NostrProfile = {
...metadata,
pubkey: npub,
};
return [profile];
}
} catch (error) {
console.error("[Search] NIP-05 lookup failed:", error);
}
return [];
}
/**
* Fuzzy match function for user list searches
*/
function fuzzyMatch(text: string, searchTerm: string): boolean {
if (!text || !searchTerm) return false;
const normalizedText = text.toLowerCase();
const normalizedSearchTerm = searchTerm.toLowerCase();
// Direct substring match
if (normalizedText.includes(normalizedSearchTerm)) {
return true;
}
// AI-NOTE: 2025-01-24 - More strict word boundary matching for profile searches
// Only match if the search term is a significant part of a word
const words = normalizedText.split(/[\s\-_\.]+/);
for (const word of words) {
// Only match if search term is at least 3 characters and represents a significant part of the word
if (normalizedSearchTerm.length >= 3) {
if (word.includes(normalizedSearchTerm) || normalizedSearchTerm.includes(word)) {
return true;
} else if (normalizedSearchTerm.includes("@")) {
// Check if it's a NIP-05 address - normalize it properly
const normalizedNip05 = normalizedSearchTerm.toLowerCase();
try {
const npub = await getNpubFromNip05(normalizedNip05);
if (npub) {
const metadata = await getUserMetadata(npub, ndk);
const profile: NostrProfile = {
...metadata,
pubkey: npub,
};
foundProfiles = [profile];
}
} catch (e) {
console.error("[Search] NIP-05 lookup failed:", e);
}
}
}
return false;
}
} else {
// Try NIP-05 search first (faster than relay search)
console.log("Starting NIP-05 search for:", normalizedSearchTerm);
foundProfiles = await searchNip05Domains(normalizedSearchTerm, ndk);
console.log(
"NIP-05 search completed, found:",
foundProfiles.length,
"profiles",
);
/**
* Search for profiles within user's lists with fuzzy matching
*/
async function searchWithinUserLists(
searchTerm: string,
userLists: any[],
ndk: NDK,
): Promise<NostrProfile[]> {
const normalizedSearchTerm = normalizeSearchTerm(searchTerm);
const foundProfiles: NostrProfile[] = [];
const processedPubkeys = new Set<string>();
// Get all pubkeys from user lists
const allPubkeys: string[] = [];
userLists.forEach(list => {
list.pubkeys.forEach((pubkey: string) => {
if (!processedPubkeys.has(pubkey)) {
allPubkeys.push(pubkey);
processedPubkeys.add(pubkey);
// If no NIP-05 results, try quick relay search
if (foundProfiles.length === 0) {
console.log("No NIP-05 results, trying quick relay search");
foundProfiles = await quickRelaySearch(normalizedSearchTerm, ndk);
console.log(
"Quick relay search completed, found:",
foundProfiles.length,
"profiles",
);
}
});
});
if (allPubkeys.length === 0) {
return foundProfiles;
}
console.log(`searchWithinUserLists: Searching ${allPubkeys.length} pubkeys from user lists with fuzzy matching`);
}
// Fetch profiles for all pubkeys in batches
for (let i = 0; i < allPubkeys.length; i += SEARCH_LIMITS.BATCH_SIZE) {
const batch = allPubkeys.slice(i, i + SEARCH_LIMITS.BATCH_SIZE);
try {
const events = await ndk.fetchEvents({
kinds: [0],
authors: batch,
// Cache the results
if (foundProfiles.length > 0) {
const events = foundProfiles.map((profile) => {
const event = new NDKEvent(ndk);
event.content = JSON.stringify(profile);
event.pubkey = profile.pubkey || "";
return event;
});
for (const event of events) {
try {
if (!event.content) continue;
const profileData = JSON.parse(event.content);
const displayName = profileData.displayName || profileData.display_name || "";
const name = profileData.name || "";
const nip05 = profileData.nip05 || "";
const about = profileData.about || "";
// Check if any field matches the search term with exact field matching only
const matchesDisplayName = fieldMatches(displayName, normalizedSearchTerm);
const matchesName = fieldMatches(name, normalizedSearchTerm);
const matchesNip05 = nip05Matches(nip05, normalizedSearchTerm);
const matchesAbout = fieldMatches(about, normalizedSearchTerm);
if (matchesDisplayName || matchesName || matchesNip05 || matchesAbout) {
const profile = createProfileFromEvent(event, profileData);
foundProfiles.push(profile);
}
} catch {
// Invalid JSON, skip
}
}
} catch (error) {
console.warn("searchWithinUserLists: Error fetching batch:", error);
const result = {
events,
secondOrder: [],
tTagEvents: [],
eventIds: new Set<string>(),
addresses: new Set<string>(),
searchType: "profile",
searchTerm: normalizedSearchTerm,
};
searchCache.set("profile", normalizedSearchTerm, result);
}
}
console.log(`searchWithinUserLists: Found ${foundProfiles.length} matching profiles in user lists with fuzzy matching`);
return foundProfiles;
console.log("Search completed, found profiles:", foundProfiles.length);
return { profiles: foundProfiles, Status: {} };
} catch (error) {
console.error("Error searching profiles:", error);
return { profiles: [], Status: {} };
}
}
/**
* Search for NIP-05 addresses across common domains
*/
async function searchNip05Domains(searchTerm: string): Promise<NostrProfile[]> {
async function searchNip05Domains(
searchTerm: string,
ndk: NDK,
): Promise<NostrProfile[]> {
const foundProfiles: NostrProfile[] = [];
// Enhanced list of common domains for NIP-05 lookups
@ -460,25 +181,33 @@ async function searchNip05Domains(searchTerm: string): Promise<NostrProfile[]> { @@ -460,25 +181,33 @@ async function searchNip05Domains(searchTerm: string): Promise<NostrProfile[]> {
try {
const npub = await getNpubFromNip05(gitcitadelAddress);
if (npub) {
console.log("NIP-05 search: SUCCESS! found npub for gitcitadel.com:", npub);
const metadata = await getUserMetadata(npub);
console.log(
"NIP-05 search: SUCCESS! found npub for gitcitadel.com:",
npub,
);
const metadata = await getUserMetadata(npub, ndk);
const profile: NostrProfile = {
...metadata,
pubkey: npub,
};
console.log("NIP-05 search: created profile for gitcitadel.com:", profile);
console.log(
"NIP-05 search: created profile for gitcitadel.com:",
profile,
);
foundProfiles.push(profile);
return foundProfiles; // Return immediately if we found it on gitcitadel.com
} else {
console.log("NIP-05 search: no npub found for gitcitadel.com");
}
} catch (error) {
console.log("NIP-05 search: error for gitcitadel.com:", error);
} catch (e) {
console.log("NIP-05 search: error for gitcitadel.com:", e);
}
// If gitcitadel.com didn't work, try other domains
console.log("NIP-05 search: gitcitadel.com failed, trying other domains...");
const otherDomains = commonDomains.filter(domain => domain !== "gitcitadel.com");
const otherDomains = commonDomains.filter(
(domain) => domain !== "gitcitadel.com",
);
// Search all other domains in parallel with timeout
const searchPromises = otherDomains.map(async (domain) => {
@ -488,18 +217,23 @@ async function searchNip05Domains(searchTerm: string): Promise<NostrProfile[]> { @@ -488,18 +217,23 @@ async function searchNip05Domains(searchTerm: string): Promise<NostrProfile[]> {
const npub = await getNpubFromNip05(nip05Address);
if (npub) {
console.log("NIP-05 search: found npub for", nip05Address, ":", npub);
const metadata = await getUserMetadata(npub);
const metadata = await getUserMetadata(npub, ndk);
const profile: NostrProfile = {
...metadata,
pubkey: npub,
};
console.log("NIP-05 search: created profile for", nip05Address, ":", profile);
console.log(
"NIP-05 search: created profile for",
nip05Address,
":",
profile,
);
return profile;
} else {
console.log("NIP-05 search: no npub found for", nip05Address);
}
} catch (error) {
console.log("NIP-05 search: error for", nip05Address, ":", error);
} catch (e) {
console.log("NIP-05 search: error for", nip05Address, ":", e);
// Continue to next domain
}
return null;
@ -518,57 +252,39 @@ async function searchNip05Domains(searchTerm: string): Promise<NostrProfile[]> { @@ -518,57 +252,39 @@ async function searchNip05Domains(searchTerm: string): Promise<NostrProfile[]> {
return foundProfiles;
}
/**
* Get all available relay URLs for comprehensive search
*/
function getAllRelayUrls(): string[] {
const userInboxRelays = get(activeInboxRelays);
const userOutboxRelays = get(activeOutboxRelays);
// AI-NOTE: 2025-01-24 - Use ALL available relays for comprehensive profile search coverage
// This includes all relays from consts.ts, user's personal relays, and local relays
const allRelayUrls = [
...searchRelays, // Dedicated profile search relays
...communityRelays, // Community relays
...secondaryRelays, // Secondary relays
...localRelays, // Local relays
...userInboxRelays, // User's personal inbox relays
...userOutboxRelays // User's personal outbox relays
];
// Deduplicate relay URLs
return [...new Set(allRelayUrls)];
}
/**
* Quick relay search with short timeout
*/
async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProfile[]> {
async function quickRelaySearch(
searchTerm: string,
ndk: NDK,
): Promise<NostrProfile[]> {
console.log("quickRelaySearch called with:", searchTerm);
// Normalize the search term for relay search
const normalizedSearchTerm = normalizeSearchTerm(searchTerm);
console.log("Normalized search term for relay search:", normalizedSearchTerm);
const uniqueRelayUrls = getAllRelayUrls();
console.log("Using ALL available relays for profile search:", uniqueRelayUrls);
console.log("Relay breakdown:", {
searchRelays: searchRelays.length,
communityRelays: communityRelays.length,
secondaryRelays: secondaryRelays.length,
localRelays: localRelays.length,
userInboxRelays: get(activeInboxRelays).length,
userOutboxRelays: get(activeOutboxRelays).length,
totalUnique: uniqueRelayUrls.length
});
// Use search relays (optimized for profiles) + user's inbox relays + community relays
const userInboxRelays = get(activeInboxRelays);
const quickRelayUrls = [
...searchRelays, // Dedicated profile search relays
...userInboxRelays, // User's personal inbox relays
...communityRelays, // Community relays
...secondaryRelays, // Secondary relays as fallback
];
// Deduplicate relay URLs
const uniqueRelayUrls = [...new Set(quickRelayUrls)];
console.log("Using relays for profile search:", uniqueRelayUrls);
// Create relay sets for parallel search
const relaySets = uniqueRelayUrls
.map((url) => {
try {
return NDKRelaySet.fromRelayUrls([url], ndk);
} catch (error) {
console.warn(`Failed to create relay set for ${url}:`, error);
} catch (e) {
console.warn(`Failed to create relay set for ${url}:`, e);
return null;
}
})
@ -582,7 +298,9 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf @@ -582,7 +298,9 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf
const foundInRelay: NostrProfile[] = [];
let eventCount = 0;
console.log(`Starting search on relay ${index + 1}: ${uniqueRelayUrls[index]}`);
console.log(
`Starting search on relay ${index + 1}: ${uniqueRelayUrls[index]}`,
);
const sub = ndk.subscribe(
{ kinds: [0] },
@ -595,15 +313,22 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf @@ -595,15 +313,22 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf
try {
if (!event.content) return;
const profileData = JSON.parse(event.content);
const displayName = profileData.displayName || profileData.display_name || "";
const displayName = profileData.displayName ||
profileData.display_name || "";
const display_name = profileData.display_name || "";
const name = profileData.name || "";
const nip05 = profileData.nip05 || "";
const about = profileData.about || "";
// Check if any field matches the search term using exact field matching only
const matchesDisplayName = fieldMatches(displayName, normalizedSearchTerm);
const matchesDisplay_name = fieldMatches(display_name, normalizedSearchTerm);
// Check if any field matches the search term using normalized comparison
const matchesDisplayName = fieldMatches(
displayName,
normalizedSearchTerm,
);
const matchesDisplay_name = fieldMatches(
display_name,
normalizedSearchTerm,
);
const matchesName = fieldMatches(name, normalizedSearchTerm);
const matchesNip05 = nip05Matches(nip05, normalizedSearchTerm);
const matchesAbout = fieldMatches(about, normalizedSearchTerm);
@ -639,7 +364,9 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf @@ -639,7 +364,9 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf
sub.on("eose", () => {
console.log(
`Relay ${index + 1} (${uniqueRelayUrls[index]}) search completed, processed ${eventCount} events, found ${foundInRelay.length} matches`,
`Relay ${index + 1} (${
uniqueRelayUrls[index]
}) search completed, processed ${eventCount} events, found ${foundInRelay.length} matches`,
);
resolve(foundInRelay);
});
@ -647,11 +374,13 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf @@ -647,11 +374,13 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf
// Short timeout for quick search
setTimeout(() => {
console.log(
`Relay ${index + 1} (${uniqueRelayUrls[index]}) search timed out after 1.5s, processed ${eventCount} events, found ${foundInRelay.length} matches`,
`Relay ${index + 1} (${
uniqueRelayUrls[index]
}) search timed out after 1.5s, processed ${eventCount} events, found ${foundInRelay.length} matches`,
);
sub.stop();
resolve(foundInRelay);
}, TIMEOUTS.RELAY_TIMEOUT);
}, 1500); // 1.5 second timeout per relay
});
});
@ -671,211 +400,8 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf @@ -671,211 +400,8 @@ async function quickRelaySearch(searchTerm: string, ndk: NDK): Promise<NostrProf
}
}
console.log(`Total unique profiles found: ${Object.keys(allProfiles).length}`);
console.log(
`Total unique profiles found: ${Object.keys(allProfiles).length}`,
);
return Object.values(allProfiles);
}
/**
* Add user list information to profiles and prioritize them
*/
function prioritizeProfiles(profiles: NostrProfile[], userLists: any[]): NostrProfile[] {
return profiles.map(profile => {
if (profile.pubkey) {
const inLists = isPubkeyInUserLists(profile.pubkey, userLists);
const listKinds = getListKindsForPubkey(profile.pubkey, userLists);
return {
...profile,
isInUserLists: inLists,
listKinds: listKinds,
};
}
return profile;
}).sort((a, b) => {
const aInLists = a.isInUserLists || false;
const bInLists = b.isInUserLists || false;
if (aInLists && !bInLists) return -1;
if (!aInLists && bInLists) return 1;
// If both are in lists, prioritize by list kind (follows first)
if (aInLists && bInLists && a.listKinds && b.listKinds) {
const aHasFollows = a.listKinds.includes(3);
const bHasFollows = b.listKinds.includes(3);
if (aHasFollows && !bHasFollows) return -1;
if (!aHasFollows && bHasFollows) return 1;
}
return 0;
});
}
/**
* Cache search results
*/
function cacheSearchResults(profiles: NostrProfile[], searchTerm: string, ndk: NDK): void {
if (profiles.length > 0) {
const events = profiles.map((profile) => {
const event = new NDKEvent(ndk);
event.content = JSON.stringify(profile);
event.pubkey = profile.pubkey || "";
// AI-NOTE: 2025-01-24 - Preserve timestamp for proper date display
if (profile.created_at) {
event.created_at = profile.created_at;
}
return event;
});
const result = {
events,
secondOrder: [],
tTagEvents: [],
eventIds: new Set<string>(),
addresses: new Set<string>(),
searchType: "profile",
searchTerm: searchTerm,
};
searchCache.set("profile", searchTerm, result);
}
}
/**
* Get cached search results
*/
function getCachedResults(searchTerm: string): NostrProfile[] | null {
const cachedResult = searchCache.get("profile", searchTerm);
if (cachedResult) {
console.log("Found cached result for:", searchTerm);
const profiles = cachedResult.events
.map((event) => {
try {
const profileData = JSON.parse(event.content);
return createProfileFromEvent(event, profileData);
} catch {
return null;
}
})
.filter(Boolean) as NostrProfile[];
console.log("Cached profiles found:", profiles.length);
return profiles;
}
return null;
}
/**
* Execute search strategy based on search term type
*/
async function executeSearchStrategy(
strategy: SearchStrategy,
searchTerm: string,
ndk: NDK,
userLists: any[],
): Promise<NostrProfile[]> {
switch (strategy) {
case 'npub':
return await searchByNostrIdentifier(searchTerm, ndk);
case 'nip05':
return await searchByNip05Address(searchTerm);
case 'userLists':
const foundProfiles: NostrProfile[] = [];
// First, search within user's lists for exact matches
if (userLists.length > 0) {
console.log("Searching within user's lists first for:", searchTerm);
const listMatches = await searchWithinUserLists(searchTerm, userLists, ndk);
foundProfiles.push(...listMatches);
console.log("User list search completed, found:", listMatches.length, "profiles");
}
// If we found enough matches in user lists, return them
if (foundProfiles.length >= 5) {
console.log("Found sufficient matches in user lists, skipping other searches");
return foundProfiles;
}
// Try NIP-05 search (faster than relay search)
console.log("Starting NIP-05 search for:", searchTerm);
const nip05Profiles = await searchNip05Domains(searchTerm);
console.log("NIP-05 search completed, found:", nip05Profiles.length, "profiles");
foundProfiles.push(...nip05Profiles);
// If still not enough results, try quick relay search
if (foundProfiles.length < 10) {
console.log("Not enough results, trying quick relay search");
const relayProfiles = await quickRelaySearch(searchTerm, ndk);
console.log("Quick relay search completed, found:", relayProfiles.length, "profiles");
foundProfiles.push(...relayProfiles);
}
// AI-NOTE: 2025-01-24 - Limit results to prevent overwhelming the UI
// For profile searches, we want quality over quantity
if (foundProfiles.length > SEARCH_LIMITS.MAX_PROFILE_RESULTS) {
console.log(`Limiting results from ${foundProfiles.length} to ${SEARCH_LIMITS.MAX_PROFILE_RESULTS} most relevant profiles`);
return foundProfiles.slice(0, SEARCH_LIMITS.MAX_PROFILE_RESULTS);
}
return foundProfiles;
default:
return [];
}
}
/**
* Search for profiles by various criteria (display name, name, NIP-05, npub)
* Prioritizes profiles from user's lists (follows, etc.)
*/
export async function searchProfiles(searchTerm: string): Promise<ProfileSearchResult> {
const normalizedSearchTerm = normalizeSearchTerm(searchTerm);
console.log("searchProfiles called with:", searchTerm, "normalized:", normalizedSearchTerm);
// Check cache first
const cachedProfiles = getCachedResults(normalizedSearchTerm);
if (cachedProfiles) {
return { profiles: cachedProfiles, Status: {} };
}
// Get user lists with stale-while-revalidate caching
let userLists: any[] = [];
let userPubkeys: Set<string> = new Set();
try {
const userListResult = await getUserListsWithCache();
userLists = userListResult.lists;
userPubkeys = userListResult.pubkeys;
console.log(`searchProfiles: Using user lists - ${userLists.length} lists with ${userPubkeys.size} unique pubkeys`);
} catch (error) {
console.warn("searchProfiles: Failed to get user lists:", error);
}
// Wait for NDK to be properly initialized
const ndk = await waitForNdk();
console.log("profile_search: NDK initialized, starting search logic");
try {
// Determine search strategy
const strategy = determineSearchStrategy(normalizedSearchTerm);
console.log("profile_search: Using search strategy:", strategy);
// Execute search strategy
const foundProfiles = await executeSearchStrategy(strategy, normalizedSearchTerm, ndk, userLists);
// Cache the results
cacheSearchResults(foundProfiles, normalizedSearchTerm, ndk);
// Add user list information to profiles and prioritize them
const prioritizedProfiles = prioritizeProfiles(foundProfiles, userLists);
console.log("Search completed, found profiles:", foundProfiles.length);
console.log("Prioritized profiles - follows first:", prioritizedProfiles.length);
return { profiles: prioritizedProfiles, Status: {} };
} catch (error) {
console.error("Error searching profiles:", error);
return { profiles: [], Status: {} };
}
}

7
src/lib/utils/relayDiagnostics.ts

@ -42,9 +42,8 @@ export async function testRelay(url: string): Promise<RelayDiagnostic> { @@ -42,9 +42,8 @@ export async function testRelay(url: string): Promise<RelayDiagnostic> {
responseTime: Date.now() - startTime,
});
}
}
};
});
}
/**
@ -93,7 +92,9 @@ export function logRelayDiagnostics(diagnostics: RelayDiagnostic[]): void { @@ -93,7 +92,9 @@ export function logRelayDiagnostics(diagnostics: RelayDiagnostic[]): void {
console.log(`✅ Working relays (${working.length}):`);
working.forEach((d) => {
console.log(
` - ${d.url}${d.requiresAuth ? " (requires auth)" : ""}${d.responseTime ? ` (${d.responseTime}ms)` : ""}`,
` - ${d.url}${d.requiresAuth ? " (requires auth)" : ""}${
d.responseTime ? ` (${d.responseTime}ms)` : ""
}`,
);
});

84
src/lib/utils/relay_info_service.ts

@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
function simplifyUrl(url: string): string {
try {
const urlObj = new URL(url);
return urlObj.hostname + (urlObj.port ? `:${urlObj.port}` : '');
return urlObj.hostname + (urlObj.port ? `:${urlObj.port}` : "");
} catch {
// If URL parsing fails, return the original string
return url;
@ -42,18 +42,23 @@ export interface RelayInfoWithMetadata extends RelayInfo { @@ -42,18 +42,23 @@ export interface RelayInfoWithMetadata extends RelayInfo {
* @param url The relay URL to fetch info for
* @returns Promise resolving to relay info or undefined if failed
*/
export async function fetchRelayInfo(url: string): Promise<RelayInfoWithMetadata | undefined> {
export async function fetchRelayInfo(
url: string,
): Promise<RelayInfoWithMetadata | undefined> {
try {
// Convert WebSocket URL to HTTP URL for NIP-11
const httpUrl = url.replace('ws://', 'http://').replace('wss://', 'https://');
const httpUrl = url.replace("ws://", "http://").replace(
"wss://",
"https://",
);
const response = await fetch(httpUrl, {
headers: {
'Accept': 'application/nostr+json',
'User-Agent': 'Alexandria/1.0'
headers: {
"Accept": "application/nostr+json",
"User-Agent": "Alexandria/1.0",
},
// Add timeout to prevent hanging
signal: AbortSignal.timeout(5000)
signal: AbortSignal.timeout(5000),
});
if (!response.ok) {
@ -62,18 +67,18 @@ export async function fetchRelayInfo(url: string): Promise<RelayInfoWithMetadata @@ -62,18 +67,18 @@ export async function fetchRelayInfo(url: string): Promise<RelayInfoWithMetadata
url,
shortUrl: simplifyUrl(url),
hasNip11: false,
triedNip11: true
triedNip11: true,
};
}
const relayInfo = await response.json() as RelayInfo;
return {
...relayInfo,
url,
shortUrl: simplifyUrl(url),
hasNip11: Object.keys(relayInfo).length > 0,
triedNip11: true
triedNip11: true,
};
} catch (error) {
console.warn(`[RelayInfo] Failed to fetch info for ${url}:`, error);
@ -81,7 +86,7 @@ export async function fetchRelayInfo(url: string): Promise<RelayInfoWithMetadata @@ -81,7 +86,7 @@ export async function fetchRelayInfo(url: string): Promise<RelayInfoWithMetadata
url,
shortUrl: simplifyUrl(url),
hasNip11: false,
triedNip11: true
triedNip11: true,
};
}
}
@ -91,16 +96,18 @@ export async function fetchRelayInfo(url: string): Promise<RelayInfoWithMetadata @@ -91,16 +96,18 @@ export async function fetchRelayInfo(url: string): Promise<RelayInfoWithMetadata
* @param urls Array of relay URLs to fetch info for
* @returns Promise resolving to array of relay info objects
*/
export async function fetchRelayInfos(urls: string[]): Promise<RelayInfoWithMetadata[]> {
export async function fetchRelayInfos(
urls: string[],
): Promise<RelayInfoWithMetadata[]> {
if (urls.length === 0) {
return [];
}
const promises = urls.map(url => fetchRelayInfo(url));
const promises = urls.map((url) => fetchRelayInfo(url));
const results = await Promise.allSettled(promises);
return results
.map(result => result.status === 'fulfilled' ? result.value : undefined)
.map((result) => result.status === "fulfilled" ? result.value : undefined)
.filter((info): info is RelayInfoWithMetadata => info !== undefined);
}
@ -110,34 +117,42 @@ export async function fetchRelayInfos(urls: string[]): Promise<RelayInfoWithMeta @@ -110,34 +117,42 @@ export async function fetchRelayInfos(urls: string[]): Promise<RelayInfoWithMeta
* @param relayInfo Optional relay info
* @returns String describing the relay type
*/
export function getRelayTypeLabel(relayUrl: string, relayInfo?: RelayInfoWithMetadata): string {
export function getRelayTypeLabel(
relayUrl: string,
relayInfo?: RelayInfoWithMetadata,
): string {
// Check if it's a local relay
if (relayUrl.includes('localhost') || relayUrl.includes('127.0.0.1')) {
return 'Local';
if (relayUrl.includes("localhost") || relayUrl.includes("127.0.0.1")) {
return "Local";
}
// Check if it's a community relay
if (relayUrl.includes('nostr.band') || relayUrl.includes('noswhere.com') ||
relayUrl.includes('damus.io') || relayUrl.includes('nostr.wine')) {
return 'Community';
if (
relayUrl.includes("nostr.band") || relayUrl.includes("noswhere.com") ||
relayUrl.includes("damus.io") || relayUrl.includes("nostr.wine")
) {
return "Community";
}
// Check if it's a user's relay (likely inbox/outbox)
if (relayUrl.includes('relay.nsec.app') || relayUrl.includes('relay.snort.social')) {
return 'User';
if (
relayUrl.includes("relay.nsec.app") ||
relayUrl.includes("relay.snort.social")
) {
return "User";
}
// Use relay name if available
if (relayInfo?.name) {
return relayInfo.name;
}
// Fallback to domain
try {
const domain = new URL(relayUrl).hostname;
return domain.replace('www.', '');
return domain.replace("www.", "");
} catch {
return 'Unknown';
return "Unknown";
}
}
@ -147,11 +162,14 @@ export function getRelayTypeLabel(relayUrl: string, relayInfo?: RelayInfoWithMet @@ -147,11 +162,14 @@ export function getRelayTypeLabel(relayUrl: string, relayInfo?: RelayInfoWithMet
* @param relayUrl Relay URL as fallback
* @returns Icon URL or undefined
*/
export function getRelayIcon(relayInfo?: RelayInfoWithMetadata, relayUrl?: string): string | undefined {
export function getRelayIcon(
relayInfo?: RelayInfoWithMetadata,
relayUrl?: string,
): string | undefined {
if (relayInfo?.icon) {
return relayInfo.icon;
}
// Generate favicon URL from relay URL
if (relayUrl) {
try {
@ -161,6 +179,6 @@ export function getRelayIcon(relayInfo?: RelayInfoWithMetadata, relayUrl?: strin @@ -161,6 +179,6 @@ export function getRelayIcon(relayInfo?: RelayInfoWithMetadata, relayUrl?: strin
// Invalid URL, return undefined
}
}
return undefined;
}

380
src/lib/utils/relay_management.ts

@ -1,5 +1,11 @@ @@ -1,5 +1,11 @@
import NDK, { NDKKind, NDKRelay, NDKUser } from "@nostr-dev-kit/ndk";
import { searchRelays, secondaryRelays, anonymousRelays, lowbandwidthRelays, localRelays } from "../consts.ts";
import {
anonymousRelays,
localRelays,
lowbandwidthRelays,
searchRelays,
secondaryRelays,
} from "../consts.ts";
import { getRelaySetForNetworkCondition } from "./network_detection.ts";
import { networkCondition } from "../stores/networkStore.ts";
import { get } from "svelte/store";
@ -11,15 +17,15 @@ import { get } from "svelte/store"; @@ -11,15 +17,15 @@ import { get } from "svelte/store";
*/
export function normalizeRelayUrl(url: string): string {
let normalized = url.toLowerCase().trim();
// Ensure protocol is present
if (!normalized.startsWith('ws://') && !normalized.startsWith('wss://')) {
normalized = 'wss://' + normalized;
if (!normalized.startsWith("ws://") && !normalized.startsWith("wss://")) {
normalized = "wss://" + normalized;
}
// Remove trailing slash
normalized = normalized.replace(/\/$/, '');
normalized = normalized.replace(/\/$/, "");
return normalized;
}
@ -58,7 +64,7 @@ export function testLocalRelayConnection( @@ -58,7 +64,7 @@ export function testLocalRelayConnection(
actualUrl?: string;
}> {
// Only test connections on client-side
if (typeof window === 'undefined') {
if (typeof window === "undefined") {
return Promise.resolve({
connected: false,
requiresAuth: false,
@ -66,7 +72,7 @@ export function testLocalRelayConnection( @@ -66,7 +72,7 @@ export function testLocalRelayConnection(
actualUrl: relayUrl,
});
}
return new Promise((resolve) => {
try {
// Ensure the URL is using ws:// protocol for local relays
@ -193,7 +199,7 @@ export function testRemoteRelayConnection( @@ -193,7 +199,7 @@ export function testRemoteRelayConnection(
actualUrl?: string;
}> {
// Only test connections on client-side
if (typeof window === 'undefined') {
if (typeof window === "undefined") {
return Promise.resolve({
connected: false,
requiresAuth: false,
@ -201,12 +207,14 @@ export function testRemoteRelayConnection( @@ -201,12 +207,14 @@ export function testRemoteRelayConnection(
actualUrl: relayUrl,
});
}
return new Promise((resolve) => {
// Ensure the URL is using wss:// protocol for remote relays
const secureUrl = relayUrl.replace(/^ws:\/\//, "wss://");
console.debug(`[relay_management.ts] Testing remote relay connection: ${secureUrl}`);
console.debug(
`[relay_management.ts] Testing remote relay connection: ${secureUrl}`,
);
// Use the existing NDK instance instead of creating a new one
const relay = new NDKRelay(secureUrl, undefined, ndk);
@ -216,7 +224,9 @@ export function testRemoteRelayConnection( @@ -216,7 +224,9 @@ export function testRemoteRelayConnection(
let actualUrl: string | undefined;
const timeout = setTimeout(() => {
console.debug(`[relay_management.ts] Relay ${secureUrl} connection timeout`);
console.debug(
`[relay_management.ts] Relay ${secureUrl} connection timeout`,
);
relay.disconnect();
resolve({
connected: false,
@ -227,7 +237,9 @@ export function testRemoteRelayConnection( @@ -227,7 +237,9 @@ export function testRemoteRelayConnection(
}, 3000);
relay.on("connect", () => {
console.debug(`[relay_management.ts] Relay ${secureUrl} connected successfully`);
console.debug(
`[relay_management.ts] Relay ${secureUrl} connected successfully`,
);
connected = true;
actualUrl = secureUrl;
clearTimeout(timeout);
@ -248,7 +260,9 @@ export function testRemoteRelayConnection( @@ -248,7 +260,9 @@ export function testRemoteRelayConnection(
relay.on("disconnect", () => {
if (!connected) {
console.debug(`[relay_management.ts] Relay ${secureUrl} disconnected without connecting`);
console.debug(
`[relay_management.ts] Relay ${secureUrl} disconnected without connecting`,
);
error = "Connection failed";
clearTimeout(timeout);
resolve({
@ -280,14 +294,12 @@ export function testRelayConnection( @@ -280,14 +294,12 @@ export function testRelayConnection(
actualUrl?: string;
}> {
// Determine if this is a local or remote relay
if (relayUrl.includes('localhost') || relayUrl.includes('127.0.0.1')) {
if (relayUrl.includes("localhost") || relayUrl.includes("127.0.0.1")) {
return testLocalRelayConnection(relayUrl, ndk);
} else {
return testRemoteRelayConnection(relayUrl, ndk);
}
}
/**
* Tests connection to local relays
@ -295,14 +307,17 @@ export function testRelayConnection( @@ -295,14 +307,17 @@ export function testRelayConnection(
* @param ndk NDK instance
* @returns Promise that resolves to array of working local relay URLs
*/
async function testLocalRelays(localRelayUrls: string[], ndk: NDK): Promise<string[]> {
async function testLocalRelays(
localRelayUrls: string[],
ndk: NDK,
): Promise<string[]> {
try {
const workingRelays: string[] = [];
if (localRelayUrls.length === 0) {
return workingRelays;
}
// Test local relays quietly, without logging failures
await Promise.all(
localRelayUrls.map(async (url) => {
@ -310,17 +325,21 @@ async function testLocalRelays(localRelayUrls: string[], ndk: NDK): Promise<stri @@ -310,17 +325,21 @@ async function testLocalRelays(localRelayUrls: string[], ndk: NDK): Promise<stri
const result = await testLocalRelayConnection(url, ndk);
if (result.connected) {
workingRelays.push(url);
console.debug(`[relay_management.ts] Local relay connected: ${url}`);
console.debug(
`[relay_management.ts] Local relay connected: ${url}`,
);
}
// Don't log failures - local relays are optional
} catch {
// Silently ignore local relay failures - they're optional
}
})
}),
);
if (workingRelays.length > 0) {
console.info(`[relay_management.ts] Found ${workingRelays.length} working local relays`);
console.info(
`[relay_management.ts] Found ${workingRelays.length} working local relays`,
);
}
return workingRelays;
} catch {
@ -339,17 +358,17 @@ export async function discoverLocalRelays(ndk: NDK): Promise<string[]> { @@ -339,17 +358,17 @@ export async function discoverLocalRelays(ndk: NDK): Promise<string[]> {
try {
// If no local relays are configured, return empty array
if (localRelays.length === 0) {
console.debug('[relay_management.ts] No local relays configured');
console.debug("[relay_management.ts] No local relays configured");
return [];
}
// Convert wss:// URLs from consts to ws:// for local testing
const localRelayUrls = localRelays.map((url: string) =>
url.replace(/^wss:\/\//, 'ws://')
const localRelayUrls = localRelays.map((url: string) =>
url.replace(/^wss:\/\//, "ws://")
);
const workingRelays = await testLocalRelays(localRelayUrls, ndk);
// If no local relays are working, return empty array
// The network detection logic will provide fallback relays
return workingRelays;
@ -365,7 +384,10 @@ export async function discoverLocalRelays(ndk: NDK): Promise<string[]> { @@ -365,7 +384,10 @@ export async function discoverLocalRelays(ndk: NDK): Promise<string[]> {
* @param user User to fetch local relays for
* @returns Promise that resolves to array of local relay URLs
*/
export async function getUserLocalRelays(ndk: NDK, user: NDKUser): Promise<string[]> {
export async function getUserLocalRelays(
ndk: NDK,
user: NDKUser,
): Promise<string[]> {
try {
const localRelayEvent = await ndk.fetchEvent(
{
@ -376,7 +398,7 @@ export async function getUserLocalRelays(ndk: NDK, user: NDKUser): Promise<strin @@ -376,7 +398,7 @@ export async function getUserLocalRelays(ndk: NDK, user: NDKUser): Promise<strin
groupable: false,
skipVerification: false,
skipValidation: false,
}
},
);
if (!localRelayEvent) {
@ -385,14 +407,17 @@ export async function getUserLocalRelays(ndk: NDK, user: NDKUser): Promise<strin @@ -385,14 +407,17 @@ export async function getUserLocalRelays(ndk: NDK, user: NDKUser): Promise<strin
const localRelays: string[] = [];
localRelayEvent.tags.forEach((tag) => {
if (tag[0] === 'r' && tag[1]) {
if (tag[0] === "r" && tag[1]) {
localRelays.push(tag[1]);
}
});
return localRelays;
} catch (error) {
console.info('[relay_management.ts] Error fetching user local relays:', error);
console.info(
"[relay_management.ts] Error fetching user local relays:",
error,
);
return [];
}
}
@ -403,7 +428,10 @@ export async function getUserLocalRelays(ndk: NDK, user: NDKUser): Promise<strin @@ -403,7 +428,10 @@ export async function getUserLocalRelays(ndk: NDK, user: NDKUser): Promise<strin
* @param user User to fetch blocked relays for
* @returns Promise that resolves to array of blocked relay URLs
*/
export async function getUserBlockedRelays(ndk: NDK, user: NDKUser): Promise<string[]> {
export async function getUserBlockedRelays(
ndk: NDK,
user: NDKUser,
): Promise<string[]> {
try {
const blockedRelayEvent = await ndk.fetchEvent(
{
@ -414,7 +442,7 @@ export async function getUserBlockedRelays(ndk: NDK, user: NDKUser): Promise<str @@ -414,7 +442,7 @@ export async function getUserBlockedRelays(ndk: NDK, user: NDKUser): Promise<str
groupable: false,
skipVerification: false,
skipValidation: false,
}
},
);
if (!blockedRelayEvent) {
@ -423,14 +451,17 @@ export async function getUserBlockedRelays(ndk: NDK, user: NDKUser): Promise<str @@ -423,14 +451,17 @@ export async function getUserBlockedRelays(ndk: NDK, user: NDKUser): Promise<str
const blockedRelays: string[] = [];
blockedRelayEvent.tags.forEach((tag) => {
if (tag[0] === 'r' && tag[1]) {
if (tag[0] === "r" && tag[1]) {
blockedRelays.push(tag[1]);
}
});
return blockedRelays;
} catch (error) {
console.info('[relay_management.ts] Error fetching user blocked relays:', error);
console.info(
"[relay_management.ts] Error fetching user blocked relays:",
error,
);
return [];
}
}
@ -441,9 +472,15 @@ export async function getUserBlockedRelays(ndk: NDK, user: NDKUser): Promise<str @@ -441,9 +472,15 @@ export async function getUserBlockedRelays(ndk: NDK, user: NDKUser): Promise<str
* @param user User to fetch outbox relays for
* @returns Promise that resolves to array of outbox relay URLs
*/
export async function getUserOutboxRelays(ndk: NDK, user: NDKUser): Promise<string[]> {
export async function getUserOutboxRelays(
ndk: NDK,
user: NDKUser,
): Promise<string[]> {
try {
console.debug('[relay_management.ts] Fetching outbox relays for user:', user.pubkey);
console.debug(
"[relay_management.ts] Fetching outbox relays for user:",
user.pubkey,
);
const relayList = await ndk.fetchEvent(
{
kinds: [10002],
@ -453,36 +490,47 @@ export async function getUserOutboxRelays(ndk: NDK, user: NDKUser): Promise<stri @@ -453,36 +490,47 @@ export async function getUserOutboxRelays(ndk: NDK, user: NDKUser): Promise<stri
groupable: false,
skipVerification: false,
skipValidation: false,
}
},
);
if (!relayList) {
console.debug('[relay_management.ts] No relay list found for user');
console.debug("[relay_management.ts] No relay list found for user");
return [];
}
console.debug('[relay_management.ts] Found relay list event:', relayList.id);
console.debug('[relay_management.ts] Relay list tags:', relayList.tags);
console.debug(
"[relay_management.ts] Found relay list event:",
relayList.id,
);
console.debug("[relay_management.ts] Relay list tags:", relayList.tags);
const outboxRelays: string[] = [];
relayList.tags.forEach((tag) => {
console.debug('[relay_management.ts] Processing tag:', tag);
if (tag[0] === 'w' && tag[1]) {
console.debug("[relay_management.ts] Processing tag:", tag);
if (tag[0] === "w" && tag[1]) {
outboxRelays.push(tag[1]);
console.debug('[relay_management.ts] Added outbox relay:', tag[1]);
} else if (tag[0] === 'r' && tag[1]) {
console.debug("[relay_management.ts] Added outbox relay:", tag[1]);
} else if (tag[0] === "r" && tag[1]) {
// Some relay lists use 'r' for both inbox and outbox
outboxRelays.push(tag[1]);
console.debug('[relay_management.ts] Added relay (r tag):', tag[1]);
console.debug("[relay_management.ts] Added relay (r tag):", tag[1]);
} else {
console.debug('[relay_management.ts] Skipping tag:', tag[0], 'value:', tag[1]);
console.debug(
"[relay_management.ts] Skipping tag:",
tag[0],
"value:",
tag[1],
);
}
});
console.debug('[relay_management.ts] Final outbox relays:', outboxRelays);
console.debug("[relay_management.ts] Final outbox relays:", outboxRelays);
return outboxRelays;
} catch (error) {
console.info('[relay_management.ts] Error fetching user outbox relays:', error);
console.info(
"[relay_management.ts] Error fetching user outbox relays:",
error,
);
return [];
}
}
@ -494,45 +542,65 @@ export async function getUserOutboxRelays(ndk: NDK, user: NDKUser): Promise<stri @@ -494,45 +542,65 @@ export async function getUserOutboxRelays(ndk: NDK, user: NDKUser): Promise<stri
export async function getExtensionRelays(): Promise<string[]> {
try {
// Check if we're in a browser environment with extension support
if (typeof window === 'undefined' || !globalThis.nostr) {
console.debug('[relay_management.ts] No globalThis.nostr available');
if (typeof window === "undefined" || !globalThis.nostr) {
console.debug("[relay_management.ts] No globalThis.nostr available");
return [];
}
console.debug('[relay_management.ts] Extension available, checking for getRelays()');
console.debug(
"[relay_management.ts] Extension available, checking for getRelays()",
);
const extensionRelays: string[] = [];
// Try to get relays from the extension's API
// Different extensions may expose their relay config differently
if (globalThis.nostr.getRelays) {
console.debug('[relay_management.ts] getRelays() method found, calling it...');
console.debug(
"[relay_management.ts] getRelays() method found, calling it...",
);
try {
const relays = await globalThis.nostr.getRelays();
console.debug('[relay_management.ts] getRelays() returned:', relays);
if (relays && typeof relays === 'object') {
console.debug("[relay_management.ts] getRelays() returned:", relays);
if (relays && typeof relays === "object") {
// Convert relay object to array of URLs
const relayUrls = Object.keys(relays);
extensionRelays.push(...relayUrls);
console.debug('[relay_management.ts] Got relays from extension:', relayUrls);
console.debug(
"[relay_management.ts] Got relays from extension:",
relayUrls,
);
}
} catch (error) {
console.debug('[relay_management.ts] Extension getRelays() failed:', error);
console.debug(
"[relay_management.ts] Extension getRelays() failed:",
error,
);
}
} else {
console.debug('[relay_management.ts] getRelays() method not found on globalThis.nostr');
console.debug(
"[relay_management.ts] getRelays() method not found on globalThis.nostr",
);
}
// If getRelays() didn't work, try alternative methods
if (extensionRelays.length === 0) {
// Some extensions might expose relays through other methods
// This is a fallback for extensions that don't expose getRelays()
console.debug('[relay_management.ts] Extension does not expose relay configuration');
console.debug(
"[relay_management.ts] Extension does not expose relay configuration",
);
}
console.debug('[relay_management.ts] Final extension relays:', extensionRelays);
console.debug(
"[relay_management.ts] Final extension relays:",
extensionRelays,
);
return extensionRelays;
} catch (error) {
console.debug('[relay_management.ts] Error getting extension relays:', error);
console.debug(
"[relay_management.ts] Error getting extension relays:",
error,
);
return [];
}
}
@ -547,36 +615,59 @@ async function testRelaySet(relayUrls: string[], ndk: NDK): Promise<string[]> { @@ -547,36 +615,59 @@ async function testRelaySet(relayUrls: string[], ndk: NDK): Promise<string[]> {
const workingRelays: string[] = [];
const maxConcurrent = 2; // Reduce to 2 relays at a time to avoid overwhelming them
console.debug(`[relay_management.ts] Testing ${relayUrls.length} relays in batches of ${maxConcurrent}`);
console.debug(
`[relay_management.ts] Testing ${relayUrls.length} relays in batches of ${maxConcurrent}`,
);
console.debug(`[relay_management.ts] Relay URLs to test:`, relayUrls);
for (let i = 0; i < relayUrls.length; i += maxConcurrent) {
const batch = relayUrls.slice(i, i + maxConcurrent);
console.debug(`[relay_management.ts] Testing batch ${Math.floor(i/maxConcurrent) + 1}:`, batch);
console.debug(
`[relay_management.ts] Testing batch ${
Math.floor(i / maxConcurrent) + 1
}:`,
batch,
);
const batchPromises = batch.map(async (url) => {
try {
console.debug(`[relay_management.ts] Testing relay: ${url}`);
const result = await testRelayConnection(url, ndk);
console.debug(`[relay_management.ts] Relay ${url} test result:`, result);
console.debug(
`[relay_management.ts] Relay ${url} test result:`,
result,
);
return result.connected ? url : null;
} catch (error) {
console.debug(`[relay_management.ts] Failed to test relay ${url}:`, error);
console.debug(
`[relay_management.ts] Failed to test relay ${url}:`,
error,
);
return null;
}
});
const batchResults = await Promise.allSettled(batchPromises);
const batchWorkingRelays = batchResults
.filter((result): result is PromiseFulfilledResult<string | null> => result.status === 'fulfilled')
.map(result => result.value)
.filter((result): result is PromiseFulfilledResult<string | null> =>
result.status === "fulfilled"
)
.map((result) => result.value)
.filter((url): url is string => url !== null);
console.debug(`[relay_management.ts] Batch ${Math.floor(i/maxConcurrent) + 1} working relays:`, batchWorkingRelays);
console.debug(
`[relay_management.ts] Batch ${
Math.floor(i / maxConcurrent) + 1
} working relays:`,
batchWorkingRelays,
);
workingRelays.push(...batchWorkingRelays);
}
console.debug(`[relay_management.ts] Total working relays after testing:`, workingRelays);
console.debug(
`[relay_management.ts] Total working relays after testing:`,
workingRelays,
);
return workingRelays;
}
@ -588,13 +679,19 @@ async function testRelaySet(relayUrls: string[], ndk: NDK): Promise<string[]> { @@ -588,13 +679,19 @@ async function testRelaySet(relayUrls: string[], ndk: NDK): Promise<string[]> {
*/
export async function buildCompleteRelaySet(
ndk: NDK,
user: NDKUser | null
user: NDKUser | null,
): Promise<{ inboxRelays: string[]; outboxRelays: string[] }> {
console.debug('[relay_management.ts] buildCompleteRelaySet: Starting with user:', user?.pubkey || 'null');
console.debug(
"[relay_management.ts] buildCompleteRelaySet: Starting with user:",
user?.pubkey || "null",
);
// Discover local relays first
const discoveredLocalRelays = await discoverLocalRelays(ndk);
console.debug('[relay_management.ts] buildCompleteRelaySet: Discovered local relays:', discoveredLocalRelays);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: Discovered local relays:",
discoveredLocalRelays,
);
// Get user-specific relays if available
let userOutboxRelays: string[] = [];
@ -603,42 +700,75 @@ export async function buildCompleteRelaySet( @@ -603,42 +700,75 @@ export async function buildCompleteRelaySet(
let extensionRelays: string[] = [];
if (user) {
console.debug('[relay_management.ts] buildCompleteRelaySet: Fetching user-specific relays for:', user.pubkey);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: Fetching user-specific relays for:",
user.pubkey,
);
try {
userOutboxRelays = await getUserOutboxRelays(ndk, user);
console.debug('[relay_management.ts] buildCompleteRelaySet: User outbox relays:', userOutboxRelays);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: User outbox relays:",
userOutboxRelays,
);
} catch (error) {
console.debug('[relay_management.ts] Error fetching user outbox relays:', error);
console.debug(
"[relay_management.ts] Error fetching user outbox relays:",
error,
);
}
try {
userLocalRelays = await getUserLocalRelays(ndk, user);
console.debug('[relay_management.ts] buildCompleteRelaySet: User local relays:', userLocalRelays);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: User local relays:",
userLocalRelays,
);
} catch (error) {
console.debug('[relay_management.ts] Error fetching user local relays:', error);
console.debug(
"[relay_management.ts] Error fetching user local relays:",
error,
);
}
try {
blockedRelays = await getUserBlockedRelays(ndk, user);
console.debug('[relay_management.ts] buildCompleteRelaySet: User blocked relays:', blockedRelays);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: User blocked relays:",
blockedRelays,
);
} catch {
// Silently ignore blocked relay fetch errors
}
try {
extensionRelays = await getExtensionRelays();
console.debug('[relay_management.ts] Extension relays gathered:', extensionRelays);
console.debug(
"[relay_management.ts] Extension relays gathered:",
extensionRelays,
);
} catch (error) {
console.debug('[relay_management.ts] Error fetching extension relays:', error);
console.debug(
"[relay_management.ts] Error fetching extension relays:",
error,
);
}
} else {
console.debug('[relay_management.ts] buildCompleteRelaySet: No user provided, skipping user-specific relays');
console.debug(
"[relay_management.ts] buildCompleteRelaySet: No user provided, skipping user-specific relays",
);
}
// Build initial relay sets and deduplicate
const finalInboxRelays = deduplicateRelayUrls([...discoveredLocalRelays, ...userLocalRelays]);
const finalOutboxRelays = deduplicateRelayUrls([...discoveredLocalRelays, ...userOutboxRelays, ...extensionRelays]);
const finalInboxRelays = deduplicateRelayUrls([
...discoveredLocalRelays,
...userLocalRelays,
]);
const finalOutboxRelays = deduplicateRelayUrls([
...discoveredLocalRelays,
...userOutboxRelays,
...extensionRelays,
]);
// Test relays and filter out non-working ones
let testedInboxRelays: string[] = [];
@ -654,21 +784,27 @@ export async function buildCompleteRelaySet( @@ -654,21 +784,27 @@ export async function buildCompleteRelaySet(
// If no relays passed testing, use remote relays without testing
if (testedInboxRelays.length === 0 && testedOutboxRelays.length === 0) {
const remoteRelays = deduplicateRelayUrls([...secondaryRelays, ...searchRelays]);
const remoteRelays = deduplicateRelayUrls([
...secondaryRelays,
...searchRelays,
]);
return {
inboxRelays: remoteRelays,
outboxRelays: remoteRelays
outboxRelays: remoteRelays,
};
}
// Always include some remote relays as fallback, even when local relays are working
const fallbackRelays = deduplicateRelayUrls([...anonymousRelays, ...secondaryRelays]);
const fallbackRelays = deduplicateRelayUrls([
...anonymousRelays,
...secondaryRelays,
]);
// Use tested relays and add fallback relays
const inboxRelays = testedInboxRelays.length > 0
const inboxRelays = testedInboxRelays.length > 0
? deduplicateRelayUrls([...testedInboxRelays, ...fallbackRelays])
: deduplicateRelayUrls(fallbackRelays);
const outboxRelays = testedOutboxRelays.length > 0
const outboxRelays = testedOutboxRelays.length > 0
? deduplicateRelayUrls([...testedOutboxRelays, ...fallbackRelays])
: deduplicateRelayUrls(fallbackRelays);
@ -678,27 +814,51 @@ export async function buildCompleteRelaySet( @@ -678,27 +814,51 @@ export async function buildCompleteRelaySet(
currentNetworkCondition,
discoveredLocalRelays,
lowbandwidthRelays,
{ inboxRelays, outboxRelays }
{ inboxRelays, outboxRelays },
);
// Filter out blocked relays and deduplicate final sets
const finalRelaySet = {
inboxRelays: deduplicateRelayUrls(networkOptimizedRelaySet.inboxRelays.filter((r: string) => !blockedRelays.includes(r))),
outboxRelays: deduplicateRelayUrls(networkOptimizedRelaySet.outboxRelays.filter((r: string) => !blockedRelays.includes(r)))
inboxRelays: deduplicateRelayUrls(
networkOptimizedRelaySet.inboxRelays.filter((r: string) =>
!blockedRelays.includes(r)
),
),
outboxRelays: deduplicateRelayUrls(
networkOptimizedRelaySet.outboxRelays.filter((r: string) =>
!blockedRelays.includes(r)
),
),
};
// Ensure we always have at least some relays
if (finalRelaySet.inboxRelays.length === 0 && finalRelaySet.outboxRelays.length === 0) {
console.warn('[relay_management.ts] No relays available, using anonymous relays as final fallback');
if (
finalRelaySet.inboxRelays.length === 0 &&
finalRelaySet.outboxRelays.length === 0
) {
console.warn(
"[relay_management.ts] No relays available, using anonymous relays as final fallback",
);
return {
inboxRelays: deduplicateRelayUrls(anonymousRelays),
outboxRelays: deduplicateRelayUrls(anonymousRelays)
outboxRelays: deduplicateRelayUrls(anonymousRelays),
};
}
console.debug('[relay_management.ts] buildCompleteRelaySet: Final relay sets - inbox:', finalRelaySet.inboxRelays.length, 'outbox:', finalRelaySet.outboxRelays.length);
console.debug('[relay_management.ts] buildCompleteRelaySet: Final inbox relays:', finalRelaySet.inboxRelays);
console.debug('[relay_management.ts] buildCompleteRelaySet: Final outbox relays:', finalRelaySet.outboxRelays);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: Final relay sets - inbox:",
finalRelaySet.inboxRelays.length,
"outbox:",
finalRelaySet.outboxRelays.length,
);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: Final inbox relays:",
finalRelaySet.inboxRelays,
);
console.debug(
"[relay_management.ts] buildCompleteRelaySet: Final outbox relays:",
finalRelaySet.outboxRelays,
);
return finalRelaySet;
}
}

16
src/lib/utils/search_result_formatter.ts

@ -6,17 +6,19 @@ export class SearchResultFormatter { @@ -6,17 +6,19 @@ export class SearchResultFormatter {
/**
* Formats a result message based on search count and type
*/
formatResultMessage(searchResultCount: number | null, searchResultType: string | null): string {
formatResultMessage(
searchResultCount: number | null,
searchResultType: string | null,
): string {
if (searchResultCount === 0) {
return "Search completed. No results found.";
}
const typeLabel =
searchResultType === "n"
? "profile"
: searchResultType === "nip05"
? "NIP-05 address"
: "event";
const typeLabel = searchResultType === "n"
? "profile"
: searchResultType === "nip05"
? "NIP-05 address"
: "event";
const countLabel = searchResultType === "n" ? "profiles" : "events";
return searchResultCount === 1

14
src/lib/utils/search_utility.ts

@ -13,13 +13,13 @@ export { searchBySubscription } from "./subscription_search"; @@ -13,13 +13,13 @@ export { searchBySubscription } from "./subscription_search";
export { searchEvent, searchNip05 } from "./event_search";
export { checkCommunity } from "./community_checker";
export {
wellKnownUrl,
lnurlpWellKnownUrl,
isValidNip05Address,
normalizeSearchTerm,
fieldMatches,
nip05Matches,
COMMON_DOMAINS,
isEmojiReaction,
createProfileFromEvent,
fieldMatches,
isEmojiReaction,
isValidNip05Address,
lnurlpWellKnownUrl,
nip05Matches,
normalizeSearchTerm,
wellKnownUrl,
} from "./search_utils";

800
src/lib/utils/subscription_search.ts

File diff suppressed because it is too large Load Diff

126
src/lib/utils/tag_event_fetch.ts

@ -1,7 +1,5 @@ @@ -1,7 +1,5 @@
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import { ndkInstance } from "../ndk";
import { get } from "svelte/store";
import { extractPubkeysFromEvents, batchFetchProfiles } from "./profileCache";
import NDK, { type NDKEvent } from "@nostr-dev-kit/ndk";
import { batchFetchProfiles, extractPubkeysFromEvents } from "./profileCache.ts";
// Constants for publication event kinds
const INDEX_EVENT_KIND = 30040;
@ -17,12 +15,12 @@ export interface TagExpansionResult { @@ -17,12 +15,12 @@ export interface TagExpansionResult {
/**
* Fetches publications and their content events from relays based on tags
*
*
* This function handles the relay-based fetching portion of tag expansion:
* 1. Fetches publication index events that have any of the specified tags
* 2. Extracts content event references from those publications
* 3. Fetches the referenced content events
*
*
* @param tags Array of tags to search for in publications
* @param existingEventIds Set of existing event IDs to avoid duplicates
* @param baseEvents Array of base events to check for existing content
@ -33,44 +31,46 @@ export async function fetchTaggedEventsFromRelays( @@ -33,44 +31,46 @@ export async function fetchTaggedEventsFromRelays(
tags: string[],
existingEventIds: Set<string>,
baseEvents: NDKEvent[],
debug?: (...args: any[]) => void
ndk: NDK,
debug?: (...args: any[]) => void,
): Promise<TagExpansionResult> {
const log = debug || console.debug;
log("Fetching from relays for tags:", tags);
// Fetch publications that have any of the specified tags
const ndk = get(ndkInstance);
const taggedPublications = await ndk.fetchEvents({
kinds: [INDEX_EVENT_KIND],
"#t": tags, // Match any of these tags
limit: 30 // Reasonable default limit
limit: 30, // Reasonable default limit
});
log("Found tagged publications from relays:", taggedPublications.size);
// Filter to avoid duplicates
const newPublications = Array.from(taggedPublications).filter(
(event: NDKEvent) => !existingEventIds.has(event.id)
(event: NDKEvent) => !existingEventIds.has(event.id),
);
// Extract content event d-tags from new publications
const contentEventDTags = new Set<string>();
const existingContentDTags = new Set(
baseEvents
.filter(e => e.kind !== undefined && CONTENT_EVENT_KINDS.includes(e.kind))
.map(e => e.tagValue("d"))
.filter(d => d !== undefined)
.filter((e) =>
e.kind !== undefined && CONTENT_EVENT_KINDS.includes(e.kind)
)
.map((e) => e.tagValue("d"))
.filter((d) => d !== undefined),
);
newPublications.forEach((event: NDKEvent) => {
const aTags = event.getMatchingTags("a");
aTags.forEach((tag: string[]) => {
// Parse the 'a' tag identifier: kind:pubkey:d-tag
if (tag[1]) {
const parts = tag[1].split(':');
const parts = tag[1].split(":");
if (parts.length >= 3) {
const dTag = parts.slice(2).join(':'); // Handle d-tags with colons
const dTag = parts.slice(2).join(":"); // Handle d-tags with colons
if (!existingContentDTags.has(dTag)) {
contentEventDTags.add(dTag);
}
@ -78,7 +78,7 @@ export async function fetchTaggedEventsFromRelays( @@ -78,7 +78,7 @@ export async function fetchTaggedEventsFromRelays(
}
});
});
// Fetch the content events
let newContentEvents: NDKEvent[] = [];
if (contentEventDTags.size > 0) {
@ -88,21 +88,21 @@ export async function fetchTaggedEventsFromRelays( @@ -88,21 +88,21 @@ export async function fetchTaggedEventsFromRelays(
});
newContentEvents = Array.from(contentEventsSet);
}
return {
publications: newPublications,
contentEvents: newContentEvents
contentEvents: newContentEvents,
};
}
/**
* Searches through already fetched events for publications with specified tags
*
*
* This function handles the local search portion of tag expansion:
* 1. Searches through existing events for publications with matching tags
* 2. Extracts content event references from those publications
* 3. Finds the referenced content events in existing events
*
*
* @param allEvents Array of all fetched events to search through
* @param tags Array of tags to search for in publications
* @param existingEventIds Set of existing event IDs to avoid duplicates
@ -115,42 +115,44 @@ export function findTaggedEventsInFetched( @@ -115,42 +115,44 @@ export function findTaggedEventsInFetched(
tags: string[],
existingEventIds: Set<string>,
baseEvents: NDKEvent[],
debug?: (...args: any[]) => void
debug?: (...args: any[]) => void,
): TagExpansionResult {
const log = debug || console.debug;
log("Searching through already fetched events for tags:", tags);
// Find publications in allEvents that have the specified tags
const taggedPublications = allEvents.filter(event => {
const taggedPublications = allEvents.filter((event) => {
if (event.kind !== INDEX_EVENT_KIND) return false;
if (existingEventIds.has(event.id)) return false; // Skip base events
// Check if event has any of the specified tags
const eventTags = event.getMatchingTags("t").map(tag => tag[1]);
return tags.some(tag => eventTags.includes(tag));
const eventTags = event.getMatchingTags("t").map((tag) => tag[1]);
return tags.some((tag) => eventTags.includes(tag));
});
const newPublications = taggedPublications;
log("Found", newPublications.length, "publications in fetched events");
// For content events, also search in allEvents
const existingContentDTags = new Set(
baseEvents
.filter(e => e.kind !== undefined && CONTENT_EVENT_KINDS.includes(e.kind))
.map(e => e.tagValue("d"))
.filter(d => d !== undefined)
.filter((e) =>
e.kind !== undefined && CONTENT_EVENT_KINDS.includes(e.kind)
)
.map((e) => e.tagValue("d"))
.filter((d) => d !== undefined),
);
const contentEventDTags = new Set<string>();
newPublications.forEach((event: NDKEvent) => {
const aTags = event.getMatchingTags("a");
aTags.forEach((tag: string[]) => {
// Parse the 'a' tag identifier: kind:pubkey:d-tag
if (tag[1]) {
const parts = tag[1].split(':');
const parts = tag[1].split(":");
if (parts.length >= 3) {
const dTag = parts.slice(2).join(':'); // Handle d-tags with colons
const dTag = parts.slice(2).join(":"); // Handle d-tags with colons
if (!existingContentDTags.has(dTag)) {
contentEventDTags.add(dTag);
}
@ -158,23 +160,23 @@ export function findTaggedEventsInFetched( @@ -158,23 +160,23 @@ export function findTaggedEventsInFetched(
}
});
});
// Find content events in allEvents
const newContentEvents = allEvents.filter(event => {
const newContentEvents = allEvents.filter((event) => {
if (!CONTENT_EVENT_KINDS.includes(event.kind || 0)) return false;
const dTag = event.tagValue("d");
return dTag !== undefined && contentEventDTags.has(dTag);
});
return {
publications: newPublications,
contentEvents: newContentEvents
contentEvents: newContentEvents,
};
}
/**
* Fetches profiles for new events and updates progress
*
*
* @param newPublications Array of new publication events
* @param newContentEvents Array of new content events
* @param onProgressUpdate Callback to update progress state
@ -184,23 +186,33 @@ export function findTaggedEventsInFetched( @@ -184,23 +186,33 @@ export function findTaggedEventsInFetched(
export async function fetchProfilesForNewEvents(
newPublications: NDKEvent[],
newContentEvents: NDKEvent[],
onProgressUpdate: (progress: { current: number; total: number } | null) => void,
debug?: (...args: any[]) => void
ndk: NDK,
onProgressUpdate: (
progress: { current: number; total: number } | null,
) => void,
debug?: (...args: any[]) => void,
): Promise<void> {
const log = debug || console.debug;
// Extract pubkeys from new events
const newPubkeys = extractPubkeysFromEvents([...newPublications, ...newContentEvents]);
const newPubkeys = extractPubkeysFromEvents([
...newPublications,
...newContentEvents,
]);
if (newPubkeys.size > 0) {
log("Fetching profiles for", newPubkeys.size, "new pubkeys from tag expansion");
log(
"Fetching profiles for",
newPubkeys.size,
"new pubkeys from tag expansion",
);
onProgressUpdate({ current: 0, total: newPubkeys.size });
await batchFetchProfiles(Array.from(newPubkeys), (fetched, total) => {
await batchFetchProfiles(Array.from(newPubkeys), ndk, (fetched, total) => {
onProgressUpdate({ current: fetched, total });
});
onProgressUpdate(null);
}
}
}

91
src/lib/utils/websocket_utils.ts

@ -18,7 +18,7 @@ export interface NostrFilter { @@ -18,7 +18,7 @@ export interface NostrFilter {
ids?: string[];
authors?: string[];
kinds?: number[];
[tag: `#${string}`]: string[] | undefined;
[tag: `#${string}`]: string[] | undefined;
since?: number;
until?: number;
limit?: number;
@ -28,14 +28,16 @@ type ResolveCallback<T> = (value: T | PromiseLike<T>) => void; @@ -28,14 +28,16 @@ type ResolveCallback<T> = (value: T | PromiseLike<T>) => void;
type RejectCallback = (reason?: any) => void;
type EventHandler = (ev: Event) => void;
type MessageEventHandler = (ev: MessageEvent) => void;
type EventHandlerReject = (reject: RejectCallback) => EventHandler;
type EventHandlerResolve<T> = (resolve: ResolveCallback<T>) => (reject: RejectCallback) => MessageEventHandler;
type EventHandlerReject = (reject: RejectCallback) => EventHandler;
type EventHandlerResolve<T> = (
resolve: ResolveCallback<T>,
) => (reject: RejectCallback) => MessageEventHandler;
function handleMessage(
ev: MessageEvent,
subId: string,
resolve: (event: NostrEvent) => void,
reject: (reason: any) => void
reject: (reason: any) => void,
) {
const data = JSON.parse(ev.data);
@ -64,43 +66,48 @@ function handleMessage( @@ -64,43 +66,48 @@ function handleMessage(
function handleError(
ev: Event,
reject: (reason: any) => void
reject: (reason: any) => void,
) {
reject(ev);
}
export async function fetchNostrEvent(filter: NostrFilter): Promise<NostrEvent | null> {
export async function fetchNostrEvent(
filter: NostrFilter,
): Promise<NostrEvent | null> {
// AI-NOTE: Updated to use active relay stores instead of hardcoded relay URL
// This ensures the function uses the user's configured relays and can find events
// across multiple relays rather than being limited to a single hardcoded relay.
// Get available relays from the active relay stores
const inboxRelays = get(activeInboxRelays);
const outboxRelays = get(activeOutboxRelays);
// Combine all available relays, prioritizing inbox relays
let availableRelays = [...inboxRelays, ...outboxRelays];
// AI-NOTE: Use fallback relays when stores are empty (e.g., during SSR)
// This ensures publications can still load even when relay stores haven't been populated
if (availableRelays.length === 0) {
// Import fallback relays from constants
const { searchRelays, secondaryRelays } = await import("../consts.ts");
availableRelays = [...searchRelays, ...secondaryRelays];
if (availableRelays.length === 0) {
availableRelays = ["wss://thecitadel.nostr1.com"];
}
}
// AI-NOTE: 2025-01-24 - Enhanced relay strategy for better event discovery
// Always include search relays in the relay set for comprehensive event discovery
const { searchRelays, secondaryRelays } = await import("../consts.ts");
const allRelays = [...availableRelays, ...searchRelays, ...secondaryRelays];
const uniqueRelays = [...new Set(allRelays)]; // Remove duplicates
console.debug(`[fetchNostrEvent] Trying ${uniqueRelays.length} relays for event discovery:`, uniqueRelays);
console.debug(
`[fetchNostrEvent] Trying ${uniqueRelays.length} relays for event discovery:`,
uniqueRelays,
);
// Try all available relays in parallel and return the first result
const relayPromises = uniqueRelays.map(async (relay) => {
try {
@ -110,16 +117,15 @@ export async function fetchNostrEvent(filter: NostrFilter): Promise<NostrEvent | @@ -110,16 +117,15 @@ export async function fetchNostrEvent(filter: NostrFilter): Promise<NostrEvent |
// AI-NOTE: Currying is used here to abstract the internal handler logic away from the WebSocket
// handling logic. The message and error handlers themselves can be refactored without affecting
// the WebSocket handling logic.
const curriedMessageHandler: (subId: string) => (resolve: ResolveCallback<NostrEvent>) => (reject: RejectCallback) => MessageEventHandler =
(subId) =>
(resolve) =>
(reject) =>
(ev: MessageEvent) =>
handleMessage(ev, subId, resolve, reject);
const curriedErrorHandler: EventHandlerReject =
(reject) =>
(ev: Event) =>
handleError(ev, reject);
const curriedMessageHandler: (
subId: string,
) => (
resolve: ResolveCallback<NostrEvent>,
) => (reject: RejectCallback) => MessageEventHandler =
(subId) => (resolve) => (reject) => (ev: MessageEvent) =>
handleMessage(ev, subId, resolve, reject);
const curriedErrorHandler: EventHandlerReject = (reject) => (ev: Event) =>
handleError(ev, reject);
// AI-NOTE: These variables store references to partially-applied handlers so that the `finally`
// block receives the correct references to clean up the listeners.
@ -133,20 +139,20 @@ export async function fetchNostrEvent(filter: NostrFilter): Promise<NostrEvent | @@ -133,20 +139,20 @@ export async function fetchNostrEvent(filter: NostrFilter): Promise<NostrEvent |
ws.addEventListener("message", messageHandler);
ws.addEventListener("error", errorHandler);
})
.withTimeout(2000)
.finally(() => {
ws.removeEventListener("message", messageHandler);
ws.removeEventListener("error", errorHandler);
WebSocketPool.instance.release(ws);
});
.withTimeout(2000)
.finally(() => {
ws.removeEventListener("message", messageHandler);
ws.removeEventListener("error", errorHandler);
WebSocketPool.instance.release(ws);
});
ws.send(JSON.stringify(["REQ", subId, filter]));
const result = await res;
if (result) {
return result;
}
return null;
} catch (err) {
return null;
@ -155,14 +161,14 @@ export async function fetchNostrEvent(filter: NostrFilter): Promise<NostrEvent | @@ -155,14 +161,14 @@ export async function fetchNostrEvent(filter: NostrFilter): Promise<NostrEvent |
// Wait for all relay results and find the first successful one
const results = await Promise.allSettled(relayPromises);
// Find the first successful result
for (const result of results) {
if (result.status === 'fulfilled' && result.value) {
if (result.status === "fulfilled" && result.value) {
return result.value;
}
}
return null;
}
@ -191,7 +197,10 @@ export async function fetchEventByDTag(dTag: string): Promise<NostrEvent> { @@ -191,7 +197,10 @@ export async function fetchEventByDTag(dTag: string): Promise<NostrEvent> {
try {
const event = await fetchNostrEvent({ "#d": [dTag], limit: 1 });
if (!event) {
error(404, `Event not found for d-tag: ${dTag}. href="/events?d=${dTag}"`);
error(
404,
`Event not found for d-tag: ${dTag}. href="/events?d=${dTag}"`,
);
}
return event;
} catch (err) {
@ -215,7 +224,10 @@ export async function fetchEventByNaddr(naddr: string): Promise<NostrEvent> { @@ -215,7 +224,10 @@ export async function fetchEventByNaddr(naddr: string): Promise<NostrEvent> {
};
const event = await fetchNostrEvent(filter);
if (!event) {
error(404, `Event not found for naddr: ${naddr}. href="/events?id=${naddr}"`);
error(
404,
`Event not found for naddr: ${naddr}. href="/events?id=${naddr}"`,
);
}
return event;
} catch (err) {
@ -234,7 +246,10 @@ export async function fetchEventByNevent(nevent: string): Promise<NostrEvent> { @@ -234,7 +246,10 @@ export async function fetchEventByNevent(nevent: string): Promise<NostrEvent> {
const decoded = neventDecode(nevent);
const event = await fetchNostrEvent({ ids: [decoded.id], limit: 1 });
if (!event) {
error(404, `Event not found for nevent: ${nevent}. href="/events?id=${nevent}"`);
error(
404,
`Event not found for nevent: ${nevent}. href="/events?id=${nevent}"`,
);
}
return event;
} catch (err) {

29
src/routes/+layout.svelte

@ -1,15 +1,16 @@ @@ -1,15 +1,16 @@
<script lang="ts">
import "../app.css";
import Navigation from "$lib/components/Navigation.svelte";
import { onMount } from "svelte";
import { onMount, setContext } from "svelte";
import { page } from "$app/stores";
import { goto } from "$app/navigation";
import { Alert } from "flowbite-svelte";
import { HammerSolid } from "flowbite-svelte-icons";
import { logCurrentRelayConfiguration, activeInboxRelays, activeOutboxRelays, cleanupNdk } from "$lib/ndk";
import { cleanupNdk } from "$lib/ndk";
import type { LayoutProps } from "./$types";
// Define children prop for Svelte 5
let { children } = $props();
let { data, children }: LayoutProps = $props();
setContext("ndk", data.ndk);
// Get standard metadata for OpenGraph tags
let title = "Library of Alexandria";
@ -20,24 +21,6 @@ @@ -20,24 +21,6 @@
let summary =
"Alexandria is a digital library, utilizing Nostr events for curated publications and wiki pages.";
// AI-NOTE: Refactored to avoid blocking $effect with logging operations
// Reactive effect to log relay configuration when stores change - non-blocking approach
$effect.pre(() => {
const inboxRelays = $activeInboxRelays;
const outboxRelays = $activeOutboxRelays;
// Only log if we have relays (not empty arrays)
if (inboxRelays.length > 0 || outboxRelays.length > 0) {
// Defer logging to avoid blocking the reactive system
requestAnimationFrame(() => {
console.log('🔌 Relay Configuration Updated:');
console.log('📥 Inbox Relays:', inboxRelays);
console.log('📤 Outbox Relays:', outboxRelays);
console.log(`📊 Total: ${inboxRelays.length} inbox, ${outboxRelays.length} outbox`);
});
}
});
onMount(() => {
const rect = document.body.getBoundingClientRect();
// document.body.style.height = `${rect.height}px`;

139
src/routes/+layout.ts

@ -1,141 +1,8 @@ @@ -1,141 +1,8 @@
import { getPersistedLogin, initNdk, ndkInstance } from "../lib/ndk.ts";
import {
loginWithExtension,
loginWithAmber,
loginWithNpub,
} from "../lib/stores/userStore.ts";
import { loginMethodStorageKey } from "../lib/stores/userStore.ts";
import Pharos, { pharosInstance } from "../lib/parser.ts";
import type { LayoutLoad } from "./$types";
import { get } from "svelte/store";
import { browser } from "$app/environment";
// AI-NOTE: SSR enabled for better SEO and OpenGraph support
export const ssr = true;
/**
* Attempts to restore the user's authentication session from localStorage.
* Handles extension, Amber (NIP-46), and npub login methods.
* Only runs on client-side.
*/
function restoreAuthSession() {
// Only run on client-side
if (!browser) return;
try {
const pubkey = getPersistedLogin();
const loginMethod = localStorage.getItem(loginMethodStorageKey);
const logoutFlag = localStorage.getItem("alexandria/logout/flag");
console.log("Layout load - persisted pubkey:", pubkey);
console.log("Layout load - persisted login method:", loginMethod);
console.log("Layout load - logout flag:", logoutFlag);
console.log("All localStorage keys:", Object.keys(localStorage));
if (pubkey && loginMethod && !logoutFlag) {
if (loginMethod === "extension") {
console.log("Restoring extension login...");
loginWithExtension();
} else if (loginMethod === "amber") {
// Attempt to restore Amber (NIP-46) session from localStorage
const relay = "wss://relay.nsec.app";
const localNsec = localStorage.getItem("amber/nsec");
if (localNsec) {
import("@nostr-dev-kit/ndk").then(
async ({ NDKNip46Signer }) => {
const ndk = get(ndkInstance);
try {
// deno-lint-ignore no-explicit-any
const amberSigner = (NDKNip46Signer as any).nostrconnect(
ndk,
relay,
localNsec,
{
name: "Alexandria",
perms: "sign_event:1;sign_event:4",
},
);
// Try to reconnect (blockUntilReady will resolve if Amber is running and session is valid)
await amberSigner.blockUntilReady();
const user = await amberSigner.user();
await loginWithAmber(amberSigner, user);
console.log("Amber session restored.");
} catch {
// If reconnection fails, automatically fallback to npub-only mode
console.warn(
"Amber session could not be restored. Falling back to npub-only mode.",
);
try {
// Set the flag first, before login
localStorage.setItem("alexandria/amber/fallback", "1");
console.log("Set fallback flag in localStorage");
// Small delay to ensure flag is set
await new Promise((resolve) => setTimeout(resolve, 100));
await loginWithNpub(pubkey);
console.log("Successfully fell back to npub-only mode.");
} catch (fallbackErr) {
console.error(
"Failed to fallback to npub-only mode:",
fallbackErr,
);
}
}
},
);
} else {
// No session data, automatically fallback to npub-only mode
console.log(
"No Amber session data found. Falling back to npub-only mode.",
);
// Set the flag first, before login
localStorage.setItem("alexandria/amber/fallback", "1");
console.log("Set fallback flag in localStorage");
// Small delay to ensure flag is set
setTimeout(async () => {
try {
await loginWithNpub(pubkey);
console.log("Successfully fell back to npub-only mode.");
} catch (fallbackErr) {
console.error(
"Failed to fallback to npub-only mode:",
fallbackErr,
);
}
}, 100);
}
} else if (loginMethod === "npub") {
console.log("Restoring npub login...");
loginWithNpub(pubkey);
}
} else if (logoutFlag) {
console.log("Skipping auto-login due to logout flag");
localStorage.removeItem("alexandria/logout/flag");
}
} catch (e) {
console.warn(
`Failed to restore login: ${e}\n\nContinuing with anonymous session.`,
);
}
}
import { initNdk } from "$lib/ndk";
export const load: LayoutLoad = () => {
// Initialize NDK with new relay management system
const ndk = initNdk();
ndkInstance.set(ndk);
// Only restore auth session on client-side
if (browser) {
restoreAuthSession();
}
const parser = new Pharos(ndk);
pharosInstance.set(parser);
return {
ndk,
parser,
ndk: initNdk(),
};
};
}

7
src/routes/contact/+page.svelte

@ -9,9 +9,9 @@ @@ -9,9 +9,9 @@
Input,
Modal,
} from "flowbite-svelte";
import { ndkInstance, ndkSignedIn, activeInboxRelays, activeOutboxRelays } from "$lib/ndk";
import { activeInboxRelays, activeOutboxRelays, getNdkContext } from "$lib/ndk";
import { userStore } from "$lib/stores/userStore";
import { communityRelays, anonymousRelays } from "$lib/consts";
import { anonymousRelays } from "$lib/consts";
import type NDK from "@nostr-dev-kit/ndk";
import { NDKEvent, NDKRelaySet } from "@nostr-dev-kit/ndk";
// @ts-ignore - Workaround for Svelte component import issue
@ -21,6 +21,8 @@ @@ -21,6 +21,8 @@
import { getMimeTags } from "$lib/utils/mime";
import { userBadge } from "$lib/snippets/UserSnippets.svelte";
const ndk = getNdkContext();
// Function to close the success message
function closeSuccessMessage() {
submissionSuccess = false;
@ -193,7 +195,6 @@ @@ -193,7 +195,6 @@
try {
// Get NDK instance
const ndk = $ndkInstance;
if (!ndk) {
throw new Error("NDK instance not available");
}

234
src/routes/events/+page.svelte

@ -1,6 +1,5 @@ @@ -1,6 +1,5 @@
<script lang="ts">
import { Heading, P } from "flowbite-svelte";
import { onMount } from "svelte";
import { page } from "$app/stores";
import { goto } from "$app/navigation";
import type { NDKEvent } from "$lib/utils/nostrUtils";
@ -8,20 +7,18 @@ @@ -8,20 +7,18 @@
import EventDetails from "$lib/components/EventDetails.svelte";
import RelayActions from "$lib/components/RelayActions.svelte";
import CommentBox from "$lib/components/CommentBox.svelte";
import CommentViewer from "$lib/components/CommentViewer.svelte";
import { userStore } from "$lib/stores/userStore";
import CommentViewer from "$lib/components/CommentViewer.svelte";
import { userBadge } from "$lib/snippets/UserSnippets.svelte";
import { getMatchingTags, toNpub, getUserMetadata } from "$lib/utils/nostrUtils";
import EventInput from "$lib/components/EventInput.svelte";
import { userPubkey, isLoggedIn } from "$lib/stores/authStore.Svelte";
import CopyToClipboard from "$lib/components/util/CopyToClipboard.svelte";
import { neventEncode, naddrEncode } from "$lib/utils";
import { activeInboxRelays, activeOutboxRelays, logCurrentRelayConfiguration } from "$lib/ndk";
import { activeInboxRelays } from "$lib/ndk";
import { getEventType } from "$lib/utils/mime";
import ViewPublicationLink from "$lib/components/util/ViewPublicationLink.svelte";
import { checkCommunity } from "$lib/utils/search_utility";
import { parseRepostContent, parseContent } from "$lib/utils/notification_utils";
import { fetchCurrentUserLists, isPubkeyInUserLists } from "$lib/utils/user_lists";
import EmbeddedEvent from "$lib/components/embedded_events/EmbeddedEvent.svelte";
let loading = $state(false);
let error = $state<string | null>(null);
@ -45,7 +42,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -45,7 +42,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
lud16?: string;
nip05?: string;
} | null>(null);
let user = $state($userStore);
let userRelayPreference = $state(false);
let showSidePanel = $state(false);
let searchInProgress = $state(false);
@ -53,59 +49,15 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -53,59 +49,15 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
let communityStatus = $state<Record<string, boolean>>({});
let searchResultsCollapsed = $state(false);
userStore.subscribe((val) => (user = val));
// Debug: Check if user is logged in
$effect(() => {
console.log("[Events Page] User state:", user);
console.log("[Events Page] User signed in:", user?.signedIn);
console.log("[Events Page] User pubkey:", user?.pubkey);
});
function handleEventFound(newEvent: NDKEvent) {
event = newEvent;
showSidePanel = true;
// AI-NOTE: 2025-01-24 - Preserve search results to allow navigation through them
// Don't clear search results when showing a single event - this allows users to browse through results
// searchResults = [];
// secondOrderResults = [];
// tTagResults = [];
// originalEventIds = new Set();
// originalAddresses = new Set();
// searchType = null;
// searchTerm = null;
// searchInProgress = false;
// secondOrderSearchMessage = null;
// AI-NOTE: 2025-01-24 - Properly parse profile data for kind 0 events
if (newEvent.kind === 0) {
try {
const parsedProfile = parseProfileContent(newEvent);
if (parsedProfile) {
profile = parsedProfile;
console.log("[Events Page] Parsed profile data:", parsedProfile);
// If the event doesn't have user list information, fetch it
if (typeof parsedProfile.isInUserLists !== 'boolean') {
fetchCurrentUserLists()
.then((userLists) => {
const isInLists = isPubkeyInUserLists(newEvent.pubkey, userLists);
// Update the profile with user list information
profile = { ...parsedProfile, isInUserLists: isInLists } as any;
// Also update the event's profileData
(newEvent as any).profileData = { ...parsedProfile, isInUserLists: isInLists };
})
.catch(() => {
profile = { ...parsedProfile, isInUserLists: false } as any;
(newEvent as any).profileData = { ...parsedProfile, isInUserLists: false };
});
}
} else {
console.warn("[Events Page] Failed to parse profile content for event:", newEvent.id);
profile = null;
}
} catch (error) {
console.error("[Events Page] Error parsing profile content:", error);
profile = JSON.parse(newEvent.content);
} catch {
profile = null;
}
} else {
@ -115,20 +67,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -115,20 +67,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
// AI-NOTE: 2025-01-24 - Ensure profile is cached for the event author
if (newEvent.pubkey) {
cacheProfileForPubkey(newEvent.pubkey);
// Update profile data with user list information
updateProfileDataWithUserLists([newEvent]);
// Also check community status for the individual event
if (!communityStatus[newEvent.pubkey]) {
checkCommunity(newEvent.pubkey)
.then((status) => {
communityStatus = { ...communityStatus, [newEvent.pubkey]: status };
})
.catch(() => {
communityStatus = { ...communityStatus, [newEvent.pubkey]: false };
});
}
}
}
@ -207,7 +145,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -207,7 +145,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
addresses: Set<string> = new Set(),
searchTypeParam?: string,
searchTermParam?: string,
loading: boolean = false, // AI-NOTE: 2025-01-24 - Add loading parameter for second-order search message logic
) {
searchResults = results;
secondOrderResults = secondOrder;
@ -257,10 +194,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -257,10 +194,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
// AI-NOTE: 2025-01-24 - Cache profiles for all search results
cacheProfilesForEvents([...results, ...secondOrder, ...tTagEvents]);
// Don't clear the current event - let the user continue viewing it
// event = null;
// profile = null;
}
// AI-NOTE: 2025-01-24 - Function to cache profiles for multiple events
@ -278,31 +211,9 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -278,31 +211,9 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
const cachePromises = Array.from(uniquePubkeys).map(pubkey => cacheProfileForPubkey(pubkey));
await Promise.allSettled(cachePromises);
// AI-NOTE: 2025-01-24 - Update profile data with user list information for cached events
await updateProfileDataWithUserLists(events);
console.log(`[Events Page] Profile caching complete`);
}
// AI-NOTE: 2025-01-24 - Function to update profile data with user list information
async function updateProfileDataWithUserLists(events: NDKEvent[]) {
try {
const userLists = await fetchCurrentUserLists();
for (const event of events) {
if (event.kind === 0 && event.pubkey) {
const existingProfileData = (event as any).profileData || parseProfileContent(event);
if (existingProfileData) {
const isInLists = isPubkeyInUserLists(event.pubkey, userLists);
(event as any).profileData = { ...existingProfileData, isInUserLists: isInLists };
}
}
}
} catch (error) {
console.warn("[Events Page] Failed to update profile data with user lists:", error);
}
}
function handleClear() {
searchType = null;
searchTerm = null;
@ -380,8 +291,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -380,8 +291,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
website?: string;
lud16?: string;
nip05?: string;
isInUserLists?: boolean;
listKinds?: number[];
} | null {
if (event.kind !== 0 || !event.content) {
return null;
@ -402,10 +311,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -402,10 +311,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
return neventEncode(event, $activeInboxRelays);
}
function getNaddrUrl(event: NDKEvent): string {
return naddrEncode(event, $activeInboxRelays);
}
function isAddressableEvent(event: NDKEvent): boolean {
return getEventType(event.kind || 0) === "addressable";
}
@ -437,16 +342,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -437,16 +342,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
return addr.slice(0, head) + "…" + addr.slice(-tail);
}
function formatEventDate(event: NDKEvent): string {
if (event.created_at) {
return new Date(event.created_at * 1000).toLocaleDateString();
}
if ((event as any).timestamp) {
return new Date((event as any).timestamp * 1000).toLocaleDateString();
}
return "Unknown date";
}
function onLoadingChange(val: boolean) {
loading = val;
searchInProgress =
@ -476,31 +371,9 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -476,31 +371,9 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
}
}
// AI-NOTE: 2025-01-24 - Ensure proper reactivity by creating a new object
communityStatus = { ...communityStatus, ...newCommunityStatus };
console.log("Community status updated:", communityStatus);
}
// AI-NOTE: Refactored to avoid blocking $effect with logging operations
// Reactive effect to log relay configuration when stores change - non-blocking approach
$effect.pre(() => {
const inboxRelays = $activeInboxRelays;
const outboxRelays = $activeOutboxRelays;
// Only log if we have relays (not empty arrays)
if (inboxRelays.length > 0 || outboxRelays.length > 0) {
// Defer logging to avoid blocking the reactive system
requestAnimationFrame(() => {
console.log('🔌 Events Page - Relay Configuration Updated:');
console.log('📥 Inbox Relays:', inboxRelays);
console.log('📤 Outbox Relays:', outboxRelays);
console.log(`📊 Total: ${inboxRelays.length} inbox, ${outboxRelays.length} outbox`);
});
}
});
</script>
<div class="w-full flex justify-center">
@ -574,7 +447,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -574,7 +447,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
</Heading>
<div class="space-y-4">
{#each searchResults as result, index}
{@const profileData = (result as any).profileData || parseProfileContent(result)}
{@const profileData = parseProfileContent(result)}
<button
class="w-full text-left border border-gray-300 dark:border-gray-600 rounded-lg p-4 bg-white dark:bg-primary-900/70 hover:bg-gray-100 dark:hover:bg-primary-800 focus:bg-gray-100 dark:focus:bg-primary-800 focus:outline-none focus:ring-2 focus:ring-primary-500 transition-colors overflow-hidden"
onclick={() => handleEventFound(result)}
@ -588,22 +461,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -588,22 +461,6 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<span class="text-xs text-gray-600 dark:text-gray-400"
>Kind: {result.kind}</span
>
{#if profileData?.isInUserLists}
<div
class="flex-shrink-0 w-4 h-4 bg-red-100 dark:bg-red-900 rounded-full flex items-center justify-center"
title="In your lists (follows, etc.)"
>
<svg
class="w-3 h-3 text-red-600 dark:text-red-400"
fill="currentColor"
viewBox="0 0 24 24"
>
<path
d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
/>
</svg>
</div>
{/if}
{#if result.pubkey && communityStatus[result.pubkey]}
<div
class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
@ -619,8 +476,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -619,8 +476,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
/>
</svg>
</div>
{/if}
{#if !profileData?.isInUserLists && !(result.pubkey && communityStatus[result.pubkey])}
{:else}
<div class="flex-shrink-0 w-4 h-4"></div>
{/if}
<span class="text-xs text-gray-600 dark:text-gray-400">
@ -632,7 +488,11 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -632,7 +488,11 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<span
class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
>
{formatEventDate(result)}
{result.created_at
? new Date(
result.created_at * 1000,
).toLocaleDateString()
: "Unknown date"}
</span>
</div>
{#if result.kind === 0 && profileData}
@ -714,11 +574,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -714,11 +574,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<div
class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
>
{#await ((result.kind === 6 || result.kind === 16) ? parseRepostContent(result.content) : parseContent(result.content)) then parsedContent}
{@html parsedContent.slice(0, 200)}{parsedContent.length > 200 ? "..." : ""}
{:catch}
{result.content.slice(0, 200)}{result.content.length > 200 ? "..." : ""}
{/await}
<EmbeddedEvent nostrIdentifier={result.id} nestingLevel={0} />
</div>
{/if}
{/if}
@ -761,22 +617,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -761,22 +617,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<span class="text-xs text-gray-600 dark:text-gray-400"
>Kind: {result.kind}</span
>
{#if profileData?.isInUserLists}
<div
class="flex-shrink-0 w-4 h-4 bg-red-100 dark:bg-red-900 rounded-full flex items-center justify-center"
title="In your lists (follows, etc.)"
>
<svg
class="w-3 h-3 text-red-600 dark:text-red-400"
fill="currentColor"
viewBox="0 0 24 24"
>
<path
d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
/>
</svg>
</div>
{:else if result.pubkey && communityStatus[result.pubkey]}
{#if result.pubkey && communityStatus[result.pubkey]}
<div
class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
title="Has posted to the community"
@ -803,7 +644,11 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -803,7 +644,11 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<span
class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
>
{formatEventDate(result)}
{result.created_at
? new Date(
result.created_at * 1000,
).toLocaleDateString()
: "Unknown date"}
</span>
</div>
<div class="text-xs text-blue-600 dark:text-blue-400 mb-1">
@ -892,11 +737,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -892,11 +737,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<div
class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
>
{#await ((result.kind === 6 || result.kind === 16) ? parseRepostContent(result.content) : parseContent(result.content)) then parsedContent}
{@html parsedContent.slice(0, 200)}{parsedContent.length > 200 ? "..." : ""}
{:catch}
{result.content.slice(0, 200)}{result.content.length > 200 ? "..." : ""}
{/await}
<EmbeddedEvent nostrIdentifier={result.id} nestingLevel={0} />
</div>
{/if}
{/if}
@ -933,22 +774,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -933,22 +774,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<span class="text-xs text-gray-600 dark:text-gray-400"
>Kind: {result.kind}</span
>
{#if profileData?.isInUserLists}
<div
class="flex-shrink-0 w-4 h-4 bg-red-100 dark:bg-red-900 rounded-full flex items-center justify-center"
title="In your lists (follows, etc.)"
>
<svg
class="w-3 h-3 text-red-600 dark:text-red-400"
fill="currentColor"
viewBox="0 0 24 24"
>
<path
d="M12 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z"
/>
</svg>
</div>
{:else if result.pubkey && communityStatus[result.pubkey]}
{#if result.pubkey && communityStatus[result.pubkey]}
<div
class="flex-shrink-0 w-4 h-4 bg-yellow-100 dark:bg-yellow-900 rounded-full flex items-center justify-center"
title="Has posted to the community"
@ -975,7 +801,11 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -975,7 +801,11 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<span
class="text-xs text-gray-500 dark:text-gray-400 ml-auto"
>
{formatEventDate(result)}
{result.created_at
? new Date(
result.created_at * 1000,
).toLocaleDateString()
: "Unknown date"}
</span>
</div>
{#if result.kind === 0 && profileData}
@ -1057,11 +887,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -1057,11 +887,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<div
class="text-sm text-gray-800 dark:text-gray-200 mt-1 line-clamp-2 break-words"
>
{#await ((result.kind === 6 || result.kind === 16) ? parseRepostContent(result.content) : parseContent(result.content)) then parsedContent}
{@html parsedContent.slice(0, 200)}{parsedContent.length > 200 ? "..." : ""}
{:catch}
{result.content.slice(0, 200)}{result.content.length > 200 ? "..." : ""}
{/await}
<EmbeddedEvent nostrIdentifier={result.id} nestingLevel={0} />
</div>
{/if}
{/if}
@ -1116,7 +942,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -1116,7 +942,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
{/if}
<div class="min-w-0 overflow-hidden">
<EventDetails {event} {profile} {searchValue} communityStatusMap={communityStatus} />
<EventDetails {event} {profile} />
</div>
<div class="min-w-0 overflow-hidden">
<RelayActions {event} />
@ -1126,7 +952,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte"; @@ -1126,7 +952,7 @@ import CommentViewer from "$lib/components/CommentViewer.svelte";
<CommentViewer {event} />
</div>
{#if user?.signedIn}
{#if isLoggedIn && userPubkey}
<div class="mt-8 min-w-0 overflow-hidden">
<Heading tag="h3" class="h-leather mb-4 break-words">Add Comment</Heading>
<CommentBox {event} {userRelayPreference} />

6
src/routes/my-notes/+page.svelte

@ -1,14 +1,15 @@ @@ -1,14 +1,15 @@
<script lang="ts">
import { onMount } from "svelte";
import { goto } from "$app/navigation";
import { userStore } from "$lib/stores/userStore";
import { ndkInstance } from "$lib/ndk";
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import { get } from "svelte/store";
import { getMatchingTags } from "$lib/utils/nostrUtils";
import { getTitleTagForEvent } from "$lib/utils/event_input_utils";
import asciidoctor from "asciidoctor";
import { postProcessAsciidoctorHtml } from "$lib/utils/markup/asciidoctorPostProcessor";
import { getNdkContext } from "$lib/ndk";
const ndk = getNdkContext();
let events: NDKEvent[] = $state([]);
let loading = $state(true);
@ -42,7 +43,6 @@ @@ -42,7 +43,6 @@
loading = false;
return;
}
const ndk = get(ndkInstance);
if (!ndk) {
error = "NDK not initialized.";
loading = false;

10
src/routes/new/edit/+page.svelte

@ -4,7 +4,6 @@ @@ -4,7 +4,6 @@
Textarea,
Toolbar,
ToolbarButton,
Tooltip,
} from "flowbite-svelte";
import {
CodeOutline,
@ -13,8 +12,11 @@ @@ -13,8 +12,11 @@
} from "flowbite-svelte-icons";
import Preview from "$lib/components/Preview.svelte";
import Pharos, { pharosInstance } from "$lib/parser";
import { ndkInstance } from "$lib/ndk";
import { goto } from "$app/navigation";
import { getNdkContext } from "$lib/ndk";
const ndk = getNdkContext();
let someIndexValue = 0;
// TODO: Prompt user to sign in before editing.
@ -26,7 +28,7 @@ @@ -26,7 +28,7 @@
const showPreview = () => {
try {
$pharosInstance ??= new Pharos($ndkInstance);
$pharosInstance ??= new Pharos(ndk);
$pharosInstance.reset();
$pharosInstance.parse(editorText);
} catch (e) {
@ -53,7 +55,7 @@ @@ -53,7 +55,7 @@
return;
}
$pharosInstance.generate($ndkInstance.activeUser?.pubkey!);
$pharosInstance.generate(ndk.activeUser?.pubkey!);
goto("/new/compose");
};
</script>

5
src/routes/proxy+layout.ts

@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
import type { LayoutLoad } from "./$types";
export const load: LayoutLoad = async () => {
return {};
};

6
src/routes/publication/+page.server.ts

@ -5,7 +5,7 @@ import type { PageServerLoad } from "./$types"; @@ -5,7 +5,7 @@ import type { PageServerLoad } from "./$types";
const ROUTES = {
PUBLICATION_BASE: "/publication",
NADDR: "/publication/naddr",
NEVENT: "/publication/nevent",
NEVENT: "/publication/nevent",
ID: "/publication/id",
D_TAG: "/publication/d",
START: "/start",
@ -17,7 +17,7 @@ const IDENTIFIER_PREFIXES = { @@ -17,7 +17,7 @@ const IDENTIFIER_PREFIXES = {
NEVENT: "nevent",
} as const;
export const load: PageServerLoad = ({ url }) => {
export const load: PageServerLoad = ({ url }: { url: URL }) => {
const id = url.searchParams.get("id");
const dTag = url.searchParams.get("d");
@ -38,4 +38,4 @@ export const load: PageServerLoad = ({ url }) => { @@ -38,4 +38,4 @@ export const load: PageServerLoad = ({ url }) => {
// If no query parameters, redirect to the start page
redirect(301, ROUTES.START);
};
};

26
src/routes/publication/[type]/[identifier]/+layout.server.ts

@ -1,34 +1,12 @@ @@ -1,34 +1,12 @@
import { error } from "@sveltejs/kit";
import type { LayoutServerLoad } from "./$types";
import type { NostrEvent } from "../../../../lib/utils/websocket_utils.ts";
// AI-NOTE: Server-side event fetching for SEO metadata
async function fetchEventServerSide(type: string, identifier: string): Promise<NostrEvent | null> {
// For now, return null to indicate server-side fetch not implemented
// This will fall back to client-side fetching
return null;
}
export const load: LayoutServerLoad = async ({ params, url }) => {
const { type, identifier } = params;
// Try to fetch event server-side for metadata
const indexEvent = await fetchEventServerSide(type, identifier);
// Extract metadata for meta tags (use fallbacks if no event found)
const title = indexEvent?.tags.find((tag) => tag[0] === "title")?.[1] || "Alexandria Publication";
const summary = indexEvent?.tags.find((tag) => tag[0] === "summary")?.[1] ||
"Alexandria is a digital library, utilizing Nostr events for curated publications and wiki pages.";
const image = indexEvent?.tags.find((tag) => tag[0] === "image")?.[1] || "/screenshots/old_books.jpg";
export const load: LayoutServerLoad = ({ url }: { url: URL }) => {
const currentUrl = `${url.origin}${url.pathname}`;
return {
indexEvent, // Will be null, triggering client-side fetch
metadata: {
title,
summary,
image,
currentUrl,
},
};
};
};

63
src/routes/publication/[type]/[identifier]/+page.ts

@ -1,30 +1,36 @@ @@ -1,30 +1,36 @@
import { error } from "@sveltejs/kit";
import type { PageLoad } from "./$types";
import { fetchEventByDTag, fetchEventById, fetchEventByNaddr, fetchEventByNevent } from "../../../../lib/utils/websocket_utils.ts";
import {
fetchEventByDTag,
fetchEventById,
fetchEventByNaddr,
fetchEventByNevent,
} from "../../../../lib/utils/websocket_utils.ts";
import type { NostrEvent } from "../../../../lib/utils/websocket_utils.ts";
export const load: PageLoad = async ({ params, parent }: { params: { type: string; identifier: string }; parent: any }) => {
export const load: PageLoad = async (
{ params }: {
params: { type: string; identifier: string };
},
) => {
const { type, identifier } = params;
// Get layout data (no server-side data since SSR is disabled)
const layoutData = await parent();
// AI-NOTE: Always fetch client-side since server-side fetch returns null for now
let indexEvent: NostrEvent | null = null;
try {
// Handle different identifier types
switch (type) {
case 'id':
case "id":
indexEvent = await fetchEventById(identifier);
break;
case 'd':
case "d":
indexEvent = await fetchEventByDTag(identifier);
break;
case 'naddr':
case "naddr":
indexEvent = await fetchEventByNaddr(identifier);
break;
case 'nevent':
case "nevent":
indexEvent = await fetchEventByNevent(identifier);
break;
default:
@ -33,48 +39,41 @@ export const load: PageLoad = async ({ params, parent }: { params: { type: strin @@ -33,48 +39,41 @@ export const load: PageLoad = async ({ params, parent }: { params: { type: strin
} catch (err) {
throw err;
}
if (!indexEvent) {
// AI-NOTE: Handle case where no relays are available during preloading
// This prevents 404 errors when relay stores haven't been populated yet
// Create appropriate search link based on type
let searchParam = '';
let searchParam = "";
switch (type) {
case 'id':
case "id":
searchParam = `id=${identifier}`;
break;
case 'd':
case "d":
searchParam = `d=${identifier}`;
break;
case 'naddr':
case 'nevent':
case "naddr":
case "nevent":
searchParam = `id=${identifier}`;
break;
default:
searchParam = `q=${identifier}`;
}
error(404, `Event not found for ${type}: ${identifier}. href="/events?${searchParam}"`);
}
const publicationType = indexEvent.tags.find((tag) => tag[0] === "type")?.[1] ?? "";
// AI-NOTE: Use proper NDK instance from layout or create one with relays
let ndk = layoutData?.ndk;
if (!ndk) {
// Import NDK dynamically to avoid SSR issues
const NDK = (await import("@nostr-dev-kit/ndk")).default;
// Import initNdk to get properly configured NDK with relays
const { initNdk } = await import("$lib/ndk");
ndk = initNdk();
error(
404,
`Event not found for ${type}: ${identifier}. href="/events?${searchParam}"`,
);
}
const publicationType =
indexEvent.tags.find((tag) => tag[0] === "type")?.[1] ?? "";
const result = {
publicationType,
indexEvent,
ndk, // Use minimal NDK instance
};
return result;
};

25
src/routes/visualize/+page.svelte

@ -8,7 +8,6 @@ @@ -8,7 +8,6 @@
import { onMount } from "svelte";
import { get } from "svelte/store";
import EventNetwork from "$lib/navigator/EventNetwork/index.svelte";
import { ndkInstance } from "$lib/ndk";
import type { NDKEvent } from "@nostr-dev-kit/ndk";
import { filterValidIndexEvents } from "$lib/utils";
import { networkFetchLimit } from "$lib/state";
@ -17,7 +16,7 @@ @@ -17,7 +16,7 @@
import type { PageData } from './$types';
import { getEventKindColor, getEventKindName } from "$lib/utils/eventColors";
import { extractPubkeysFromEvents, batchFetchProfiles } from "$lib/utils/profileCache";
import { userStore } from "$lib/stores/userStore";
import { activePubkey, getNdkContext } from "$lib/ndk";
// Import utility functions for tag-based event fetching
// These functions handle the complex logic of finding publications by tags
// and extracting their associated content events
@ -28,6 +27,8 @@ @@ -28,6 +27,8 @@
} from "$lib/utils/tag_event_fetch";
import { deduplicateAndCombineEvents } from "$lib/utils/eventDeduplication";
import type { EventCounts } from "$lib/types";
const ndk = getNdkContext();
// Configuration
const DEBUG = true; // Set to true to enable debug logging
@ -122,15 +123,15 @@ @@ -122,15 +123,15 @@
}
// Get the current user's pubkey
const currentUserPubkey = get(userStore).pubkey;
if (!currentUserPubkey) {
const currentUserPubkey = get(activePubkey);
if (!currentUserPubkey) {
console.warn("No logged-in user, cannot fetch user's follow list");
return [];
}
// If limit is 1, only fetch the current user's follow list
if (config.limit === 1) {
const userFollowList = await $ndkInstance.fetchEvents({
const userFollowList = await ndk.fetchEvents({
kinds: [3],
authors: [currentUserPubkey],
limit: 1
@ -148,7 +149,7 @@ @@ -148,7 +149,7 @@
debug(`Fetched user's follow list`);
} else {
// If limit > 1, fetch the user's follow list plus additional ones from people they follow
const userFollowList = await $ndkInstance.fetchEvents({
const userFollowList = await ndk.fetchEvents({
kinds: [3],
authors: [currentUserPubkey],
limit: 1
@ -180,7 +181,7 @@ @@ -180,7 +181,7 @@
debug(`Fetching ${pubkeysToFetch.length} additional follow lists (total limit: ${config.limit})`);
const additionalFollowLists = await $ndkInstance.fetchEvents({
const additionalFollowLists = await ndk.fetchEvents({
kinds: [3],
authors: pubkeysToFetch
});
@ -215,7 +216,7 @@ @@ -215,7 +216,7 @@
debug(`Fetching level ${level} follow lists for ${currentLevelPubkeys.length} pubkeys`);
// Fetch follow lists for this level
const levelFollowLists = await $ndkInstance.fetchEvents({
const levelFollowLists = await ndk.fetchEvents({
kinds: [3],
authors: currentLevelPubkeys
});
@ -362,7 +363,7 @@ @@ -362,7 +363,7 @@
const followEvents = await fetchFollowLists(config);
allFetchedEvents.push(...followEvents);
} else {
const fetchedEvents = await $ndkInstance.fetchEvents(
const fetchedEvents = await ndk.fetchEvents(
{
kinds: [config.kind],
limit: config.limit
@ -394,7 +395,7 @@ @@ -394,7 +395,7 @@
if (data.eventId) {
// Fetch specific publication
debug(`Fetching specific publication: ${data.eventId}`);
const event = await $ndkInstance.fetchEvent(data.eventId);
const event = await ndk.fetchEvent(data.eventId);
if (!event) {
throw new Error(`Publication not found: ${data.eventId}`);
@ -414,7 +415,7 @@ @@ -414,7 +415,7 @@
const indexConfig = publicationConfigs.find(ec => ec.kind === INDEX_EVENT_KIND);
const indexLimit = indexConfig?.limit || 20;
const indexEvents = await $ndkInstance.fetchEvents(
const indexEvents = await ndk.fetchEvents(
{
kinds: [INDEX_EVENT_KIND],
limit: indexLimit
@ -455,7 +456,7 @@ @@ -455,7 +456,7 @@
const contentEventPromises = Array.from(referencesByAuthor.entries()).map(
async ([author, refs]) => {
const dTags = [...new Set(refs.map(r => r.dTag))]; // Dedupe d-tags
return $ndkInstance.fetchEvents({
return ndk.fetchEvents({
kinds: enabledContentKinds, // Only fetch enabled kinds
authors: [author],
"#d": dTags,

10
src/routes/visualize/+page.ts

@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
import type { PageLoad } from './$types';
import type { PageLoad } from "./$types";
export const load: PageLoad = async ({ url }) => {
const eventId = url.searchParams.get('event');
const eventId = url.searchParams.get("event");
return {
eventId
eventId,
};
};
};

5
src/styles/events.css

@ -1,5 +0,0 @@ @@ -1,5 +0,0 @@
@layer components {
canvas.qr-code {
@apply block mx-auto my-4;
}
}

8
src/styles/notifications.css

@ -151,7 +151,13 @@ @@ -151,7 +151,13 @@
/* Transition utilities */
.transition-colors {
transition: color 0.15s ease-in-out, background-color 0.15s ease-in-out, border-color 0.15s ease-in-out, text-decoration-color 0.15s ease-in-out, fill 0.15s ease-in-out, stroke 0.15s ease-in-out;
transition:
color 0.15s ease-in-out,
background-color 0.15s ease-in-out,
border-color 0.15s ease-in-out,
text-decoration-color 0.15s ease-in-out,
fill 0.15s ease-in-out,
stroke 0.15s ease-in-out;
}
.transition-all {

20
src/styles/publications.css

@ -100,7 +100,8 @@ @@ -100,7 +100,8 @@
/* blockquote; prose and poetry quotes */
.publication-leather .quoteblock,
.publication-leather .verseblock {
@apply p-4 my-4 border-s-4 rounded border-primary-300 bg-primary-50 dark:border-primary-500 dark:bg-primary-700;
@apply p-4 my-4 border-s-4 rounded border-primary-300 bg-primary-50
dark:border-primary-500 dark:bg-primary-700;
}
.publication-leather .verseblock pre.content {
@ -154,7 +155,8 @@ @@ -154,7 +155,8 @@
}
.publication-leather .admonitionblock.tip {
@apply rounded overflow-hidden border border-success-100 dark:border-success-800;
@apply rounded overflow-hidden border border-success-100
dark:border-success-800;
}
.publication-leather .admonitionblock.tip .icon,
@ -172,7 +174,8 @@ @@ -172,7 +174,8 @@
}
.publication-leather .admonitionblock.important {
@apply rounded overflow-hidden border border-primary-200 dark:border-primary-700;
@apply rounded overflow-hidden border border-primary-200
dark:border-primary-700;
}
.publication-leather .admonitionblock.important .icon,
@ -181,7 +184,8 @@ @@ -181,7 +184,8 @@
}
.publication-leather .admonitionblock.caution {
@apply rounded overflow-hidden border border-warning-200 dark:border-warning-700;
@apply rounded overflow-hidden border border-warning-200
dark:border-warning-700;
}
.publication-leather .admonitionblock.caution .icon,
@ -190,7 +194,8 @@ @@ -190,7 +194,8 @@
}
.publication-leather .admonitionblock.warning {
@apply rounded overflow-hidden border border-danger-200 dark:border-danger-800;
@apply rounded overflow-hidden border border-danger-200
dark:border-danger-800;
}
.publication-leather .admonitionblock.warning .icon,
@ -201,7 +206,7 @@ @@ -201,7 +206,7 @@
/* listingblock, literalblock */
.publication-leather .listingblock,
.publication-leather .literalblock {
@apply p-4 rounded bg-highlight dark:bg-primary-700;
@apply p-4 rounded bg-highlight dark:bg-primary-700;
}
.publication-leather .sidebarblock .title,
@ -254,7 +259,8 @@ @@ -254,7 +259,8 @@
@screen lg {
@media (hover: hover) {
.blog .discreet .card-leather:not(:hover) {
@apply bg-primary-50 dark:bg-primary-1000 opacity-75 transition duration-500 ease-in-out;
@apply bg-primary-50 dark:bg-primary-1000 opacity-75 transition
duration-500 ease-in-out;
}
.blog .discreet .group {
@apply bg-transparent;

6
src/styles/scrollbar.css

@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
@layer components {
/* Global scrollbar styles */
* {
scrollbar-color: rgba(87, 66, 41, 0.8) transparent; /* Transparent track, default scrollbar thumb */
scrollbar-color: rgba(87, 66, 41, 0.8)
transparent; /* Transparent track, default scrollbar thumb */
}
/* Webkit Browsers (Chrome, Safari, Edge) */
@ -14,7 +15,8 @@ @@ -14,7 +15,8 @@
}
*::-webkit-scrollbar-thumb {
@apply bg-primary-500 dark:bg-primary-600 hover:bg-primary-600 dark:hover:bg-primary-800;
@apply bg-primary-500 dark:bg-primary-600 hover:bg-primary-600
dark:hover:bg-primary-800;
border-radius: 6px; /* Rounded scrollbar */
}
}

28
src/styles/visualize.css

@ -30,7 +30,8 @@ @@ -30,7 +30,8 @@
}
.legend-letter {
@apply absolute inset-0 flex items-center justify-center text-black text-xs font-bold;
@apply absolute inset-0 flex items-center justify-center text-black text-xs
font-bold;
}
.legend-text {
@ -39,7 +40,8 @@ @@ -39,7 +40,8 @@
/* Network visualization styles - specific to visualization */
.network-container {
@apply flex flex-col w-full h-[calc(100vh-138px)] min-h-[400px] max-h-[900px];
@apply flex flex-col w-full h-[calc(100vh-138px)] min-h-[400px]
max-h-[900px];
}
.network-svg-container {
@ -48,11 +50,15 @@ @@ -48,11 +50,15 @@
.network-svg {
@apply w-full sm:h-[100%] border;
@apply border border-primary-200 has-[:hover]:border-primary-700 dark:bg-primary-1000 dark:border-primary-800 dark:has-[:hover]:bg-primary-950 dark:has-[:hover]:border-primary-500 rounded;
@apply border border-primary-200 has-[:hover]:border-primary-700
dark:bg-primary-1000 dark:border-primary-800
dark:has-[:hover]:bg-primary-950 dark:has-[:hover]:border-primary-500
rounded;
}
.network-error {
@apply w-full p-4 bg-red-100 dark:bg-red-900 text-red-800 dark:text-red-200 rounded-lg mb-4;
@apply w-full p-4 bg-red-100 dark:bg-red-900 text-red-800 dark:text-red-200
rounded-lg mb-4;
}
.network-error-title {
@ -78,8 +84,9 @@ @@ -78,8 +84,9 @@
/* Tooltip styles - specific to visualization tooltips */
.tooltip-close-btn {
@apply absolute top-2 right-2 bg-gray-200 hover:bg-gray-300 dark:bg-gray-700 dark:hover:bg-gray-600
rounded-full p-1 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200;
@apply absolute top-2 right-2 bg-gray-200 hover:bg-gray-300 dark:bg-gray-700
dark:hover:bg-gray-600 rounded-full p-1 text-gray-500 hover:text-gray-700
dark:text-gray-400 dark:hover:text-gray-200;
}
.tooltip-content {
@ -91,7 +98,8 @@ @@ -91,7 +98,8 @@
}
.tooltip-title-link {
@apply text-gray-800 hover:text-blue-600 dark:text-gray-200 dark:hover:text-blue-400;
@apply text-gray-800 hover:text-blue-600 dark:text-gray-200
dark:hover:text-blue-400;
}
.tooltip-metadata {
@ -99,11 +107,13 @@ @@ -99,11 +107,13 @@
}
.tooltip-summary {
@apply mt-2 text-xs bg-gray-100 dark:bg-gray-900 p-2 rounded overflow-auto max-h-40;
@apply mt-2 text-xs bg-gray-100 dark:bg-gray-900 p-2 rounded overflow-auto
max-h-40;
}
.tooltip-content-preview {
@apply mt-2 text-xs bg-gray-100 dark:bg-gray-900 p-2 rounded overflow-auto max-h-40;
@apply mt-2 text-xs bg-gray-100 dark:bg-gray-900 p-2 rounded overflow-auto
max-h-40;
}
.tooltip-help-text {

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save