13 changed files with 853 additions and 483 deletions
@ -1,26 +1,50 @@
@@ -1,26 +1,50 @@
|
||||
LoadModule mpm_prefork_module modules/mod_mpm_prefork.so |
||||
LoadModule rewrite_module modules/mod_rewrite.so |
||||
LoadModule headers_module modules/mod_headers.so |
||||
LoadModule authz_core_module modules/mod_authz_core.so |
||||
LoadModule log_config_module modules/mod_log_config.so |
||||
LoadModule unixd_module modules/mod_unixd.so |
||||
LoadModule dir_module modules/mod_dir.so |
||||
|
||||
PidFile "/usr/local/apache2/logs/httpd.pid" |
||||
ErrorLog "/proc/self/fd/2" |
||||
CustomLog "/proc/self/fd/1" common |
||||
LogLevel info |
||||
|
||||
Listen ${PORT} |
||||
ServerName localhost |
||||
DocumentRoot "/usr/local/apache2/htdocs" |
||||
DirectoryIndex index.html |
||||
|
||||
User daemon |
||||
Group daemon |
||||
|
||||
RewriteEngine On |
||||
RewriteRule ^/healthz$ /healthz.json [L] |
||||
|
||||
<Directory "/usr/local/apache2/htdocs"> |
||||
Options Indexes FollowSymLinks |
||||
AllowOverride All |
||||
Require all granted |
||||
|
||||
RewriteEngine On |
||||
# Allow direct access to index.html and existing files |
||||
RewriteRule ^index\.html$ - [L] |
||||
# If file exists, serve it |
||||
RewriteCond %{REQUEST_FILENAME} -f |
||||
RewriteRule . - [L] |
||||
# If directory exists, serve it (DirectoryIndex will handle it) |
||||
RewriteCond %{REQUEST_FILENAME} -d |
||||
RewriteRule . - [L] |
||||
# Otherwise, serve 200.html for SPA routing |
||||
RewriteRule . /200.html [L] |
||||
</Directory> |
||||
|
||||
<Location "/healthz"> |
||||
<Location "/healthz.json"> |
||||
Header set Content-Type "application/json" |
||||
Header set Cache-Control "public, max-age=5" |
||||
</Location> |
||||
|
||||
RewriteEngine On |
||||
RewriteBase / |
||||
RewriteRule ^healthz$ /healthz.json [L] |
||||
|
||||
RewriteRule ^index\.html$ - [L] |
||||
RewriteCond %{REQUEST_FILENAME} !-f |
||||
RewriteCond %{REQUEST_FILENAME} !-d |
||||
RewriteRule . /200.html [L] |
||||
|
||||
<IfModule mod_headers.c> |
||||
Header set Service-Worker-Allowed "/" |
||||
</IfModule> |
||||
|
||||
@ -1,100 +0,0 @@
@@ -1,100 +0,0 @@
|
||||
1. When I open a ThreadDrawer, the "Replying to:..." blurb at the top should render as full event. And, if that replied-to event is also a reply, it's OP should also be rendered as a full event. And so on, up the hierarchy, until we get to an event that isn't a reference or reply to any other (no e-tag or q-tag or a-tag). I want to see the entire discussion tree, so that the event I clicked in the Feed view is displayed in complete context. |
||||
|
||||
2. Fix the Threads list loading so slowly. I should immediately be seeing what is in cache, and then you update the cache and add anything missing, in a second sweep. And make sure updating doesn't cause the page the jump around or create endless loops. |
||||
|
||||
3. Make sure that pinning and bookmarking (from the event "..." menu) actually create/update and publish the list events. |
||||
|
||||
4. Add a delete event menu item to the event "..." menu, that publishes a deletion request to all available relays. |
||||
|
||||
5. Always render a pretty OpenGraph card, for URLs, if they provide one. Unless the URL is in the middle of a list, paragraph, or otherwise part of some larger structure. |
||||
|
||||
6. Make sure that highlights work, according to NIP-84. refer to ../jumble for a working version. |
||||
|
||||
Some example events: |
||||
|
||||
{ |
||||
"id": "93bea17f71ed9ea7f6832e3be7e617b3387e0700193cfcebaf3ffbc2e6f48a7f", |
||||
"pubkey": "17538dc2a62769d09443f18c37cbe358fab5bbf981173542aa7c5ff171ed77c4", |
||||
"created_at": 1769023343, |
||||
"kind": 9802, |
||||
"tags": [ |
||||
[ |
||||
"e", |
||||
"6f854ade40cf3f24046249e650f55b33add3ee1526c00cc93cc7dfc80b8dc121", |
||||
"source" |
||||
] |
||||
], |
||||
"content": "not real wisdom, being a pretense of knowing the unknown", |
||||
"sig": "150279e733e16fa85439916f9f5b8108898a35cbf18062638dfc94e7a38f4a2faae8ce918750ef327fc16b7e7ca8739b1e8aff3b9dd238363d08eec423abba83" |
||||
} |
||||
|
||||
{ |
||||
"id": "1cd2017dd33a2efddffb9814c1993cf62e6d8a8e2e90af40973b6d4d1ea509f0", |
||||
"pubkey": "a9434ee165ed01b286becfc2771ef1705d3537d051b387288898cc00d5c885be", |
||||
"created_at": 1769288219, |
||||
"kind": 9802, |
||||
"tags": [ |
||||
[ |
||||
"p", |
||||
"a9434ee165ed01b286becfc2771ef1705d3537d051b387288898cc00d5c885be" |
||||
], |
||||
[ |
||||
"a", |
||||
"30023:a9434ee165ed01b286becfc2771ef1705d3537d051b387288898cc00d5c885be:comparing-community-specs" |
||||
], |
||||
[ |
||||
"context", |
||||
"A single publication can be targeted to up to 12 communities via one Targeted Publication event. The creator's intended audience is explicit and transparent — anyone can see which communities a piece of content was meant for. This can serve as an organic disovery route for related Communities + lowers the bar for bootstrapping new ones." |
||||
], |
||||
[ |
||||
"alt", |
||||
"This highlight was made by https://primal.net web client" |
||||
] |
||||
], |
||||
"content": " The creator's intended audience is explicit and transparent — anyone can see which communities a piece of content was meant for. This can serve as an organic disovery route for related Communities + lowers the bar for bootstrapping new ones.", |
||||
"sig": "b490a12fbc1ab0063c6ddb3ae091212a4fcf76fdf9581d5f0291f24a9443b45d9f11d70e8035ea9c61b95ad47952c46ceeffa6dbb0fa5351bc51aad2e3d54add" |
||||
} |
||||
|
||||
In the first highlight event, there is simply the content field, which should be rendered as a quote, with a link to the original source (event or URL) below it. If the URL provides OpenGraph data, display it and add the hyperlink to it. For events: display a card with "A note from: <user badge rendered>" and then the "title", "image", and "summary" tags, if available. Make the card a clickable hyperlink to the event's /event page. |
||||
|
||||
7. Make #hashtags and t-tag topic buttons clickable. Clicking on one should launch a /topics/nameOfHashtag page, that reveals an event list of everything on the relays that includes that topic as a hashtag or a t-tag. |
||||
|
||||
8. Display a metadata card, at the top of the page, when rendering any replaceable event in /event . Render tags like "image", "description", "summary", "author", "title", etc. |
||||
|
||||
9. Add an Asciidoctor library to the packages. Use that for rendering kinds 30818 and 30041. All other kinds use Markdown. |
||||
|
||||
10. If a /event page is opened for a 30040 event, make sure that you analyze and then lazy-load the entire event-index hierarchy (see ../nips-silberengel/NKBIP-01.adoc) into the cache and then into the view. The index can use a-tags or e-tags, or a mix of both. Handle both types of tags and make sure to render the events in the original order. Retry any missing events, after the first loading pass, but don't loop infinitely. |
||||
|
||||
11. Display a metadata card, at the top, for the OP 30040. Only display metadata for nested events, if they differ from the OP. |
||||
|
||||
12. Please note that kind 30040 events typically contain 30041s, but they can actually contain any type of event the creator wants. Make sure to render each one according to its kind (markdown or asciidoc). |
||||
|
||||
13. Both the metadata card and the section events should have their "title" displayed (if none is provided, render the d-tag without hyphens and in Title Case) and have a "..." menu. The section events should have a new menu item: "Open in a new window" that opens the section as a /event in the browser. The index OP should have a new menu item: "Label this as a book" that creates a "general" 1985 label with "booklist". |
||||
|
||||
14. If an event opened in /event has been highlighted, render the highlight on the displayed text. (for 30040s, this needs to run after the publication has finished loading, or it won't find the text). Hovering over the highlight should display the user-badge of the person who created the highlight, with a button "View the highlight". Clicking the button should make the highlight open to the right, in a thread panel. |
||||
|
||||
15. There should be a /replaceable/d-tag-placed-here url path that searches for all replaceable events that have that d-tag and lists them in a list. Clicking one should display it in thread-panel on the right. |
||||
|
||||
16. Add a main menu item, to the right of Feeds: Write |
||||
it should open to a page offering two choicees: find an existing event to edit, create a new event |
||||
|
||||
Clicking find should then demand they enter an event id (hex id, nevent, naddr, note) and click "Find". |
||||
The event should be searched for in cache and then the relays, (return the newest version found) and the json rendered, below a hyperlink to the related /event page. |
||||
They should be able to click an "Edit" button, and then the event is displayed as a form, where they can add/edit/delete tags and change the content. Don't render id, kind, pubkey, sig, created_at as those are to be generated when they click "Publish". Publish to cache and to the standard write-relays. Publishing should reveal the standard success/failure message for the relays. If none were successful, allow them to attempt to republish from cache. If successful, wait 5 seconds and then, open the event in the /event page. |
||||
|
||||
Clicking create should ask them to enter a kind they would like to write: 1, 11, 9802, 1222, 20, 21, 22, 30023, 30818, 30817, 30041, 30040 (metadata-only, no sections added, they can do that manually in the edit function, add that as a help-text), 1068 |
||||
|
||||
17. If the user is looking at their own profile page, display a menu item "Adjust profile events" that opens a left-side panel that allows them select one of the following events to create/update: 0, 3, 30315, 10133, 10002, 10432, 10001, 10003, 10895, 10015, 10030, 30030, 10000, 30008. Selecting one should open an appropriate form and preload it with any event found in cache or on the relays. Publish to cache and to the standard write-relays. Publishing should reveal the standard success/failure message for the relays. If none were successful, allow them to attempt to republish from cache. If successful, wait 5 seconds and then, open the event in the /event page. |
||||
|
||||
18. Make sure the /event page can handle metadata-only (no "content") events gracefully, displaying their tag-lists. |
||||
|
||||
Get rid of the light/dark mode button on the main nav bar. Instead, change the preferences button so that it opens a left-side panel with light/dark mode, text-size and paragraph spacing settings, as well as a new checkbox: Create expiring events (6 months: kinds 7, 1, 30315) |
||||
|
||||
that adds a 6-month expiration time stamp to those event they create, like: |
||||
["expiration", "1600000000"] |
||||
|
||||
also allow them to determine their preferred media-upload server (see ../jumble for how this is done, in /settings/posts) |
||||
|
||||
and add a button "Manage Cache" that opens a page /cache that contains a full cache browser and manager |
||||
|
||||
Add a short "About" section, at the bottom of the panel. |
||||
@ -0,0 +1,166 @@
@@ -0,0 +1,166 @@
|
||||
/** |
||||
* Memory management for Nostr client |
||||
* Tracks in-memory event usage and provides cleanup mechanisms |
||||
*/ |
||||
|
||||
import type { NostrEvent } from '../../types/nostr.js'; |
||||
|
||||
interface EventReference { |
||||
id: string; |
||||
size: number; |
||||
timestamp: number; |
||||
} |
||||
|
||||
class MemoryManager { |
||||
private eventReferences: Map<string, EventReference> = new Map(); |
||||
private totalSize: number = 0; |
||||
private warningThresholds = [50 * 1024 * 1024, 100 * 1024 * 1024, 200 * 1024 * 1024]; // 50MB, 100MB, 200MB
|
||||
private lastWarningLevel: number = -1; |
||||
|
||||
/** |
||||
* Estimate size of an event in bytes |
||||
*/ |
||||
private estimateEventSize(event: NostrEvent): number { |
||||
// Rough estimate: JSON string length + overhead
|
||||
return JSON.stringify(event).length + 100; // 100 bytes overhead for Map entry
|
||||
} |
||||
|
||||
/** |
||||
* Track an event in memory |
||||
*/ |
||||
trackEvent(event: NostrEvent): void { |
||||
const id = event.id; |
||||
const size = this.estimateEventSize(event); |
||||
|
||||
// If already tracked, update size if different
|
||||
const existing = this.eventReferences.get(id); |
||||
if (existing) { |
||||
this.totalSize -= existing.size; |
||||
} |
||||
|
||||
this.eventReferences.set(id, { |
||||
id, |
||||
size, |
||||
timestamp: Date.now() |
||||
}); |
||||
|
||||
this.totalSize += size; |
||||
this.checkThresholds(); |
||||
} |
||||
|
||||
/** |
||||
* Untrack an event (when it's removed from memory) |
||||
*/ |
||||
untrackEvent(eventId: string): void { |
||||
const ref = this.eventReferences.get(eventId); |
||||
if (ref) { |
||||
this.totalSize -= ref.size; |
||||
this.eventReferences.delete(eventId); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* Untrack multiple events |
||||
*/ |
||||
untrackEvents(eventIds: string[]): void { |
||||
for (const id of eventIds) { |
||||
this.untrackEvent(id); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* Check memory thresholds and warn if exceeded |
||||
*/ |
||||
private checkThresholds(): void { |
||||
const currentLevel = this.warningThresholds.findIndex(threshold => this.totalSize >= threshold); |
||||
|
||||
if (currentLevel > this.lastWarningLevel) { |
||||
const thresholdMB = this.warningThresholds[currentLevel] / (1024 * 1024); |
||||
const currentMB = (this.totalSize / (1024 * 1024)).toFixed(2); |
||||
console.warn( |
||||
`[memory-manager] Memory usage exceeded ${thresholdMB}MB threshold. ` + |
||||
`Current usage: ${currentMB}MB (${this.eventReferences.size} events)` |
||||
); |
||||
this.lastWarningLevel = currentLevel; |
||||
|
||||
// If we've exceeded the highest threshold, suggest cleanup
|
||||
if (currentLevel === this.warningThresholds.length - 1) { |
||||
console.warn( |
||||
`[memory-manager] Consider cleaning up old events. ` + |
||||
`Use cleanupOldEvents() to free memory.` |
||||
); |
||||
} |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* Clean up oldest events until we're under the target size |
||||
*/ |
||||
cleanupOldEvents(targetSize: number): string[] { |
||||
if (this.totalSize <= targetSize) { |
||||
return []; |
||||
} |
||||
|
||||
const sorted = Array.from(this.eventReferences.values()) |
||||
.sort((a, b) => a.timestamp - b.timestamp); // Oldest first
|
||||
|
||||
const removed: string[] = []; |
||||
let freedSize = 0; |
||||
const targetFreed = this.totalSize - targetSize; |
||||
|
||||
for (const ref of sorted) { |
||||
if (freedSize >= targetFreed) { |
||||
break; |
||||
} |
||||
|
||||
this.totalSize -= ref.size; |
||||
this.eventReferences.delete(ref.id); |
||||
removed.push(ref.id); |
||||
freedSize += ref.size; |
||||
} |
||||
|
||||
const freedMB = (freedSize / (1024 * 1024)).toFixed(2); |
||||
console.debug( |
||||
`[memory-manager] Cleaned up ${removed.length} old events, freed ${freedMB}MB` |
||||
); |
||||
|
||||
return removed; |
||||
} |
||||
|
||||
/** |
||||
* Get current memory usage statistics |
||||
*/ |
||||
getStats(): { |
||||
totalSize: number; |
||||
totalSizeMB: number; |
||||
eventCount: number; |
||||
averageEventSize: number; |
||||
} { |
||||
return { |
||||
totalSize: this.totalSize, |
||||
totalSizeMB: this.totalSize / (1024 * 1024), |
||||
eventCount: this.eventReferences.size, |
||||
averageEventSize: this.eventReferences.size > 0
|
||||
? this.totalSize / this.eventReferences.size
|
||||
: 0 |
||||
}; |
||||
} |
||||
|
||||
/** |
||||
* Clear all tracking |
||||
*/ |
||||
clear(): void { |
||||
this.eventReferences.clear(); |
||||
this.totalSize = 0; |
||||
this.lastWarningLevel = -1; |
||||
} |
||||
|
||||
/** |
||||
* Get list of tracked event IDs (for debugging) |
||||
*/ |
||||
getTrackedEventIds(): string[] { |
||||
return Array.from(this.eventReferences.keys()); |
||||
} |
||||
} |
||||
|
||||
export const memoryManager = new MemoryManager(); |
||||
Loading…
Reference in new issue