Merge upstream main into vanish optimization branch.

Resolve IUserRepository conflict by retaining both vanish-state methods and new admit-user API, and keep branch passing build/lint/unit tests.

Made-with: Cursor

Author: vikashsiwach

.gitignore

@@ -43,4 +43,6 @@ dist
 .nostr
 
 # Docker Compose overrides
-docker-compose.overrides.yml
+docker-compose.overrides.yml
+# Export output
+*.jsonl

.nycrc.json

@@ -1,26 +1,26 @@
 {
   "all": true,
   "cache": true,
-  "branches": 80,
-  "lines": 80,
-  "functions": 80,
-  "statements": 80,
+  "branches": 47,
+  "lines": 54,
+  "functions": 48,
+  "statements": 55,
   "watermarks": {
     "lines": [
-      80,
-      95
+      54,
+      80
     ],
     "functions": [
-      80,
-      95
+      48,
+      80
     ],
     "branches": [
-      80,
-      95
+      47,
+      80
     ],
     "statements": [
-      80,
-      95
+      55,
+      80
     ]
   },
   "extension": [

README.md

@@ -570,6 +570,54 @@ To see the integration test coverage report open `.coverage/integration/lcov-rep
   open .coverage/integration/lcov-report/index.html
   ```
 
+## Export Events
+
+Export all stored events to a [JSON Lines](https://jsonlines.org/) (`.jsonl`) file. Each line is a valid NIP-01 Nostr event JSON object. The export streams rows from the database using cursors, so it works safely on relays with millions of events without loading them into memory.
+
+```
+npm run export                            # writes to events.jsonl
+npm run export -- backup-2024-01-01.jsonl # custom filename
+```
+
+The script reads the same `DB_*` environment variables used by the relay (see [CONFIGURATION.md](CONFIGURATION.md)).
+## Relay Maintenance
+
+Use `clean-db` to wipe or prune `events` table data. This also removes
+corresponding data from the derived `event_tags` table when present.
+
+Dry run (no deletion):
+
+  ```
+  npm run clean-db -- --all --dry-run
+  ```
+
+Full wipe:
+
+  ```
+  npm run clean-db -- --all --force
+  ```
+
+Delete events older than N days:
+
+  ```
+  npm run clean-db -- --older-than=30 --force
+  ```
+
+Delete only selected kinds:
+
+  ```
+  npm run clean-db -- --kinds=1,7,4 --force
+  ```
+
+Delete only selected kinds older than N days:
+
+  ```
+  npm run clean-db -- --older-than=30 --kinds=1,7,4 --force
+  ```
+
+By default, the script asks for explicit confirmation (`Type 'DELETE' to confirm`).
+Use `--force` to skip the prompt.
+
 ## Configuration
 
 You can change the default folder by setting the `NOSTR_CONFIG_DIR` environment variable to a different path.

migrations/20260409201624_admit_user_func.js

@@ -0,0 +1,27 @@
+exports.up = async function (knex) {
+  return knex.schema
+    .raw(
+      `CREATE OR REPLACE FUNCTION admit_user(user_pubkey BYTEA, tos_accepted TIMESTAMP WITHOUT TIME ZONE)
+RETURNS INTEGER
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    PERFORM ASSERT_SERIALIZED();
+
+    INSERT INTO "users" ("pubkey", "is_admitted", "tos_accepted_at", "created_at", "updated_at")
+    VALUES (user_pubkey, true, tos_accepted, now_utc(), now_utc())
+    ON CONFLICT ("pubkey")
+    DO UPDATE SET
+      "is_admitted" = true,
+      "tos_accepted_at" = tos_accepted,
+      "updated_at" = now_utc();
+
+    RETURN 0;
+END;
+$$;`)
+}
+
+exports.down = function (knex) {
+  return knex.schema
+    .raw('DROP FUNCTION IF EXISTS admit_user(BYTEA, TIMESTAMP WITHOUT TIME ZONE);')
+}