feat(nip17): support gift-wrapped private direct messages

Generalize the AUTH-gated, recipient-only delivery rule from NIP-04 to
also cover NIP-17 kind 1059 gift wraps. When the relay is configured to
require AUTH for kind 1059, only the AUTH'd recipient named in the
event's `p` tag receives it; otherwise gift wraps broadcast like any
regular event.

- relay/event.py: add `is_seal`, `is_gift_wrap`, `is_private_message`
  helpers (kinds 13, 1059)
- relay/client_connection.py: rename `_is_direct_message_for_other` ->
  `_is_private_event_for_other`; key off `is_private_message` so the
  same gating applies to kinds 4 and 1059
- relay/relay.py: advertise NIPs 17, 44, 59 in NIP-11 supported_nips
- README: document NIP-17/44/59 transport-level support
- tests/test_nip17.py: unit tests for kind classification, AUTH-gated
  1059 delivery (recipient vs non-recipient vs unauthenticated), and
  regression coverage for kind 4 gating

NIP-44 (encryption) and NIP-59 (wrap/seal) are client-side concerns;
the relay treats payloads as opaque ciphertext and stores kind 1059
like any regular event.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

.gitattributes

@@ -0,0 +1 @@
+MOCK.md export-ignore

.github/workflows/ci.yml

@@ -0,0 +1,29 @@
+name: CI
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  lint:
+    uses: lnbits/lnbits/.github/workflows/lint.yml@dev
+  tests:
+    runs-on: ubuntu-latest
+    needs: [lint]
+    steps:
+      - uses: actions/checkout@v4
+      - uses: lnbits/lnbits/.github/actions/prepare@dev
+      - name: Run pytest
+        uses: pavelzw/pytest-action@v2
+        env:
+          LNBITS_BACKEND_WALLET_CLASS: FakeWallet
+          PYTHONUNBUFFERED: 1
+          DEBUG: true
+        with:
+          verbose: true
+          job-summary: true
+          emoji: false
+          click-to-expand: true
+          custom-pytest: uv run pytest
+          report-title: 'test'

.github/workflows/release.yml

@@ -0,0 +1,58 @@
+on:
+  push:
+    tags:
+      - 'v[0-9]+.[0-9]+.[0-9]+'
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Create github release
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.ref_name }}
+        run: |
+          gh release create "$tag" --generate-notes
+
+  pullrequest:
+    needs: [release]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.EXT_GITHUB }}
+          repository: lnbits/lnbits-extensions
+          path: './lnbits-extensions'
+
+      - name: setup git user
+        run: |
+          git config --global user.name "alan"
+          git config --global user.email "alan@lnbits.com"
+
+      - name: Create pull request in extensions repo
+        env:
+          GH_TOKEN: ${{ secrets.EXT_GITHUB }}
+          repo_name: '${{ github.event.repository.name }}'
+          tag: '${{ github.ref_name }}'
+          branch: 'update-${{ github.event.repository.name }}-${{ github.ref_name }}'
+          title: '[UPDATE] ${{ github.event.repository.name }} to ${{ github.ref_name }}'
+          body: 'https://github.com/lnbits/${{ github.event.repository.name }}/releases/${{ github.ref_name }}'
+          archive: 'https://github.com/lnbits/${{ github.event.repository.name }}/archive/refs/tags/${{ github.ref_name }}.zip'
+        run: |
+          cd lnbits-extensions
+          git checkout -b $branch
+
+          # if there is another open PR
+          git pull origin $branch || echo "branch does not exist"
+
+          sh util.sh update_extension $repo_name $tag
+
+          git add -A
+          git commit -am "$title"
+          git push origin $branch
+
+          # check if pr exists before creating it
+          gh config set pager cat
+          check=$(gh pr list -H $branch | wc -l)
+          test $check -ne 0 || gh pr create --title "$title" --body "$body" --repo lnbits/lnbits-extensions

.gitignore

@@ -1 +1,5 @@
 __pycache__
+node_modules
+.venv
+.mypy_cache
+data

.prettierrc

@@ -0,0 +1,12 @@
+{
+  "semi": false,
+  "arrowParens": "avoid",
+  "insertPragma": false,
+  "printWidth": 80,
+  "proseWrap": "preserve",
+  "singleQuote": true,
+  "trailingComma": "none",
+  "useTabs": false,
+  "bracketSameLine": false,
+  "bracketSpacing": false
+}

Makefile

@@ -0,0 +1,49 @@
+all: format check
+
+format: prettier black ruff
+
+check: mypy pyright checkblack checkruff checkprettier
+
+prettier:
+	uv run ./node_modules/.bin/prettier --write .
+pyright:
+	uv run ./node_modules/.bin/pyright
+
+mypy:
+	uv run mypy .
+
+black:
+	uv run black .
+
+ruff:
+	uv run ruff check . --fix
+
+checkruff:
+	uv run ruff check .
+
+checkprettier:
+	uv run ./node_modules/.bin/prettier --check .
+
+checkblack:
+	uv run black --check .
+
+checkeditorconfig:
+	editorconfig-checker
+
+test:
+	LNBITS_DATA_FOLDER="./tests/data" \
+	PYTHONUNBUFFERED=1 \
+	DEBUG=true \
+	uv run pytest
+
+install-pre-commit-hook:
+	@echo "Installing pre-commit hook to git"
+	@echo "Uninstall the hook with uv run pre-commit uninstall"
+	uv run pre-commit install
+
+pre-commit:
+	uv run pre-commit run --all-files
+
+
+checkbundle:
+	@echo "skipping checkbundle"

README.md

@@ -1,12 +1,131 @@
 # Nostr Relay
 
-## One click and spin up your own Nostr relay. Share with the world, or use privately.
+### One click and spin up your own Nostr relay. Share with the world, or use privately.
 
-A simple UI wrapper for the great python relay library <a href="https://code.pobblelabs.org/fossil/nostr_relay/">nostr_relay</a>.
+**Configure**:
 
-UI for diagnostics and management (key alow/ban lists, rate limiting) coming soon!
+- Free Plan: with limitted storage (limit can be changed)
+- Paid Plan: `pay to join` and `pay for storage`
+- Storage Limit (can buy more)
+- Rate Limit
+- Filter Limit
+- Allow/Block accounts
+- Optional Auth for `Events` and `Filters`
 
-### Usage
+## Supported NIPs
 
-1. Enable extension
-2. Enable relay 
+- [x] **NIP-01**: Basic protocol flow
+  - [x] Regular Events
+  - [x] Replaceable Events (kinds 10000-19999)
+  - [x] Ephemeral Events (kinds 20000-29999)
+  - [x] Addressable Events (kinds 30000-39999)
+- [x] **NIP-02**: Contact List and Petnames
+  - `kind: 3`: delete past contact lists as soon as the relay receives a new one
+- [x] **NIP-04**: Encrypted Direct Message
+  - if `AUTH` enabled: send only to the intended target
+- [x] **NIP-09**: Event Deletion
+  - [x] 'e' tags: Delete regular events by event ID
+  - [x] 'a' tags: Delete addressable events by address (kind:pubkey:d-identifier)
+- [x] **NIP-11**: Relay Information Document
+  - > **Note**: the endpoint is NOT on the root level of the domain. It also includes a path (eg https://lnbits.link/nostrrelay/)
+- [ ] **NIP-12**: Generic Tag Queries
+  - todo
+- [x] **NIP-15**: End of Stored Events Notice
+- [x] **NIP-16**: Event Treatment
+  - [x] Regular Events
+  - [x] Replaceable Events
+  - [x] Ephemeral Events
+- [x] **NIP-17**: Private Direct Messages
+  - `kind: 1059` gift wraps stored and broadcast like regular events
+  - if `AUTH` enabled for `kind: 1059`: deliver only to the recipient
+    named in the `p` tag (same gating as NIP-04)
+  - encryption (NIP-44) and wrapping (NIP-59) are client-side concerns;
+    the relay handles transport only
+- [x] **NIP-20**: Command Results
+  - todo: use correct prefixes
+- [x] **NIP-22**: Event created_at Limits
+- [ ] **NIP-26**: Delegated Event Signing
+  - not planned
+- [x] **NIP-28** Public Chat
+  - `kind: 41`: handled similar to `kind 0` metadata events
+- [x] **NIP-33**: Addressable Events (moved to NIP-01)
+  - ✅ Implemented as part of NIP-01 addressable events
+- [ ] **NIP-40**: Expiration Timestamp
+  - todo
+- [x] **NIP-42**: Authentication of clients to relays
+  - todo: use correct prefix
+- [x] **NIP-44**: Encrypted Payloads (Versioned)
+  - relay treats payloads as opaque; encryption is client-side
+- [ ] **NIP-50**: Search Capability
+  - todo
+- [x] **NIP-59**: Gift Wrap
+  - `kind: 13` (seal) and `kind: 1059` (gift wrap) accepted; unwrapping is client-side
+
+## Create Relay
+
+Creating a new relay is straightforward. Just click `New Relay` then enter the Relay Info.
+
+> **Note**: admin users can select a relay id. Regular users will be assigned a generated relay id.
+> The relay can be activated/deactivated.
+
+- **New Relay Dialog**
+  - ![image](https://user-images.githubusercontent.com/2951406/219601417-9292d5b9-d96c-4ff6-a6fd-6c8b37b9872d.png)
+
+## Configure Relay
+
+Find your Relay in the list and click the expand button (`+`) to configure it.
+
+### Relay Info
+
+This tab contains data according to `NIP-11` (Relay Information Document).
+
+> **Note**: the `domain` is added automatically and shoud be corrected manually if needed. This value is used for `NIP-42` (Authentication of clients to relays)
+
+- **Relay Info Tab**
+  - ![image](https://user-images.githubusercontent.com/2951406/219601945-f3987de0-ed0c-48d5-b31e-44d8356cfa9a.png)
+
+### Payment
+
+By default the relay is free to access, but it can be configured to ask for payments.
+It is encourage to also activate the `Require Auth` option for paid relays.
+
+> **Note**: check the info button (`I`) tooltip for a description of each field.
+
+- **Payment Config Tab**
+  - ![image](https://user-images.githubusercontent.com/2951406/219609779-1513ad00-e816-4b4f-8e1e-459e5e1c586f.png)
+
+Click on the Relay ID (or visit `https://{your_domain}/nostrrelay/${relay_id}`) for the Relay public page.
+Here the entry and storage fees can be paid.
+
+- **Relay Public Page**
+  - ![image](https://user-images.githubusercontent.com/2951406/219610594-ec2984ca-2c09-4187-91c3-96a25e8b5722.png)
+
+### Config
+
+Configure `NIP-22` (_Event `created_at` Limits_), `NIP-42` (_Authentication of clients to relays_) and other Relay parameters.
+
+Some configurations are not standard (`NIPs`) but they help control what clients are allowed to do, thus blocking (some) attack vectors.
+
+> **Note**: check the info button (`I`) tooltip for a description of each field.
+
+- **Config Tab**
+  - ![image](https://user-images.githubusercontent.com/2951406/219611794-57066899-5bc3-4439-ad98-af6fd4130ee9.png)
+
+### Accounts
+
+Allows the Relay operator to `Block` or `Allow` certain accounts.
+
+If an account is `allowed` then it is not required to `pay to join`.
+
+When an account is `blocked` it does not matter if it `paid to join` or if it is `allowed`.
+
+- **Accounts Tab**
+  - ![image](https://user-images.githubusercontent.com/2951406/219615500-8ca98580-dc3d-4163-b321-ae9279d47a98.png)
+
+## Development
+
+Create Symbolic Link:
+
+```
+ln -s /Users/my-user/git-repos/nostr-relay-extension/ /Users/my-user/git-repos/lnbits/lnbits/extensions/nostrrelay
+```

__init__.py

@@ -1,33 +1,59 @@
+import asyncio
+
 from fastapi import APIRouter
-from fastapi.staticfiles import StaticFiles
+from loguru import logger
 
-from lnbits.db import Database
-from lnbits.helpers import template_renderer
-from lnbits.settings import settings
-
-db = Database("ext_nostrrelay")
+from .client_manager import client_manager
+from .crud import db
+from .tasks import wait_for_paid_invoices
+from .views import nostrrelay_generic_router
+from .views_api import nostrrelay_api_router
 
 nostrrelay_ext: APIRouter = APIRouter(prefix="/nostrrelay", tags=["NostrRelay"])
+nostrrelay_ext.include_router(nostrrelay_generic_router)
+nostrrelay_ext.include_router(nostrrelay_api_router)
+
 
 nostrrelay_static_files = [
     {
         "path": "/nostrrelay/static",
-        "app": StaticFiles(directory="lnbits/extensions/nostrrelay/static"),
         "name": "nostrrelay_static",
     }
 ]
 
+nostrrelay_redirect_paths = [
+    {
+        "from_path": "/",
+        "redirect_to_path": "/api/v1/relay-info",
+        "header_filters": {"accept": "application/nostr+json"},
+    }
+]
 
-def nostrrelay_renderer():
-    return template_renderer(["lnbits/extensions/nostrrelay/templates"])
+scheduled_tasks: list[asyncio.Task] = []
 
 
-from .models import NostrRelay
-from .views import *  # noqa
-from .views_api import *  # noqa
+async def nostrrelay_stop():
+    for task in scheduled_tasks:
+        try:
+            task.cancel()
+        except Exception as ex:
+            logger.warning(ex)
+    try:
+        await client_manager.stop()
+    except Exception as ex:
+        logger.warning(ex)
 
-settings.lnbits_relay_information = {
-    "name": "LNbits Nostr Relay", 
-    "description": "Multiple relays are supported",
-    **NostrRelay.info()
-}
+
+def nostrrelay_start():
+    from lnbits.tasks import create_permanent_unique_task
+
+    task = create_permanent_unique_task("ext_nostrrelay", wait_for_paid_invoices)
+    scheduled_tasks.append(task)
+
+
+__all__ = [
+    "db",
+    "nostrrelay_ext",
+    "nostrrelay_start",
+    "nostrrelay_stop",
+]

client_manager.py

@@ -1,261 +1,3 @@
-import json
-import time
-from typing import Any, Awaitable, Callable, List, Optional, Tuple
+from .relay.client_manager import NostrClientManager
 
-from fastapi import WebSocket
-from loguru import logger
-
-from .crud import (
-    create_event,
-    delete_events,
-    get_config_for_all_active_relays,
-    get_event,
-    get_events,
-    mark_events_deleted,
-)
-from .models import ClientConfig, NostrEvent, NostrEventType, NostrFilter, RelayConfig
-
-
-class NostrClientManager:
-    def __init__(self: "NostrClientManager"):
-        self._clients: dict = {}
-        self._active_relays: dict = {}
-        self._is_ready = False
-
-    async def add_client(self, c: "NostrClientConnection") -> bool:
-        if not self._is_ready:
-            await self.init_relays()
-
-        if not (await self._allow_client(c)):
-            return False
-
-        self._set_client_callbacks(c)
-        self.clients(c.relay_id).append(c)
-
-        return True
-
-
-    def remove_client(self, c: "NostrClientConnection"):
-        self.clients(c.relay_id).remove(c)
-
-    async def broadcast_event(self, source: "NostrClientConnection", event: NostrEvent):
-        for client in self.clients(source.relay_id):
-            await client.notify_event(event)
-
-    async def init_relays(self):
-        self._active_relays = await get_config_for_all_active_relays()
-        self._is_ready = True
-
-    async def enable_relay(self, relay_id: str, config: RelayConfig):
-        self._is_ready = True
-        self._active_relays[relay_id] = config
-
-    async def disable_relay(self, relay_id: str):
-        await self._stop_clients_for_relay(relay_id)
-        if relay_id in self._active_relays:
-            del self._active_relays[relay_id]
-
-    def get_relay_config(self, relay_id: str) -> RelayConfig:
-        return self._active_relays[relay_id]
-            
-    def clients(self, relay_id: str) -> List["NostrClientConnection"]:
-        if relay_id not in self._clients:
-            self._clients[relay_id] = []
-        return self._clients[relay_id]
-
-    async def _stop_clients_for_relay(self, relay_id: str):
-        for client in self.clients(relay_id):
-            if client.relay_id == relay_id:
-                await client.stop(reason=f"Relay '{relay_id}' has been deactivated.")
-
-    async def _allow_client(self, c: "NostrClientConnection") -> bool:
-        if c.relay_id not in self._active_relays:
-            await c.stop(reason=f"Relay '{c.relay_id}' is not active")
-            return False
-        #todo: NIP-42: AUTH
-        return True
-
-    def _set_client_callbacks(self, client):
-        setattr(client, "broadcast_event", self.broadcast_event)
-        def get_client_config() -> ClientConfig:
-            return self.get_relay_config(client.relay_id)
-        setattr(client, "get_client_config", get_client_config)
-        
-class NostrClientConnection:
-
-    def __init__(self, relay_id: str, websocket: WebSocket):
-        self.websocket = websocket
-        self.relay_id = relay_id
-        self.filters: List[NostrFilter] = []
-        self.broadcast_event: Optional[Callable[[NostrClientConnection, NostrEvent], Awaitable[None]]] = None
-        self.get_client_config: Optional[Callable[[], ClientConfig]] = None
-
-        self._last_event_timestamp = 0 # in seconds
-        self._event_count_per_timestamp = 0
-
-    async def start(self):
-        await self.websocket.accept()
-        while True:
-            json_data = await self.websocket.receive_text()
-            try:
-                data = json.loads(json_data)
-
-                resp = await self._handle_message(data)
-                for r in resp:
-                    await self._send_msg(r)
-            except Exception as e:
-                logger.warning(e)
-
-    async def stop(self, reason: Optional[str]):
-        message = reason if reason else "Server closed webocket"
-        try:
-            await self._send_msg(["NOTICE", message])
-        except:
-            pass
-
-        try:
-            await self.websocket.close(reason=reason)
-        except:
-            pass
-
-    async def notify_event(self, event: NostrEvent) -> bool:
-        for filter in self.filters:
-            if filter.matches(event):
-                resp = event.serialize_response(filter.subscription_id)
-                await self._send_msg(resp)
-                return True
-        return False
-
-    async def _broadcast_event(self, e: NostrEvent):
-        if self.broadcast_event:
-            await self.broadcast_event(self, e)
-
-    async def _handle_message(self, data: List) -> List:
-        if len(data) < 2:
-            return []
-
-        message_type = data[0]
-        if message_type == NostrEventType.EVENT:
-            await self._handle_event(NostrEvent.parse_obj(data[1]))
-            return []
-        if message_type == NostrEventType.REQ:
-            if len(data) != 3:
-                return []
-            return await self._handle_request(data[1], NostrFilter.parse_obj(data[2]))
-        if message_type == NostrEventType.CLOSE:
-            self._handle_close(data[1])
-
-        return []
-
-    async def _handle_event(self, e: NostrEvent):
-        resp_nip20: List[Any] = ["OK", e.id]
-
-        valid, message = self._validate_event(e)
-        if not valid:
-            resp_nip20 + [valid, message]
-            await self._send_msg(resp_nip20)
-            return None
-
-        try:
-            if e.is_replaceable_event():
-                await delete_events(
-                    self.relay_id, NostrFilter(kinds=[e.kind], authors=[e.pubkey])
-                )
-            await create_event(self.relay_id, e)
-            await self._broadcast_event(e)
-
-            if e.is_delete_event():
-                await self._handle_delete_event(e)
-            resp_nip20 += [True, ""]
-        except Exception as ex:
-            logger.debug(ex)
-            event = await get_event(self.relay_id, e.id)
-            # todo: handle NIP20 in detail
-            message = "error: failed to create event"
-            resp_nip20 += [event != None, message]
-
-        await self._send_msg(resp_nip20)
-            
-
-    @property
-    def client_config(self) -> ClientConfig:
-        if not self.get_client_config:
-                raise Exception("Client not ready!")
-        return self.get_client_config()
-
-    async def _send_msg(self, data: List):
-        await self.websocket.send_text(json.dumps(data))
-
-    async def _handle_delete_event(self, event: NostrEvent):
-        # NIP 09
-        filter = NostrFilter(authors=[event.pubkey])
-        filter.ids = [t[1] for t in event.tags if t[0] == "e"]
-        events_to_delete = await get_events(self.relay_id, filter, False)
-        ids = [e.id for e in events_to_delete if not e.is_delete_event()]
-        await mark_events_deleted(self.relay_id, NostrFilter(ids=ids))
-
-    async def _handle_request(self, subscription_id: str, filter: NostrFilter) -> List:
-        filter.subscription_id = subscription_id
-        self._remove_filter(subscription_id)
-        if self._can_add_filter():
-            return [["NOTICE", f"Maximum number of filters ({self.client_config.max_client_filters}) exceeded."]]
-
-        filter.enforce_limit(self.client_config.limit_per_filter)
-        self.filters.append(filter)
-        events = await get_events(self.relay_id, filter)
-        serialized_events = [
-            event.serialize_response(subscription_id) for event in events
-        ]
-        resp_nip15 = ["EOSE", subscription_id]
-        serialized_events.append(resp_nip15)
-        return serialized_events
-
-    def _remove_filter(self, subscription_id: str):
-        self.filters = [f for f in self.filters if f.subscription_id != subscription_id]
-
-    def _handle_close(self, subscription_id: str):
-        self._remove_filter(subscription_id)
-
-    def _can_add_filter(self) -> bool:
-        return self.client_config.max_client_filters != 0 and len(self.filters) >= self.client_config.max_client_filters
-
-    def _validate_event(self, e: NostrEvent)-> Tuple[bool, str]:
-        if self._exceeded_max_events_per_second():
-            return False, f"Exceeded max events per second limit'!"
-
-        if not self.client_config.is_author_allowed(e.pubkey):
-            return False, f"Public key '{e.pubkey}' is not allowed in relay '{self.relay_id}'!"
-
-        try:
-            e.check_signature()
-        except ValueError:
-            return False, "invalid: wrong event `id` or `sig`"
-
-        in_range, message = self._created_at_in_range(e.created_at)
-        if not in_range:
-            return False, message
-
-        return True, ""
-
-    def _exceeded_max_events_per_second(self) -> bool:
-        if self.client_config.max_events_per_second == 0:
-            return False
-
-        current_time = round(time.time())
-        if self._last_event_timestamp == current_time:
-            self._event_count_per_timestamp += 1
-        else:
-            self._last_event_timestamp = current_time
-            self._event_count_per_timestamp = 0
-
-        return self._event_count_per_timestamp > self.client_config.max_events_per_second
-
-    def _created_at_in_range(self, created_at: int) -> Tuple[bool, str]:
-        current_time = round(time.time())
-        if self.client_config.created_at_in_past != 0:
-            if created_at < (current_time - self.client_config.created_at_in_past):
-                return False, "created_at is too much into the past"
-        if self.client_config.created_at_in_future != 0:
-            if created_at > (current_time + self.client_config.created_at_in_future):
-                return False, "created_at is too much into the future"
-        return True, ""
+client_manager: NostrClientManager = NostrClientManager()

config.json

@@ -1,6 +1,42 @@
 {
   "name": "Nostr Relay",
+  "version": "1.1.0",
   "short_description": "One click launch your own relay!",
   "tile": "/nostrrelay/static/image/nostrrelay.png",
-  "contributors": ["arcbtc", "DCs"]
+  "min_lnbits_version": "1.4.0",
+  "contributors": [
+    {
+      "name": "motorina0",
+      "uri": "https://github.com/motorina0",
+      "role": "Contributor"
+    },
+    {
+      "name": "dni",
+      "uri": "https://github.com/dni",
+      "role": "Contributor"
+    }
+  ],
+  "images": [
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/static/image/1.png"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/static/image/2.png"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/static/image/3.png"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/static/image/4.png"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/static/image/5.png"
+    },
+    {
+      "uri": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/static/image/6.png"
+    }
+  ],
+  "description_md": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/description.md",
+  "terms_and_conditions_md": "https://raw.githubusercontent.com/lnbits/nostrrelay/main/toc.md",
+  "license": "MIT"
 }

crud.py

@@ -1,204 +1,313 @@
 import json
-from typing import Any, List, Optional
 
-from lnbits.helpers import urlsafe_short_hash
+from lnbits.db import Database
 
-from . import db
-from .models import NostrEvent, NostrFilter, NostrRelay, RelayConfig
+from .models import NostrAccount, NostrEventTags
+from .relay.event import NostrEvent
+from .relay.filter import NostrFilter
+from .relay.relay import NostrRelay, RelayPublicSpec
 
-########################## RELAYS ####################
+db = Database("ext_nostrrelay")
 
-async def create_relay(user_id: str, r: NostrRelay) -> NostrRelay:
-    await db.execute(
-        """
-        INSERT INTO nostrrelay.relays (user_id, id, name, description, pubkey, contact, meta)
-        VALUES (?, ?, ?, ?, ?, ?, ?)
-        """,
-        (user_id, r.id, r.name, r.description, r.pubkey, r.contact, json.dumps(dict(r.config))),
-    )
-    relay = await get_relay(user_id, r.id)
-    assert relay, "Created relay cannot be retrieved"
+
+async def create_relay(relay: NostrRelay) -> NostrRelay:
+    await db.insert("nostrrelay.relays", relay)
     return relay
 
-async def update_relay(user_id: str, r: NostrRelay) -> NostrRelay:
-    await db.execute(
-        """
-        UPDATE nostrrelay.relays
-        SET (name, description, pubkey, contact, active, meta) = (?, ?, ?, ?, ?, ?)
-        WHERE user_id = ? AND id = ?
-        """,
-        (r.name, r.description, r.pubkey, r.contact, r.active, json.dumps(dict(r.config)), user_id, r.id),
+
+async def update_relay(relay: NostrRelay) -> NostrRelay:
+    await db.update("nostrrelay.relays", relay, "WHERE user_id = :user_id AND id = :id")
+    return relay
+
+
+async def get_relay(user_id: str, relay_id: str) -> NostrRelay | None:
+    return await db.fetchone(
+        "SELECT * FROM nostrrelay.relays WHERE user_id = :user_id AND id = :id",
+        {"user_id": user_id, "id": relay_id},
+        NostrRelay,
     )
 
-    return r
 
-async def get_relay(user_id: str, relay_id: str) -> Optional[NostrRelay]:
-    row = await db.fetchone("""SELECT * FROM nostrrelay.relays WHERE user_id = ? AND id = ?""", (user_id, relay_id,))
+async def get_relay_by_id(relay_id: str) -> NostrRelay | None:
+    """Note: it does not require `user_id`. Can read any relay. Use it with care."""
+    return await db.fetchone(
+        "SELECT * FROM nostrrelay.relays WHERE id = :id",
+        {"id": relay_id},
+        NostrRelay,
+    )
 
-    return NostrRelay.from_row(row) if row else None
 
-async def get_relays(user_id: str) -> List[NostrRelay]:
-    rows = await db.fetchall("""SELECT * FROM nostrrelay.relays WHERE user_id = ? ORDER BY id ASC""", (user_id,))
+async def get_relays(user_id: str) -> list[NostrRelay]:
+    return await db.fetchall(
+        "SELECT * FROM nostrrelay.relays WHERE user_id = :user_id ORDER BY id ASC",
+        {"user_id": user_id},
+        NostrRelay,
+    )
 
-    return [NostrRelay.from_row(row) for row in rows]
 
 async def get_config_for_all_active_relays() -> dict:
-    rows = await db.fetchall("SELECT id, meta FROM nostrrelay.relays WHERE active = true",)
+    relays = await db.fetchall(
+        "SELECT * FROM nostrrelay.relays WHERE active = true",
+        model=NostrRelay,
+    )
     active_relay_configs = {}
-    for r in rows:
-        active_relay_configs[r["id"]] = RelayConfig(**json.loads(r["meta"])) #todo: from_json
+    for relay in relays:
+        active_relay_configs[relay.id] = relay.meta
 
     return active_relay_configs
 
-async def get_public_relay(relay_id: str) -> Optional[dict]:
-    row = await db.fetchone("""SELECT * FROM nostrrelay.relays WHERE id = ?""", (relay_id,))
 
-    if not row:
+async def get_public_relay(relay_id: str) -> dict | None:
+    relay = await db.fetchone(
+        "SELECT * FROM nostrrelay.relays WHERE id = :id",
+        {"id": relay_id},
+        NostrRelay,
+    )
+    if not relay:
         return None
 
-    relay = NostrRelay.from_row(row)
     return {
         **NostrRelay.info(),
         "id": relay.id,
         "name": relay.name,
-        "description":relay.description,
-        "pubkey":relay.pubkey,
-        "contact":relay.contact
+        "description": relay.description,
+        "pubkey": relay.pubkey,
+        "contact": relay.contact,
+        "config": RelayPublicSpec(**relay.meta.dict()).dict(by_alias=True),
     }
 
 
 async def delete_relay(user_id: str, relay_id: str):
-   await db.execute("""DELETE FROM nostrrelay.relays WHERE user_id = ? AND id = ?""", (user_id, relay_id,))
-
-
-########################## EVENTS ####################
-async def create_event(relay_id: str, e: NostrEvent):
     await db.execute(
-        """
-        INSERT INTO nostrrelay.events (
-            relay_id,
-            id,
-            pubkey,
-            created_at,
-            kind,
-            content,
-            sig,
-            size
-        )
-        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
-        """,
-        (relay_id, e.id, e.pubkey, e.created_at, e.kind, e.content, e.sig, e.size_bytes),
+        "DELETE FROM nostrrelay.relays WHERE user_id = :user_id AND id = :id",
+        {"user_id": user_id, "id": relay_id},
     )
 
+
+async def create_event(event: NostrEvent):
+    event_ = await get_event(event.relay_id, event.id)
+    if event_:
+        return None
+    await db.insert("nostrrelay.events", event)
+
     # todo: optimize with bulk insert
-    for tag in e.tags:
+    for tag in event.tags:
         name, value, *rest = tag
         extra = json.dumps(rest) if rest else None
-        await create_event_tags(relay_id, e.id, name, value, extra)
-
-async def get_events(relay_id: str, filter: NostrFilter, include_tags = True) -> List[NostrEvent]:
-    query, values = build_select_events_query(relay_id, filter)
-
-    rows = await db.fetchall(query, tuple(values))
-
-    events = []
-    for row in rows:
-        event = NostrEvent.from_row(row)
-        if include_tags:
-            event.tags = await get_event_tags(relay_id, event.id)
-        events.append(event)
-
-    return events
-
-async def get_event(relay_id: str, id: str) -> Optional[NostrEvent]:
-    row = await db.fetchone("SELECT * FROM nostrrelay.events WHERE relay_id = ? AND id = ?", (relay_id, id,))
-    if not row:
-        return None
-
-    event = NostrEvent.from_row(row)
-    event.tags = await get_event_tags(relay_id, id)
-    return event
-
-async def get_storage_for_public_key(relay_id: str, pubkey: str) -> int:
-    row = await db.fetchone("SELECT SUM(size) FROM nostrrelay.events WHERE relay_id = ? AND pubkey = ?", (relay_id, pubkey,))
-    if not row:
-        return 0
-
-    return row["sum"]
-
-
-
-async def mark_events_deleted(relay_id: str,  filter: NostrFilter):
-    if filter.is_empty():
-        return None
-    _, where, values = filter.to_sql_components(relay_id)
-
-    await db.execute(f"""UPDATE nostrrelay.events SET deleted=true WHERE {" AND ".join(where)}""", tuple(values))
-
-async def delete_events(relay_id: str,  filter: NostrFilter):
-    if filter.is_empty():
-        return None
-    _, where, values = filter.to_sql_components(relay_id)
-
-    query = f"""DELETE from nostrrelay.events WHERE {" AND ".join(where)}"""
-    await db.execute(query, tuple(values))
-    #todo: delete tags
-
-
-async def delete_all_events(relay_id: str):
-    query = "DELETE from nostrrelay.events WHERE relay_id = ?"
-    await db.execute(query, (relay_id,))
-    # todo: delete tags
-
-async def create_event_tags(
-    relay_id: str, event_id: str, tag_name: str, tag_value: str, extra_values: Optional[str]
-):
-    await db.execute(
-        """
-        INSERT INTO nostrrelay.event_tags (
-            relay_id,
-            event_id,
-            name,
-            value,
-            extra
+        _tag = NostrEventTags(
+            relay_id=event.relay_id,
+            event_id=event.id,
+            name=name,
+            value=value,
+            extra=extra,
         )
-        VALUES (?, ?, ?, ?, ?)
-        """,
-        (relay_id, event_id, tag_name, tag_value, extra_values),
-    )
-
-async def get_event_tags(
-    relay_id: str, event_id: str
-) -> List[List[str]]:
-    rows = await db.fetchall(
-        "SELECT * FROM nostrrelay.event_tags WHERE relay_id = ? and event_id = ?",
-        (relay_id, event_id),
-    )
-
-    tags: List[List[str]] = []
-    for row in rows:
-        tag = [row["name"], row["value"]]
-        extra = row["extra"]
-        if extra:
-            tag += json.loads(extra)
-        tags.append(tag)
-
-    return tags
+        await create_event_tags(_tag)
 
 
-def build_select_events_query(relay_id:str, filter:NostrFilter):
-    inner_joins, where, values = filter.to_sql_components(relay_id)
+async def get_events(
+    relay_id: str, nostr_filter: NostrFilter, include_tags=True
+) -> list[NostrEvent]:
 
+    inner_joins, where, values = nostr_filter.to_sql_components(relay_id)
     query = f"""
-        SELECT id, pubkey, created_at, kind, content, sig 
-        FROM nostrrelay.events 
+        SELECT * FROM nostrrelay.events
         {" ".join(inner_joins)}
         WHERE { " AND ".join(where)}
         ORDER BY created_at DESC
         """
 
     # todo: check & enforce range
-    if filter.limit and filter.limit > 0:
-        query += f" LIMIT {filter.limit}"
+    if nostr_filter.limit and nostr_filter.limit > 0:
+        query += f" LIMIT {nostr_filter.limit}"
 
-    return query, values
+    events = await db.fetchall(query, values, NostrEvent)
+
+    for event in events:
+        if include_tags:
+            event.tags = await get_event_tags(relay_id, event.id)
+
+    return events
+
+
+async def get_event(relay_id: str, event_id: str) -> NostrEvent | None:
+    event = await db.fetchone(
+        "SELECT * FROM nostrrelay.events WHERE relay_id = :relay_id AND id = :id",
+        {"relay_id": relay_id, "id": event_id},
+        NostrEvent,
+    )
+    if not event:
+        return None
+    event.tags = await get_event_tags(relay_id, event_id)
+    return event
+
+
+async def get_storage_for_public_key(relay_id: str, publisher_pubkey: str) -> int:
+    """
+    Returns the storage space in bytes for all the events of a public key.
+    Deleted events are also counted
+    """
+    row: dict = await db.fetchone(
+        """
+        SELECT SUM(size) as sum FROM nostrrelay.events
+        WHERE relay_id = :relay_id AND publisher = :publisher GROUP BY publisher
+        """,
+        {"relay_id": relay_id, "publisher": publisher_pubkey},
+    )
+
+    if not row:
+        return 0
+
+    return round(row["sum"])
+
+
+async def get_prunable_events(relay_id: str, pubkey: str) -> list[tuple[str, int]]:
+    """
+    Return the oldest 10 000 events. Only the `id` and the size are returned,
+    so the data size should be small
+    """
+    events = await db.fetchall(
+        """
+        SELECT * FROM nostrrelay.events
+        WHERE relay_id = :relay_id AND pubkey = :pubkey
+        ORDER BY created_at ASC LIMIT 10000
+        """,
+        {"relay_id": relay_id, "pubkey": pubkey},
+        NostrEvent,
+    )
+
+    return [(event.id, event.size_bytes) for event in events]
+
+
+async def mark_events_deleted(relay_id: str, nostr_filter: NostrFilter):
+    if nostr_filter.is_empty():
+        return None
+    _, where, values = nostr_filter.to_sql_components(relay_id)
+
+    await db.execute(
+        f"UPDATE nostrrelay.events SET deleted=true WHERE {' AND '.join(where)}",
+        values,
+    )
+
+
+async def delete_events(relay_id: str, nostr_filter: NostrFilter):
+    if nostr_filter.is_empty():
+        return None
+    inner_joins, where, values = nostr_filter.to_sql_components(relay_id)
+
+    if inner_joins:
+        # Use subquery for DELETE operations with JOINs
+        subquery = f"""
+            SELECT nostrrelay.events.id FROM nostrrelay.events
+            {" ".join(inner_joins)}
+            WHERE {" AND ".join(where)}
+        """
+        query = f"DELETE FROM nostrrelay.events WHERE id IN ({subquery})"
+    else:
+        # Simple DELETE without JOINs
+        query = f"DELETE FROM nostrrelay.events WHERE {' AND '.join(where)}"
+
+    await db.execute(query, values)
+    # todo: delete tags
+
+
+# move to services
+async def prune_old_events(relay_id: str, pubkey: str, space_to_regain: int):
+    prunable_events = await get_prunable_events(relay_id, pubkey)
+    prunable_event_ids = []
+    size = 0
+
+    for pe in prunable_events:
+        prunable_event_ids.append(pe[0])
+        size += pe[1]
+
+        if size > space_to_regain:
+            break
+
+    await delete_events(relay_id, NostrFilter(ids=prunable_event_ids))
+
+
+async def delete_all_events(relay_id: str):
+    await db.execute(
+        "DELETE from nostrrelay.events WHERE relay_id = :id",
+        {"id": relay_id},
+    )
+    # todo: delete tags
+
+
+async def create_event_tags(tag: NostrEventTags):
+    await db.insert("nostrrelay.event_tags", tag)
+
+
+async def get_event_tags(relay_id: str, event_id: str) -> list[list[str]]:
+    _tags = await db.fetchall(
+        """
+        SELECT * FROM nostrrelay.event_tags
+        WHERE relay_id = :relay_id and event_id = :event_id
+        """,
+        {"relay_id": relay_id, "event_id": event_id},
+        model=NostrEventTags,
+    )
+
+    tags: list[list[str]] = []
+    for tag in _tags:
+        _tag = [tag.name, tag.value]
+        if tag.extra:
+            _tag += json.loads(tag.extra)
+        tags.append(_tag)
+
+    return tags
+
+
+async def create_account(account: NostrAccount) -> NostrAccount:
+    await db.insert("nostrrelay.accounts", account)
+    return account
+
+
+async def update_account(account: NostrAccount) -> NostrAccount:
+    await db.update(
+        "nostrrelay.accounts",
+        account,
+        "WHERE relay_id = :relay_id AND pubkey = :pubkey",
+    )
+    return account
+
+
+async def delete_account(relay_id: str, pubkey: str):
+    await db.execute(
+        """
+        DELETE FROM nostrrelay.accounts
+        WHERE relay_id = :id AND pubkey = :pubkey
+        """,
+        {"id": relay_id, "pubkey": pubkey},
+    )
+
+
+async def get_account(
+    relay_id: str,
+    pubkey: str,
+) -> NostrAccount | None:
+    return await db.fetchone(
+        """
+        SELECT * FROM nostrrelay.accounts
+        WHERE relay_id = :id AND pubkey = :pubkey
+        """,
+        {"id": relay_id, "pubkey": pubkey},
+        NostrAccount,
+    )
+
+
+async def get_accounts(
+    relay_id: str,
+    allowed=True,
+    blocked=False,
+) -> list[NostrAccount]:
+    if not allowed and not blocked:
+        return []
+    return await db.fetchall(
+        """
+        SELECT * FROM nostrrelay.accounts
+        WHERE relay_id = :id AND allowed = :allowed OR blocked = :blocked
+        """,
+        {"id": relay_id, "allowed": allowed, "blocked": blocked},
+        NostrAccount,
+    )

description.md

@@ -0,0 +1,8 @@
+Create a Nostr relay in just 2 steps!
+
+Optional settings include:
+
+- Charging for storage
+- Charging for joining
+- Npub allow/ban list (for restricting access)
+- Pruning and filtering

helpers.py

@@ -0,0 +1,37 @@
+from urllib.parse import urlparse
+
+from bech32 import bech32_decode, convertbits
+from starlette.responses import JSONResponse
+
+
+def normalize_public_key(pubkey: str) -> str:
+    if pubkey.startswith("npub1"):
+        _, decoded_data = bech32_decode(pubkey)
+        if not decoded_data:
+            raise ValueError("Public Key is not valid npub")
+
+        decoded_data_bits = convertbits(decoded_data, 5, 8, False)
+        if not decoded_data_bits:
+            raise ValueError("Public Key is not valid npub")
+        return bytes(decoded_data_bits).hex()
+
+    # check if valid hex
+    if len(pubkey) != 64:
+        raise ValueError("Public Key is not valid hex")
+    int(pubkey, 16)
+    return pubkey
+
+
+def extract_domain(url: str) -> str:
+    return urlparse(url).netloc
+
+
+def relay_info_response(relay_public_data: dict) -> JSONResponse:
+    return JSONResponse(
+        content=relay_public_data,
+        headers={
+            "Access-Control-Allow-Origin": "*",
+            "Access-Control-Allow-Headers": "*",
+            "Access-Control-Allow-Methods": "GET",
+        },
+    )

manifest.json

@@ -3,7 +3,7 @@
     {
       "id": "nostrrelay",
       "organisation": "lnbits",
-            "repository": "nostr-relay-extension"
+      "repository": "nostrrelay"
     }
   ]
 }

migrations.py

@@ -23,13 +23,15 @@ async def m001_initial(db):
         CREATE TABLE nostrrelay.events (
             relay_id TEXT NOT NULL,
             deleted BOOLEAN DEFAULT false,
-            id TEXT PRIMARY KEY,
+            publisher TEXT NOT NULL,
+            id TEXT NOT NULL,
             pubkey TEXT NOT NULL,
             created_at {db.big_int} NOT NULL,
             kind INT NOT NULL,
             content TEXT NOT NULL,
             sig TEXT NOT NULL,
-            size {db.big_int} DEFAULT 0
+            size {db.big_int} DEFAULT 0,
+            PRIMARY KEY (relay_id, id)
         );
         """
     )
@@ -45,3 +47,18 @@ async def m001_initial(db):
         );
         """
     )
+
+    await db.execute(
+        f"""
+        CREATE TABLE nostrrelay.accounts (
+            relay_id TEXT NOT NULL,
+            pubkey TEXT NOT NULL,
+            sats {db.big_int} DEFAULT 0,
+            storage {db.big_int} DEFAULT 0,
+            paid_to_join BOOLEAN DEFAULT false,
+            allowed BOOLEAN DEFAULT false,
+            blocked BOOLEAN DEFAULT false,
+            PRIMARY KEY (relay_id, pubkey)
+        );
+        """
+    )

models.py

@@ -1,260 +1,45 @@
-import hashlib
-import json
-from enum import Enum
-from sqlite3 import Row
-from typing import Any, List, Optional, Tuple
-
-from pydantic import BaseModel, Field
-from secp256k1 import PublicKey
+from pydantic import BaseModel
 
 
-class ClientConfig(BaseModel):
-    max_client_filters = Field(0, alias="maxClientFilters")
-    limit_per_filter = Field(1000, alias="limitPerFilter")
-    max_events_per_second = Field(0, alias="maxEventsPerSecond")
-
-    created_at_days_past = Field(0, alias="createdAtDaysPast")
-    created_at_hours_past = Field(0, alias="createdAtHoursPast")
-    created_at_minutes_past = Field(0, alias="createdAtMinutesPast")
-    created_at_seconds_past = Field(0, alias="createdAtSecondsPast")
-
-    created_at_days_future = Field(0, alias="createdAtDaysFuture")
-    created_at_hours_future = Field(0, alias="createdAtHoursFuture")
-    created_at_minutes_future = Field(0, alias="createdAtMinutesFuture")
-    created_at_seconds_future = Field(0, alias="createdAtSecondsFuture")
-
-    
-    free_storage_value = Field("1", alias="freeStorageValue")
-    free_storage_unit = Field("MB", alias="freeStorageUnit")
-    full_storage_action = Field("prune", alias="fullStorageAction")
-    
-    allowed_public_keys = Field([], alias="allowedPublicKeys")
-    blocked_public_keys = Field([], alias="blockedPublicKeys")
-    
-
-    def is_author_allowed(self, p: str) -> bool:
-        if p in self.blocked_public_keys:
-            return False
-        if len(self.allowed_public_keys) == 0:
-            return True
-        # todo: check payment
-        return p in self.allowed_public_keys
-
-    @property
-    def created_at_in_past(self) -> int:
-        return self.created_at_days_past * 86400 + self.created_at_hours_past * 3600 + self.created_at_minutes_past * 60 + self.created_at_seconds_past
-
-    @property
-    def created_at_in_future(self) -> int:
-        return self.created_at_days_future * 86400 + self.created_at_hours_future * 3600 + self.created_at_minutes_future * 60 + self.created_at_seconds_future
-
-    class Config:
-        allow_population_by_field_name = True
-
-class RelayConfig(ClientConfig):
-    is_paid_relay = Field(False, alias="isPaidRelay")
-    wallet = Field("")
-    cost_to_join = Field(0, alias="costToJoin")
-    free_storage = Field(0, alias="freeStorage")
-
-    storage_cost_value = Field(0, alias="storageCostValue")
-    storage_cost_unit = Field("MB", alias="storageCostUnit")
-
-
-class NostrRelay(BaseModel):
-    id: str
-    name: str
-    description: Optional[str]
-    pubkey: Optional[str]
-    contact: Optional[str]
-    active: bool = False
-
-    config: "RelayConfig" = RelayConfig()
-
-
-    @classmethod
-    def from_row(cls, row: Row) -> "NostrRelay":
-        relay = cls(**dict(row))
-        relay.config = RelayConfig(**json.loads(row["meta"]))
-        return relay
-
-    @classmethod
-    def info(cls,) -> dict:
-        return {
-            "contact": "https://t.me/lnbits",
-            "supported_nips": [1, 9, 11, 15, 20, 22],
-            "software": "LNbits",
-            "version": "",
-        }
-
-
-class NostrEventType(str, Enum):
-    EVENT = "EVENT"
-    REQ = "REQ"
-    CLOSE = "CLOSE"
-
-
-class NostrEvent(BaseModel):
-    id: str
+class BuyOrder(BaseModel):
+    action: str
+    relay_id: str
     pubkey: str
-    created_at: int
-    kind: int
-    tags: List[List[str]] = []
-    content: str = ""
-    sig: str
+    units_to_buy: int = 0
 
-    def serialize(self) -> List:
-        return [0, self.pubkey, self.created_at, self.kind, self.tags, self.content]
+    def is_valid_action(self) -> bool:
+        return self.action in ["join", "storage"]
 
-    def serialize_json(self) -> str:
-        e = self.serialize()
-        return json.dumps(e, separators=(",", ":"), ensure_ascii=False)
+
+class NostrPartialAccount(BaseModel):
+    relay_id: str
+    pubkey: str
+    allowed: bool | None = None
+    blocked: bool | None = None
+
+
+class NostrAccount(BaseModel):
+    pubkey: str
+    relay_id: str
+    sats: int = 0
+    storage: int = 0
+    paid_to_join: bool = False
+    allowed: bool = False
+    blocked: bool = False
 
     @property
-    def event_id(self) -> str:
-        data = self.serialize_json()
-        id = hashlib.sha256(data.encode()).hexdigest()
-        return id
-
-    @property
-    def size_bytes(self) -> int:
-        s = json.dumps(dict(self), separators=(",", ":"), ensure_ascii=False)
-        return len(s.encode())
-
-    def is_replaceable_event(self) -> bool:
-        return self.kind in [0, 3]
-
-    def is_delete_event(self) -> bool:
-        return self.kind == 5
-
-    def check_signature(self):
-        event_id = self.event_id
-        if self.id != event_id:
-            raise ValueError(
-                f"Invalid event id. Expected: '{event_id}' got '{self.id}'"
-            )
-        try:
-            pub_key = PublicKey(bytes.fromhex("02" + self.pubkey), True)
-        except Exception:
-            raise ValueError(
-                f"Invalid public key: '{self.pubkey}' for event '{self.id}'"
-            )
-
-        valid_signature = pub_key.schnorr_verify(
-            bytes.fromhex(event_id), bytes.fromhex(self.sig), None, raw=True
-        )
-        if not valid_signature:
-            raise ValueError(f"Invalid signature: '{self.sig}' for event '{self.id}'")
-
-    def serialize_response(self, subscription_id):
-        return [NostrEventType.EVENT, subscription_id, dict(self)]
+    def can_join(self):
+        """If an account is explicitly allowed then it does not need to pay"""
+        return self.paid_to_join or self.allowed
 
     @classmethod
-    def from_row(cls, row: Row) -> "NostrEvent":
-        return cls(**dict(row))
+    def null_account(cls) -> "NostrAccount":
+        return NostrAccount(pubkey="", relay_id="")
 
 
-class NostrFilter(BaseModel):
-    subscription_id: Optional[str]
-
-    ids: List[str] = []
-    authors: List[str] = []
-    kinds: List[int] = []
-    e: List[str] = Field([], alias="#e")
-    p: List[str] = Field([], alias="#p")
-    since: Optional[int]
-    until: Optional[int]
-    limit: Optional[int]
-
-    def matches(self, e: NostrEvent) -> bool:
-        # todo: starts with
-        if len(self.ids) != 0 and e.id not in self.ids:
-            return False
-        if len(self.authors) != 0 and e.pubkey not in self.authors:
-            return False
-        if len(self.kinds) != 0 and e.kind not in self.kinds:
-            return False
-
-        if self.since and e.created_at < self.since:
-            return False
-        if self.until and self.until > 0 and e.created_at > self.until:
-            return False
-
-        found_e_tag = self.tag_in_list(e.tags, "e")
-        found_p_tag = self.tag_in_list(e.tags, "p")
-        if not found_e_tag or not found_p_tag:
-            return False
-
-        return True
-
-    def tag_in_list(self, event_tags, tag_name) -> bool:
-        filter_tags = dict(self).get(tag_name, [])
-        if len(filter_tags) == 0:
-            return True
-
-        event_tag_values = [t[1] for t in event_tags if t[0] == tag_name]
-
-        common_tags = [
-            event_tag for event_tag in event_tag_values if event_tag in filter_tags
-        ]
-        if len(common_tags) == 0:
-            return False
-        return True
-
-    def is_empty(self):
-        return (
-            len(self.ids) == 0
-            and len(self.authors) == 0
-            and len(self.kinds) == 0
-            and len(self.e) == 0
-            and len(self.p) == 0
-            and (not self.since)
-            and (not self.until)
-        )
-
-    def enforce_limit(self, limit: int):
-        if not self.limit or self.limit > limit:
-            self.limit = limit
-
-    def to_sql_components(self, relay_id: str) -> Tuple[List[str], List[str], List[Any]]:
-        inner_joins: List[str] = []
-        where = ["deleted=false", "nostrrelay.events.relay_id = ?"]
-        values: List[Any] = [relay_id]
-
-        if len(self.e):
-            values += self.e
-            e_s = ",".join(["?"] * len(self.e))
-            inner_joins.append("INNER JOIN nostrrelay.event_tags e_tags ON nostrrelay.events.id = e_tags.event_id")
-            where.append(f" (e_tags.value in ({e_s}) AND e_tags.name = 'e')")
-
-        if len(self.p):
-            values += self.p
-            p_s = ",".join(["?"] * len(self.p))
-            inner_joins.append("INNER JOIN nostrrelay.event_tags p_tags ON nostrrelay.events.id = p_tags.event_id")
-            where.append(f" p_tags.value in ({p_s}) AND p_tags.name = 'p'")
-
-        if len(self.ids) != 0:
-            ids = ",".join(["?"] * len(self.ids))
-            where.append(f"id IN ({ids})")
-            values += self.ids
-
-        if len(self.authors) != 0:
-            authors = ",".join(["?"] * len(self.authors))
-            where.append(f"pubkey IN ({authors})")
-            values += self.authors
-
-        if len(self.kinds) != 0:
-            kinds = ",".join(["?"] * len(self.kinds))
-            where.append(f"kind IN ({kinds})")
-            values += self.kinds
-
-        if self.since:
-            where.append("created_at >= ?")
-            values += [self.since]
-
-        if self.until:
-            where.append("created_at < ?")
-            values += [self.until]
-        
-
-        return inner_joins, where, values
+class NostrEventTags(BaseModel):
+    relay_id: str
+    event_id: str
+    name: str
+    value: str
+    extra: str | None = None

package-lock.json

@@ -0,0 +1,59 @@
+{
+  "name": "nostrrelay",
+  "version": "1.0.0",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "nostrrelay",
+      "version": "1.0.0",
+      "license": "ISC",
+      "dependencies": {
+        "prettier": "^3.2.5",
+        "pyright": "^1.1.358"
+      }
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/prettier": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz",
+      "integrity": "sha512-rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==",
+      "bin": {
+        "prettier": "bin/prettier.cjs"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/prettier/prettier?sponsor=1"
+      }
+    },
+    "node_modules/pyright": {
+      "version": "1.1.369",
+      "resolved": "https://registry.npmjs.org/pyright/-/pyright-1.1.369.tgz",
+      "integrity": "sha512-K0mQzVNSN5yq+joFK0JraOlhtL2HKrubCa+SnFznkLsnoZKbmq7M8UpSSDsJKPFfevkmqOKodgGzvt27C6RJAg==",
+      "bin": {
+        "pyright": "index.js",
+        "pyright-langserver": "langserver.index.js"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.3.3"
+      }
+    }
+  }
+}

package.json

@@ -0,0 +1,15 @@
+{
+  "name": "nostrrelay",
+  "version": "1.0.0",
+  "description": "Nostrrelay",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "prettier": "^3.2.5",
+    "pyright": "^1.1.358"
+  }
+}

pyproject.toml

@@ -0,0 +1,91 @@
+[project]
+name = "nostrrelay"
+version = "1.1.0"
+requires-python = ">=3.10,<3.13"
+description = "LNbits, free and open-source Lightning wallet and accounts system."
+authors = [{ name = "Alan Bits", email = "alan@lnbits.com" }]
+urls = { Homepage = "https://lnbits.com", Repository = "https://github.com/lnbits/nostrrelay" }
+dependencies = [ "lnbits>1" ]
+
+[tool.poetry]
+package-mode = false
+
+[dependency-groups]
+dev= [
+    "black",
+    "pytest-asyncio",
+    "pytest",
+    "mypy==1.17.1",
+    "pre-commit",
+    "ruff",
+    "pytest-md",
+]
+
+[tool.mypy]
+plugins = ["pydantic.mypy"]
+
+[tool.pydantic-mypy]
+init_forbid_extra = true
+init_typed = true
+warn_required_dynamic_aliases = true
+warn_untyped_fields = true
+
+[tool.pytest.ini_options]
+log_cli = false
+testpaths = [
+  "tests"
+]
+
+[tool.black]
+line-length = 88
+
+[tool.ruff]
+# Same as Black. + 10% rule of black
+line-length = 88
+exclude = [
+    "boltz_client"
+]
+
+
+[tool.ruff.lint]
+# Enable:
+# F - pyflakes
+# E - pycodestyle errors
+# W - pycodestyle warnings
+# I - isort
+# A - flake8-builtins
+# C - mccabe
+# N - naming
+# UP - pyupgrade
+# RUF - ruff
+# B - bugbear
+select = ["F", "E", "W", "I", "A", "C", "N", "UP", "RUF", "B"]
+# UP007: pyupgrade: use X | Y instead of Optional. (python3.10)
+ignore = ["UP007"]
+
+# Allow autofix for all enabled rules (when `--fix`) is provided.
+fixable = ["ALL"]
+unfixable = []
+
+# Allow unused variables when underscore-prefixed.
+dummy-variable-rgx = "^(_+|(_+[a-zA-Z0-9_]*[a-zA-Z0-9]+?))$"
+
+# needed for pydantic
+[tool.ruff.lint.pep8-naming]
+classmethod-decorators = [
+    "root_validator",
+]
+
+# Ignore unused imports in __init__.py files.
+# [tool.ruff.lint.extend-per-file-ignores]
+# "views_api.py" = ["F401"]
+
+[tool.ruff.lint.mccabe]
+max-complexity = 11
+
+[tool.ruff.lint.flake8-bugbear]
+# Allow default arguments like, e.g., `data: List[str] = fastapi.Query(None)`.
+extend-immutable-calls = [
+    "fastapi.Depends",
+    "fastapi.Query",
+]

relay/client_connection.py

@@ -0,0 +1,357 @@
+import json
+import time
+from collections.abc import Awaitable, Callable
+from typing import Any
+
+from fastapi import WebSocket
+from lnbits.helpers import urlsafe_short_hash
+from loguru import logger
+
+from ..crud import (
+    NostrAccount,
+    create_event,
+    delete_events,
+    get_account,
+    get_event,
+    get_events,
+    mark_events_deleted,
+)
+from .event import NostrEvent, NostrEventType
+from .event_validator import EventValidator
+from .filter import NostrFilter
+from .relay import RelaySpec
+
+
+class NostrClientConnection:
+    def __init__(self, relay_id: str, websocket: WebSocket):
+        self.websocket = websocket
+        self.relay_id = relay_id
+        self.filters: list[NostrFilter] = []
+        self.auth_pubkey: str | None = None  # set if authenticated
+        self._auth_challenge: str | None = None
+        self._auth_challenge_created_at = 0
+
+        self.event_validator = EventValidator(self.relay_id)
+
+        self.broadcast_event: (
+            Callable[[NostrClientConnection, NostrEvent], Awaitable[None]] | None
+        ) = None
+        self.get_client_config: Callable[[], RelaySpec] | None = None
+
+    async def start(self):
+        await self.websocket.accept()
+        while True:
+            json_data = await self.websocket.receive_text()
+            try:
+                data = json.loads(json_data)
+
+                resp = await self._handle_message(data)
+                for r in resp:
+                    await self._send_msg(r)
+            except Exception as e:
+                logger.warning(e)
+
+    async def stop(self, reason: str | None):
+        message = reason if reason else "Server closed webocket"
+        try:
+            await self._send_msg(["NOTICE", message])
+        except Exception:
+            pass
+
+        try:
+            await self.websocket.close(reason=reason)
+        except Exception:
+            pass
+
+    def init_callbacks(self, broadcast_event: Callable, get_client_config: Callable):
+        self.broadcast_event = broadcast_event
+        self.get_client_config = get_client_config
+        self.event_validator.get_client_config = get_client_config
+
+    async def notify_event(self, event: NostrEvent) -> bool:
+        if self._is_private_event_for_other(event):
+            return False
+
+        for nostr_filter in self.filters:
+            if nostr_filter.matches(event):
+                resp = event.serialize_response(nostr_filter.subscription_id)
+                await self._send_msg(resp)
+                return True
+            else:
+                logger.info(
+                    f"[NOSTRRELAY CLIENT] ❌ Filter didn't match for event {event.id}"
+                )
+        return False
+
+    def _is_private_event_for_other(self, event: NostrEvent) -> bool:
+        """
+        p-tagged events that carry a single intended recipient (NIP-04 kind 4
+        direct messages and NIP-17 kind 1059 gift wraps) should not be
+        broadcast to arbitrary subscribers when the relay enforces AUTH for
+        that kind. Deliver only to the AUTH'd recipient named in a `p` tag.
+        """
+        if not event.is_private_message:
+            return False
+        if not self.config.event_requires_auth(event.kind):
+            return False
+        if not self.auth_pubkey:
+            return True
+        if event.has_tag_value("p", self.auth_pubkey):
+            return False
+        return True
+
+    async def _broadcast_event(self, e: NostrEvent):
+        if self.broadcast_event:
+            await self.broadcast_event(self, e)
+        else:
+            logger.warning(
+                f"[NOSTRRELAY CLIENT] ❌ No broadcast_event callback available for event {e.id}"
+            )
+
+    async def _handle_message(self, data: list) -> list:
+        if len(data) < 2:
+            return []
+
+        message_type = data[0]
+
+        if message_type == NostrEventType.EVENT:
+            event_dict = {
+                "relay_id": self.relay_id,
+                "publisher": data[1]["pubkey"],
+                **data[1],
+            }
+
+            event = NostrEvent(**event_dict)
+            # Set the size field from the size_bytes property
+            event.size = event.size_bytes
+            await self._handle_event(event)
+            return []
+        if message_type == NostrEventType.REQ:
+            if len(data) < 3:
+                return []
+            subscription_id = data[1]
+            # Handle multiple filters in REQ message
+            # First remove existing filters for this subscription_id
+            self._remove_filter(subscription_id)
+            responses = []
+            for filter_data in data[2:]:
+                response = await self._handle_request(
+                    subscription_id, NostrFilter.parse_obj(filter_data)
+                )
+                responses.extend(response)
+            return responses
+        if message_type == NostrEventType.CLOSE:
+            self._handle_close(data[1])
+        if message_type == NostrEventType.AUTH:
+            await self._handle_auth()
+
+        return []
+
+    async def _handle_event(self, e: NostrEvent):
+        logger.info(f"nostr event: [{e.kind}, {e.pubkey}, '{e.content}']")
+        resp_nip20: list[Any] = ["OK", e.id]
+
+        if e.is_auth_response_event:
+            valid, message = self.event_validator.validate_auth_event(
+                e, self._auth_challenge
+            )
+            if not valid:
+                resp_nip20 += [valid, message]
+                await self._send_msg(resp_nip20)
+                return None
+            self.auth_pubkey = e.pubkey
+
+        if not self.auth_pubkey and self.config.event_requires_auth(e.kind):
+            await self._send_msg(["AUTH", self._current_auth_challenge()])
+            resp_nip20 += [
+                False,
+                f"Relay requires authentication for events of kind '{e.kind}'",
+            ]
+            await self._send_msg(resp_nip20)
+            return None
+
+        publisher_pubkey = self.auth_pubkey if self.auth_pubkey else e.pubkey
+        valid, message = await self.event_validator.validate_write(e, publisher_pubkey)
+        if not valid:
+            resp_nip20 += [valid, message]
+            await self._send_msg(resp_nip20)
+            return None
+        try:
+            if e.is_replaceable_event:
+                await delete_events(
+                    self.relay_id,
+                    NostrFilter(kinds=[e.kind], authors=[e.pubkey], until=e.created_at),
+                )
+            if e.is_addressable_event:
+                # Extract 'd' tag value for addressable replacement (NIP-01)
+                d_tag_value = next((t[1] for t in e.tags if t[0] == "d"), None)
+
+                if d_tag_value:
+                    deletion_filter = NostrFilter(
+                        kinds=[e.kind],
+                        authors=[e.pubkey],
+                        **{"#d": [d_tag_value]},  # type: ignore
+                        until=e.created_at,
+                    )
+
+                    await delete_events(self.relay_id, deletion_filter)
+            if not e.is_ephemeral_event:
+                await create_event(e)
+            await self._broadcast_event(e)
+
+            if e.is_delete_event:
+                await self._handle_delete_event(e)
+            resp_nip20 += [True, ""]
+        except Exception as ex:
+            logger.debug(ex)
+            event = await get_event(self.relay_id, e.id)
+            # todo: handle NIP20 in detail
+            message = "error: failed to create event"
+            resp_nip20 += [event is not None, message]
+
+        await self._send_msg(resp_nip20)
+
+    @property
+    def config(self) -> RelaySpec:
+        if not self.get_client_config:
+            raise Exception("Client not ready!")
+        return self.get_client_config()
+
+    async def _send_msg(self, data: list):
+        await self.websocket.send_text(json.dumps(data))
+
+    async def _handle_delete_event(self, event: NostrEvent):
+        # NIP 09 - Handle both regular events (e tags) and parameterized replaceable events (a tags)
+
+        # Get event IDs from 'e' tags (for regular events)
+        event_ids = [t[1] for t in event.tags if t[0] == "e"]
+
+        # Get event addresses from 'a' tags (for parameterized replaceable events)
+        event_addresses = [t[1] for t in event.tags if t[0] == "a"]
+
+        ids_to_delete = []
+
+        # Handle regular event deletions (e tags)
+        if event_ids:
+            nostr_filter = NostrFilter(authors=[event.pubkey], ids=event_ids)
+            events_to_delete = await get_events(self.relay_id, nostr_filter, False)
+            ids_to_delete.extend(
+                [e.id for e in events_to_delete if not e.is_delete_event]
+            )
+
+        # Handle parameterized replaceable event deletions (a tags)
+        if event_addresses:
+            for addr in event_addresses:
+                # Parse address format: kind:pubkey:d-tag
+                parts = addr.split(":")
+                if len(parts) == 3:
+                    kind_str, addr_pubkey, d_tag = parts
+                    try:
+                        kind = int(kind_str)
+                        # Only delete if the address pubkey matches the deletion event author
+                        if addr_pubkey == event.pubkey:
+                            # NOTE: Use "#d" alias, not "d" directly (Pydantic Field alias)
+                            nostr_filter = NostrFilter(
+                                authors=[addr_pubkey],
+                                kinds=[kind],
+                                **{"#d": [d_tag]},  # Use alias to set d field
+                            )
+                            events_to_delete = await get_events(
+                                self.relay_id, nostr_filter, False
+                            )
+                            ids_to_delete.extend(
+                                [
+                                    e.id
+                                    for e in events_to_delete
+                                    if not e.is_delete_event
+                                ]
+                            )
+                        else:
+                            logger.warning(
+                                f"Deletion request pubkey mismatch: {addr_pubkey} != {event.pubkey}"
+                            )
+                    except ValueError:
+                        logger.warning(f"Invalid kind in address: {addr}")
+                else:
+                    logger.warning(
+                        f"Invalid address format (expected kind:pubkey:d-tag): {addr}"
+                    )
+
+        # Only mark events as deleted if we found specific IDs
+        if ids_to_delete:
+            await mark_events_deleted(self.relay_id, NostrFilter(ids=ids_to_delete))
+
+    async def _handle_request(
+        self, subscription_id: str, nostr_filter: NostrFilter
+    ) -> list:
+        if self.config.require_auth_filter:
+            if not self.auth_pubkey:
+                return [["AUTH", self._current_auth_challenge()]]
+            account = await get_account(self.relay_id, self.auth_pubkey)
+            if not account:
+                account = NostrAccount.null_account()
+
+            if account.blocked:
+                return [
+                    [
+                        "NOTICE",
+                        (
+                            f"Public key '{self.auth_pubkey}' is not allowed "
+                            f"in relay '{self.relay_id}'!"
+                        ),
+                    ]
+                ]
+
+            if not account.can_join and not self.config.is_free_to_join:
+                return [["NOTICE", f"This is a paid relay: '{self.relay_id}'"]]
+
+        nostr_filter.subscription_id = subscription_id
+        if not self._can_add_filter():
+            max_filters = self.config.max_client_filters
+            return [
+                [
+                    "NOTICE",
+                    f"Maximum number of filters ({max_filters}) exceeded.",
+                ]
+            ]
+
+        nostr_filter.enforce_limit(self.config.limit_per_filter)
+        self.filters.append(nostr_filter)
+        events = await get_events(self.relay_id, nostr_filter)
+        events = [e for e in events if not self._is_private_event_for_other(e)]
+        serialized_events = [
+            event.serialize_response(subscription_id) for event in events
+        ]
+        resp_nip15 = ["EOSE", subscription_id]
+        serialized_events.append(resp_nip15)
+        return serialized_events
+
+    def _remove_filter(self, subscription_id: str):
+        self.filters = [f for f in self.filters if f.subscription_id != subscription_id]
+
+    def _handle_close(self, subscription_id: str):
+        self._remove_filter(subscription_id)
+
+    async def _handle_auth(self):
+        await self._send_msg(["AUTH", self._current_auth_challenge()])
+
+    def _can_add_filter(self) -> bool:
+        return (
+            self.config.max_client_filters == 0
+            or len(self.filters) < self.config.max_client_filters
+        )
+
+    def _auth_challenge_expired(self):
+        if self._auth_challenge_created_at == 0:
+            return True
+        current_time_seconds = round(time.time())
+        chanllenge_max_age_seconds = 300  # 5 min
+        return (
+            current_time_seconds - self._auth_challenge_created_at
+        ) >= chanllenge_max_age_seconds
+
+    def _current_auth_challenge(self):
+        if self._auth_challenge_expired():
+            self._auth_challenge = self.relay_id + ":" + urlsafe_short_hash()
+            self._auth_challenge_created_at = round(time.time())
+        return self._auth_challenge

relay/client_manager.py

@@ -0,0 +1,73 @@
+from ..crud import get_config_for_all_active_relays
+from .client_connection import NostrClientConnection
+from .event import NostrEvent
+from .relay import RelaySpec
+
+
+class NostrClientManager:
+    def __init__(self: "NostrClientManager"):
+        self._clients: dict = {}
+        self._active_relays: dict = {}
+        self._is_ready = False
+
+    async def add_client(self, c: NostrClientConnection) -> bool:
+        if not self._is_ready:
+            await self.init_relays()
+
+        if not (await self._allow_client(c)):
+            return False
+
+        self._set_client_callbacks(c)
+        self.clients(c.relay_id).append(c)
+
+        return True
+
+    def remove_client(self, c: NostrClientConnection):
+        self.clients(c.relay_id).remove(c)
+
+    async def broadcast_event(self, source: NostrClientConnection, event: NostrEvent):
+        for client in self.clients(source.relay_id):
+            await client.notify_event(event)
+
+    async def init_relays(self):
+        self._active_relays = await get_config_for_all_active_relays()
+        self._is_ready = True
+
+    async def enable_relay(self, relay_id: str, config: RelaySpec):
+        self._is_ready = True
+        self._active_relays[relay_id] = config
+
+    async def disable_relay(self, relay_id: str):
+        await self._stop_clients_for_relay(relay_id)
+        if relay_id in self._active_relays:
+            del self._active_relays[relay_id]
+
+    def get_relay_config(self, relay_id: str) -> RelaySpec:
+        return self._active_relays[relay_id]
+
+    def clients(self, relay_id: str) -> list[NostrClientConnection]:
+        if relay_id not in self._clients:
+            self._clients[relay_id] = []
+        return self._clients[relay_id]
+
+    async def stop(self):
+        for relay_id in self._active_relays:
+            await self._stop_clients_for_relay(relay_id)
+
+    async def _stop_clients_for_relay(self, relay_id: str):
+        for client in self.clients(relay_id):
+            if client.relay_id == relay_id:
+                await client.stop(reason=f"Relay '{relay_id}' has been deactivated.")
+
+    async def _allow_client(self, c: NostrClientConnection) -> bool:
+        if c.relay_id not in self._active_relays:
+            await c.stop(reason=f"Relay '{c.relay_id}' is not active")
+            return False
+        return True
+
+    def _set_client_callbacks(self, client: NostrClientConnection):
+        def get_client_config() -> RelaySpec:
+            return self.get_relay_config(client.relay_id)
+
+        client.get_client_config = get_client_config
+        client.init_callbacks(self.broadcast_event, get_client_config)

relay/event.py

@@ -0,0 +1,124 @@
+import hashlib
+import json
+from enum import Enum
+
+from coincurve import PublicKeyXOnly
+from pydantic import BaseModel, Field
+
+
+class NostrEventType(str, Enum):
+    EVENT = "EVENT"
+    REQ = "REQ"
+    CLOSE = "CLOSE"
+    AUTH = "AUTH"
+
+
+class NostrEvent(BaseModel):
+    id: str
+    relay_id: str
+    publisher: str
+    pubkey: str
+    created_at: int
+    kind: int
+    tags: list[list[str]] = Field(default=[], no_database=True)
+    content: str = ""
+    sig: str
+    size: int = 0
+
+    def nostr_dict(self) -> dict:
+        _nostr_dict = dict(self)
+        _nostr_dict.pop("relay_id")
+        _nostr_dict.pop("publisher")
+        return _nostr_dict
+
+    def serialize(self) -> list:
+        return [0, self.pubkey, self.created_at, self.kind, self.tags, self.content]
+
+    def serialize_json(self) -> str:
+        e = self.serialize()
+        return json.dumps(e, separators=(",", ":"), ensure_ascii=False)
+
+    @property
+    def event_id(self) -> str:
+        data = self.serialize_json()
+        return hashlib.sha256(data.encode()).hexdigest()
+
+    @property
+    def size_bytes(self) -> int:
+        s = json.dumps(self.nostr_dict(), separators=(",", ":"), ensure_ascii=False)
+        return len(s.encode())
+
+    @property
+    def is_replaceable_event(self) -> bool:
+        return self.kind in [0, 3, 41] or (self.kind >= 10000 and self.kind < 20000)
+
+    @property
+    def is_auth_response_event(self) -> bool:
+        return self.kind == 22242
+
+    @property
+    def is_direct_message(self) -> bool:
+        return self.kind == 4
+
+    @property
+    def is_delete_event(self) -> bool:
+        return self.kind == 5
+
+    @property
+    def is_seal(self) -> bool:
+        return self.kind == 13
+
+    @property
+    def is_gift_wrap(self) -> bool:
+        return self.kind == 1059
+
+    @property
+    def is_private_message(self) -> bool:
+        # Kinds whose payload addresses a single recipient via a `p` tag and is
+        # not meant to be broadcast to other subscribers when AUTH is enforced.
+        # NIP-04 (kind 4) and NIP-17 (kind 1059 gift wrap).
+        return self.is_direct_message or self.is_gift_wrap
+
+    @property
+    def is_regular_event(self) -> bool:
+        return self.kind >= 1000 and self.kind < 10000
+
+    @property
+    def is_ephemeral_event(self) -> bool:
+        return self.kind >= 20000 and self.kind < 30000
+
+    @property
+    def is_addressable_event(self) -> bool:
+        return self.kind >= 30000 and self.kind < 40000
+
+    def check_signature(self):
+        event_id = self.event_id
+        if self.id != event_id:
+            raise ValueError(
+                f"Invalid event id. Expected: '{event_id}' got '{self.id}'"
+            )
+        try:
+            pub_key = PublicKeyXOnly(bytes.fromhex(self.pubkey))
+        except Exception as exc:
+            raise ValueError(
+                f"Invalid public key: '{self.pubkey}' for event '{self.id}'"
+            ) from exc
+
+        valid_signature = pub_key.verify(
+            bytes.fromhex(self.sig),
+            bytes.fromhex(event_id),
+        )
+        if not valid_signature:
+            raise ValueError(f"Invalid signature: '{self.sig}' for event '{self.id}'")
+
+    def serialize_response(self, subscription_id):
+        return [NostrEventType.EVENT, subscription_id, self.nostr_dict()]
+
+    def tag_values(self, tag_name: str) -> list[str]:
+        return [t[1] for t in self.tags if t[0] == tag_name]
+
+    def has_tag_value(self, tag_name: str, tag_value: str) -> bool:
+        return tag_value in self.tag_values(tag_name)
+
+    def is_direct_message_for_pubkey(self, pubkey: str) -> bool:
+        return self.is_direct_message and self.has_tag_value("p", pubkey)

relay/event_validator.py

@@ -0,0 +1,135 @@
+import time
+from collections.abc import Callable
+
+from ..crud import get_account, get_storage_for_public_key, prune_old_events
+from ..helpers import extract_domain
+from ..models import NostrAccount
+from .event import NostrEvent
+from .relay import RelaySpec
+
+
+class EventValidator:
+    def __init__(self, relay_id: str):
+        self.relay_id = relay_id
+
+        self._last_event_timestamp = 0  # in hours
+        self._event_count_per_timestamp = 0
+
+        self.get_client_config: Callable[[], RelaySpec] | None = None
+
+    async def validate_write(
+        self, e: NostrEvent, publisher_pubkey: str
+    ) -> tuple[bool, str]:
+        valid, message = self._validate_event(e)
+        if not valid:
+            return (valid, message)
+
+        if e.is_ephemeral_event:
+            return True, ""
+
+        valid, message = await self._validate_storage(publisher_pubkey, e.size_bytes)
+        if not valid:
+            return (valid, message)
+
+        return True, ""
+
+    def validate_auth_event(
+        self, e: NostrEvent, auth_challenge: str | None
+    ) -> tuple[bool, str]:
+        valid, message = self._validate_event(e)
+        if not valid:
+            return (valid, message)
+
+        relay_tag = e.tag_values("relay")
+        challenge_tag = e.tag_values("challenge")
+        if len(relay_tag) == 0 or len(challenge_tag) == 0:
+            return False, "error: NIP42 tags are missing for auth event"
+
+        if self.config.domain != extract_domain(relay_tag[0]):
+            return False, "error: wrong relay domain for auth event"
+
+        if auth_challenge != challenge_tag[0]:
+            return False, "error: wrong chanlange value for auth event"
+
+        return True, ""
+
+    @property
+    def config(self) -> RelaySpec:
+        if not self.get_client_config:
+            raise Exception("EventValidator not ready!")
+        return self.get_client_config()
+
+    def _validate_event(self, e: NostrEvent) -> tuple[bool, str]:
+        if self._exceeded_max_events_per_hour():
+            return False, "Exceeded max events per hour limit'!"
+
+        try:
+            e.check_signature()
+        except ValueError:
+            return False, "invalid: wrong event `id` or `sig`"
+
+        in_range, message = self._created_at_in_range(e.created_at)
+        if not in_range:
+            return False, message
+
+        return True, ""
+
+    async def _validate_storage(
+        self, pubkey: str, event_size_bytes: int
+    ) -> tuple[bool, str]:
+        if self.config.is_read_only_relay:
+            return False, "Cannot write event, relay is read-only"
+
+        account = await get_account(self.relay_id, pubkey)
+        if not account:
+            account = NostrAccount.null_account()
+
+        if account.blocked:
+            return (
+                False,
+                f"Public key '{pubkey}' is not allowed in relay '{self.relay_id}'!",
+            )
+
+        if not account.can_join and not self.config.is_free_to_join:
+            return False, f"This is a paid relay: '{self.relay_id}'"
+
+        stored_bytes = await get_storage_for_public_key(self.relay_id, pubkey)
+        total_available_storage = account.storage + self.config.free_storage_bytes_value
+        if (stored_bytes + event_size_bytes) <= total_available_storage:
+            return True, ""
+
+        if self.config.full_storage_action == "block":
+            return (
+                False,
+                f"Cannot write event, no storage available for public key: '{pubkey}'",
+            )
+
+        if event_size_bytes > total_available_storage:
+            return False, "Message is too large. Not enough storage available for it."
+
+        await prune_old_events(self.relay_id, pubkey, event_size_bytes)
+
+        return True, ""
+
+    def _exceeded_max_events_per_hour(self) -> bool:
+        if self.config.max_events_per_hour == 0:
+            return False
+
+        current_time = round(time.time() / 3600)
+        if self._last_event_timestamp == current_time:
+            self._event_count_per_timestamp += 1
+        else:
+            self._last_event_timestamp = current_time
+            self._event_count_per_timestamp = 0
+
+        return self._event_count_per_timestamp > self.config.max_events_per_hour
+
+    def _created_at_in_range(self, created_at: int) -> tuple[bool, str]:
+        current_time = round(time.time())
+        if self.config.created_at_in_past != 0:
+            if created_at < (current_time - self.config.created_at_in_past):
+                return False, "created_at is too much into the past"
+        if self.config.created_at_in_future != 0:
+            if created_at > (current_time + self.config.created_at_in_future):
+                return False, "created_at is too much into the future"
+        return True, ""

relay/filter.py

@@ -0,0 +1,123 @@
+from pydantic import BaseModel, Field
+
+from .event import NostrEvent
+
+
+class NostrFilter(BaseModel):
+    e: list[str] = Field(default=[], alias="#e")
+    p: list[str] = Field(default=[], alias="#p")
+    d: list[str] = Field(default=[], alias="#d")
+    ids: list[str] = []
+    authors: list[str] = []
+    kinds: list[int] = []
+    subscription_id: str | None = None
+    since: int | None = None
+    until: int | None = None
+    limit: int | None = None
+
+    def matches(self, e: NostrEvent) -> bool:
+        # todo: starts with
+        if len(self.ids) != 0 and e.id not in self.ids:
+            return False
+        if len(self.authors) != 0 and e.pubkey not in self.authors:
+            return False
+        if len(self.kinds) != 0 and e.kind not in self.kinds:
+            return False
+
+        if self.since and e.created_at < self.since:
+            return False
+        if self.until and self.until > 0 and e.created_at > self.until:
+            return False
+
+        # Check tag filters - only fail if filter is specified and no match found
+        if not self.tag_in_list(e.tags, "e"):
+            return False
+        if not self.tag_in_list(e.tags, "p"):
+            return False
+        if not self.tag_in_list(e.tags, "d"):
+            return False
+
+        return True
+
+    def tag_in_list(self, event_tags, tag_name) -> bool:
+        filter_tags = dict(self).get(tag_name, [])
+        if len(filter_tags) == 0:
+            return True
+
+        event_tag_values = [t[1] for t in event_tags if t[0] == tag_name]
+
+        common_tags = [
+            event_tag for event_tag in event_tag_values if event_tag in filter_tags
+        ]
+        if len(common_tags) == 0:
+            return False
+        return True
+
+    def is_empty(self):
+        return (
+            len(self.ids) == 0
+            and len(self.authors) == 0
+            and len(self.kinds) == 0
+            and len(self.e) == 0
+            and len(self.p) == 0
+            and (not self.since)
+            and (not self.until)
+        )
+
+    def enforce_limit(self, limit: int):
+        if not self.limit or self.limit > limit:
+            self.limit = limit
+
+    def to_sql_components(self, relay_id: str) -> tuple[list[str], list[str], dict]:
+        inner_joins: list[str] = []
+        where = ["deleted=false", "nostrrelay.events.relay_id = :relay_id"]
+        values: dict = {"relay_id": relay_id}
+
+        if len(self.e):
+            e_s = ",".join([f"'{e}'" for e in self.e])
+            inner_joins.append(
+                "INNER JOIN nostrrelay.event_tags e_tags "
+                "ON nostrrelay.events.id = e_tags.event_id"
+            )
+            where.append(f" (e_tags.value in ({e_s}) AND e_tags.name = 'e')")
+
+        if len(self.p):
+            p_s = ",".join([f"'{p}'" for p in self.p])
+            inner_joins.append(
+                "INNER JOIN nostrrelay.event_tags p_tags "
+                "ON nostrrelay.events.id = p_tags.event_id"
+            )
+            where.append(f" p_tags.value in ({p_s}) AND p_tags.name = 'p'")
+
+        if len(self.d):
+            d_s = ",".join([f"'{d}'" for d in self.d])
+            d_join = (
+                "INNER JOIN nostrrelay.event_tags d_tags "
+                "ON nostrrelay.events.id = d_tags.event_id"
+            )
+            d_where = f" d_tags.value in ({d_s}) AND d_tags.name = 'd'"
+
+            inner_joins.append(d_join)
+            where.append(d_where)
+
+        if len(self.ids) != 0:
+            ids = ",".join([f"'{_id}'" for _id in self.ids])
+            where.append(f"id IN ({ids})")
+
+        if len(self.authors) != 0:
+            authors = ",".join([f"'{author}'" for author in self.authors])
+            where.append(f"pubkey IN ({authors})")
+
+        if len(self.kinds) != 0:
+            kinds = ",".join([f"'{kind}'" for kind in self.kinds])
+            where.append(f"kind IN ({kinds})")
+
+        if self.since:
+            where.append("created_at >= :since")
+            values["since"] = self.since
+
+        if self.until:
+            where.append("created_at < :until")
+            values["until"] = self.until
+
+        return inner_joins, where, values

relay/relay.py

@@ -0,0 +1,122 @@
+from pydantic import BaseModel, Field
+
+
+class Spec(BaseModel):
+    class Config:
+        allow_population_by_field_name = True
+
+
+class FilterSpec(Spec):
+    max_client_filters: int = Field(default=0, alias="maxClientFilters")
+    limit_per_filter: int = Field(default=1000, alias="limitPerFilter")
+
+
+class EventSpec(Spec):
+    max_events_per_hour: int = Field(default=0, alias="maxEventsPerHour")
+
+    created_at_days_past: int = Field(default=0, alias="createdAtDaysPast")
+    created_at_hours_past: int = Field(default=0, alias="createdAtHoursPast")
+    created_at_minutes_past: int = Field(default=0, alias="createdAtMinutesPast")
+    created_at_seconds_past: int = Field(default=0, alias="createdAtSecondsPast")
+
+    created_at_days_future: int = Field(default=0, alias="createdAtDaysFuture")
+    created_at_hours_future: int = Field(default=0, alias="createdAtHoursFuture")
+    created_at_minutes_future: int = Field(default=0, alias="createdAtMinutesFuture")
+    created_at_seconds_future: int = Field(default=0, alias="createdAtSecondsFuture")
+
+    @property
+    def created_at_in_past(self) -> int:
+        return (
+            self.created_at_days_past * 86400
+            + self.created_at_hours_past * 3600
+            + self.created_at_minutes_past * 60
+            + self.created_at_seconds_past
+        )
+
+    @property
+    def created_at_in_future(self) -> int:
+        return (
+            self.created_at_days_future * 86400
+            + self.created_at_hours_future * 3600
+            + self.created_at_minutes_future * 60
+            + self.created_at_seconds_future
+        )
+
+
+class StorageSpec(Spec):
+    free_storage_value: int = Field(default=1, alias="freeStorageValue")
+    free_storage_unit: str = Field(default="MB", alias="freeStorageUnit")
+    full_storage_action: str = Field(default="prune", alias="fullStorageAction")
+
+    @property
+    def free_storage_bytes_value(self):
+        value = self.free_storage_value * 1024
+        if self.free_storage_unit == "MB":
+            value *= 1024
+        return value
+
+
+class AuthSpec(Spec):
+    require_auth_events: bool = Field(default=False, alias="requireAuthEvents")
+    skiped_auth_events: list = Field(default=[], alias="skipedAuthEvents")
+    forced_auth_events: list = Field(default=[], alias="forcedAuthEvents")
+    require_auth_filter: bool = Field(default=False, alias="requireAuthFilter")
+
+    def event_requires_auth(self, kind: int) -> bool:
+        if self.require_auth_events:
+            return kind not in self.skiped_auth_events
+        return kind in self.forced_auth_events
+
+
+class PaymentSpec(Spec):
+    is_paid_relay: bool = Field(default=False, alias="isPaidRelay")
+    cost_to_join: int = Field(default=0, alias="costToJoin")
+
+    storage_cost_value: int = Field(default=0, alias="storageCostValue")
+    storage_cost_unit: str = Field(default="MB", alias="storageCostUnit")
+
+    @property
+    def is_free_to_join(self):
+        return not self.is_paid_relay or self.cost_to_join == 0
+
+
+class WalletSpec(Spec):
+    wallet: str = Field(default="")
+
+
+class RelayPublicSpec(FilterSpec, EventSpec, StorageSpec, PaymentSpec):
+    domain: str = ""
+
+    @property
+    def is_read_only_relay(self):
+        return self.free_storage_value == 0 and not self.is_paid_relay
+
+
+class RelaySpec(RelayPublicSpec, WalletSpec, AuthSpec):
+    pass
+
+
+class NostrRelay(BaseModel):
+    id: str
+    user_id: str | None = None
+    name: str
+    description: str | None = None
+    pubkey: str | None = None
+    contact: str | None = None
+    active: bool = False
+    meta: RelaySpec = RelaySpec()
+
+    @property
+    def is_free_to_join(self):
+        return not self.meta.is_paid_relay or self.meta.cost_to_join == 0
+
+    @classmethod
+    def info(
+        cls,
+    ) -> dict:
+        return {
+            "contact": "https://t.me/lnbits",
+            "supported_nips": [1, 2, 4, 9, 11, 15, 16, 17, 20, 22, 28, 42, 44, 59],
+            "software": "LNbits",
+            "version": "",
+        }

static/components/relay-details.js

@@ -0,0 +1,290 @@
+window.app.component('relay-details', {
+  name: 'relay-details',
+  template: '#relay-details',
+  props: ['relay-id', 'adminkey', 'inkey', 'wallet-options'],
+  data() {
+    return {
+      tab: 'info',
+      relay: null,
+      accounts: [],
+      accountPubkey: '',
+      formDialogItem: {
+        show: false,
+        data: {
+          name: '',
+          description: ''
+        }
+      },
+      showBlockedAccounts: true,
+      showAllowedAccounts: false,
+      accountsTable: {
+        columns: [
+          {
+            name: 'action',
+            align: 'left',
+            label: '',
+            field: ''
+          },
+          {
+            name: 'pubkey',
+            align: 'left',
+            label: 'Public Key',
+            field: 'pubkey'
+          },
+          {
+            name: 'allowed',
+            align: 'left',
+            label: 'Allowed',
+            field: 'allowed'
+          },
+          {
+            name: 'blocked',
+            align: 'left',
+            label: 'Blocked',
+            field: 'blocked'
+          },
+          {
+            name: 'paid_to_join',
+            align: 'left',
+            label: 'Paid to join',
+            field: 'paid_to_join'
+          },
+          {
+            name: 'sats',
+            align: 'left',
+            label: 'Spent Sats',
+            field: 'sats'
+          },
+          {
+            name: 'storage',
+            align: 'left',
+            label: 'Storage',
+            field: 'storage'
+          }
+        ],
+        pagination: {
+          rowsPerPage: 10
+        }
+      },
+      skipEventKind: 0,
+      forceEventKind: 0
+    }
+  },
+
+  computed: {
+    hours() {
+      const y = []
+      for (let i = 0; i <= 24; i++) {
+        y.push(i)
+      }
+      return y
+    },
+    range60() {
+      const y = []
+      for (let i = 0; i <= 60; i++) {
+        y.push(i)
+      }
+      return y
+    },
+    storageUnits() {
+      return ['KB', 'MB']
+    },
+    fullStorageActions() {
+      return [
+        {value: 'block', label: 'Block New Events'},
+        {value: 'prune', label: 'Prune Old Events'}
+      ]
+    },
+    wssLink() {
+      this.relay.meta.domain =
+        this.relay.meta.domain || window.location.hostname
+      return 'wss://' + this.relay.meta.domain + '/nostrrelay/' + this.relay.id
+    }
+  },
+
+  methods: {
+    satBtc(val, showUnit = true) {
+      return satOrBtc(val, showUnit, this.satsDenominated)
+    },
+    deleteRelay() {
+      LNbits.utils
+        .confirmDialog(
+          'All data will be lost! Are you sure you want to delete this relay?'
+        )
+        .onOk(async () => {
+          try {
+            await LNbits.api.request(
+              'DELETE',
+              '/nostrrelay/api/v1/relay/' + this.relayId,
+              this.adminkey
+            )
+            this.$emit('relay-deleted', this.relayId)
+            Quasar.Notify.create({
+              type: 'positive',
+              message: 'Relay Deleted',
+              timeout: 5000
+            })
+          } catch (error) {
+            LNbits.utils.notifyApiError(error)
+          }
+        })
+    },
+    async getRelay() {
+      try {
+        const {data} = await LNbits.api.request(
+          'GET',
+          '/nostrrelay/api/v1/relay/' + this.relayId,
+          this.inkey
+        )
+        this.relay = data
+      } catch (error) {
+        LNbits.utils.notifyApiError(error)
+      }
+    },
+    async updateRelay() {
+      try {
+        const {data} = await LNbits.api.request(
+          'PATCH',
+          '/nostrrelay/api/v1/relay/' + this.relayId,
+          this.adminkey,
+          this.relay
+        )
+        this.relay = data
+        this.$emit('relay-updated', this.relay)
+        this.$q.notify({
+          type: 'positive',
+          message: 'Relay Updated',
+          timeout: 5000
+        })
+      } catch (error) {
+        console.warn(error)
+        LNbits.utils.notifyApiError(error)
+      }
+    },
+    togglePaidRelay: async function () {
+      this.relay.meta.wallet =
+        this.relay.meta.wallet || this.walletOptions[0].value
+    },
+    getAccounts: async function () {
+      try {
+        const {data} = await LNbits.api.request(
+          'GET',
+          `/nostrrelay/api/v1/account?relay_id=${this.relay.id}&allowed=${this.showAllowedAccounts}&blocked=${this.showBlockedAccounts}`,
+          this.inkey
+        )
+        this.accounts = data
+      } catch (error) {
+        LNbits.utils.notifyApiError(error)
+      }
+    },
+    allowPublicKey: async function (pubkey, allowed) {
+      await this.updatePublicKey({pubkey, allowed})
+    },
+    blockPublicKey: async function (pubkey, blocked = true) {
+      await this.updatePublicKey({pubkey, blocked})
+    },
+    removePublicKey: async function (pubkey) {
+      LNbits.utils
+        .confirmDialog('This public key will be removed from relay!')
+        .onOk(async () => {
+          await this.deletePublicKey(pubkey)
+        })
+    },
+    togglePublicKey: async function (account, action) {
+      if (action === 'allow') {
+        await this.updatePublicKey({
+          pubkey: account.pubkey,
+          allowed: account.allowed
+        })
+      }
+      if (action === 'block') {
+        await this.updatePublicKey({
+          pubkey: account.pubkey,
+          blocked: account.blocked
+        })
+      }
+    },
+    updatePublicKey: async function (ops) {
+      try {
+        await LNbits.api.request(
+          'PUT',
+          '/nostrrelay/api/v1/account',
+          this.adminkey,
+          {
+            relay_id: this.relay.id,
+            pubkey: ops.pubkey,
+            allowed: ops.allowed,
+            blocked: ops.blocked
+          }
+        )
+        this.$q.notify({
+          type: 'positive',
+          message: 'Account Updated',
+          timeout: 5000
+        })
+        this.accountPubkey = ''
+        await this.getAccounts()
+      } catch (error) {
+        LNbits.utils.notifyApiError(error)
+      }
+    },
+
+    deletePublicKey: async function (pubkey) {
+      try {
+        await LNbits.api.request(
+          'DELETE',
+          `/nostrrelay/api/v1/account/${this.relay.id}/${pubkey}`,
+          this.adminkey,
+          {}
+        )
+        this.$q.notify({
+          type: 'positive',
+          message: 'Account Deleted',
+          timeout: 5000
+        })
+        await this.getAccounts()
+      } catch (error) {
+        LNbits.utils.notifyApiError(error)
+      }
+    },
+
+    addSkipAuthForEvent: function () {
+      value = +this.skipEventKind
+      if (this.relay.meta.skipedAuthEvents.indexOf(value) != -1) {
+        return
+      }
+      this.relay.meta.skipedAuthEvents.push(value)
+    },
+    removeSkipAuthForEvent: function (eventKind) {
+      value = +eventKind
+      this.relay.meta.skipedAuthEvents =
+        this.relay.meta.skipedAuthEvents.filter(e => e !== value)
+    },
+    addForceAuthForEvent: function () {
+      value = +this.forceEventKind
+      if (this.relay.meta.forcedAuthEvents.indexOf(value) != -1) {
+        return
+      }
+      this.relay.meta.forcedAuthEvents.push(value)
+    },
+    removeForceAuthForEvent: function (eventKind) {
+      value = +eventKind
+      this.relay.meta.forcedAuthEvents =
+        this.relay.meta.forcedAuthEvents.filter(e => e !== value)
+    },
+    // todo: bad. base.js not present in custom components
+    copyText: function (text, message, position) {
+      Quasar.copyToClipboard(text).then(function () {
+        Quasar.Notify.create({
+          message: message || 'Copied to clipboard!',
+          position: position || 'bottom'
+        })
+      })
+    }
+  },
+
+  async created() {
+    await this.getRelay()
+    await this.getAccounts()
+  }
+})

static/components/relay-details/relay-details.js

@@ -1,138 +0,0 @@
-async function relayDetails(path) {
-  const template = await loadTemplateAsync(path)
-  Vue.component('relay-details', {
-    name: 'relay-details',
-    template,
-
-    props: ['relay-id', 'adminkey', 'inkey', 'wallet-options'],
-    data: function () {
-      return {
-        tab: 'info',
-        relay: null,
-        blockedPubkey: '',
-        allowedPubkey: '',
-        formDialogItem: {
-          show: false,
-          data: {
-            name: '',
-            description: ''
-          }
-        }
-      }
-    },
-
-    computed: {
-      hours: function () {
-        const y = []
-        for (let i = 0; i <= 24; i++) {
-          y.push(i)
-        }
-        return y
-      },
-      range60: function () {
-        const y = []
-        for (let i = 0; i <= 60; i++) {
-          y.push(i)
-        }
-        return y
-      },
-      storageUnits: function () {
-        return ['KB', 'MB']
-      },
-      fullStorageActions: function () {
-        return [
-          {value: 'block', label: 'Block New Events'},
-          {value: 'prune', label: 'Prune Old Events'}
-        ]
-      }
-    },
-
-    methods: {
-      satBtc(val, showUnit = true) {
-        return satOrBtc(val, showUnit, this.satsDenominated)
-      },
-      deleteRelay: function () {
-        LNbits.utils
-          .confirmDialog(
-            'All data will be lost! Are you sure you want to delete this relay?'
-          )
-          .onOk(async () => {
-            try {
-              await LNbits.api.request(
-                'DELETE',
-                '/nostrrelay/api/v1/relay/' + this.relayId,
-                this.adminkey
-              )
-              this.$emit('relay-deleted', this.relayId)
-              this.$q.notify({
-                type: 'positive',
-                message: 'Relay Deleted',
-                timeout: 5000
-              })
-            } catch (error) {
-              console.warn(error)
-              LNbits.utils.notifyApiError(error)
-            }
-          })
-      },
-      getRelay: async function () {
-        try {
-          const {data} = await LNbits.api.request(
-            'GET',
-            '/nostrrelay/api/v1/relay/' + this.relayId,
-            this.inkey
-          )
-          this.relay = data
-
-          console.log('###  this.relay', this.relay)
-        } catch (error) {
-          LNbits.utils.notifyApiError(error)
-        }
-      },
-      updateRelay: async function () {
-        try {
-          const {data} = await LNbits.api.request(
-            'PUT',
-            '/nostrrelay/api/v1/relay/' + this.relayId,
-            this.adminkey,
-            this.relay
-          )
-          this.relay = data
-          this.$emit('relay-updated', this.relay)
-          this.$q.notify({
-            type: 'positive',
-            message: 'Relay Updated',
-            timeout: 5000
-          })
-        } catch (error) {
-          LNbits.utils.notifyApiError(error)
-        }
-      },
-      togglePaidRelay: async function () {
-        this.relay.config.wallet =
-          this.relay.config.wallet || this.walletOptions[0].value
-      },
-      allowPublicKey: function () {
-        this.relay.config.allowedPublicKeys.push(this.allowedPubkey)
-        this.allowedPubkey = ''
-      },
-      blockPublicKey: function () {
-        this.relay.config.blockedPublicKeys.push(this.blockedPubkey)
-        this.blockedPubkey = ''
-      },
-      deleteAllowedPublicKey: function (pubKey) {
-        this.relay.config.allowedPublicKeys =
-          this.relay.config.allowedPublicKeys.filter(p => p !== pubKey)
-      },
-
-      deleteBlockedPublicKey: function (pubKey) {
-        this.relay.config.blockedPublicKeys =
-          this.relay.config.blockedPublicKeys.filter(p => p !== pubKey)
-      }
-    },
-
-    created: async function () {
-      await this.getRelay()
-    }
-  })
-}

static/js/index.js

@@ -1,12 +1,7 @@
-const relays = async () => {
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  await relayDetails('static/components/relay-details/relay-details.html')
-
-  new Vue({
+window.app = Vue.createApp({
   el: '#vue',
   mixins: [windowMixin],
-    data: function () {
+  data() {
     return {
       filter: '',
       relayLinks: [],
@@ -100,9 +95,7 @@ const relays = async () => {
             this.relayLinks.find(old => old.id === c.id)
           )
         )
-          console.log('### relayLinks', this.relayLinks)
       } catch (error) {
-          console.log('### getRelays', error)
         LNbits.utils.notifyApiError(error)
       }
     },
@@ -123,7 +116,6 @@ const relays = async () => {
       }
     },
     showToggleRelayDialog: function (relay) {
-        console.log('### showToggleRelayDialog', relay)
       if (relay.active) {
         this.toggleRelay(relay)
         return
@@ -134,22 +126,16 @@ const relays = async () => {
           this.toggleRelay(relay)
         })
         .onCancel(async () => {
-            console.log('#### onCancel')
           relay.active = !relay.active
         })
     },
     toggleRelay: async function (relay) {
-        console.log('### toggleRelay', relay)
       try {
         await LNbits.api.request(
           'PUT',
           '/nostrrelay/api/v1/relay/' + relay.id,
           this.g.user.wallets[0].adminkey,
-            {
-              active: relay.active,
-              id: relay.id,
-              name: relay.name
-            }
+          {}
         )
       } catch (error) {
         LNbits.utils.notifyApiError(error)
@@ -184,7 +170,4 @@ const relays = async () => {
   created: async function () {
     await this.getRelays()
   }
-  })
-}
-
-relays()
+})

static/js/utils.js

@@ -5,22 +5,3 @@ const mapRelay = (obj, oldObj = {}) => {
 
   return relay
 }
-
-function loadTemplateAsync(path) {
-  const result = new Promise(resolve => {
-    const xhttp = new XMLHttpRequest()
-
-    xhttp.onreadystatechange = function () {
-      if (this.readyState == 4) {
-        if (this.status == 200) resolve(this.responseText)
-
-        if (this.status == 404) resolve(`<div>Page not found: ${path}</div>`)
-      }
-    }
-
-    xhttp.open('GET', path, true)
-    xhttp.send()
-  })
-
-  return result
-}

tasks.py

@@ -0,0 +1,99 @@
+import asyncio
+import json
+
+from lnbits.core.models import Payment
+from lnbits.core.services import websocket_updater
+from lnbits.tasks import register_invoice_listener
+from loguru import logger
+
+from .crud import create_account, get_account, update_account
+from .models import NostrAccount
+
+
+async def wait_for_paid_invoices():
+    invoice_queue = asyncio.Queue()
+    register_invoice_listener(invoice_queue, "ext_nostrrelay")
+
+    while True:
+        payment = await invoice_queue.get()
+        await on_invoice_paid(payment)
+
+
+async def on_invoice_paid(payment: Payment):
+    if payment.extra.get("tag") != "nostrrely":
+        return
+
+    relay_id = payment.extra.get("relay_id")
+    pubkey = payment.extra.get("pubkey")
+    payment_hash = payment.payment_hash
+
+    if not relay_id or not pubkey:
+        message = (
+            "Invoice extra data missing for 'relay_id' and 'pubkey'. "
+            f"Payment hash: {payment_hash}"
+        )
+        logger.warning(message)
+        await websocket_updater(
+            payment_hash, json.dumps({"success": False, "message": message})
+        )
+        return
+
+    action = payment.extra.get("action")
+    if action == "join":
+        await invoice_paid_to_join(relay_id, pubkey, payment.amount)
+        await websocket_updater(payment_hash, json.dumps({"success": True}))
+        return
+
+    if action == "storage":
+        storage_to_buy = payment.extra.get("storage_to_buy")
+        if not storage_to_buy:
+            message = (
+                "Invoice extra data missing for 'storage_to_buy'. "
+                f"Payment hash: {payment_hash}"
+            )
+            logger.warning(message)
+            return
+        await invoice_paid_for_storage(relay_id, pubkey, storage_to_buy, payment.amount)
+        await websocket_updater(payment_hash, json.dumps({"success": True}))
+        return
+
+    await websocket_updater(
+        payment_hash,
+        json.dumps({"success": False, "message": f"Bad action name: '{action}'"}),
+    )
+
+
+async def invoice_paid_to_join(relay_id: str, pubkey: str, amount: int):
+    account = await get_account(relay_id, pubkey)
+    if not account:
+        account = NostrAccount(
+            relay_id=relay_id, pubkey=pubkey, paid_to_join=True, sats=amount
+        )
+        await create_account(account)
+        return
+
+    if account.blocked or account.paid_to_join:
+        return
+
+    account.paid_to_join = True
+    account.sats += amount
+    await update_account(account)
+
+
+async def invoice_paid_for_storage(
+    relay_id: str, pubkey: str, storage_to_buy: int, amount: int
+):
+    account = await get_account(relay_id, pubkey)
+    if not account:
+        account = NostrAccount(
+            relay_id=relay_id, pubkey=pubkey, storage=storage_to_buy, sats=amount
+        )
+        await create_account(account)
+        return
+
+    if account.blocked:
+        return
+
+    account.storage = storage_to_buy
+    account.sats += amount
+    await update_account(account)

templates/nostrrelay/index.html

@@ -1,10 +1,10 @@
 {% extends "base.html" %} {% from "macros.jinja" import window_vars with context
 %} {% block page %}
+
 <div class="row q-col-gutter-md">
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
       <q-card-section>
-        {% raw %}
         <q-btn unelevated color="primary" @click="openCreateRelayDialog()"
           >New relay
         </q-btn>
@@ -49,10 +49,10 @@
         <q-table
           flat
           dense
-          :data="relayLinks"
+          :rows="relayLinks"
           row-key="id"
           :columns="relaysTable.columns"
-          :pagination.sync="relaysTable.pagination"
+          v-model:pagination="relaysTable.pagination"
           :filter="filter"
         >
           <template v-slot:body="props">
@@ -68,25 +68,38 @@
                 />
               </q-td>
 
-              <q-td key="id" :props="props"> {{props.row.id}} </q-td>
+              <q-td key="id" :props="props">
+                <a
+                  style="color: unset"
+                  :href="props.row.id"
+                  target="_blank"
+                  v-text="props.row.id"
+                ></a>
+              </q-td>
               <q-td key="toggle" :props="props">
                 <q-toggle
                   size="sm"
                   color="secodary"
                   v-model="props.row.active"
-                  @input="showToggleRelayDialog(props.row)"
+                  @update:model-value="showToggleRelayDialog(props.row)"
                 ></q-toggle>
               </q-td>
-              <q-td auto-width> {{props.row.name}} </q-td>
-              <q-td key="description" :props="props">
-                {{props.row.description}}
-              </q-td>
-              <q-td key="pubkey" :props="props">
-                <div>{{props.row.pubkey}}</div>
-              </q-td>
-              <q-td key="contact" :props="props">
-                <div>{{props.row.contact}}</div>
-              </q-td>
+              <q-td auto-width v-text="props.row.name"></q-td>
+              <q-td
+                key="description"
+                :props="props"
+                v-text="props.row.description"
+              ></q-td>
+              <q-td
+                key="pubkey"
+                :props="props"
+                v-text="props.row.pubkey"
+              ></q-td>
+              <q-td
+                key="contact"
+                :props="props"
+                v-text="props.row.contact"
+              ></q-td>
             </q-tr>
             <q-tr v-if="props.row.expanded" :props="props">
               <q-td colspan="100%">
@@ -105,7 +118,6 @@
               </q-td>
             </q-tr>
           </template>
-          {% endraw %}
         </q-table>
       </q-card-section>
     </q-card>
@@ -184,9 +196,14 @@
     </q-card>
   </q-dialog>
 </div>
+{% endblock %} {% block vue_templates %}
+<template id="relay-details">
+  {% include("nostrrelay/relay-details.html") %}
+</template>
+
 {% endblock %} {% block scripts %} {{ window_vars(user) }}
-<script src="{{ url_for('nostrrelay_static', path='js/utils.js') }}"></script>
-<script src="{{ url_for('nostrrelay_static', path='components/relay-details/relay-details.js') }}"></script>
-<script src="{{ url_for('nostrrelay_static', path='js/index.js') }}"></script>
+<script src="{{ static_url_for('nostrrelay/static', path='js/utils.js') }}"></script>
+<script src="{{ static_url_for('nostrrelay/static', path='js/index.js') }}"></script>
+<script src="{{ static_url_for('nostrrelay/static', path='components/relay-details.js') }}"></script>
 
 {% endblock %}

templates/nostrrelay/public.html

@@ -1,29 +1,284 @@
-{% extends "public.html" %} {% block toolbar_title %} {{ nostrrelay.name }}
-<q-btn
-  flat
-  dense
-  size="md"
-  @click.prevent="urlDialog.show = true"
-  icon="share"
-  color="white"
-></q-btn>
+{% extends "public.html" %} {% block toolbar_title %} LNbits Relay
+<q-icon name="sensors" class="q-ml-lg" />
 {% endblock %} {% block footer %}{% endblock %} {% block page_container %}
+
 <q-page-container>
   <q-page>
-    <h3>Shareable public page on relay to go here!</h3>
+    <div class="row q-col-gutter-md">
+      <div class="col-12 col-md-2 q-gutter-y-md"></div>
+      <div class="col-12 col-md-6 q-gutter-y-md q-pa-xl">
+        <q-card>
+          <q-card-section>
+            <h4 v-text="relay.name" class="q-my-none"></h4>
+          </q-card-section>
+          <div v-if="relay.description" class="q-ma-lg">
+            <q-separator></q-separator>
+            <span class="text-subtitle1" v-text="relay.description"></span>
+          </div>
+        </q-card>
+        <q-card class="q-pb-xl">
+          <q-card-section>
+            <div class="row">
+              <div class="col-2 q-pt-sm">
+                <span class="text-bold">Relay Link:</span>
+              </div>
+              <div class="col-8">
+                <q-input
+                  filled
+                  dense
+                  readonly
+                  v-model.trim="wssLink"
+                  type="text"
+                  label="Relay Link"
+                ></q-input>
+              </div>
+              <div class="col-2">
+                <q-btn
+                  outline
+                  color="grey"
+                  class="float-right"
+                  @click="copyText(wssLink)"
+                  >Copy</q-btn
+                >
+              </div>
+            </div>
+          </q-card-section>
+          <q-card-section v-if="relay.meta.isPaidRelay">
+            <div class="row">
+              <div class="col-2 q-pt-sm">
+                <span class="text-bold">Public Key:</span>
+              </div>
+              <div class="col-8">
+                <q-input
+                  filled
+                  dense
+                  v-model.trim="pubkey"
+                  type="text"
+                  label="User Public Key"
+                ></q-input>
+              </div>
+              <div class="col-2"></div>
+            </div>
+          </q-card-section>
+          <q-card-section v-if="relay.meta.isPaidRelay">
+            <div class="row">
+              <div class="col-2">
+                <span class="text-bold">Cost to join: </span>
+              </div>
+              <div class="col-6">
+                <div>
+                  <span v-text="relay.meta.costToJoin"></span>
+                  <span class="text-bold q-ml-sm">sats</span>
+                </div>
+              </div>
+              <div class="col-4">
+                <div v-if="relay.meta.costToJoin">
+                  <q-btn
+                    @click="createInvoice('join')"
+                    unelevated
+                    color="primary"
+                    class="float-right"
+                    >Pay to Join</q-btn
+                  >
+                </div>
+                <div v-else>
+                  <q-badge color="green" class="float-right"
+                    ><span>Free to join</span>
+                  </q-badge>
+                </div>
+              </div>
+            </div>
+          </q-card-section>
+          <q-card-section v-if="relay.meta.isPaidRelay">
+            <div class="row q-mt-md q-mb-md">
+              <div class="col-2 q-pt-sm">
+                <span class="text-bold">Storage cost: </span>
+              </div>
+              <div class="col-3 q-pt-sm">
+                <span v-text="relay.meta.storageCostValue"></span>
+                <span class="text-bold q-ml-sm"> sats per</span>
+                <q-badge color="orange">
+                  <span v-text="relay.meta.storageCostUnit"></span>
+                </q-badge>
+              </div>
+              <div class="col-2">
+                <q-input
+                  v-if="relay.meta.storageCostValue"
+                  filled
+                  dense
+                  v-model="unitsToBuy"
+                  type="number"
+                  min="0"
+                  :label="relay.meta.storageCostUnit"
+                ></q-input>
+              </div>
+              <div class="col-2 q-pt-sm">
+                <div v-if="relay.meta.storageCostValue">
+                  <span class="text-bold q-ml-md" v-text="storageCost"></span>
+                  <span>sats</span>
+                </div>
+              </div>
+              <div class="col-3">
+                <div v-if="relay.meta.storageCostValue">
+                  <q-btn
+                    @click="createInvoice('storage')"
+                    unelevated
+                    color="primary"
+                    class="float-right"
+                    >Buy storage space</q-btn
+                  >
+                </div>
+                <div v-else>
+                  <q-badge color="green" class="float-right"
+                    ><span>Free storage</span>
+                  </q-badge>
+                </div>
+              </div>
+            </div>
+            <q-separator></q-separator>
+          </q-card-section>
+          <q-card-section v-else>
+            <q-badge color="yellow" text-color="black">
+              <h5 class="text-subtitle1 q-my-none">
+                This is a free Nostr Relay
+              </h5>
+            </q-badge>
+          </q-card-section>
+          <q-card-section>
+            <q-expansion-item
+              v-if="invoice"
+              group="join-invoice"
+              label="Invoice"
+              :content-inset-level="0.5"
+              default-opened
+            >
+              <div class="row q-ma-md">
+                <div class="col-3"></div>
+                <div class="col-6 text-center">
+                  <q-btn outline color="grey" @click="copyText(invoice)"
+                    >Copy invoice</q-btn
+                  >
+                </div>
+                <div class="col-3"></div>
+              </div>
+              <div class="row">
+                <div class="col-3"></div>
+                <div class="col-6">
+                  <q-responsive :ratio="1">
+                    <qrcode
+                      :value="'lightning:'+invoice"
+                      :options="{width: 340}"
+                      class="rounded-borders"
+                    ></qrcode>
+                  </q-responsive>
+                </div>
+                <div class="col-3"></div>
+              </div>
+            </q-expansion-item>
+            <q-expansion-item v-else-if="invoiceResponse">
+              <div class="row">
+                <div class="col-3"></div>
+                <div class="col-6">
+                  <q-icon
+                    v-if="invoiceResponse.success"
+                    name="check"
+                    style="color: green; font-size: 21.4em"
+                  ></q-icon>
+                  <span v-else v-text="invoiceResponse.message"></span>
+                </div>
+                <div class="col-3"></div>
+              </div>
+            </q-expansion-item>
+          </q-card-section>
+        </q-card>
+      </div>
+    </div>
   </q-page>
 </q-page-container>
 {% endblock %} {% block scripts %}
 <script>
-  Vue.component(VueQrcode.name, VueQrcode)
-
-  new Vue({
+  window.app = Vue.createApp({
     el: '#vue',
     mixins: [windowMixin],
-    data: function () {
-      return {}
+    data() {
+      return {
+        relay: JSON.parse('{{relay | tojson | safe}}'),
+        pubkey: '',
+        invoice: '',
+        invoiceResponse: null,
+        unitsToBuy: 0
+      }
     },
-    methods: {}
+    computed: {
+      storageCost: function () {
+        if (!this.relay || !this.relay.meta.storageCostValue) return 0
+        return this.unitsToBuy * this.relay.meta.storageCostValue
+      },
+      wssLink: function () {
+        this.relay.meta.domain =
+          this.relay.meta.domain || window.location.hostname
+        return (
+          'wss://' + this.relay.meta.domain + '/nostrrelay/' + this.relay.id
+        )
+      }
+    },
+    methods: {
+      createInvoice: async function (action) {
+        if (!action) return
+        this.invoice = ''
+        if (!this.pubkey) {
+          this.$q.notify({
+            timeout: 5000,
+            type: 'warning',
+            message: 'Public key is missing'
+          })
+          return
+        }
+        try {
+          const reqData = {
+            action,
+            relay_id: this.relay.id,
+            pubkey: this.pubkey,
+            units_to_buy: this.unitsToBuy
+          }
+          const {data} = await LNbits.api.request(
+            'PUT',
+            '/nostrrelay/api/v1/pay',
+            '',
+            reqData
+          )
+          this.invoice = data.invoice
+          const paymentHashTag = decode(data.invoice).data.tags.find(
+            t => t && t.description === 'payment_hash'
+          )
+          if (paymentHashTag) {
+            await this.waitForPaidInvoice(paymentHashTag.value)
+          }
+        } catch (error) {
+          LNbits.utils.notifyApiError(error)
+        }
+      },
+      waitForPaidInvoice: function (paymentHash) {
+        try {
+          const scheme = location.protocol === 'http:' ? 'ws' : 'wss'
+          const port = location.port ? `:${location.port}` : ''
+          const wsUrl = `${scheme}://${document.domain}${port}/api/v1/ws/${paymentHash}`
+          const wsConnection = new WebSocket(wsUrl)
+          wsConnection.onmessage = e => {
+            this.invoiceResponse = JSON.parse(e.data)
+            this.invoice = null
+            wsConnection.close()
+          }
+        } catch (error) {
+          Quasar.Notify.create({
+            timeout: 5000,
+            type: 'warning',
+            message: 'Failed to get invoice status',
+            caption: `${error}`
+          })
+        }
+      }
+    }
   })
 </script>
 {% endblock %}

templates/nostrrelay/relay-details.html

@@ -3,8 +3,7 @@
     <q-tab name="info" label="Relay Info"></q-tab>
     <q-tab name="payment" label="Payment"></q-tab>
     <q-tab name="config" label="Config"></q-tab>
-    <q-tab name="allowed" label="Allowed"></q-tab>
-    <q-tab name="blocked" label="Blocked"></q-tab>
+    <q-tab name="accounts" label="Accounts"></q-tab>
   </q-tabs>
   <q-tab-panels v-model="tab">
     <q-tab-panel name="info">
@@ -57,27 +56,54 @@
           </div>
           <div class="col-3 col-sm-1"></div>
         </div>
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col-3 q-pr-lg">Domain:</div>
+          <div class="col-6 col-sm-8 q-pr-lg">
+            <q-input
+              filled
+              dense
+              v-model.trim="relay.meta.domain"
+              type="text"
+            ></q-input>
+          </div>
+          <div class="col-3 col-sm-1"></div>
+        </div>
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col-3 q-pr-lg">Web Socket Link:</div>
+          <div class="col-6 col-sm-8 q-pr-lg">
+            <q-input
+              filled
+              dense
+              v-model.trim="wssLink"
+              type="text"
+              readonly
+            ></q-input>
+          </div>
+          <div class="col-3 col-sm-1">
+            <q-btn outline color="grey" @click="copyText(wssLink)">Copy</q-btn>
+          </div>
+        </div>
       </div>
     </q-tab-panel>
     <q-tab-panel name="payment">
       <div v-if="relay">
         <div class="row items-center no-wrap q-mb-md">
           <div class="col-3 q-pr-lg q-pb-md">Free Storage:</div>
-          <div class="col-2 col-sm-4 q-pr-lg">
+          <div class="col-md-2 col-sm-4 q-pr-lg">
             <q-input
               filled
               dense
-              v-model.trim="relay.config.freeStorageValue"
+              v-model.trim="relay.meta.freeStorageValue"
               type="number"
               hint="Value"
               min="0"
             ></q-input>
           </div>
-          <div class="col-2 col-sm-4 q-pr-lg">
+          <div class="col-md-2 col-sm-4 q-pr-lg">
             <q-select
               filled
               dense
-              v-model="relay.config.freeStorageUnit"
+              v-model="relay.meta.freeStorageUnit"
               type="text"
               hint="Unit"
               :options="storageUnits"
@@ -91,9 +117,9 @@
               </q-tooltip></q-icon
             >
           </div>
-          <div class="col-4 col-sm-2">
+          <div class="col-md-4 col-sm-2">
             <q-badge
-              v-if="relay.config.freeStorageValue == 0"
+              v-if="relay.meta.freeStorageValue == 0"
               color="orange"
               class="float-right q-mb-md"
               ><span>No free storage</span>
@@ -103,38 +129,38 @@
         <q-separator></q-separator>
         <div class="row items-center no-wrap q-mb-md">
           <div class="col-3 q-pr-lg">Paid Plan:</div>
-          <div class="col-3 q-pr-lg">
+          <div class="col-md-3 q-pr-lg">
             <q-toggle
               color="secodary"
-              v-model="relay.config.isPaidRelay"
-              @input="togglePaidRelay"
+              v-model="relay.meta.isPaidRelay"
+              @update:model-value="togglePaidRelay"
             ></q-toggle>
           </div>
           <div class="col-6">
             <q-badge
-              v-if="!relay.config.isPaidRelay && relay.config.freeStorageValue == 0"
+              v-if="!relay.meta.isPaidRelay && relay.meta.freeStorageValue == 0"
               color="orange"
               class="float-right q-mb-md"
-              ><span>No data will be stored, only broadcast</span>
+              ><span>No data will be stored. Read-only relay.</span>
             </q-badge>
           </div>
         </div>
 
-        <div v-if="relay.config.isPaidRelay && relay.config.wallet">
+        <div v-if="relay.meta.isPaidRelay && relay.meta.wallet">
           <div class="row items-center no-wrap q-mb-md">
             <div class="col-3 q-pr-lg">Wallet:</div>
-            <div class="col-6 col-sm-8 q-pr-lg">
+            <div class="col-md-6 col-sm-8 q-pr-lg">
               <q-select
                 filled
                 dense
                 emit-value
-                v-model="relay.config.wallet"
+                v-model="relay.meta.wallet"
                 :options="walletOptions"
                 label="Wallet *"
               >
               </q-select>
             </div>
-            <div class="col-3 col-sm-1">
+            <div class="col-md-3 col-sm-1">
               <q-icon name="info" class="cursor-pointer">
                 <q-tooltip>
                   Wallet where the paiments will be sent to.
@@ -144,11 +170,11 @@
           </div>
           <div class="row items-center no-wrap q-mb-md">
             <div class="col-3 q-pr-lg">Cost to join (sats):</div>
-            <div class="col-2 col-sm-4 q-pr-lg">
+            <div class="col-md-2 col-sm-4 q-pr-lg">
               <q-input
                 filled
                 dense
-                v-model.trim="relay.config.costToJoin"
+                v-model.trim="relay.meta.costToJoin"
                 type="number"
                 hint="sats"
                 min="0"
@@ -161,9 +187,9 @@
                 </q-tooltip></q-icon
               >
             </div>
-            <div class="col-6 col-sm-4">
+            <div class="col-md-6 col-sm-4">
               <q-badge
-                v-if="relay.config.costToJoin == 0"
+                v-if="relay.meta.costToJoin == 0"
                 color="green"
                 class="float-right"
                 ><span>Free to join</span>
@@ -172,21 +198,21 @@
           </div>
           <div class="row items-center no-wrap q-mb-md">
             <div class="col-3 q-pr-lg">Storage Cost (sats):</div>
-            <div class="col-2 col-sm-4 q-pr-lg">
+            <div class="col-md-2 col-sm-4 q-pr-lg">
               <q-input
                 filled
                 dense
-                v-model.trim="relay.config.storageCostValue"
+                v-model.trim="relay.meta.storageCostValue"
                 type="number"
                 hint="sats"
                 min="0"
               ></q-input>
             </div>
-            <div class="col-2 col-sm-4 q-pr-lg">
+            <div class="col-md-2 col-sm-4 q-pr-lg">
               <q-select
                 filled
                 dense
-                v-model="relay.config.storageCostUnit"
+                v-model="relay.meta.storageCostUnit"
                 type="text"
                 hint="Unit"
                 :options="storageUnits"
@@ -199,9 +225,9 @@
                 </q-tooltip></q-icon
               >
             </div>
-            <div class="col-4 col-sm-0">
+            <div class="col-md-4 col-sm-0">
               <q-badge
-                v-if="relay.config.storageCostValue == 0"
+                v-if="relay.meta.storageCostValue == 0"
                 color="green"
                 class="float-right"
                 ><span>Unlimited storage</span>
@@ -219,7 +245,7 @@
             <q-input
               filled
               dense
-              v-model.trim="relay.config.createdAtDaysPast"
+              v-model.trim="relay.meta.createdAtDaysPast"
               type="number"
               min="0"
               hint="Days"
@@ -229,7 +255,7 @@
             <q-select
               filled
               dense
-              v-model="relay.config.createdAtHoursPast"
+              v-model="relay.meta.createdAtHoursPast"
               type="number"
               hint="Hours"
               :options="hours"
@@ -239,7 +265,7 @@
             <q-select
               filled
               dense
-              v-model="relay.config.createdAtMinutesPast"
+              v-model="relay.meta.createdAtMinutesPast"
               type="number"
               hint="Minutes"
               :options="range60"
@@ -249,7 +275,7 @@
             <q-select
               filled
               dense
-              v-model="relay.config.createdAtSecondsPast"
+              v-model="relay.meta.createdAtSecondsPast"
               type="number"
               hint="Seconds"
               :options="range60"
@@ -270,7 +296,7 @@
             <q-input
               filled
               dense
-              v-model.trim="relay.config.createdAtDaysFuture"
+              v-model.trim="relay.meta.createdAtDaysFuture"
               type="number"
               min="0"
               hint="Days"
@@ -280,7 +306,7 @@
             <q-select
               filled
               dense
-              v-model="relay.config.createdAtHoursFuture"
+              v-model="relay.meta.createdAtHoursFuture"
               type="number"
               hint="Hours"
               :options="hours"
@@ -290,7 +316,7 @@
             <q-select
               filled
               dense
-              v-model="relay.config.createdAtMinutesFuture"
+              v-model="relay.meta.createdAtMinutesFuture"
               type="number"
               hint="Minutes"
               :options="range60"
@@ -300,7 +326,7 @@
             <q-select
               filled
               dense
-              v-model="relay.config.createdAtSecondsFuture"
+              v-model="relay.meta.createdAtSecondsFuture"
               type="number"
               hint="Seconds"
               :options="range60"
@@ -316,6 +342,101 @@
           </div>
         </div>
         <q-separator></q-separator>
+        <div class="row items-center no-wrap q-mb-md q-mt-md">
+          <div class="col-3 q-pr-lg">Require Auth :</div>
+          <div class="col-2 col-sm-4 q-pr-lg">
+            <q-toggle
+              color="secodary"
+              class="q-ml-md q-mr-md"
+              v-model="relay.meta.requireAuthFilter"
+              >For Filters</q-toggle
+            >
+          </div>
+          <div class="col-2 col-sm-4 q-pr-lg">
+            <q-toggle
+              color="secodary"
+              class="q-ml-md q-mr-md"
+              v-model="relay.meta.requireAuthEvents"
+              >For All Events</q-toggle
+            >
+          </div>
+          <div class="col-5 col-sm-5">
+            <q-icon name="info" class="cursor-pointer">
+              <q-tooltip>
+                Require client authentication for accessing different types of
+                resources.
+              </q-tooltip></q-icon
+            >
+          </div>
+        </div>
+        <div
+          v-if="relay.meta.requireAuthEvents"
+          class="row items-center no-wrap q-mb-md q-mt-md"
+        >
+          <div class="col-3 q-pr-lg">Skip Auth For Events:</div>
+          <div class="col-1">
+            <q-input
+              filled
+              dense
+              v-model.trim="skipEventKind"
+              type="number"
+              min="0"
+            ></q-input>
+          </div>
+          <div class="col-1">
+            <q-btn
+              unelevated
+              color="secondary"
+              icon="add"
+              @click="addSkipAuthForEvent()"
+            ></q-btn>
+          </div>
+          <div class="col-7">
+            <q-chip
+              v-for="e in relay.meta.skipedAuthEvents"
+              :key="e"
+              removable
+              @remove="removeSkipAuthForEvent(e)"
+              color="primary"
+              text-color="white"
+            >
+              <span v-text="e"></span>
+            </q-chip>
+          </div>
+        </div>
+        <div v-else class="row items-center no-wrap q-mb-md q-mt-md">
+          <div class="col-3 q-pr-lg">Force Auth For Events:</div>
+          <div class="col-1">
+            <q-input
+              filled
+              dense
+              v-model.trim="forceEventKind"
+              type="number"
+              min="0"
+            ></q-input>
+          </div>
+          <div class="col-1">
+            <q-btn
+              unelevated
+              color="secondary"
+              icon="add"
+              @click="addForceAuthForEvent()"
+            ></q-btn>
+          </div>
+          <div class="col-7">
+            <q-chip
+              v-for="e in relay.meta.forcedAuthEvents"
+              :key="e"
+              removable
+              @remove="removeForceAuthForEvent(e)"
+              color="primary"
+              text-color="white"
+            >
+              <span v-text="e"></span>
+            </q-chip>
+          </div>
+        </div>
+        <q-separator></q-separator>
         <div class="row items-center no-wrap q-mb-md q-mt-md">
           <div class="col-3 q-pr-lg">Full Storage Action:</div>
           <div class="col-3 col-sm-4 q-pr-lg">
@@ -323,7 +444,7 @@
               filled
               dense
               emit-value
-              v-model="relay.config.fullStorageAction"
+              v-model="relay.meta.fullStorageAction"
               type="text"
               :options="fullStorageActions"
             ></q-select>
@@ -343,7 +464,7 @@
             <q-input
               filled
               dense
-              v-model.trim="relay.config.limitPerFilter"
+              v-model.trim="relay.meta.limitPerFilter"
               type="number"
               min="0"
             ></q-input>
@@ -356,7 +477,7 @@
               </q-tooltip></q-icon
             >
             <q-badge
-              v-if="relay.config.limitPerFilter == 0"
+              v-if="relay.meta.limitPerFilter == 0"
               color="green"
               class="float-right"
               ><span>No Limit</span>
@@ -369,7 +490,7 @@
             <q-input
               filled
               dense
-              v-model.trim="relay.config.maxClientFilters"
+              v-model.trim="relay.meta.maxClientFilters"
               type="number"
               min="0"
             ></q-input>
@@ -383,7 +504,7 @@
               </q-tooltip></q-icon
             >
             <q-badge
-              v-if="relay.config.maxClientFilters == 0"
+              v-if="relay.meta.maxClientFilters == 0"
               color="green"
               class="float-right"
               ><span>Unlimited Filters</span>
@@ -391,12 +512,12 @@
           </div>
         </div>
         <div class="row items-center no-wrap q-mb-md">
-          <div class="col-3 q-pr-lg">Max events per second:</div>
+          <div class="col-3 q-pr-lg">Max events per hour:</div>
           <div class="col-3 col-sm-4 q-pr-lg">
             <q-input
               filled
               dense
-              v-model.trim="relay.config.maxEventsPerSecond"
+              v-model.trim="relay.meta.maxEventsPerHour"
               type="number"
               min="0"
             ></q-input>
@@ -409,7 +530,7 @@
               </q-tooltip></q-icon
             >
             <q-badge
-              v-if="relay.config.maxEventsPerSecond == 0"
+              v-if="relay.meta.maxEventsPerHour == 0"
               color="green"
               class="float-right"
               ><span>No Limit</span>
@@ -418,86 +539,119 @@
         </div>
       </div>
     </q-tab-panel>
-    <q-tab-panel name="allowed">
+    <q-tab-panel name="accounts">
       <div v-if="relay">
+        <q-card class="q-mr-lg q-mb-md"
+          ><q-card-section>
             <div class="row items-center no-wrap q-mb-md">
-          <div class="col-3 q-pr-lg">Allowed Public Key</div>
-          <div class="col-7 q-pr-lg">
+              <div class="col-2 q-pr-lg">Public Key:</div>
+              <div class="col-5 q-pr-lg">
                 <q-input
                   filled
                   dense
-              v-model.trim="allowedPubkey"
+                  v-model.trim="accountPubkey"
                   type="text"
                 ></q-input>
               </div>
-          <div class="col-2 q-pr-lg">
+              <div class="col-2 q-pr-md">
                 <q-btn
                   unelevated
-              color="secondary"
-              class="float-right"
-              @click="allowPublicKey()"
-              >Add</q-btn
+                  color="green"
+                  class="float-left"
+                  @click="allowPublicKey(accountPubkey, true)"
+                  >Allow</q-btn
                 >
               </div>
-        </div>
-        <div
-          :key="p"
-          v-for="p in relay.config.allowedPublicKeys"
-          class="row q-mb-xs"
-        >
-          <div class="col-3 q-pr-lg"></div>
-          <div class="col-9 q-pr-lg">
-            {{p}}
+              <div class="col-3">
                 <q-btn
-              size="sm"
                   unelevated
                   color="pink"
-              icon="cancel"
-              class="float-right"
-              @click="deleteAllowedPublicKey(p)"
-            ></q-btn>
+                  class="float-left"
+                  @click="blockPublicKey(accountPubkey, true)"
+                  >Block</q-btn
+                >
               </div>
             </div>
-      </div>
-    </q-tab-panel>
-    <q-tab-panel name="blocked">
-      <div v-if="relay">
+          </q-card-section>
+        </q-card>
+        <q-card class="q-mr-lg q-mb-dm"
+          ><q-card-section>
             <div class="row items-center no-wrap q-mb-md">
-          <div class="col-3 q-pr-lg">Blocked Public Key</div>
-          <div class="col-7 q-pr-lg">
-            <q-input
-              filled
-              dense
-              v-model.trim="blockedPubkey"
-              type="text"
-            ></q-input>
-          </div>
-          <div class="col-2 q-pr-lg">
-            <q-btn
-              unelevated
-              color="secondary"
-              class="float-right"
-              @click="blockPublicKey()"
-              >Add</q-btn
-            >
-          </div>
-        </div>
-        <div
-          :key="p"
-          v-for="p in relay.config.blockedPublicKeys"
-          class="row q-mb-xs"
-        >
-          <div class="col-3 q-pr-lg"></div>
+              <div class="col-3 q-pr-lg">Filter:</div>
               <div class="col-9 q-pr-lg">
-            {{p}}
-            <q-btn
-              unelevated
+                <q-toggle
                   size="sm"
+                  color="secodary"
+                  class="q-mr-lg"
+                  v-model="showAllowedAccounts"
+                  @update:model-value="getAccounts()"
+                  >Show Allowed Account</q-toggle
+                >
+                <q-toggle
+                  size="sm"
+                  color="secodary"
+                  class="q-mr-lg"
+                  v-model="showBlockedAccounts"
+                  @update:model-value="getAccounts()"
+                >
+                  Show Blocked Accounts</q-toggle
+                >
+              </div>
+            </div>
+          </q-card-section></q-card
+        >
+        <div class="row items-center no-wrap q-mb-md">
+          <div class="col-12 q-pr-lg">
+            <q-table
+              flat
+              dense
+              :rows="accounts"
+              row-key="pubkey"
+              :columns="accountsTable.columns"
+              :pagination.sync="accountsTable.pagination"
+            >
+              <template v-slot:body="props">
+                <q-tr :props="props">
+                  <q-td key="action" :props="props">
+                    <q-btn
+                      dense
                       color="pink"
-              icon="cancel"
                       class="float-right"
-              @click="deleteBlockedPublicKey(p)"
-            ></q-btn>
+                      @click="removePublicKey(props.row.pubkey)"
+                      size="sm"
+                      >Delete</q-btn
+                    >
+                  </q-td>
+                  <q-td key="pubkey" :props="props">
+                    <span v-text="props.row.pubkey"></span>
+                  </q-td>
+                  <q-td key="allowed" :props="props">
+                    <q-toggle
+                      size="sm"
+                      color="secodary"
+                      v-model="props.row.allowed"
+                      @update:model-value="togglePublicKey(props.row, 'allow')"
+                    ></q-toggle>
+                  </q-td>
+                  <q-td key="blocked" :props="props">
+                    <q-toggle
+                      size="sm"
+                      color="secodary"
+                      v-model="props.row.blocked"
+                      @update:model-value="togglePublicKey(props.row, 'block')"
+                    ></q-toggle>
+                  </q-td>
+
+                  <q-td auto-width
+                    ><span v-text="props.row.paid_to_join"></span>
+                  </q-td>
+                  <q-td auto-width> <span v-text="props.row.sats"></span></q-td>
+                  <q-td auto-width
+                    ><span v-text="props.row.storage"></span>
+                  </q-td>
+                </q-tr>
+              </template>
+            </q-table>
           </div>
         </div>
       </div>

tests/conftest.py

@@ -0,0 +1,53 @@
+import asyncio
+import inspect
+
+import pytest
+import pytest_asyncio
+from lnbits.db import Database
+from loguru import logger
+from pydantic import BaseModel
+
+from .. import migrations
+from ..relay.event import NostrEvent
+from .helpers import get_fixtures
+
+
+class EventFixture(BaseModel):
+    name: str
+    exception: str | None
+    data: NostrEvent
+
+
+@pytest.fixture(scope="session")
+def event_loop():
+    loop = asyncio.get_event_loop()
+    yield loop
+    loop.close()
+
+
+@pytest_asyncio.fixture(scope="session", autouse=True)
+async def migrate_db():
+    db = Database("ext_nostrrelay")
+    await db.execute("DROP TABLE IF EXISTS nostrrelay.events;")
+    await db.execute("DROP TABLE IF EXISTS nostrrelay.relays;")
+    await db.execute("DROP TABLE IF EXISTS nostrrelay.event_tags;")
+    await db.execute("DROP TABLE IF EXISTS nostrrelay.accounts;")
+
+    # check if exists else skip migrations
+    for key, migrate in inspect.getmembers(migrations, inspect.isfunction):
+        logger.info(f"Running migration '{key}'.")
+        await migrate(db)
+
+    yield db
+
+
+@pytest.fixture(scope="session")
+def valid_events(migrate_db) -> list[EventFixture]:
+    data = get_fixtures("events")
+    return [EventFixture.parse_obj(e) for e in data["valid"]]
+
+
+@pytest.fixture(scope="session")
+def invalid_events(migrate_db) -> list[EventFixture]:
+    data = get_fixtures("events")
+    return [EventFixture.parse_obj(e) for e in data["invalid"]]

tests/fixture/clients.json

@@ -82,12 +82,7 @@
       "REQ",
       "notifications:0b29ecc73ba400e5b4bd1e4cb0d8f524e9958345",
       {
-                "kinds": [
-                    1,
-                    7,
-                    6,
-                    4
-                ],
+        "kinds": [1, 7, 6, 4],
         "#p": [
           "0b29ecc73ba400e5b4bd1e4cb0d8f524e9958345749197ca21c8da38d0622816"
         ],
@@ -127,11 +122,7 @@
             "e",
             "05741bda9079cdf66f3be977a4d31287366470d1337b1aeb09506da4fbf7cd85"
           ],
-                    [
-                        "e",
-                        "mock-id",
-                        ""
-                    ],
+          ["e", "mock-id", ""],
           [
             "e",
             "bb34749ffd3eb0e393e54cc90b61a7dd5f34108d4931467861d20281c0b7daea"
@@ -153,9 +144,7 @@
       "REQ",
       "contact",
       {
-                "kinds": [
-                    3
-                ],
+        "kinds": [3],
         "authors": [
           "d685447c43c7c18dbbea61923cf0b63e1ab46bed69b153a48279a95c40bd414a"
         ]
@@ -185,9 +174,7 @@
       "REQ",
       "profile",
       {
-                "kinds": [
-                    0
-                ],
+        "kinds": [0],
         "authors": [
           "0b29ecc73ba400e5b4bd1e4cb0d8f524e9958345749197ca21c8da38d0622816"
         ]
@@ -197,9 +184,7 @@
       "REQ",
       "sub0",
       {
-                "kinds": [
-                    1
-                ],
+        "kinds": [1],
         "authors": [
           "0b29ecc73ba400e5b4bd1e4cb0d8f524e9958345749197ca21c8da38d0622816"
         ],
@@ -308,9 +293,7 @@
       "REQ",
       "notifications:d685447c43c7c18dbbea61923cf0b63e1ab46bed",
       {
-                "kinds": [
-                    4
-                ],
+        "kinds": [4],
         "#p": [
           "d685447c43c7c18dbbea61923cf0b63e1ab46bed69b153a48279a95c40bd414a"
         ],
@@ -321,9 +304,7 @@
       "REQ",
       "notifications:delete",
       {
-                "kinds": [
-                    5
-                ],
+        "kinds": [5],
         "authors": [
           "0b29ecc73ba400e5b4bd1e4cb0d8f524e9958345749197ca21c8da38d0622816"
         ],

tests/fixture/events.json

@@ -4,6 +4,8 @@
       "name": "kind 0, metadata",
       "data": {
         "id": "380299ac06ef1bff58e7e5a04a2c5efcd0e15b113e71acf3440269e3bd2486f6",
+        "relay_id": "r1",
+        "publisher": "ae9d97d1627f6d02376cd0ce0ceed716d573deca355649d8e03a9323aaaa2491",
         "pubkey": "ae9d97d1627f6d02376cd0ce0ceed716d573deca355649d8e03a9323aaaa2491",
         "created_at": 1675242172,
         "kind": 0,
@@ -19,6 +21,8 @@
         "content": "i126",
         "tags": [],
         "created_at": 1675239988,
+        "relay_id": "r1",
+        "publisher": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "pubkey": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "id": "3219eec7427e365585d5adf26f5d2dd2709d3f0f2c0e1f79dc9021e951c67d96",
         "sig": "b1791d17052cef2a65f487ecd976952a721680da9cda4e0f11f4ea04425b1e0a273b27233a4fc50b9d98ebdf1d0722e52634db9830ba53ad8caeb1e2afc9b7d1"
@@ -42,6 +46,8 @@
           ]
         ],
         "created_at": 1675240147,
+        "relay_id": "r1",
+        "publisher": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "pubkey": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "id": "6b2b6cb9c72caaf3dfbc5baa5e68d75ac62f38ec011b36cc83832218c36e4894",
         "sig": "ee855296f691880bac51148996b4200c21da7c8a54c65ab29a83a30bbace3bb5de49f6bdbe8102473211078d006b63bcc67a6e905bf22b3f2195b9e2feaa0957"
@@ -51,6 +57,8 @@
       "name": "kind 3, contact list",
       "data": {
         "id": "d1e5db203ef5fb1699f106f132bae1a3b5c9c8acf4fbb6c4a50844a6827164f1",
+        "relay_id": "r1",
+        "publisher": "69795541a6635015b7e18b7f3f0f663fdec952bbd92642ee879610fae2e25718",
         "pubkey": "69795541a6635015b7e18b7f3f0f663fdec952bbd92642ee879610fae2e25718",
         "created_at": 1675095502,
         "kind": 3,
@@ -68,6 +76,8 @@
       "name": "kind 3, relays",
       "data": {
         "id": "ee5fd14c3f8198bafbc70250c1c9d773069479ea456e8a11cfd889eb0eb63a9e",
+        "relay_id": "r1",
+        "publisher": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "pubkey": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "created_at": 1675175242,
         "kind": 3,
@@ -105,6 +115,8 @@
           ]
         ],
         "created_at": 1675240247,
+        "relay_id": "r1",
+        "publisher": "99a566c374211fd7f3db531f296b574a726329f509fbf3285cf3feac4e9b488e",
         "pubkey": "99a566c374211fd7f3db531f296b574a726329f509fbf3285cf3feac4e9b488e",
         "id": "e742abcd1befd0ef51fc047d5bcd3df360bf0d87f29702a333b06cb405ca40e5",
         "sig": "eb7269eec350a3a1456261fe4e53a6a58b028497bdfc469c1579940ddcfe29688b420f33b7a9d69d41a9a689e00e661749cde5a44de16a341a8b2be3df6d770d"
@@ -122,6 +134,8 @@
           ]
         ],
         "created_at": 1675241034,
+        "relay_id": "r1",
+        "publisher": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "pubkey": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "id": "31e27bb0133d48b4e27cc23ca533f305fd613b1485d0fc27b3d65354ae7bd4d1",
         "sig": "e6f48d78f516212f3272c73eb2a6229b7f4d8254f453d8fe3f225ecf5e1367ed6d15859c678c7d00dee0d6b545fb4967c383b559fe20e59891e229428ed2c312"
@@ -145,6 +159,8 @@
         ],
         "content": "#[0]",
         "created_at": 1675240471,
+        "relay_id": "r1",
+        "publisher": "99a566c374211fd7f3db531f296b574a726329f509fbf3285cf3feac4e9b488e",
         "pubkey": "99a566c374211fd7f3db531f296b574a726329f509fbf3285cf3feac4e9b488e",
         "id": "64e69392dc44972433f80bdb4889d3a5a53b6ba7a18a0f5b9518e0bebfeb202e",
         "sig": "6ae812a285be3a0bee8c4ae894bc3a92bbc4a78e03c3b1265e9e4f67668fd2c4fe59af69ab2248e49739e733e270b258384abe45f3b7e2a2fba9caebf405f74e"
@@ -166,6 +182,8 @@
           ]
         ],
         "created_at": 1675240377,
+        "relay_id": "r1",
+        "publisher": "99a566c374211fd7f3db531f296b574a726329f509fbf3285cf3feac4e9b488e",
         "pubkey": "99a566c374211fd7f3db531f296b574a726329f509fbf3285cf3feac4e9b488e",
         "id": "9ad503684485edc2d2c52d024e00d920f50c29e07c7b0e39d221c96f9eecc6da",
         "sig": "2619c94b8ae65ac153f287de810a5447bcdd9bf177b149cc1f428a7aa750a3751881bb0ef6359017ab70a45b5062d0be7205fa2c71b6c990e886486a17875947"
@@ -175,14 +193,11 @@
       "name": "kind 30,000, replaceable events, 'd' tag",
       "data": {
         "kind": 30000,
-                "tags": [
-                    [
-                        "d",
-                        "chats/null/lastOpened"
-                    ]
-                ],
+        "tags": [["d", "chats/null/lastOpened"]],
         "content": "1675242945",
         "created_at": 1675242945,
+        "relay_id": "r1",
+        "publisher": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "pubkey": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "id": "21248bddbab900b8c2f0713c925519f4f50d71eb081149f71221e69db3a5e2d1",
         "sig": "f9be83b62cbbfd6070d434758d3fe7e709947abfff701b240fca5f20fc538f35018be97fd5b236c72f7021845f3a3c805ba878269b5ddf44fe03ec161f60e5d8"
@@ -195,6 +210,8 @@
       "exception": "Invalid event id. Expected: '380299ac06ef1bff58e7e5a04a2c5efcd0e15b113e71acf3440269e3bd2486f6' got '380299ac06ef1bff58e7e5a04a2c5efcd0e15b113e71acaaaaaaaaaaaaaaaaaa'",
       "data": {
         "id": "380299ac06ef1bff58e7e5a04a2c5efcd0e15b113e71acaaaaaaaaaaaaaaaaaa",
+        "relay_id": "r1",
+        "publisher": "ae9d97d1627f6d02376cd0ce0ceed716d573deca355649d8e03a9323aaaa2491",
         "pubkey": "ae9d97d1627f6d02376cd0ce0ceed716d573deca355649d8e03a9323aaaa2491",
         "created_at": 1675242172,
         "kind": 0,
@@ -211,6 +228,8 @@
         "content": "i126",
         "tags": [],
         "created_at": 1675239988,
+        "relay_id": "r1",
+        "publisher": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "pubkey": "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211",
         "id": "3219eec7427e365585d5adf26f5d2dd2709d3f0f2c0e1f79dc9021e951c67d96",
         "sig": "b1791d17052cef2a65f487ecd976952a721680da9cda4e0f11f4ea04425b1e0a273b27233a4fc50b9d98ebdf1d0722e52634dbaaaaaaaaaaaaaaaaaaaaaaaaaa"

tests/helpers.py

@@ -1,6 +1,7 @@
 import json
 
-FIXTURES_PATH = "tests/extensions/nostrrelay/fixture"
+FIXTURES_PATH = "./tests/fixture"
+
 
 def get_fixtures(file):
     """

tests/test_clients.py

@@ -1,17 +1,17 @@
 import asyncio
 from json import dumps, loads
-from typing import Optional
 
 import pytest
 from fastapi import WebSocket
 from loguru import logger
 
-from lnbits.extensions.nostrrelay.client_manager import (
+from ..relay.client_connection import (
     NostrClientConnection,
+)
+from ..relay.client_manager import (
     NostrClientManager,
 )
-from lnbits.extensions.nostrrelay.models import RelayConfig
-
+from ..relay.relay import RelaySpec
 from .helpers import get_fixtures
 
 fixtures = get_fixtures("clients")
@@ -24,10 +24,10 @@ RELAY_ID = "relay_01"
 class MockWebSocket(WebSocket):
     def __init__(self):
         self.sent_messages = []
-        self.fake_wire: asyncio.Queue[str] = asyncio.Queue(0)
+        self.fake_wire = asyncio.Queue(0)
         pass
 
-    async def accept(self):
+    async def accept(self, *_, **__):
         await asyncio.sleep(0.1)
 
     async def receive_text(self) -> str:
@@ -40,10 +40,8 @@ class MockWebSocket(WebSocket):
     async def wire_mock_data(self, data: dict):
         await self.fake_wire.put(dumps(data))
 
-    async def close(
-        self, code: int = 1000, reason: Optional[str] = None
-    ) -> None:
-        logger.info(reason)
+    async def close(self, code: int = 1000, reason: str | None = None) -> None:
+        logger.info(f"{code}: {reason}")
 
 
 @pytest.mark.asyncio
@@ -71,19 +69,25 @@ async def test_alice_and_bob():
     await alice_deletes_post01__bob_is_notified(ws_alice, ws_bob)
 
 
+tasks = []
+
+
 async def init_clients():
     client_manager = NostrClientManager()
-    await client_manager.enable_relay(RELAY_ID, RelayConfig())
+    await client_manager.enable_relay(RELAY_ID, RelaySpec())
 
     ws_alice = MockWebSocket()
     client_alice = NostrClientConnection(relay_id=RELAY_ID, websocket=ws_alice)
     await client_manager.add_client(client_alice)
-    asyncio.create_task(client_alice.start())
+    task1 = asyncio.create_task(client_alice.start())
+    tasks.append(task1)
 
     ws_bob = MockWebSocket()
     client_bob = NostrClientConnection(relay_id=RELAY_ID, websocket=ws_bob)
     await client_manager.add_client(client_bob)
-    asyncio.create_task(client_bob.start())
+    task2 = asyncio.create_task(client_bob.start())
+    tasks.append(task2)
+
     return ws_alice, ws_bob
 
 
@@ -98,16 +102,13 @@ async def alice_wires_meta_and_post01(ws_alice: MockWebSocket):
 
     assert (
         len(ws_alice.sent_messages) == 4
-    ), "Alice: Expected 3 confirmations to be sent"
+    ), "Alice: Expected 4 confirmations to be sent"
     assert ws_alice.sent_messages[0] == dumps(
         alice["meta_response"]
     ), "Alice: Wrong confirmation for meta"
     assert ws_alice.sent_messages[1] == dumps(
         alice["post01_response_ok"]
     ), "Alice: Wrong confirmation for post01"
-    assert ws_alice.sent_messages[2] == dumps(
-        alice["post01_response_duplicate"]
-    ), "Alice: Expected failure for double posting"
     assert ws_alice.sent_messages[3] == dumps(
         alice["meta_update_response"]
     ), "Alice: Expected confirmation for meta update"
@@ -152,10 +153,6 @@ async def bob_wires_contact_list(ws_alice: MockWebSocket, ws_bob: MockWebSocket)
     await ws_alice.wire_mock_data(alice["subscribe_to_bob_contact_list"])
     await asyncio.sleep(0.1)
 
-
-    print("### ws_alice.sent_message", ws_alice.sent_messages)
-    print("### ws_bob.sent_message", ws_bob.sent_messages)
-
     assert (
         len(ws_bob.sent_messages) == 2
     ), "Bob: Expected 1 confirmation for create contact list"

tests/test_events.py

@@ -1,50 +1,37 @@
 import json
-from typing import List, Optional
 
 import pytest
 from loguru import logger
-from pydantic import BaseModel
 
-from lnbits.extensions.nostrrelay.crud import create_event, get_event, get_events
-from lnbits.extensions.nostrrelay.models import NostrEvent, NostrFilter
-
-from .helpers import get_fixtures
+from ..crud import (
+    create_event,
+    get_event,
+    get_events,
+)
+from ..relay.event import NostrEvent
+from ..relay.filter import NostrFilter
+from .conftest import EventFixture
 
 RELAY_ID = "r1"
 
-class EventFixture(BaseModel):
-    name: str
-    exception: Optional[str]
-    data: NostrEvent
 
-
-@pytest.fixture
-def valid_events() -> List[EventFixture]:
-    data = get_fixtures("events")
-    return [EventFixture.parse_obj(e) for e in data["valid"]]
-
-@pytest.fixture
-def invalid_events() -> List[EventFixture]:
-    data = get_fixtures("events")
-    return [EventFixture.parse_obj(e) for e in data["invalid"]]
-
-
-def test_valid_event_id_and_signature(valid_events: List[EventFixture]):
+def test_valid_event_id_and_signature(valid_events: list[EventFixture]):
     for f in valid_events:
         try:
             f.data.check_signature()
         except Exception as e:
-            logger.error(f"Invalid 'id' ot 'signature' for fixture: '{f.name}'")
+            logger.error(f"Invalid 'id' of 'signature' for fixture: '{f.name}'")
             raise e
 
-def test_invalid_event_id_and_signature(invalid_events: List[EventFixture]):
+
+def test_invalid_event_id_and_signature(invalid_events: list[EventFixture]):
     for f in invalid_events:
         with pytest.raises(ValueError, match=f.exception):
             f.data.check_signature()
 
 
 @pytest.mark.asyncio
-async def test_valid_event_crud(valid_events: List[EventFixture]):    
+async def test_valid_event_crud(valid_events: list[EventFixture]):
     author = "a24496bca5dd73300f4e5d5d346c73132b7354c597fcbb6509891747b4689211"
     event_id = "3219eec7427e365585d5adf26f5d2dd2709d3f0f2c0e1f79dc9021e951c67d96"
     reply_event_id = "6b2b6cb9c72caaf3dfbc5baa5e68d75ac62f38ec011b36cc83832218c36e4894"
@@ -52,14 +39,12 @@ async def test_valid_event_crud(valid_events: List[EventFixture]):
 
     # insert all events in DB before doing an query
     for e in all_events:
-        await create_event(RELAY_ID, e)
-
+        await create_event(e)
 
     for f in valid_events:
         await get_by_id(f.data, f.name)
         await filter_by_id(all_events, f.data, f.name)
 
-    
     await filter_by_author(all_events, author)
 
     await filter_by_tag_p(all_events, author)
@@ -70,76 +55,99 @@ async def test_valid_event_crud(valid_events: List[EventFixture]):
 
     await filter_by_tag_e_p_and_author(all_events, author, event_id, reply_event_id)
 
+
 async def get_by_id(data: NostrEvent, test_name: str):
     event = await get_event(RELAY_ID, data.id)
     assert event, f"Failed to restore event (id='{data.id}')"
-    assert event.json() != json.dumps(data.json()), f"Restored event is different for fixture '{test_name}'"
+    assert event.json() != json.dumps(
+        data.json()
+    ), f"Restored event is different for fixture '{test_name}'"
 
-async def filter_by_id(all_events: List[NostrEvent], data: NostrEvent, test_name: str):
-    filter = NostrFilter(ids=[data.id])
 
-    events = await get_events(RELAY_ID, filter)
+async def filter_by_id(all_events: list[NostrEvent], data: NostrEvent, test_name: str):
+    nostr_filter = NostrFilter(ids=[data.id])
+
+    events = await get_events(RELAY_ID, nostr_filter)
     assert len(events) == 1, f"Expected one queried event '{test_name}'"
-    assert events[0].json() != json.dumps(data.json()), f"Queried event is different for fixture '{test_name}'"
+    assert events[0].json() != json.dumps(
+        data.json()
+    ), f"Queried event is different for fixture '{test_name}'"
 
-    filtered_events = [e for e in all_events if filter.matches(e)]
+    filtered_events = [e for e in all_events if nostr_filter.matches(e)]
     assert len(filtered_events) == 1, f"Expected one filter event '{test_name}'"
-    assert filtered_events[0].json() != json.dumps(data.json()), f"Filtered event is different for fixture '{test_name}'"
+    assert filtered_events[0].json() != json.dumps(
+        data.json()
+    ), f"Filtered event is different for fixture '{test_name}'"
 
 
-async def filter_by_author(all_events: List[NostrEvent], author):
-    filter = NostrFilter(authors=[author])
-    events_by_author = await get_events(RELAY_ID, filter)
-    assert len(events_by_author) == 5, f"Failed to query by authors"
+async def filter_by_author(all_events: list[NostrEvent], author):
+    nostr_filter = NostrFilter(authors=[author])
+    events_by_author = await get_events(RELAY_ID, nostr_filter)
+    assert len(events_by_author) == 5, "Failed to query by authors"
 
-    filtered_events = [e for e in all_events if filter.matches(e)]
-    assert len(filtered_events) == 5, f"Failed to filter by authors"
+    filtered_events = [e for e in all_events if nostr_filter.matches(e)]
+    assert len(filtered_events) == 5, "Failed to filter by authors"
 
-async def filter_by_tag_p(all_events: List[NostrEvent], author):
+
+async def filter_by_tag_p(all_events: list[NostrEvent], author):
     # todo: check why constructor does not work for fields with aliases (#e, #p)
-    filter = NostrFilter() 
-    filter.p.append(author)
+    nostr_filter = NostrFilter()
+    nostr_filter.p.append(author)
 
-    events_related_to_author = await get_events(RELAY_ID, filter)
-    assert len(events_related_to_author) == 5, f"Failed to query by tag 'p'"
+    events_related_to_author = await get_events(RELAY_ID, nostr_filter)
+    assert len(events_related_to_author) == 5, "Failed to query by tag 'p'"
 
-    filtered_events = [e for e in all_events if filter.matches(e)]
-    assert len(filtered_events) == 5, f"Failed to filter by tag 'p'"
+    filtered_events = [e for e in all_events if nostr_filter.matches(e)]
+    assert len(filtered_events) == 5, "Failed to filter by tag 'p'"
 
 
-async def filter_by_tag_e(all_events: List[NostrEvent],  event_id):
-    filter = NostrFilter()
-    filter.e.append(event_id)
+async def filter_by_tag_e(all_events: list[NostrEvent], event_id):
+    nostr_filter = NostrFilter()
+    nostr_filter.e.append(event_id)
 
-    events_related_to_event = await get_events(RELAY_ID, filter)
-    assert len(events_related_to_event) == 2, f"Failed to query by tag 'e'"
+    events_related_to_event = await get_events(RELAY_ID, nostr_filter)
+    assert len(events_related_to_event) == 2, "Failed to query by tag 'e'"
 
-    filtered_events = [e for e in all_events if filter.matches(e)]
-    assert len(filtered_events) == 2, f"Failed to filter by tag 'e'"
-
-async def filter_by_tag_e_and_p(all_events: List[NostrEvent],  author, event_id, reply_event_id):
-    filter = NostrFilter()
-    filter.p.append(author)
-    filter.e.append(event_id)
-    
-    events_related_to_event = await get_events(RELAY_ID, filter)
-    assert len(events_related_to_event) == 1, f"Failed to quert by tags 'e' & 'p'"
-    assert events_related_to_event[0].id == reply_event_id, f"Failed to query the right event by tags 'e' & 'p'"
-
-    filtered_events = [e for e in all_events if filter.matches(e)]
-    assert len(filtered_events) == 1, f"Failed to filter by tags 'e' & 'p'"
-    assert filtered_events[0].id == reply_event_id, f"Failed to find the right event by tags 'e' & 'p'"
-
-async def filter_by_tag_e_p_and_author(all_events: List[NostrEvent], author, event_id, reply_event_id):
-    filter = NostrFilter(authors=[author])
-    filter.p.append(author)
-    filter.e.append(event_id)
-    events_related_to_event = await get_events(RELAY_ID, filter)
-    assert len(events_related_to_event) == 1, f"Failed to query by 'author' and tags 'e' & 'p'"
-    assert events_related_to_event[0].id == reply_event_id, f"Failed to query the right event by 'author' and tags 'e' & 'p'"
-
-    filtered_events = [e for e in all_events if filter.matches(e)]
-    assert len(filtered_events) == 1, f"Failed to filter by 'author' and tags 'e' & 'p'"
-    assert filtered_events[0].id == reply_event_id, f"Failed to filter the right event by 'author' and tags 'e' & 'p'"
+    filtered_events = [e for e in all_events if nostr_filter.matches(e)]
+    assert len(filtered_events) == 2, "Failed to filter by tag 'e'"
 
 
+async def filter_by_tag_e_and_p(
+    all_events: list[NostrEvent], author, event_id, reply_event_id
+):
+    nostr_filter = NostrFilter()
+    nostr_filter.p.append(author)
+    nostr_filter.e.append(event_id)
+
+    events_related_to_event = await get_events(RELAY_ID, nostr_filter)
+    assert len(events_related_to_event) == 1, "Failed to quert by tags 'e' & 'p'"
+    assert (
+        events_related_to_event[0].id == reply_event_id
+    ), "Failed to query the right event by tags 'e' & 'p'"
+
+    filtered_events = [e for e in all_events if nostr_filter.matches(e)]
+    assert len(filtered_events) == 1, "Failed to filter by tags 'e' & 'p'"
+    assert (
+        filtered_events[0].id == reply_event_id
+    ), "Failed to find the right event by tags 'e' & 'p'"
+
+
+async def filter_by_tag_e_p_and_author(
+    all_events: list[NostrEvent], author, event_id, reply_event_id
+):
+    nostr_filter = NostrFilter(authors=[author])
+    nostr_filter.p.append(author)
+    nostr_filter.e.append(event_id)
+    events_related_to_event = await get_events(RELAY_ID, nostr_filter)
+    assert (
+        len(events_related_to_event) == 1
+    ), "Failed to query by 'author' and tags 'e' & 'p'"
+    assert (
+        events_related_to_event[0].id == reply_event_id
+    ), "Failed to query the right event by 'author' and tags 'e' & 'p'"
+
+    filtered_events = [e for e in all_events if nostr_filter.matches(e)]
+    assert len(filtered_events) == 1, "Failed to filter by 'author' and tags 'e' & 'p'"
+    assert (
+        filtered_events[0].id == reply_event_id
+    ), "Failed to filter the right event by 'author' and tags 'e' & 'p'"

tests/test_init.py

@@ -0,0 +1,17 @@
+import pytest
+from fastapi import APIRouter
+
+from .. import nostrrelay_ext, nostrrelay_start, nostrrelay_stop
+
+
+# just import router and add it to a test router
+@pytest.mark.asyncio
+async def test_router():
+    router = APIRouter()
+    router.include_router(nostrrelay_ext)
+
+
+@pytest.mark.asyncio
+async def test_start_and_stop():
+    nostrrelay_start()
+    await nostrrelay_stop()

tests/test_nip17.py

@@ -0,0 +1,132 @@
+"""
+Unit tests for NIP-17 (Private Direct Messages) handling.
+
+Covers:
+  - kind 1059 (gift wrap) and kind 13 (seal) classification on NostrEvent
+  - the AUTH-gated private-recipient delivery rule in NostrClientConnection
+"""
+
+from unittest.mock import MagicMock
+
+import pytest
+
+from ..relay.client_connection import NostrClientConnection
+from ..relay.event import NostrEvent
+from ..relay.relay import RelaySpec
+
+RELAY_ID = "relay_nip17"
+RECIPIENT = "1111111111111111111111111111111111111111111111111111111111111111"
+OTHER = "2222222222222222222222222222222222222222222222222222222222222222"
+EPHEMERAL = "3333333333333333333333333333333333333333333333333333333333333333"
+SIG = "0" * 128
+
+
+def _gift_wrap_for(recipient: str) -> NostrEvent:
+    """Build a kind 1059 event addressed to recipient. Skips signature validity."""
+    return NostrEvent(
+        id="0" * 64,
+        relay_id=RELAY_ID,
+        publisher=EPHEMERAL,
+        pubkey=EPHEMERAL,
+        created_at=0,
+        kind=1059,
+        tags=[["p", recipient]],
+        content="ciphertext",
+        sig=SIG,
+    )
+
+
+def test_kind_classification_helpers():
+    seal = NostrEvent(
+        id="0" * 64,
+        relay_id=RELAY_ID,
+        publisher=OTHER,
+        pubkey=OTHER,
+        created_at=0,
+        kind=13,
+        tags=[],
+        content="",
+        sig=SIG,
+    )
+    wrap = _gift_wrap_for(RECIPIENT)
+
+    assert seal.is_seal
+    assert not seal.is_gift_wrap
+    assert not seal.is_private_message  # seals carry no recipient metadata
+
+    assert wrap.is_gift_wrap
+    assert not wrap.is_seal
+    assert wrap.is_private_message
+    assert not wrap.is_ephemeral_event  # nostrmarket relies on storage
+
+
+def _make_connection(relay_spec: RelaySpec) -> NostrClientConnection:
+    conn = NostrClientConnection(relay_id=RELAY_ID, websocket=MagicMock())
+    conn.get_client_config = lambda: relay_spec
+    return conn
+
+
+@pytest.mark.parametrize(
+    "force_auth,auth_pubkey,event_recipient,expected_filtered",
+    [
+        # AUTH not required for 1059 -> never filtered (matches NIP-04 default)
+        (False, None, RECIPIENT, False),
+        (False, RECIPIENT, RECIPIENT, False),
+        (False, OTHER, RECIPIENT, False),
+        # AUTH required for 1059 -> only the recipient gets it
+        (True, None, RECIPIENT, True),
+        (True, RECIPIENT, RECIPIENT, False),
+        (True, OTHER, RECIPIENT, True),
+    ],
+)
+def test_gift_wrap_auth_gated_delivery(
+    force_auth, auth_pubkey, event_recipient, expected_filtered
+):
+    spec = RelaySpec(forcedAuthEvents=[1059] if force_auth else [])
+    conn = _make_connection(spec)
+    conn.auth_pubkey = auth_pubkey
+
+    wrap = _gift_wrap_for(event_recipient)
+    assert conn._is_private_event_for_other(wrap) is expected_filtered
+
+
+def test_kind_4_dm_still_gated_under_auth():
+    """Regression: the NIP-04 gating behavior must remain identical."""
+    spec = RelaySpec(forcedAuthEvents=[4])
+    conn = _make_connection(spec)
+    conn.auth_pubkey = OTHER
+
+    dm = NostrEvent(
+        id="0" * 64,
+        relay_id=RELAY_ID,
+        publisher=RECIPIENT,
+        pubkey=RECIPIENT,
+        created_at=0,
+        kind=4,
+        tags=[["p", RECIPIENT]],
+        content="ciphertext",
+        sig=SIG,
+    )
+    assert conn._is_private_event_for_other(dm) is True
+
+    conn.auth_pubkey = RECIPIENT
+    assert conn._is_private_event_for_other(dm) is False
+
+
+def test_non_private_kinds_never_filtered():
+    spec = RelaySpec(forcedAuthEvents=[1059, 4])
+    conn = _make_connection(spec)
+    conn.auth_pubkey = OTHER
+
+    note = NostrEvent(
+        id="0" * 64,
+        relay_id=RELAY_ID,
+        publisher=RECIPIENT,
+        pubkey=RECIPIENT,
+        created_at=0,
+        kind=1,
+        tags=[["p", RECIPIENT]],
+        content="hello",
+        sig=SIG,
+    )
+    assert conn._is_private_event_for_other(note) is False

toc.md

@@ -0,0 +1,29 @@
+# Terms and Conditions for LNbits Extension
+
+## 1. Acceptance of Terms
+
+By installing and using the LNbits extension ("Extension"), you agree to be bound by these terms and conditions ("Terms"). If you do not agree to these Terms, do not use the Extension.
+
+## 2. License
+
+The Extension is free and open-source software, released under [specify the FOSS license here, e.g., GPL-3.0, MIT, etc.]. You are permitted to use, copy, modify, and distribute the Extension under the terms of that license.
+
+## 3. No Warranty
+
+The Extension is provided "as is" and with all faults, and the developer expressly disclaims all warranties of any kind, whether express, implied, statutory, or otherwise, including but not limited to warranties of merchantability, fitness for a particular purpose, non-infringement, and any warranties arising out of course of dealing or usage of trade. No advice or information, whether oral or written, obtained from the developer or elsewhere will create any warranty not expressly stated in this Terms.
+
+## 4. Limitation of Liability
+
+In no event will the developer be liable to you or any third party for any direct, indirect, incidental, special, consequential, or punitive damages, including lost profit, lost revenue, loss of data, or other damages arising out of or in connection with your use of the Extension, even if the developer has been advised of the possibility of such damages. The foregoing limitation of liability shall apply to the fullest extent permitted by law in the applicable jurisdiction.
+
+## 5. Modification of Terms
+
+The developer reserves the right to modify these Terms at any time. You are advised to review these Terms periodically for any changes. Changes to these Terms are effective when they are posted on the appropriate location within or associated with the Extension.
+
+## 6. General Provisions
+
+If any provision of these Terms is held to be invalid or unenforceable, that provision will be enforced to the maximum extent permissible, and the other provisions of these Terms will remain in full force and effect. These Terms constitute the entire agreement between you and the developer regarding the use of the Extension.
+
+## 7. Contact Information
+
+If you have any questions about these Terms, please contact the developer at [developer's contact information].

views.py

@@ -1,29 +1,41 @@
-from fastapi import Depends, Request
-from fastapi.templating import Jinja2Templates
-from starlette.responses import HTMLResponse
+from http import HTTPStatus
 
+from fastapi import APIRouter, Depends, HTTPException, Request
+from fastapi.responses import HTMLResponse
 from lnbits.core.models import User
 from lnbits.decorators import check_user_exists
+from lnbits.helpers import template_renderer
 
-from . import nostrrelay_ext, nostrrelay_renderer
+from .crud import get_public_relay
+from .helpers import relay_info_response
 
-templates = Jinja2Templates(directory="templates")
+nostrrelay_generic_router: APIRouter = APIRouter()
 
 
-@nostrrelay_ext.get("/", response_class=HTMLResponse)
+def nostrrelay_renderer():
+    return template_renderer(["nostrrelay/templates"])
+
+
+@nostrrelay_generic_router.get("/", response_class=HTMLResponse)
 async def index(request: Request, user: User = Depends(check_user_exists)):
     return nostrrelay_renderer().TemplateResponse(
-        "nostrrelay/index.html", {"request": request, "user": user.dict()}
+        "nostrrelay/index.html", {"request": request, "user": user.json()}
     )
 
 
-@nostrrelay_ext.get("/public")
-async def nostrrelay(request: Request, nostrrelay_id):
+@nostrrelay_generic_router.get("/{relay_id}")
+async def nostrrelay(request: Request, relay_id: str):
+    relay_public_data = await get_public_relay(relay_id)
+
+    if not relay_public_data:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="Cannot find relay",
+        )
+
+    if request.headers.get("accept") == "application/nostr+json":
+        return relay_info_response(relay_public_data)
+
     return nostrrelay_renderer().TemplateResponse(
-        "nostrrelay/public.html",
-        {
-            "request": request,
-            # "nostrrelay": relay,
-            "web_manifest": f"/nostrrelay/manifest/{nostrrelay_id}.webmanifest",
-        },
+        "nostrrelay/public.html", {"request": request, "relay": relay_public_data}
     )

views_api.py

@@ -1,36 +1,42 @@
 from http import HTTPStatus
-from typing import List, Optional
-
-from fastapi import Depends, WebSocket
-from fastapi.exceptions import HTTPException
-from fastapi.responses import JSONResponse
-from loguru import logger
-from pydantic.types import UUID4
 
+from fastapi import APIRouter, Depends, HTTPException, Request, WebSocket
+from lnbits.core.crud import get_user
+from lnbits.core.models import WalletTypeInfo
+from lnbits.core.services import create_invoice
 from lnbits.decorators import (
-    WalletTypeInfo,
-    check_admin,
     require_admin_key,
     require_invoice_key,
 )
 from lnbits.helpers import urlsafe_short_hash
+from loguru import logger
+from starlette.responses import JSONResponse
 
-from . import nostrrelay_ext
-from .client_manager import NostrClientConnection, NostrClientManager
+from .client_manager import client_manager
 from .crud import (
+    create_account,
     create_relay,
+    delete_account,
     delete_all_events,
     delete_relay,
-    get_public_relay,
+    get_account,
+    get_accounts,
     get_relay,
+    get_relay_by_id,
     get_relays,
+    update_account,
     update_relay,
 )
-from .models import NostrRelay
+from .helpers import extract_domain, normalize_public_key, relay_info_response
+from .models import BuyOrder, NostrAccount, NostrPartialAccount
+from .relay.client_manager import NostrClientConnection
+from .relay.relay import NostrRelay
 
-client_manager = NostrClientManager()
+nostrrelay_api_router = APIRouter()
 
-@nostrrelay_ext.websocket("/{relay_id}")
+
+@nostrrelay_api_router.websocket("/{relay_id}")
+@nostrrelay_api_router.websocket("/{relay_id}/")
 async def websocket_endpoint(relay_id: str, websocket: WebSocket):
     client = NostrClientConnection(relay_id=relay_id, websocket=websocket)
     client_accepted = await client_manager.add_client(client)
@@ -44,98 +50,95 @@ async def websocket_endpoint(relay_id: str, websocket: WebSocket):
         client_manager.remove_client(client)
 
 
-
-@nostrrelay_ext.get("/{relay_id}", status_code=HTTPStatus.OK)
-async def api_nostrrelay_info(relay_id: str):
-    relay = await get_public_relay(relay_id)
-    if not relay:
-        raise HTTPException(
-            status_code=HTTPStatus.NOT_FOUND,
-            detail="Relay not found",
-        )
-
-    return JSONResponse(content=relay, headers={
-        "Access-Control-Allow-Origin": "*", 
-        "Access-Control-Allow-Headers": "*",
-        "Access-Control-Allow-Methods": "GET"
-    })
-
-
-
-@nostrrelay_ext.post("/api/v1/relay")
-async def api_create_relay(data: NostrRelay, wallet: WalletTypeInfo = Depends(require_admin_key)) -> NostrRelay:
+@nostrrelay_api_router.post("/api/v1/relay")
+async def api_create_relay(
+    data: NostrRelay,
+    request: Request,
+    key_info: WalletTypeInfo = Depends(require_admin_key),
+) -> NostrRelay:
+    data.user_id = key_info.wallet.user
     if len(data.id):
-        await check_admin(UUID4(wallet.wallet.user))
+        user = await get_user(data.user_id)
+        assert user, "User not found."
+        assert user.admin, "Only admin users can set the relay ID"
     else:
         data.id = urlsafe_short_hash()[:8]
 
-    try:
-        relay = await create_relay(wallet.wallet.user, data)
+    data.meta.domain = extract_domain(str(request.url))
+    relay = await create_relay(data)
     return relay
 
-    except Exception as ex:
-        logger.warning(ex)
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot create relay",
-        )
 
-@nostrrelay_ext.put("/api/v1/relay/{relay_id}")
-async def api_update_relay(relay_id: str, data: NostrRelay, wallet: WalletTypeInfo = Depends(require_admin_key)) -> NostrRelay:
+@nostrrelay_api_router.patch("/api/v1/relay/{relay_id}")
+async def api_update_relay(
+    relay_id: str, data: NostrRelay, wallet: WalletTypeInfo = Depends(require_admin_key)
+) -> NostrRelay:
     if relay_id != data.id:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
             detail="Cannot change the relay id",
         )
 
-    try:
     relay = await get_relay(wallet.wallet.user, data.id)
     if not relay:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND,
             detail="Relay not found",
         )
+
     updated_relay = NostrRelay.parse_obj({**dict(relay), **dict(data)})
-        updated_relay = await update_relay(wallet.wallet.user, updated_relay)
+    updated_relay.user_id = wallet.wallet.user
+    updated_relay = await update_relay(updated_relay)
+
+    # activate & deactivate have their own endpoint
+    updated_relay.active = relay.active
 
     if updated_relay.active:
-            await client_manager.enable_relay(relay_id, updated_relay.config)
+        await client_manager.enable_relay(relay_id, updated_relay.meta)
     else:
         await client_manager.disable_relay(relay_id)
 
     return updated_relay
 
-    except HTTPException as ex:
-        raise ex
-    except Exception as ex:
-        logger.warning(ex)
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot update relay",
-        )
 
-
-@nostrrelay_ext.get("/api/v1/relay")
-async def api_get_relays(wallet: WalletTypeInfo = Depends(require_invoice_key)) -> List[NostrRelay]:
-    try:
-        return await get_relays(wallet.wallet.user)
-    except Exception as ex:
-        logger.warning(ex)
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot fetch relays",
-        )
-
-@nostrrelay_ext.get("/api/v1/relay/{relay_id}")
-async def api_get_relay(relay_id: str, wallet: WalletTypeInfo = Depends(require_invoice_key)) -> Optional[NostrRelay]:
-    try:
+@nostrrelay_api_router.put("/api/v1/relay/{relay_id}")
+async def api_toggle_relay(
+    relay_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
+) -> NostrRelay:
     relay = await get_relay(wallet.wallet.user, relay_id)
-    except Exception as ex:
-        logger.warning(ex)
+    if not relay:
         raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot fetch relay",
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="Relay not found",
         )
+    relay.active = not relay.active
+    await update_relay(relay)
+
+    if relay.active:
+        await client_manager.enable_relay(relay_id, relay.meta)
+    else:
+        await client_manager.disable_relay(relay_id)
+
+    return relay
+
+
+@nostrrelay_api_router.get("/api/v1/relay")
+async def api_get_relays(
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
+) -> list[NostrRelay]:
+    return await get_relays(wallet.wallet.user)
+
+
+@nostrrelay_api_router.get("/api/v1/relay-info")
+async def api_get_relay_info() -> JSONResponse:
+    return relay_info_response(NostrRelay.info())
+
+
+@nostrrelay_api_router.get("/api/v1/relay/{relay_id}")
+async def api_get_relay(
+    relay_id: str, wallet: WalletTypeInfo = Depends(require_invoice_key)
+) -> NostrRelay | None:
+    relay = await get_relay(wallet.wallet.user, relay_id)
     if not relay:
         raise HTTPException(
             status_code=HTTPStatus.NOT_FOUND,
@@ -143,8 +146,69 @@ async def api_get_relay(relay_id: str, wallet: WalletTypeInfo = Depends(require_
         )
     return relay
 
-@nostrrelay_ext.delete("/api/v1/relay/{relay_id}")
-async def api_delete_relay(relay_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)):
+
+@nostrrelay_api_router.put("/api/v1/account", dependencies=[Depends(require_admin_key)])
+async def api_create_or_update_account(
+    data: NostrPartialAccount,
+) -> NostrAccount:
+    data.pubkey = normalize_public_key(data.pubkey)
+    account = await get_account(data.relay_id, data.pubkey)
+    if not account:
+        account = NostrAccount(
+            pubkey=data.pubkey,
+            relay_id=data.relay_id,
+            blocked=data.blocked or False,
+            allowed=data.allowed or False,
+        )
+        return await create_account(account)
+
+    if data.blocked is not None:
+        account.blocked = data.blocked
+    if data.allowed is not None:
+        account.allowed = data.allowed
+
+    return await update_account(account)
+
+
+@nostrrelay_api_router.delete(
+    "/api/v1/account/{relay_id}/{pubkey}", dependencies=[Depends(require_admin_key)]
+)
+async def api_delete_account(
+    relay_id: str,
+    pubkey: str,
+):
+    try:
+        pubkey = normalize_public_key(pubkey)
+    except ValueError as ex:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Invalid pubkey: {ex!s}",
+        ) from ex
+    return await delete_account(relay_id, pubkey)
+
+
+@nostrrelay_api_router.get("/api/v1/account")
+async def api_get_accounts(
+    relay_id: str,
+    allowed: bool = False,
+    blocked: bool = True,
+    wallet: WalletTypeInfo = Depends(require_invoice_key),
+) -> list[NostrAccount]:
+    # make sure the user has access to the relay
+    relay = await get_relay(wallet.wallet.user, relay_id)
+    if not relay:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="Relay not found",
+        )
+    accounts = await get_accounts(relay.id, allowed, blocked)
+    return accounts
+
+
+@nostrrelay_api_router.delete("/api/v1/relay/{relay_id}")
+async def api_delete_relay(
+    relay_id: str, wallet: WalletTypeInfo = Depends(require_admin_key)
+):
     try:
         await client_manager.disable_relay(relay_id)
         await delete_relay(wallet.wallet.user, relay_id)
@@ -154,4 +218,55 @@ async def api_delete_relay(relay_id: str, wallet: WalletTypeInfo = Depends(requi
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
             detail="Cannot delete relay",
+        ) from ex
+
+
+@nostrrelay_api_router.put("/api/v1/pay")
+async def api_pay_to_join(data: BuyOrder):
+    pubkey = normalize_public_key(data.pubkey)
+    relay = await get_relay_by_id(data.relay_id)
+    if not relay:
+        raise HTTPException(
+            status_code=HTTPStatus.NOT_FOUND,
+            detail="Relay not found",
         )
+    amount = 0
+    storage_to_buy = 0
+    if data.action == "join":
+        if relay.is_free_to_join:
+            raise ValueError("Relay is free to join")
+        amount = int(relay.meta.cost_to_join)
+    elif data.action == "storage":
+        if relay.meta.storage_cost_value == 0:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="Relay storage cost is zero. Cannot buy!",
+            )
+        if data.units_to_buy == 0:
+            raise HTTPException(
+                status_code=HTTPStatus.BAD_REQUEST,
+                detail="Must specify how much storage to buy!",
+            )
+        storage_to_buy = data.units_to_buy * relay.meta.storage_cost_value * 1024
+        if relay.meta.storage_cost_unit == "MB":
+            storage_to_buy *= 1024
+        amount = data.units_to_buy * relay.meta.storage_cost_value
+    else:
+        raise HTTPException(
+            status_code=HTTPStatus.BAD_REQUEST,
+            detail=f"Unknown action: '{data.action}'",
+        )
+
+    payment = await create_invoice(
+        wallet_id=relay.meta.wallet,
+        amount=amount,
+        memo=f"Pubkey '{data.pubkey}' wants to join {relay.id}",
+        extra={
+            "tag": "nostrrely",
+            "action": data.action,
+            "relay_id": relay.id,
+            "pubkey": pubkey,
+            "storage_to_buy": storage_to_buy,
+        },
+    )
+    return {"invoice": payment.bolt11}