.github/workflows/ci.yml

@@ -1,29 +0,0 @@
-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

@@ -1,58 +0,0 @@
-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,4 +1,24 @@
+.DS_Store
+._*
+
 __pycache__
-node_modules
+*.py[cod]
+*$py.class
 .mypy_cache
-.venv
+.vscode
+*-lock.json
+
+*.egg
+*.egg-info
+.coverage
+.pytest_cache
+.webassets-cache
+htmlcov
+test-reports
+tests/data/*.sqlite3
+
+*.swo
+*.swp
+*.pyo
+*.pyc
+*.env

.prettierrc

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

Makefile

@@ -1,47 +0,0 @@
-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:
-	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,124 +1,15 @@
 # Nostrclient - <small>[LNbits](https://github.com/lnbits/lnbits) extension</small>
-
 <small>For more about LNBits extension check [this tutorial](https://github.com/lnbits/lnbits/wiki/LNbits-Extensions)</small>
 
-## Overview
+`nostrclient` is an always-on extension that can open multiple connections to nostr relays and act as a multiplexer for other clients: You open a single websocket to `nostrclient` which then sends the data to multiple relays. The responses from these relays are then sent back to the client.
 
-`nostrclient` is an always-on Nostr relay multiplexer that simplifies connecting to multiple Nostr relays. Instead of your Nostr client managing connections to dozens of relays, you connect to a single WebSocket endpoint provided by `nostrclient`, which then fans out your requests to all configured relays and aggregates the responses back to you.
+![2023-03-08 18 11 07](https://user-images.githubusercontent.com/93376500/225265727-369f0f8a-196e-41df-a0d1-98b50a0228be.jpg)
 
-### Why Use This?
 
-- **Simplified Client Configuration** - Connect to one endpoint instead of managing multiple relay connections
-- **Always-On Connectivity** - Your LNbits instance maintains persistent connections to relays
-- **Resource Efficient** - Share relay connections across multiple clients
-- **Subscription Management** - Automatic subscription ID rewriting prevents conflicts between clients
+### Troubleshoot
+The `Test Endpoint` functionality heps the user to check that the `nostrclient` web-socket endpoint works as expected. 
 
-## Architecture
-
-```mermaid
-flowchart LR
-    A[Client A] -->|WebSocket| N
-    B[Client B] -->|WebSocket| N
-    C[Client C] -->|WebSocket| N
-
-    N[nostrclient<br/>Router] -->|Fan Out| R1[Relay A]
-    N -->|Fan Out| R2[Relay B]
-    N -->|Fan Out| R3[Relay C]
-    N -->|Fan Out| R4[Relay D]
-
-    R1 -.->|Aggregate| N
-    R2 -.->|Aggregate| N
-    R3 -.->|Aggregate| N
-    R4 -.->|Aggregate| N
-```
-
-**Key Feature:** The router rewrites subscription IDs to prevent conflicts when multiple clients use the same IDs.
-
-## Features
-
-- **Multi-Relay Multiplexing** - Connect to multiple Nostr relays through a single WebSocket
-- **Public & Private Endpoints** - Configurable public and private WebSocket access
-- **Automatic Reconnection** - Failed relays are automatically retried with exponential backoff
-- **Subscription Deduplication** - Events are deduplicated before being sent to clients
-- **Health Monitoring** - Track relay connection status, latency, and error rates
-- **Test Endpoint** - Send test messages to verify your setup is working
-
-## How It Works
-
-1. **Client Connection** - Your Nostr client connects to the nostrclient WebSocket endpoint
-2. **Subscription Rewriting** - Each subscription ID is rewritten to prevent conflicts between multiple clients
-3. **Fan-Out** - Subscription requests are sent to all configured relays
-4. **Aggregation** - Events from all relays are collected and deduplicated
-5. **Response** - Events are sent back to the client with the original subscription ID
-
-## Configuration
-
-### WebSocket Endpoints
-
-- **Public Endpoint**: `/api/v1/relay` - Available to anyone (if enabled)
-- **Private Endpoint**: `/api/v1/{encrypted_id}` - Requires valid encrypted endpoint ID
-
-Configure endpoint access in the extension settings:
-
-- `private_ws` - Enable/disable private WebSocket access
-- `public_ws` - Enable/disable public WebSocket access
-
-### Adding Relays
-
-Use the nostrclient UI to add/remove Nostr relays. The extension will automatically:
-
-- Connect to new relays
-- Publish existing subscriptions to new relays
-- Monitor relay health and reconnect as needed
-
-## Testing
-
-### Test Endpoint Functionality
-
-The `Test Endpoint` feature helps verify that your nostrclient WebSocket endpoint works correctly.
-
-**How to test:**
-
-1. Navigate to the nostrclient extension in LNbits
-2. Use the Test Endpoint feature
-3. Send a DM to yourself (or a temporary account)
-4. Verify that messages are sent and received correctly
+The LNbits user can DM itself (or a temp account) from `nostrclient` and verify that the messages are sent and received correctly.
 
 https://user-images.githubusercontent.com/2951406/236780745-929c33c2-2502-49be-84a3-db02a7aabc0e.mp4
 
-## Troubleshooting
-
-### Connection Issues
-
-- **Check relay status** - View relay health in the nostrclient UI
-- **Verify endpoint configuration** - Ensure public_ws or private_ws is enabled
-- **Check logs** - Review LNbits logs for connection errors
-
-### Subscription Not Receiving Events
-
-- **Verify relays are connected** - Check the relay status in the UI
-- **Test with known event** - Use the Test Endpoint to verify connectivity
-- **Check relay compatibility** - Some relays may not support all Nostr features
-
-## Development
-
-This extension uses `uv` for dependency management.
-
-### Quick Start
-
-```bash
-# Format code
-make format
-
-# Run type checks and linting
-make check
-
-# Run tests
-make test
-```
-
-For more development commands, see the [Makefile](./Makefile).
-
-## License
-
-MIT License - see [LICENSE](./LICENSE)

__init__.py

@@ -1,59 +1,51 @@
 import asyncio
+from typing import List
 
 from fastapi import APIRouter
-from loguru import logger
+from starlette.staticfiles import StaticFiles
 
-from .crud import db
-from .router import all_routers, nostr_client
-from .tasks import check_relays, init_relays, subscribe_events
-from .views import nostrclient_generic_router
-from .views_api import nostrclient_api_router
+from lnbits.db import Database
+from lnbits.helpers import template_renderer
+from lnbits.tasks import catch_everything_and_restart
+
+from .nostr.client.client import NostrClient as NostrClientLib
+
+db = Database("ext_nostrclient")
 
 nostrclient_static_files = [
     {
         "path": "/nostrclient/static",
+        "app": StaticFiles(directory="lnbits/extensions/nostrclient/static"),
         "name": "nostrclient_static",
     }
 ]
 
 nostrclient_ext: APIRouter = APIRouter(prefix="/nostrclient", tags=["nostrclient"])
-nostrclient_ext.include_router(nostrclient_generic_router)
-nostrclient_ext.include_router(nostrclient_api_router)
-scheduled_tasks: list[asyncio.Task] = []
+
+scheduled_tasks: List[asyncio.Task] = []
+
+class NostrClient:
+    def __init__(self):
+        self.client: NostrClientLib = NostrClientLib(connect=False)
 
 
-async def nostrclient_stop():
-    for task in scheduled_tasks:
-        try:
-            task.cancel()
-        except Exception as ex:
-            logger.warning(ex)
+nostr = NostrClient()
 
-    for router in all_routers:
-        try:
-            await router.stop()
-            all_routers.remove(router)
-        except Exception as e:
-            logger.error(e)
 
-    nostr_client.close()
+def nostr_renderer():
+    return template_renderer(["lnbits/extensions/nostrclient/templates"])
+
+
+from .tasks import check_relays, init_relays, subscribe_events
+from .views import *  # noqa
+from .views_api import *  # noqa
 
 
 def nostrclient_start():
-    from lnbits.tasks import create_permanent_unique_task
-
-    task1 = create_permanent_unique_task("ext_nostrclient_init_relays", init_relays)
-    task2 = create_permanent_unique_task(
-        "ext_nostrclient_subscrive_events", subscribe_events
-    )
-    task3 = create_permanent_unique_task("ext_nostrclient_check_relays", check_relays)
-    scheduled_tasks.extend([task1, task2, task3])
-
-
-__all__ = [
-    "db",
-    "nostrclient_ext",
-    "nostrclient_start",
-    "nostrclient_static_files",
-    "nostrclient_stop",
-]
+    loop = asyncio.get_event_loop()
+    task1 = loop.create_task(catch_everything_and_restart(init_relays))
+    scheduled_tasks.append(task1)
+    task2 = loop.create_task(catch_everything_and_restart(subscribe_events))
+    scheduled_tasks.append(task2)
+    task3 = loop.create_task(catch_everything_and_restart(check_relays))
+    scheduled_tasks.append(task3)

cbc.py

@@ -0,0 +1,26 @@
+from Cryptodome.Cipher import AES
+
+BLOCK_SIZE = 16
+
+
+class AESCipher(object):
+    """This class is compatible with crypto.createCipheriv('aes-256-cbc')"""
+
+    def __init__(self, key=None):
+        self.key = key
+
+    def pad(self, data):
+        length = BLOCK_SIZE - (len(data) % BLOCK_SIZE)
+        return data + (chr(length) * length).encode()
+
+    def unpad(self, data):
+        return data[: -(data[-1] if type(data[-1]) == int else ord(data[-1]))]
+
+    def encrypt(self, plain_text):
+        cipher = AES.new(self.key, AES.MODE_CBC)
+        b = plain_text.encode("UTF-8")
+        return cipher.iv, cipher.encrypt(self.pad(b))
+
+    def decrypt(self, iv, enc_text):
+        cipher = AES.new(self.key, AES.MODE_CBC, iv=iv)
+        return self.unpad(cipher.decrypt(enc_text).decode("UTF-8"))

config.json

@@ -1,17 +1,6 @@
 {
   "name": "Nostr Client",
-  "short_description": "Nostr relay multiplexer",
-  "version": "1.1.0",
+  "short_description": "Nostr client for extensions",
   "tile": "/nostrclient/static/images/nostr-bitcoin.png",
-  "contributors": ["calle", "motorina0", "dni"],
-  "min_lnbits_version": "1.4.0",
-  "images": [
-    {
-      "uri": "https://raw.githubusercontent.com/lnbits/nostrclient/add-extension-metadata/static/images/1.jpeg"
-    },
-    {
-      "uri": "https://raw.githubusercontent.com/lnbits/nostrclient/add-extension-metadata/static/images/2.jpeg"
-    }
-  ],
-  "description_md": "https://raw.githubusercontent.com/lnbits/nostrclient/add-extension-metadata/description.md"
+  "contributors": ["calle"]
 }

crud.py

@@ -1,52 +1,31 @@
-from lnbits.db import Database
+from typing import List, Optional, Union
 
-from .models import Config, Relay, UserConfig
+import shortuuid
 
-db = Database("ext_nostrclient")
+from lnbits.helpers import urlsafe_short_hash
+
+from . import db
+from .models import Relay, RelayList
 
 
-async def get_relays() -> list[Relay]:
-    return await db.fetchall(
-        "SELECT * FROM nostrclient.relays",
-        model=Relay,
+async def get_relays() -> RelayList:
+    row = await db.fetchall("SELECT * FROM nostrclient.relays")
+    return RelayList(__root__=row)
+
+
+async def add_relay(relay: Relay) -> None:
+    await db.execute(
+        f"""
+        INSERT INTO nostrclient.relays (
+            id,
+            url,
+            active
+        )
+        VALUES (?, ?, ?)
+        """,
+        (relay.id, relay.url, relay.active),
     )
-
-
-async def add_relay(relay: Relay) -> Relay:
-    await db.insert("nostrclient.relays", relay)
-    return relay
 
 
 async def delete_relay(relay: Relay) -> None:
-    if not relay.url:
-        return
-    await db.execute(
-        "DELETE FROM nostrclient.relays WHERE url = :url", {"url": relay.url}
-    )
-
-
-######################CONFIG#######################
-async def create_config(owner_id: str) -> Config:
-    admin_config = UserConfig(owner_id=owner_id)
-    await db.insert("nostrclient.config", admin_config)
-    return admin_config.extra
-
-
-async def update_config(owner_id: str, config: Config) -> Config:
-    user_config = UserConfig(owner_id=owner_id, extra=config)
-    await db.update("nostrclient.config", user_config, "WHERE owner_id = :owner_id")
-    return user_config.extra
-
-
-async def get_config(owner_id: str) -> Config | None:
-    user_config: UserConfig = await db.fetchone(
-        """
-            SELECT * FROM nostrclient.config
-            WHERE owner_id = :owner_id
-        """,
-        {"owner_id": owner_id},
-        model=UserConfig,
-    )
-    if user_config:
-        return user_config.extra
-    return None
+    await db.execute("DELETE FROM nostrclient.relays WHERE url = ?", (relay.url,))

description.md

@@ -1,8 +0,0 @@
-An always-on relay multiplexer that simplifies connecting to multiple Nostr relays.
-
-Instead of your Nostr client managing connections to dozens of relays, you connect to a single WebSocket endpoint provided by `nostrclient`, which then fans out your requests to all configured relays and aggregates the responses back to you.
-
-- **Simplified Client Configuration** - Connect to one endpoint instead of managing multiple relay connections
-- **Always-On Connectivity** - Your LNbits instance maintains persistent connections to relays
-- **Resource Efficient** - Share relay connections across multiple clients
-- **Automatic Subscription Management** - Subscription ID rewriting prevents conflicts between clients

migrations.py

@@ -3,7 +3,7 @@ async def m001_initial(db):
     Initial nostrclient table.
     """
     await db.execute(
-        """
+        f"""
         CREATE TABLE nostrclient.relays (
             id TEXT NOT NULL PRIMARY KEY,
             url TEXT NOT NULL,
@@ -11,22 +11,3 @@ async def m001_initial(db):
         );
     """
     )
-
-
-async def m002_create_config_table(db):
-    """
-    Allow the extension to persist and retrieve any number of config values.
-    """
-
-    await db.execute(
-        """CREATE TABLE nostrclient.config (
-            json_data TEXT NOT NULL
-        );"""
-    )
-
-
-async def m003_update_config_table(db):
-    await db.execute("ALTER TABLE nostrclient.config RENAME COLUMN json_data TO extra")
-    await db.execute(
-        "ALTER TABLE nostrclient.config ADD COLUMN owner_id TEXT DEFAULT 'admin'"
-    )

models.py

@@ -1,54 +1,68 @@
-from lnbits.helpers import urlsafe_short_hash
+from dataclasses import dataclass
+from typing import Dict, List, Optional
+
+from fastapi import Request
+from fastapi.param_functions import Query
 from pydantic import BaseModel, Field
 
+from lnbits.helpers import urlsafe_short_hash
+
 
 class RelayStatus(BaseModel):
-    num_sent_events: int | None = 0
-    num_received_events: int | None = 0
-    error_counter: int | None = 0
-    error_list: list | None = []
-    notice_list: list | None = []
-
+    num_sent_events: Optional[int] = 0
+    num_received_events: Optional[int] = 0
+    error_counter: Optional[int] = 0
+    error_list: Optional[List] = []
+    notice_list: Optional[List] = []
     
 class Relay(BaseModel):
-    id: str | None = None
-    url: str | None = None
-    active: bool | None = None
-
-    connected: bool | None = Field(default=None, no_database=True)
-    connected_string: str | None = Field(default=None, no_database=True)
-    status: RelayStatus | None = Field(default=None, no_database=True)
-
-    ping: int | None = Field(default=None, no_database=True)
+    id: Optional[str] = None
+    url: Optional[str] = None
+    connected: Optional[bool] = None
+    connected_string: Optional[str] = None
+    status: Optional[RelayStatus] = None
+    active: Optional[bool] = None
+    ping: Optional[int] = None
 
     def _init__(self):
         if not self.id:
             self.id = urlsafe_short_hash()
 
 
-class RelayDb(BaseModel):
-    id: str
-    url: str
-    active: bool | None = True
+class RelayList(BaseModel):
+    __root__: List[Relay]
+
+
+class Event(BaseModel):
+    content: str
+    pubkey: str
+    created_at: Optional[int]
+    kind: int
+    tags: Optional[List[List[str]]]
+    sig: str
+
+
+class Filter(BaseModel):
+    ids: Optional[List[str]]
+    kinds: Optional[List[int]]
+    authors: Optional[List[str]]
+    since: Optional[int]
+    until: Optional[int]
+    e: Optional[List[str]] = Field(alias="#e")
+    p: Optional[List[str]] = Field(alias="#p")
+    limit: Optional[int]
+
+
+class Filters(BaseModel):
+    __root__: List[Filter]
 
 
 class TestMessage(BaseModel):
-    sender_private_key: str | None
+    sender_private_key: Optional[str]
     reciever_public_key: str
     message: str
 
-
 class TestMessageResponse(BaseModel):
     private_key: str
     public_key: str
     event_json: str
-
-
-class Config(BaseModel):
-    private_ws: bool = True
-    public_ws: bool = False
-
-
-class UserConfig(BaseModel):
-    owner_id: str
-    extra: Config = Config()

nostr/bech32.py

@@ -26,22 +26,19 @@ from enum import Enum
 
 class Encoding(Enum):
     """Enumeration type to list the various supported encodings."""
-
     BECH32 = 1
     BECH32M = 2
 
-
 CHARSET = "qpzry9x8gf2tvdw0s3jn54khce6mua7l"
-BECH32M_CONST = 0x2BC830A3
-
+BECH32M_CONST = 0x2bc830a3
 
 def bech32_polymod(values):
     """Internal function that computes the Bech32 checksum."""
-    generator = [0x3B6A57B2, 0x26508E6D, 0x1EA119FA, 0x3D4233DD, 0x2A1462B3]
+    generator = [0x3b6a57b2, 0x26508e6d, 0x1ea119fa, 0x3d4233dd, 0x2a1462b3]
     chk = 1
     for value in values:
         top = chk >> 25
-        chk = (chk & 0x1FFFFFF) << 5 ^ value
+        chk = (chk & 0x1ffffff) << 5 ^ value
         for i in range(5):
             chk ^= generator[i] if ((top >> i) & 1) else 0
     return chk
@@ -61,7 +58,6 @@ def bech32_verify_checksum(hrp, data):
         return Encoding.BECH32M
     return None
 
-
 def bech32_create_checksum(hrp, data, spec):
     """Compute the checksum values given HRP and data."""
     values = bech32_hrp_expand(hrp) + data
@@ -73,29 +69,26 @@ def bech32_create_checksum(hrp, data, spec):
 def bech32_encode(hrp, data, spec):
     """Compute a Bech32 string given HRP and data values."""
     combined = data + bech32_create_checksum(hrp, data, spec)
-    return hrp + "1" + "".join([CHARSET[d] for d in combined])
-
+    return hrp + '1' + ''.join([CHARSET[d] for d in combined])
 
 def bech32_decode(bech):
     """Validate a Bech32/Bech32m string, and determine HRP and data."""
-    if (any(ord(x) < 33 or ord(x) > 126 for x in bech)) or (
-        bech.lower() != bech and bech.upper() != bech
-    ):
+    if ((any(ord(x) < 33 or ord(x) > 126 for x in bech)) or
+            (bech.lower() != bech and bech.upper() != bech)):
         return (None, None, None)
     bech = bech.lower()
-    pos = bech.rfind("1")
+    pos = bech.rfind('1')
     if pos < 1 or pos + 7 > len(bech) or len(bech) > 90:
         return (None, None, None)
-    if not all(x in CHARSET for x in bech[pos + 1 :]):
+    if not all(x in CHARSET for x in bech[pos+1:]):
         return (None, None, None)
     hrp = bech[:pos]
-    data = [CHARSET.find(x) for x in bech[pos + 1 :]]
+    data = [CHARSET.find(x) for x in bech[pos+1:]]
     spec = bech32_verify_checksum(hrp, data)
     if spec is None:
         return (None, None, None)
     return (hrp, data[:-6], spec)
 
-
 def convertbits(data, frombits, tobits, pad=True):
     """General power-of-2 base conversion."""
     acc = 0
@@ -124,29 +117,22 @@ def decode(hrp, addr):
     hrpgot, data, spec = bech32_decode(addr)
     if hrpgot != hrp:
         return (None, None)
-    decoded = convertbits(data[1:], 5, 8, False)  # type: ignore
+    decoded = convertbits(data[1:], 5, 8, False)
     if decoded is None or len(decoded) < 2 or len(decoded) > 40:
         return (None, None)
-    if data[0] > 16:  # type: ignore
+    if data[0] > 16:
         return (None, None)
-    if data[0] == 0 and len(decoded) != 20 and len(decoded) != 32:  # type: ignore
+    if data[0] == 0 and len(decoded) != 20 and len(decoded) != 32:
         return (None, None)
-    if (
-        data[0] == 0  # type: ignore
-        and spec != Encoding.BECH32
-        or data[0] != 0  # type: ignore
-        and spec != Encoding.BECH32M
-    ):
+    if data[0] == 0 and spec != Encoding.BECH32 or data[0] != 0 and spec != Encoding.BECH32M:
         return (None, None)
-    return (data[0], decoded)  # type: ignore
+    return (data[0], decoded)
 
 
 def encode(hrp, witver, witprog):
     """Encode a segwit address."""
     spec = Encoding.BECH32 if witver == 0 else Encoding.BECH32M
-    wit_prog = convertbits(witprog, 8, 5)
-    assert wit_prog
-    ret = bech32_encode(hrp, [witver, *wit_prog], spec)
+    ret = bech32_encode(hrp, [witver] + convertbits(witprog, 8, 5), spec)
     if decode(hrp, ret) == (None, None):
         return None
     return ret

nostr/client/client.py

@@ -1,75 +1,44 @@
-import asyncio
-
-from loguru import logger
+import time
+from typing import List
 
 from ..relay_manager import RelayManager
 
 
 class NostrClient:
-    relay_manager: RelayManager
-    running: bool
+    relays = [ ]
+    relay_manager = RelayManager()
 
-    def __init__(self):
-        self.running = True
-        self.relay_manager = RelayManager()
+    def __init__(self, relays: List[str] = [], connect=True):
+        if len(relays):
+            self.relays = relays
+        if connect:
+            self.connect()
 
-    def connect(self, relays):
-        for relay in relays:
-            try:
+    async def connect(self):
+        for relay in self.relays:
             self.relay_manager.add_relay(relay)
-            except Exception as e:
-                logger.debug(e)
-        self.running = True
-
-    def reconnect(self, relays):
-        self.relay_manager.remove_relays()
-        self.connect(relays)
 
     def close(self):
-        try:
-            self.relay_manager.close_all_subscriptions()
         self.relay_manager.close_connections()
 
-            self.running = False
-        except Exception as e:
-            logger.error(e)
-
-    async def subscribe(
+    def subscribe(
         self,
         callback_events_func=None,
         callback_notices_func=None,
         callback_eosenotices_func=None,
     ):
-        while self.running:
-            self._check_events(callback_events_func)
-            self._check_notices(callback_notices_func)
-            self._check_eos_notices(callback_eosenotices_func)
-
-            await asyncio.sleep(0.2)
-
-    def _check_events(self, callback_events_func=None):
-        try:
+        while True:
             while self.relay_manager.message_pool.has_events():
                 event_msg = self.relay_manager.message_pool.get_event()
                 if callback_events_func:
                     callback_events_func(event_msg)
-        except Exception as e:
-            logger.debug(e)
-
-    def _check_notices(self, callback_notices_func=None):
-        try:
             while self.relay_manager.message_pool.has_notices():
                 event_msg = self.relay_manager.message_pool.get_notice()
                 if callback_notices_func:
                     callback_notices_func(event_msg)
-        except Exception as e:
-            logger.debug(e)
-
-    def _check_eos_notices(self, callback_eosenotices_func=None):
-        try:
             while self.relay_manager.message_pool.has_eose_notices():
                 event_msg = self.relay_manager.message_pool.get_eose_notice()
                 if callback_eosenotices_func:
                     callback_eosenotices_func(event_msg)
-        except Exception as e:
-            logger.debug(e)
+
+            time.sleep(0.1)

nostr/delegation.py

@@ -0,0 +1,32 @@
+import time
+from dataclasses import dataclass
+
+
+@dataclass
+class Delegation:
+    delegator_pubkey: str
+    delegatee_pubkey: str
+    event_kind: int
+    duration_secs: int = 30*24*60  # default to 30 days
+    signature: str = None  # set in PrivateKey.sign_delegation
+
+    @property
+    def expires(self) -> int:
+        return int(time.time()) + self.duration_secs
+    
+    @property
+    def conditions(self) -> str:
+        return f"kind={self.event_kind}&created_at<{self.expires}"
+    
+    @property
+    def delegation_token(self) -> str:
+        return f"nostr:delegation:{self.delegatee_pubkey}:{self.conditions}"
+
+    def get_tag(self) -> list[str]:
+        """ Called by Event """
+        return [
+            "delegation",
+            self.delegator_pubkey,
+            self.conditions,
+            self.signature,
+        ]

nostr/event.py

@@ -3,9 +3,9 @@ import time
 from dataclasses import dataclass, field
 from enum import IntEnum
 from hashlib import sha256
-from typing import Optional
+from typing import List
 
-import coincurve
+from secp256k1 import PublicKey
 
 from .message_type import ClientMessageType
 
@@ -21,14 +21,14 @@ class EventKind(IntEnum):
 
 @dataclass
 class Event:
-    content: Optional[str] = None
-    public_key: Optional[str] = None
-    created_at: Optional[int] = None
+    content: str = None
+    public_key: str = None
+    created_at: int = None
     kind: int = EventKind.TEXT_NOTE
-    tags: list[list[str]] = field(
+    tags: List[List[str]] = field(
         default_factory=list
     )  # Dataclasses require special handling when the default value is a mutable type
-    signature: Optional[str] = None
+    signature: str = None
 
     def __post_init__(self):
         if self.content is not None and not isinstance(self.content, str):
@@ -40,7 +40,7 @@ class Event:
 
     @staticmethod
     def serialize(
-        public_key: str, created_at: int, kind: int, tags: list[list[str]], content: str
+        public_key: str, created_at: int, kind: int, tags: List[List[str]], content: str
     ) -> bytes:
         data = [0, public_key, created_at, kind, tags, content]
         data_str = json.dumps(data, separators=(",", ":"), ensure_ascii=False)
@@ -48,7 +48,7 @@ class Event:
 
     @staticmethod
     def compute_id(
-        public_key: str, created_at: int, kind: int, tags: list[list[str]], content: str
+        public_key: str, created_at: int, kind: int, tags: List[List[str]], content: str
     ):
         return sha256(
             Event.serialize(public_key, created_at, kind, tags, content)
@@ -57,9 +57,6 @@ class Event:
     @property
     def id(self) -> str:
         # Always recompute the id to reflect the up-to-date state of the Event
-        assert self.public_key
-        assert self.created_at
-        assert self.content
         return Event.compute_id(
             self.public_key, self.created_at, self.kind, self.tags, self.content
         )
@@ -73,10 +70,12 @@ class Event:
         self.tags.append(["e", event_id])
 
     def verify(self) -> bool:
-        assert self.public_key
-        assert self.signature
-        pub_key = coincurve.PublicKeyXOnly(bytes.fromhex(self.public_key))
-        return pub_key.verify(bytes.fromhex(self.signature), bytes.fromhex(self.id))
+        pub_key = PublicKey(
+            bytes.fromhex("02" + self.public_key), True
+        )  # add 02 for schnorr (bip340)
+        return pub_key.schnorr_verify(
+            bytes.fromhex(self.id), bytes.fromhex(self.signature), None, raw=True
+        )
 
     def to_message(self) -> str:
         return json.dumps(
@@ -97,9 +96,9 @@ class Event:
 
 @dataclass
 class EncryptedDirectMessage(Event):
-    recipient_pubkey: Optional[str] = None
-    cleartext_content: Optional[str] = None
-    reference_event_id: Optional[str] = None
+    recipient_pubkey: str = None
+    cleartext_content: str = None
+    reference_event_id: str = None
 
     def __post_init__(self):
         if self.content is not None:
@@ -123,7 +122,6 @@ class EncryptedDirectMessage(Event):
     def id(self) -> str:
         if self.content is None:
             raise Exception(
-                "EncryptedDirectMessage `id` is undefined until its"
-                + " message is encrypted and stored in the `content` field"
+                "EncryptedDirectMessage `id` is undefined until its message is encrypted and stored in the `content` field"
             )
         return super().id

nostr/filter.py

@@ -0,0 +1,134 @@
+from collections import UserList
+from typing import List
+
+from .event import Event, EventKind
+
+
+class Filter:
+    """
+    NIP-01 filtering.
+
+    Explicitly supports "#e" and "#p" tag filters via `event_refs` and `pubkey_refs`.
+
+    Arbitrary NIP-12 single-letter tag filters are also supported via `add_arbitrary_tag`.
+    If a particular single-letter tag gains prominence, explicit support should be
+    added. For example:
+        # arbitrary tag
+        filter.add_arbitrary_tag('t', [hashtags])
+
+        # promoted to explicit support
+        Filter(hashtag_refs=[hashtags])
+    """
+
+    def __init__(
+        self,
+        event_ids: List[str] = None,
+        kinds: List[EventKind] = None,
+        authors: List[str] = None,
+        since: int = None,
+        until: int = None,
+        event_refs: List[
+            str
+        ] = None,  # the "#e" attr; list of event ids referenced in an "e" tag
+        pubkey_refs: List[
+            str
+        ] = None,  # The "#p" attr; list of pubkeys referenced in a "p" tag
+        limit: int = None,
+    ) -> None:
+        self.event_ids = event_ids
+        self.kinds = kinds
+        self.authors = authors
+        self.since = since
+        self.until = until
+        self.event_refs = event_refs
+        self.pubkey_refs = pubkey_refs
+        self.limit = limit
+
+        self.tags = {}
+        if self.event_refs:
+            self.add_arbitrary_tag("e", self.event_refs)
+        if self.pubkey_refs:
+            self.add_arbitrary_tag("p", self.pubkey_refs)
+
+    def add_arbitrary_tag(self, tag: str, values: list):
+        """
+        Filter on any arbitrary tag with explicit handling for NIP-01 and NIP-12
+        single-letter tags.
+        """
+        # NIP-01 'e' and 'p' tags and any NIP-12 single-letter tags must be prefixed with "#"
+        tag_key = tag if len(tag) > 1 else f"#{tag}"
+        self.tags[tag_key] = values
+
+    def matches(self, event: Event) -> bool:
+        if self.event_ids is not None and event.id not in self.event_ids:
+            return False
+        if self.kinds is not None and event.kind not in self.kinds:
+            return False
+        if self.authors is not None and event.public_key not in self.authors:
+            return False
+        if self.since is not None and event.created_at < self.since:
+            return False
+        if self.until is not None and event.created_at > self.until:
+            return False
+        if (self.event_refs is not None or self.pubkey_refs is not None) and len(
+            event.tags
+        ) == 0:
+            return False
+
+        if self.tags:
+            e_tag_identifiers = set([e_tag[0] for e_tag in event.tags])
+            for f_tag, f_tag_values in self.tags.items():
+                # Omit any NIP-01 or NIP-12 "#" chars on single-letter tags
+                f_tag = f_tag.replace("#", "")
+
+                if f_tag not in e_tag_identifiers:
+                    # Event is missing a tag type that we're looking for
+                    return False
+
+                # Multiple values within f_tag_values are treated as OR search; an Event
+                # needs to match only one.
+                # Note: an Event could have multiple entries of the same tag type
+                # (e.g. a reply to multiple people) so we have to check all of them.
+                match_found = False
+                for e_tag in event.tags:
+                    if e_tag[0] == f_tag and e_tag[1] in f_tag_values:
+                        match_found = True
+                        break
+                if not match_found:
+                    return False
+
+        return True
+
+    def to_json_object(self) -> dict:
+        res = {}
+        if self.event_ids is not None:
+            res["ids"] = self.event_ids
+        if self.kinds is not None:
+            res["kinds"] = self.kinds
+        if self.authors is not None:
+            res["authors"] = self.authors
+        if self.since is not None:
+            res["since"] = self.since
+        if self.until is not None:
+            res["until"] = self.until
+        if self.limit is not None:
+            res["limit"] = self.limit
+        if self.tags:
+            res.update(self.tags)
+
+        return res
+
+
+class Filters(UserList):
+    def __init__(self, initlist: "list[Filter]" = []) -> None:
+        super().__init__(initlist)
+        self.data: "list[Filter]"
+
+    def match(self, event: Event):
+        for filter in self.data:
+            if filter.matches(event):
+                return True
+        return False
+
+    def to_json_array(self) -> list:
+        return [filter.to_json_object() for filter in self.data]

nostr/key.py

@@ -1,11 +1,14 @@
 import base64
 import secrets
+from hashlib import sha256
 
-import coincurve
+import secp256k1
+from cffi import FFI
 from cryptography.hazmat.primitives import padding
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 
-from .bech32 import Encoding, bech32_decode, bech32_encode, convertbits
+from . import bech32
+from .delegation import Delegation
 from .event import EncryptedDirectMessage, Event, EventKind
 
 
@@ -14,61 +17,55 @@ class PublicKey:
         self.raw_bytes = raw_bytes
 
     def bech32(self) -> str:
-        converted_bits = convertbits(self.raw_bytes, 8, 5)
-        return bech32_encode("npub", converted_bits, Encoding.BECH32)
+        converted_bits = bech32.convertbits(self.raw_bytes, 8, 5)
+        return bech32.bech32_encode("npub", converted_bits, bech32.Encoding.BECH32)
 
     def hex(self) -> str:
         return self.raw_bytes.hex()
 
-    def verify_signed_message_hash(self, message_hash: str, sig: str) -> bool:
-        pk = coincurve.PublicKeyXOnly(self.raw_bytes)
-        return pk.verify(bytes.fromhex(sig), bytes.fromhex(message_hash))
+    def verify_signed_message_hash(self, hash: str, sig: str) -> bool:
+        pk = secp256k1.PublicKey(b"\x02" + self.raw_bytes, True)
+        return pk.schnorr_verify(bytes.fromhex(hash), bytes.fromhex(sig), None, True)
 
     @classmethod
     def from_npub(cls, npub: str):
         """Load a PublicKey from its bech32/npub form"""
-        _, data, _ = bech32_decode(npub)
-        raw_data = convertbits(data, 5, 8)
-        assert raw_data
-        raw_public_key = raw_data[:-1]
+        hrp, data, spec = bech32.bech32_decode(npub)
+        raw_public_key = bech32.convertbits(data, 5, 8)[:-1]
         return cls(bytes(raw_public_key))
 
 
 class PrivateKey:
-    def __init__(self, raw_secret: bytes | None = None) -> None:
-        if raw_secret is not None:
+    def __init__(self, raw_secret: bytes = None) -> None:
+        if not raw_secret is None:
             self.raw_secret = raw_secret
         else:
             self.raw_secret = secrets.token_bytes(32)
 
-        sk = coincurve.PrivateKey(self.raw_secret)
-        assert sk.public_key
-        self.public_key = PublicKey(sk.public_key.format()[1:])
+        sk = secp256k1.PrivateKey(self.raw_secret)
+        self.public_key = PublicKey(sk.pubkey.serialize()[1:])
 
     @classmethod
     def from_nsec(cls, nsec: str):
         """Load a PrivateKey from its bech32/nsec form"""
-        _, data, _ = bech32_decode(nsec)
-        raw_data = convertbits(data, 5, 8)
-        assert raw_data
-        raw_secret = raw_data[:-1]
+        hrp, data, spec = bech32.bech32_decode(nsec)
+        raw_secret = bech32.convertbits(data, 5, 8)[:-1]
         return cls(bytes(raw_secret))
 
     def bech32(self) -> str:
-        converted_bits = convertbits(self.raw_secret, 8, 5)
-        return bech32_encode("nsec", converted_bits, Encoding.BECH32)
+        converted_bits = bech32.convertbits(self.raw_secret, 8, 5)
+        return bech32.bech32_encode("nsec", converted_bits, bech32.Encoding.BECH32)
 
     def hex(self) -> str:
         return self.raw_secret.hex()
 
     def tweak_add(self, scalar: bytes) -> bytes:
-        sk = coincurve.PrivateKey(self.raw_secret)
-        return sk.add(scalar).to_der()
+        sk = secp256k1.PrivateKey(self.raw_secret)
+        return sk.tweak_add(scalar)
 
     def compute_shared_secret(self, public_key_hex: str) -> bytes:
-        pk = coincurve.PublicKey(bytes.fromhex("02" + public_key_hex))
-        sk = coincurve.PrivateKey(self.raw_secret)
-        return sk.ecdh(pk.format())
+        pk = secp256k1.PublicKey(bytes.fromhex("02" + public_key_hex), True)
+        return pk.ecdh(self.raw_secret, hashfn=copy_x)
 
     def encrypt_message(self, message: str, public_key_hex: str) -> str:
         padder = padding.PKCS7(128).padder()
@@ -82,14 +79,9 @@ class PrivateKey:
         encryptor = cipher.encryptor()
         encrypted_message = encryptor.update(padded_data) + encryptor.finalize()
 
-        return (
-            f"{base64.b64encode(encrypted_message).decode()}"
-            + f"?iv={base64.b64encode(iv).decode()}"
-        )
+        return f"{base64.b64encode(encrypted_message).decode()}?iv={base64.b64encode(iv).decode()}"
 
     def encrypt_dm(self, dm: EncryptedDirectMessage) -> None:
-        assert dm.cleartext_content
-        assert dm.recipient_pubkey
         dm.content = self.encrypt_message(
             message=dm.cleartext_content, public_key_hex=dm.recipient_pubkey
         )
@@ -112,23 +104,28 @@ class PrivateKey:
 
         return unpadded_data.decode()
 
-    def sign_message_hash(self, message_hash: bytes) -> str:
-        sk = coincurve.PrivateKey(self.raw_secret)
-        sig = sk.sign_schnorr(message_hash)
+    def sign_message_hash(self, hash: bytes) -> str:
+        sk = secp256k1.PrivateKey(self.raw_secret)
+        sig = sk.schnorr_sign(hash, None, raw=True)
         return sig.hex()
 
     def sign_event(self, event: Event) -> None:
         if event.kind == EventKind.ENCRYPTED_DIRECT_MESSAGE and event.content is None:
-            self.encrypt_dm(event)  # type: ignore
+            self.encrypt_dm(event)
         if event.public_key is None:
             event.public_key = self.public_key.hex()
         event.signature = self.sign_message_hash(bytes.fromhex(event.id))
 
+    def sign_delegation(self, delegation: Delegation) -> None:
+        delegation.signature = self.sign_message_hash(
+            sha256(delegation.delegation_token.encode()).digest()
+        )
+
     def __eq__(self, other):
         return self.raw_secret == other.raw_secret
 
 
-def mine_vanity_key(prefix: str | None = None, suffix: str | None = None) -> PrivateKey:
+def mine_vanity_key(prefix: str = None, suffix: str = None) -> PrivateKey:
     if prefix is None and suffix is None:
         raise ValueError("Expected at least one of 'prefix' or 'suffix' arguments")
 
@@ -144,3 +141,14 @@ def mine_vanity_key(prefix: str | None = None, suffix: str | None = None) -> Pri
         break
 
     return sk
+
+
+ffi = FFI()
+
+
+@ffi.callback(
+    "int (unsigned char *, const unsigned char *, const unsigned char *, void *)"
+)
+def copy_x(output, x32, y32, data):
+    ffi.memmove(output, x32, 32)
+    return 1

nostr/message_pool.py

@@ -2,15 +2,13 @@ import json
 from queue import Queue
 from threading import Lock
 
+from .event import Event
 from .message_type import RelayMessageType
 
 
 class EventMessage:
-    def __init__(
-        self, event: str, event_id: str, subscription_id: str, url: str
-    ) -> None:
+    def __init__(self, event: Event, subscription_id: str, url: str) -> None:
         self.event = event
-        self.event_id = event_id
         self.subscription_id = subscription_id
         self.url = url
 
@@ -61,16 +59,18 @@ class MessagePool:
         message_type = message_json[0]
         if message_type == RelayMessageType.EVENT:
             subscription_id = message_json[1]
-            event = message_json[2]
-            if "id" not in event:
-                return
-            event_id = event["id"]
-
-            with self.lock:
-                if f"{subscription_id}_{event_id}" not in self._unique_events:
-                    self._accept_event(
-                        EventMessage(json.dumps(event), event_id, subscription_id, url)
+            e = message_json[2]
+            event = Event(
+                e["content"],
+                e["pubkey"],
+                e["created_at"],
+                e["kind"],
+                e["tags"],
+                e["sig"],
             )
+            with self.lock:
+                if not f"{subscription_id}_{event.id}" in self._unique_events:
+                    self._accept_event(EventMessage(event, subscription_id, url))
         elif message_type == RelayMessageType.NOTICE:
             self.notices.put(NoticeMessage(message_json[1], url))
         elif message_type == RelayMessageType.END_OF_STORED_EVENTS:
@@ -78,12 +78,10 @@ class MessagePool:
 
     def _accept_event(self, event_message: EventMessage):
         """
-        Event uniqueness is considered per `subscription_id`.  The `subscription_id` is
-        rewritten to be unique and it is the same accross relays. The same event can
-        come from different subscriptions (from the same client or from different ones).
+            Event uniqueness is considered per `subscription_id`. 
+            The `subscription_id` is rewritten to be unique and it is the same accross relays.
+            The same event can come from different subscriptions (from the same client or from different ones).
             Clients that have joined later should receive older events.
         """
         self.events.put(event_message)
-        self._unique_events.add(
-            f"{event_message.subscription_id}_{event_message.event_id}"
-        )
+        self._unique_events.add(f"{event_message.subscription_id}_{event_message.event.id}")

nostr/relay.py

@@ -1,35 +1,57 @@
-import asyncio
 import json
 import time
 from queue import Queue
+from threading import Lock
+from typing import List
 
 from loguru import logger
 from websocket import WebSocketApp
 
+from .event import Event
+from .filter import Filters
 from .message_pool import MessagePool
+from .message_type import RelayMessageType
 from .subscription import Subscription
 
 
+class RelayPolicy:
+    def __init__(self, should_read: bool = True, should_write: bool = True) -> None:
+        self.should_read = should_read
+        self.should_write = should_write
+
+    def to_json_object(self) -> dict[str, bool]:
+        return {"read": self.should_read, "write": self.should_write}
+
+
 class Relay:
-    def __init__(self, url: str, message_pool: MessagePool) -> None:
+    def __init__(
+        self,
+        url: str,
+        policy: RelayPolicy,
+        message_pool: MessagePool,
+        subscriptions: dict[str, Subscription] = {},
+    ) -> None:
         self.url = url
+        self.policy = policy
         self.message_pool = message_pool
+        self.subscriptions = subscriptions
         self.connected: bool = False
         self.reconnect: bool = True
         self.shutdown: bool = False
-
         self.error_counter: int = 0
         self.error_threshold: int = 100
-        self.error_list: list[str] = []
-        self.notice_list: list[str] = []
+        self.error_list: List[str] = []
+        self.notice_list: List[str] = []
         self.last_error_date: int = 0
         self.num_received_events: int = 0
         self.num_sent_events: int = 0
         self.num_subscriptions: int = 0
+        self.ssl_options: dict = {}
+        self.proxy: dict = {}
+        self.lock = Lock()
+        self.queue = Queue()
 
-        self.queue: Queue = Queue()
-
-    def connect(self):
+    def connect(self, ssl_options: dict = None, proxy: dict = None):
         self.ws = WebSocketApp(
             self.url,
             on_open=self._on_open,
@@ -39,14 +61,19 @@ class Relay:
             on_ping=self._on_ping,
             on_pong=self._on_pong,
         )
+        self.ssl_options = ssl_options
+        self.proxy = proxy
         if not self.connected:
-            self.ws.run_forever(ping_interval=10)
+            self.ws.run_forever(
+                sslopt=ssl_options,
+                http_proxy_host=None if proxy is None else proxy.get("host"),
+                http_proxy_port=None if proxy is None else proxy.get("port"),
+                proxy_type=None if proxy is None else proxy.get("type"),
+                ping_interval=5,
+            )
 
     def close(self):
-        try:
         self.ws.close()
-        except Exception as e:
-            logger.warning(f"[Relay: {self.url}] Failed to close websocket: {e}")
         self.connected = False
         self.shutdown = True
 
@@ -62,57 +89,68 @@ class Relay:
     def publish(self, message: str):
         self.queue.put(message)
 
-    def publish_subscriptions(self, subscriptions: list[Subscription]):
-        for s in subscriptions:
-            assert s.filters
-            json_str = json.dumps(["REQ", s.id, *s.filters])
+    def publish_subscriptions(self):
+        for _, subscription in self.subscriptions.items():
+            s = subscription.to_json_object()
+            json_str = json.dumps(["REQ", s["id"], s["filters"][0]])
             self.publish(json_str)
 
-    async def queue_worker(self):
+    def queue_worker(self):
         while True:
             if self.connected:
                 try:
                     message = self.queue.get(timeout=1)
                     self.num_sent_events += 1
                     self.ws.send(message)
-                except Exception as _:
+                except:
                     pass
             else:
-                await asyncio.sleep(1)
+                time.sleep(0.1)
             
             if self.shutdown:
-                logger.warning(f"[Relay: {self.url}] Closing queue worker.")
-                return
+                logger.warning(f"Closing queue worker for '{self.url}'.")
+                break
 
-    def close_subscription(self, sub_id: str) -> None:
-        try:
-            self.publish(json.dumps(["CLOSE", sub_id]))
-        except Exception as e:
-            logger.debug(f"[Relay: {self.url}] Failed to close subscription: {e}")
+    def add_subscription(self, id, filters: Filters):
+        with self.lock:
+            self.subscriptions[id] = Subscription(id, filters)
+
+    def close_subscription(self, id: str) -> None:
+        with self.lock:
+            self.subscriptions.pop(id)
+            self.publish(json.dumps(["CLOSE", id]))
+
+    def to_json_object(self) -> dict:
+        return {
+            "url": self.url,
+            "policy": self.policy.to_json_object(),
+            "subscriptions": [
+                subscription.to_json_object()
+                for subscription in self.subscriptions.values()
+            ],
+        }
 
     def add_notice(self, notice: str):
-        self.notice_list = [notice, *self.notice_list]
+        self.notice_list = ([notice] + self.notice_list)[:20]
 
     def _on_open(self, _):
-        logger.info(f"[Relay: {self.url}] Connected.")
+        logger.info(f"Connected to relay: '{self.url}'.")
         self.connected = True
-        self.shutdown = False
         
     def _on_close(self, _, status_code, message):
-        logger.warning(
-            f"[Relay: {self.url}] Connection closed."
-            + f" Status: '{status_code}'. Message: '{message}'."
-        )
+        logger.warning(f"Connection to relay {self.url} closed. Status: '{status_code}'. Message: '{message}'.")
         self.close()
 
     def _on_message(self, _, message: str):
+        if self._is_valid_message(message):
             self.num_received_events += 1
             self.message_pool.add_message(message, self.url)
 
     def _on_error(self, _, error):
-        logger.warning(f"[Relay: {self.url}] Error: '{error!s}'")
+        logger.warning(f"Relay error: '{str(error)}'")
         self._append_error_message(str(error))
-        self.close()
+        self.connected = False
+        self.error_counter += 1
 
     def _on_ping(self, *_):
         return
@@ -120,7 +158,65 @@ class Relay:
     def _on_pong(self, *_):
         return
 
+    def _is_valid_message(self, message: str) -> bool:
+        message = message.strip("\n")
+        if not message or message[0] != "[" or message[-1] != "]":
+            return False
+
+        message_json = json.loads(message)
+        message_type = message_json[0]
+
+        if not RelayMessageType.is_valid(message_type):
+            return False
+        
+        if message_type == RelayMessageType.EVENT:
+            return self._is_valid_event_message(message_json)
+        
+        if message_type == RelayMessageType.COMMAND_RESULT:
+            return self._is_valid_command_result_message(message, message_json)
+
+        return True
+
+    def _is_valid_event_message(self, message_json):
+        if not len(message_json) == 3:
+            return False
+
+        subscription_id = message_json[1]
+        with self.lock:
+            if subscription_id not in self.subscriptions:
+                return False
+
+        e = message_json[2]
+        event = Event(
+            e["content"],
+            e["pubkey"],
+            e["created_at"],
+            e["kind"],
+            e["tags"],
+            e["sig"],
+        )
+        if not event.verify():
+            return False
+
+        with self.lock:
+            subscription = self.subscriptions[subscription_id]
+
+        if subscription.filters and not subscription.filters.match(event):
+            return False
+        
+        return True
+    
+    def _is_valid_command_result_message(self, message,  message_json):
+        if not len(message_json) < 3:
+            return False
+        
+        if message_json[2] != True:
+            logger.warning(f"Relay '{self.url}' negative command result: '{message}'")
+            self._append_error_message(message)
+            return False
+
+        return True
+    
     def _append_error_message(self, message):
-        self.error_counter += 1
-        self.error_list = [message, *self.error_list]
+        self.error_list = ([message] + self.error_list)[:20]
         self.last_error_date = int(time.time())

nostr/relay_manager.py

@@ -1,15 +1,20 @@
-import asyncio
+
+import ssl
 import threading
 import time
-from typing import List
 
 from loguru import logger
 
+from .filter import Filters
 from .message_pool import MessagePool, NoticeMessage
-from .relay import Relay
+from .relay import Relay, RelayPolicy
 from .subscription import Subscription
 
 
+class RelayException(Exception):
+    pass
+
+
 class RelayManager:
     def __init__(self) -> None:
         self.relays: dict[str, Relay] = {}
@@ -19,88 +24,61 @@ class RelayManager:
         self._cached_subscriptions: dict[str, Subscription] = {}
         self._subscriptions_lock = threading.Lock()
 
-    def add_relay(self, url: str) -> Relay:
+    def add_relay(self, url: str, read: bool = True, write: bool = True) -> Relay:
         if url in list(self.relays.keys()):
-            logger.debug(f"Relay '{url}' already present.")
-            return self.relays[url]
+            return
        
-        relay = Relay(url, self.message_pool)
+        with self._subscriptions_lock:
+            subscriptions = self._cached_subscriptions.copy()
+
+        policy = RelayPolicy(read, write)
+        relay = Relay(url, policy, self.message_pool, subscriptions)
         self.relays[url] = relay
 
-        self._open_connection(relay)
+        self._open_connection(
+            relay,
+            {"cert_reqs": ssl.CERT_NONE}
+        )  # NOTE: This disables ssl certificate verification
 
-        relay.publish_subscriptions(list(self._cached_subscriptions.values()))
+        relay.publish_subscriptions()
         return relay
 
     def remove_relay(self, url: str):
-        try:
         self.relays[url].close()
-        except Exception as e:
-            logger.debug(e)
-
-        if url in self.relays:
         self.relays.pop(url)
-
-        try:
         self.threads[url].join(timeout=5)
-        except Exception as e:
-            logger.debug(e)
-
-        if url in self.threads:
         self.threads.pop(url)
-
-        try:
         self.queue_threads[url].join(timeout=5)
-        except Exception as e:
-            logger.debug(e)
-
-        if url in self.queue_threads:
         self.queue_threads.pop(url)
  
-    def remove_relays(self):
-        relay_urls = list(self.relays.keys())
-        for url in relay_urls:
-            self.remove_relay(url)
 
-    def add_subscription(self, id: str, filters: List[str]):
-        s = Subscription(id, filters)
+    def add_subscription(self, id: str, filters: Filters):
         with self._subscriptions_lock:
-            self._cached_subscriptions[id] = s
+            self._cached_subscriptions[id] = Subscription(id, filters)
 
         for relay in self.relays.values():
-            relay.publish_subscriptions([s])
+            relay.add_subscription(id, filters)
 
     def close_subscription(self, id: str):
-        try:
-            logger.info(f"Closing subscription: '{id}'.")
         with self._subscriptions_lock:
-                if id in self._cached_subscriptions:
             self._cached_subscriptions.pop(id)
 
         for relay in self.relays.values():
             relay.close_subscription(id)
-        except Exception as e:
-            logger.debug(e)
-
-    def close_subscriptions(self, subscriptions: List[str]):
-        for id in subscriptions:
-            self.close_subscription(id)
-
-    def close_all_subscriptions(self):
-        all_subscriptions = list(self._cached_subscriptions.keys())
-        self.close_subscriptions(all_subscriptions)
 
     def check_and_restart_relays(self):
         stopped_relays = [r for r in self.relays.values() if r.shutdown]
         for relay in stopped_relays:
             self._restart_relay(relay)
 
+
     def close_connections(self):
         for relay in self.relays.values():
             relay.close()
 
     def publish_message(self, message: str):
         for relay in self.relays.values():
+            if relay.policy.should_write:
                 relay.publish(message)
 
     def handle_notice(self, notice: NoticeMessage):
@@ -108,32 +86,29 @@ class RelayManager:
         if relay:
             relay.add_notice(notice.content)
 
-    def _open_connection(self, relay: Relay):
+    def _open_connection(self, relay: Relay, ssl_options: dict = None, proxy: dict = None):          
         self.threads[relay.url] = threading.Thread(
             target=relay.connect,
+            args=(ssl_options, proxy),
             name=f"{relay.url}-thread",
             daemon=True,
         )
         self.threads[relay.url].start()
 
-        def wrap_async_queue_worker():
-            asyncio.run(relay.queue_worker())
-
         self.queue_threads[relay.url] = threading.Thread(
-            target=wrap_async_queue_worker,
+            target=relay.queue_worker,
             name=f"{relay.url}-queue",
             daemon=True,
         )
         self.queue_threads[relay.url].start()
 
     def _restart_relay(self, relay: Relay):
+        if relay.error_threshold_reached:
             time_since_last_error = time.time() - relay.last_error_date
-
-        min_wait_time = min(
-            60 * relay.error_counter, 60 * 60
-        )  # try at least once an hour
-        if time_since_last_error < min_wait_time:
+            if time_since_last_error < 60 * 60 * 2: # last day
                 return
+            relay.error_counter = 0
+            relay.error_list = []
             
         logger.info(f"Restarting connection to relay '{relay.url}'")
 

nostr/subscription.py

@@ -1,7 +1,13 @@
-from typing import Optional
+from .filter import Filters
 
 
 class Subscription:
-    def __init__(self, id: str, filters: Optional[list[str]] = None) -> None:
+    def __init__(self, id: str, filters: Filters=None) -> None:
         self.id = id
         self.filters = filters
+
+    def to_json_object(self):
+        return { 
+            "id": self.id, 
+            "filters": self.filters.to_json_array() 
+        }

package-lock.json

@@ -1,59 +0,0 @@
-{
-  "name": "nostrclient",
-  "version": "1.0.0",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "nostrclient",
-      "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.3",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz",
-      "integrity": "sha512-i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==",
-      "bin": {
-        "prettier": "bin/prettier.cjs"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/prettier/prettier?sponsor=1"
-      }
-    },
-    "node_modules/pyright": {
-      "version": "1.1.374",
-      "resolved": "https://registry.npmjs.org/pyright/-/pyright-1.1.374.tgz",
-      "integrity": "sha512-ISbC1YnYDYrEatoKKjfaA5uFIp0ddC/xw9aSlN/EkmwupXUMVn41Jl+G6wHEjRhC+n4abHZeGpEvxCUus/K9dA==",
-      "bin": {
-        "pyright": "index.js",
-        "pyright-langserver": "langserver.index.js"
-      },
-      "engines": {
-        "node": ">=14.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "~2.3.3"
-      }
-    }
-  }
-}

package.json

@@ -1,15 +0,0 @@
-{
-  "name": "nostrclient",
-  "version": "1.0.0",
-  "description": "",
-  "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

@@ -1,98 +0,0 @@
-[project]
-name = "lnbits-nostrclient"
-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/nostrclient" }
-dependencies = [ "lnbits>1" ]
-
-[tool.poetry]
-package-mode = false
-
-[tool.uv]
-dev-dependencies = [
-    "black",
-    "pytest-asyncio",
-    "pytest",
-    "mypy",
-    "pre-commit",
-    "ruff",
-    "pytest-md",
-    "types-cffi",
-]
-
-[tool.mypy]
-exclude = "(nostr/*)"
-plugins = ["pydantic.mypy"]
-
-[[tool.mypy.overrides]]
-module = [
-  "nostr.*",
-]
-follow_imports = "skip"
-ignore_missing_imports = "True"
-
-[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 = [
-    "nostr",
-]
-
-[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"]
-ignore = ["C901"]
-
-# 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]
-# "__init__.py" = ["F401", "F403"]
-
-# [tool.ruff.lint.mccabe]
-# max-complexity = 10
-
-[tool.ruff.lint.flake8-bugbear]
-# Allow default arguments like, e.g., `data: List[str] = fastapi.Query(None)`.
-extend-immutable-calls = [
-    "fastapi.Depends",
-    "fastapi.Query",
-]

router.py

@@ -1,85 +1,84 @@
 import asyncio
 import json
-from typing import ClassVar
+from typing import List, Union
 
-from fastapi import WebSocket, WebSocketDisconnect
-from lnbits.helpers import urlsafe_short_hash
+from fastapi import WebSocketDisconnect
 from loguru import logger
 
-from .nostr.client.client import NostrClient
+from lnbits.helpers import urlsafe_short_hash
 
-# from . import nostr_client
-from .nostr.message_pool import EndOfStoredEventsMessage, EventMessage, NoticeMessage
-
-nostr_client: NostrClient = NostrClient()
-all_routers: list["NostrRouter"] = []
+from . import nostr
+from .models import Event, Filter
+from .nostr.filter import Filter as NostrFilter
+from .nostr.filter import Filters as NostrFilters
+from .nostr.message_pool import EndOfStoredEventsMessage, NoticeMessage
 
 
 class NostrRouter:
-    received_subscription_events: ClassVar[dict[str, list[EventMessage]]] = {}
-    received_subscription_notices: ClassVar[list[NoticeMessage]] = []
-    received_subscription_eosenotices: ClassVar[dict[str, EndOfStoredEventsMessage]] = (
-        {}
-    )
 
-    def __init__(self, websocket: WebSocket):
+    received_subscription_events: dict[str, list[Event]] = {}
+    received_subscription_notices: list[NoticeMessage] = []
+    received_subscription_eosenotices: dict[str, EndOfStoredEventsMessage] = {}
+
+    def __init__(self, websocket):
+        self.subscriptions: List[str] = []
         self.connected: bool = True
-        self.websocket: WebSocket = websocket
-        self.tasks: list[asyncio.Task] = []
-        self.original_subscription_ids: dict[str, str] = {}
+        self.websocket = websocket
+        self.tasks: List[asyncio.Task] = []
+        self.original_subscription_ids = {}
 
-    @property
-    def subscriptions(self) -> list[str]:
-        return list(self.original_subscription_ids.keys())
-
-    def start(self):
-        self.connected = True
-        self.tasks.append(asyncio.create_task(self._client_to_nostr()))
-        self.tasks.append(asyncio.create_task(self._nostr_to_client()))
-
-    async def stop(self):
-        nostr_client.relay_manager.close_subscriptions(self.subscriptions)
-        self.connected = False
-
-        for t in self.tasks:
-            try:
-                t.cancel()
-            except Exception as _:
-                pass
-
-        try:
-            await self.websocket.close(reason="Websocket connection closed")
-        except Exception as _:
-            pass
-
-    async def _client_to_nostr(self):
-        """
-        Receives requests / data from the client and forwards it to relays.
-        """
-        while self.connected:
+    async def client_to_nostr(self):
+        """Receives requests / data from the client and forwards it to relays. If the
+        request was a subscription/filter, registers it with the nostr client lib.
+        Remembers the subscription id so we can send back responses from the relay to this
+        client in `nostr_to_client`"""
+        while True:
             try:
                 json_str = await self.websocket.receive_text()
-            except WebSocketDisconnect as e:
-                logger.debug(e)
-                await self.stop()
+            except WebSocketDisconnect:
+                self.connected = False
                 break
 
             try:
                 await self._handle_client_to_nostr(json_str)
             except Exception as e:
-                logger.debug(f"Failed to handle client message: '{e!s}'.")
+                logger.debug(f"Failed to handle client message: '{str(e)}'.")
 
-    async def _nostr_to_client(self):
-        """Sends responses from relays back to the client."""
-        while self.connected:
+
+    async def nostr_to_client(self):
+        """Sends responses from relays back to the client. Polls the subscriptions of this client
+        stored in `my_subscriptions`. Then gets all responses for this subscription id from `received_subscription_events` which
+        is filled in tasks.py. Takes one response after the other and relays it back to the client. Reconstructs
+        the reponse manually because the nostr client lib we're using can't do it. Reconstructs the original subscription id
+        that we had previously rewritten in order to avoid collisions when multiple clients use the same id.
+        """
+        while True and self.connected:
             try:
                 await self._handle_subscriptions()
                 self._handle_notices()
             except Exception as e:
-                logger.debug(f"Failed to handle response for client: '{e!s}'.")
-                await asyncio.sleep(1)
+                logger.debug(f"Failed to handle response for client: '{str(e)}'.")
             await asyncio.sleep(0.1)
 
+
+    async def start(self):
+        self.tasks.append(asyncio.create_task(self.client_to_nostr()))
+        self.tasks.append(asyncio.create_task(self.nostr_to_client()))
+
+    async def stop(self):
+        for t in self.tasks:
+            try:
+                t.cancel()
+            except:
+                pass
+
+        for s in self.subscriptions:
+            try:
+                nostr.client.relay_manager.close_subscription(s)
+            except:
+                pass
+        self.connected = False
+
     async def _handle_subscriptions(self):
         for s in self.subscriptions:
             if s in NostrRouter.received_subscription_events:
@@ -87,50 +86,73 @@ class NostrRouter:
             if s in NostrRouter.received_subscription_eosenotices:
                 await self._handle_received_subscription_eosenotices(s)
 
+
+
     async def _handle_received_subscription_eosenotices(self, s):
-        try:
-            if s not in self.original_subscription_ids:
-                return
         s_original = self.original_subscription_ids[s]
         event_to_forward = ["EOSE", s_original]
         del NostrRouter.received_subscription_eosenotices[s]
         
         await self.websocket.send_text(json.dumps(event_to_forward))
-        except Exception as e:
-            logger.debug(e)
 
     async def _handle_received_subscription_events(self, s):
-        try:
-            if s not in NostrRouter.received_subscription_events:
-                return
-
         while len(NostrRouter.received_subscription_events[s]):
-                event_message = NostrRouter.received_subscription_events[s].pop(0)
-                event_json = event_message.event
+            my_event = NostrRouter.received_subscription_events[s].pop(0)
+            # event.to_message() does not include the subscription ID, we have to add it manually
+            event_json = {
+                            "id": my_event.id,
+                            "pubkey": my_event.public_key,
+                            "created_at": my_event.created_at,
+                            "kind": my_event.kind,
+                            "tags": my_event.tags,
+                            "content": my_event.content,
+                            "sig": my_event.signature,
+                        }
 
             # this reconstructs the original response from the relay
             # reconstruct original subscription id
             s_original = self.original_subscription_ids[s]
-                event_to_forward = json.dumps(
-                    ["EVENT", s_original, json.loads(event_json)]
-                )
-                await self.websocket.send_text(event_to_forward)
-        except Exception as e:
-            logger.warning(
-                f"[NOSTRCLIENT] Error in _handle_received_subscription_events: {e}"
-            )
+            event_to_forward = ["EVENT", s_original, event_json]
+            await self.websocket.send_text(json.dumps(event_to_forward))
 
     def _handle_notices(self):
         while len(NostrRouter.received_subscription_notices):
             my_event = NostrRouter.received_subscription_notices.pop(0)
-            logger.debug(f"[Relay '{my_event.url}'] Notice: '{my_event.content}']")
-            #  Note: we don't send it to the user because
-            #  we don't know who should receive it
-            nostr_client.relay_manager.handle_notice(my_event)
+            #  note: we don't send it to the user because we don't know who should receive it
+            logger.info(f"Relay ('{my_event.url}') notice: '{my_event.content}']")
+            nostr.client.relay_manager.handle_notice(my_event)
+        
+
+
+    def _marshall_nostr_filters(self, data: Union[dict, list]):
+        filters = data if isinstance(data, list) else [data]
+        filters = [Filter.parse_obj(f) for f in filters]
+        filter_list: list[NostrFilter] = []
+        for filter in filters:
+            filter_list.append(
+                NostrFilter(
+                    event_ids=filter.ids,  # type: ignore
+                    kinds=filter.kinds,  # type: ignore
+                    authors=filter.authors,  # type: ignore
+                    since=filter.since,  # type: ignore
+                    until=filter.until,  # type: ignore
+                    event_refs=filter.e,  # type: ignore
+                    pubkey_refs=filter.p,  # type: ignore
+                    limit=filter.limit,  # type: ignore
+                )
+            )
+        return NostrFilters(filter_list)
 
     async def _handle_client_to_nostr(self, json_str):
+        """Parses a (string) request from a client. If it is a subscription (REQ) or a CLOSE, it will
+        register the subscription in the nostr client library that we're using so we can
+        receive the callbacks on it later. Will rewrite the subscription id since we expect
+        multiple clients to use the router and want to avoid subscription id collisions
+        """
+
         json_data = json.loads(json_str)
-        assert len(json_data), "Bad JSON array"
+        assert len(json_data)
+
 
         if json_data[0] == "REQ":
             self._handle_client_req(json_data)
@@ -141,35 +163,28 @@ class NostrRouter:
             return
 
         if json_data[0] == "EVENT":
-            nostr_client.relay_manager.publish_message(json_str)
+            nostr.client.relay_manager.publish_message(json_str)
             return
 
     def _handle_client_req(self, json_data):
         subscription_id = json_data[1]
-        logger.info(f"New subscription: '{subscription_id}'")
         subscription_id_rewritten = urlsafe_short_hash()
         self.original_subscription_ids[subscription_id_rewritten] = subscription_id
-        filters = json_data[2:]
+        fltr = json_data[2]
+        filters = self._marshall_nostr_filters(fltr)
 
-        nostr_client.relay_manager.add_subscription(subscription_id_rewritten, filters)
+        nostr.client.relay_manager.add_subscription(
+                subscription_id_rewritten, filters
+            )
+        request_rewritten = json.dumps([json_data[0], subscription_id_rewritten, fltr])
+        
+        self.subscriptions.append(subscription_id_rewritten)
+        nostr.client.relay_manager.publish_message(request_rewritten)
 
     def _handle_client_close(self, subscription_id):
-        subscription_id_rewritten = next(
-            (
-                k
-                for k, v in self.original_subscription_ids.items()
-                if v == subscription_id
-            ),
-            None,
-        )
+        subscription_id_rewritten = next((k for k, v in self.original_subscription_ids.items() if v == subscription_id), None)
         if subscription_id_rewritten:
             self.original_subscription_ids.pop(subscription_id_rewritten)
-            nostr_client.relay_manager.close_subscription(subscription_id_rewritten)
-            logger.info(
-                f"""
-            Unsubscribe from '{subscription_id_rewritten}'.
-            Original id: '{subscription_id}.'
-            """
-            )
+            nostr.client.relay_manager.close_subscription(subscription_id_rewritten)
         else:
-            logger.info(f"Failed to unsubscribe from '{subscription_id}.'")
+            logger.debug(f"Failed to unsubscribe from '{subscription_id}.'")

tasks.py

@@ -3,69 +3,76 @@ import threading
 
 from loguru import logger
 
+from . import nostr
 from .crud import get_relays
 from .nostr.message_pool import EndOfStoredEventsMessage, EventMessage, NoticeMessage
-from .router import NostrRouter, nostr_client
+from .router import NostrRouter, nostr
 
 
 async def init_relays():
+    # reinitialize the entire client
+    nostr.__init__()
     # get relays from db
     relays = await get_relays()
     # set relays and connect to them
-    valid_relays = [r.url for r in relays if r.url]
-
-    nostr_client.reconnect(valid_relays)
+    nostr.client.relays = list(set([r.url for r in relays.__root__ if r.url]))
+    await nostr.client.connect()
 
 
 async def check_relays():
-    """Check relays that have been disconnected"""
+    """ Check relays that have been disconnected """
     while True:
         try:
             await asyncio.sleep(20)
-            nostr_client.relay_manager.check_and_restart_relays()
+            nostr.client.relay_manager.check_and_restart_relays()
         except Exception as e:
-            logger.warning(f"Cannot restart relays: '{e!s}'.")
+            logger.warning(f"Cannot restart relays: '{str(e)}'.")
     
 
 async def subscribe_events():
-    while not [r.connected for r in nostr_client.relay_manager.relays.values()]:
+    while not any([r.connected for r in nostr.client.relay_manager.relays.values()]):
         await asyncio.sleep(2)
 
-    def callback_events(event_message: EventMessage):
-        sub_id = event_message.subscription_id
-        if sub_id not in NostrRouter.received_subscription_events:
-            NostrRouter.received_subscription_events[sub_id] = [event_message]
-            return
-
+    def callback_events(eventMessage: EventMessage):
+        if eventMessage.subscription_id in NostrRouter.received_subscription_events:
             # do not add duplicate events (by event id)
-        ids = [e.event_id for e in NostrRouter.received_subscription_events[sub_id]]
-        if event_message.event_id in ids:
+            if eventMessage.event.id in set(
+                [
+                    e.id
+                    for e in NostrRouter.received_subscription_events[eventMessage.subscription_id]
+                ]
+            ):
                 return
 
-        NostrRouter.received_subscription_events[sub_id].append(event_message)
-
-    def callback_notices(notice_message: NoticeMessage):
-        if notice_message not in NostrRouter.received_subscription_notices:
-            NostrRouter.received_subscription_notices.append(notice_message)
-
-    def callback_eose_notices(event_message: EndOfStoredEventsMessage):
-        sub_id = event_message.subscription_id
-        if sub_id in NostrRouter.received_subscription_eosenotices:
+            NostrRouter.received_subscription_events[eventMessage.subscription_id].append(
+                eventMessage.event
+            )
+        else:
+            NostrRouter.received_subscription_events[eventMessage.subscription_id] = [
+                eventMessage.event
+            ]
         return
 
-        NostrRouter.received_subscription_eosenotices[sub_id] = event_message
+    def callback_notices(noticeMessage: NoticeMessage):
+        if noticeMessage not in NostrRouter.received_subscription_notices:
+            NostrRouter.received_subscription_notices.append(noticeMessage)
+        return
 
-    def wrap_async_subscribe():
-        asyncio.run(
-            nostr_client.subscribe(
+    def callback_eose_notices(eventMessage: EndOfStoredEventsMessage):
+        if eventMessage.subscription_id not in NostrRouter.received_subscription_eosenotices:
+            NostrRouter.received_subscription_eosenotices[
+                eventMessage.subscription_id
+            ] = eventMessage
+
+        return
+
+    t = threading.Thread(
+        target=nostr.client.subscribe,
+        args=(
             callback_events,
             callback_notices,
             callback_eose_notices,
-            )
-        )
-
-    t = threading.Thread(
-        target=wrap_async_subscribe,
+        ),
         name="Nostr-event-subscription",
         daemon=True,
     )

templates/nostrclient/index.html

@@ -4,47 +4,21 @@
   <div class="col-12 col-md-7 q-gutter-y-md">
     <q-card>
       <q-form @submit="addRelay">
-        <div class="row">
-          <div class="col-12 col-md-7 q-pa-md">
-            <q-input
-              outlined
-              v-model="relayToAdd"
-              dense
-              filled
-              label="Relay URL"
-            ></q-input>
+        <div class="row q-pa-md">
+          <div class="col-9">
+            <q-input outlined v-model="relayToAdd" dense filled label="Relay URL"></q-input>
           </div>
-          <div class="col-6 col-md-3 q-pa-md">
-            <q-btn-dropdown
-              unelevated
-              split
-              color="primary"
-              class="float-left"
-              type="submit"
-              label="Add Relay"
-            >
-              <q-item
-                v-for="relay in predefinedRelays"
-                :key="relay"
-                @click="addCustomRelay(relay)"
-                clickable
-                v-close-popup
-              >
+          <div class="col-3">
+
+            <q-btn-dropdown unelevated split color="primary" class="float-right" type="submit" label="Add Relay">
+              <q-item v-for="relay in predefinedRelays" :key="relay" @click="addCustomRelay(relay)" clickable
+                v-close-popup>
                 <q-item-section>
                   <q-item-label><span v-text="relay"></span></q-item-label>
                 </q-item-section>
               </q-item>
             </q-btn-dropdown>
           </div>
-          <div class="col-6 col-md-2 q-pa-md">
-            <q-btn
-              unelevated
-              @click="config.showDialog = true"
-              color="primary"
-              icon="settings"
-              class="float-right"
-            ></q-btn>
-          </div>
         </div>
       </q-form>
     </q-card>
@@ -55,36 +29,18 @@
             <h5 class="text-subtitle1 q-my-none">Nostrclient</h5>
           </div>
           <div class="col-auto">
-            <q-input
-              borderless
-              dense
-              debounce="300"
-              v-model="filter"
-              placeholder="Search"
-            >
+            <q-input borderless dense debounce="300" v-model="filter" placeholder="Search">
               <template v-slot:append>
                 <q-icon name="search"></q-icon>
               </template>
             </q-input>
           </div>
         </div>
-        <q-table
-          flat
-          dense
-          :rows="nostrrelayLinks"
-          row-key="id"
-          :columns="relayTable.columns"
-          :pagination.sync="relayTable.pagination"
-          :filter="filter"
-        >
+        <q-table flat dense :data="nostrrelayLinks" row-key="id" :columns="relayTable.columns"
+          :pagination.sync="relayTable.pagination" :filter="filter">
           <template v-slot:header="props">
             <q-tr :props="props">
-              <q-th
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                auto-width
-              >
+              <q-th v-for="col in props.cols" :key="col.name" :props="props" auto-width>
                 <div v-if="col.name == 'id'"></div>
                 <div v-else>{{ col.label }}</div>
               </q-th>
@@ -93,43 +49,29 @@
 
           <template v-slot:body="props">
             <q-tr :props="props">
-              <q-td
-                v-for="col in props.cols"
-                :key="col.name"
-                :props="props"
-                auto-width
-              >
+              <q-td v-for="col in props.cols" :key="col.name" :props="props" auto-width>
                 <div v-if="col.name == 'connected'">
                   <div v-if="col.value">🟢</div>
-                  <div v-else>🔴</div>
+                  <div v-else> 🔴 </div>
                 </div>
                 <div v-else-if="col.name == 'status'">
                   <div>
-                    ⬆️ <span v-text="col.value.sentEvents"></span> ⬇️
-                    <span v-text="col.value.receveidEvents"></span>
-                    <span
-                      @click="showLogDataDialog(col.value.errorList)"
-                      class="cursor-pointer"
-                    >
-                      ⚠️ <span v-text="col.value.errorCount"> </span>
+                    ⬆️ <span v-text="col.value.sentEvents"></span>
+                    ⬇️ <span v-text="col.value.receveidEvents"></span>
+                    <span @click="showLogDataDialog(col.value.errorList)" class="cursor-pointer">
+                      ⚠️ <span v-text="col.value.errorCount">
                       </span>
-                    <span
-                      @click="showLogDataDialog(col.value.noticeList)"
-                      class="cursor-pointer float-right"
-                    >
+                    </span>
+                    <span @click="showLogDataDialog(col.value.noticeList)" class="cursor-pointer float-right">
                       ⓘ
                       </span>
+                    </span>
+
                   </div>
                 </div>
                 <div v-else-if="col.name == 'delete'">
-                  <q-btn
-                    flat
-                    dense
-                    size="md"
-                    @click="showDeleteRelayDialog(props.row.url)"
-                    icon="cancel"
-                    color="pink"
-                  ></q-btn>
+                  <q-btn flat dense size="md" @click="showDeleteRelayDialog(props.row.url)" icon="cancel"
+                    color="pink"></q-btn>
                 </div>
                 <div v-else>
                   <div>{{ col.value }}</div>
@@ -145,32 +87,15 @@
         <div class="row">
           <div class="col">
             <div class="text-weight-bold">
-              <q-btn
-                flat
-                dense
-                size="0.6rem"
-                class="q-px-none q-mx-none"
-                color="grey"
-                icon="content_copy"
-                @click="copyText(`wss://${host}/nostrclient/api/v1/relay`)"
-                ><q-tooltip>Copy address</q-tooltip></q-btn
-              >
+              <q-btn flat dense size="0.6rem" class="q-px-none q-mx-none" color="grey" icon="content_copy"
+                @click="copyText(`wss://${host}/nostrclient/api/v1/relay`)"><q-tooltip>Copy address</q-tooltip></q-btn>
               Your endpoint:
-              <q-badge
-                outline
-                class="q-ml-sm text-subtitle2"
-                :label="`wss://${host}/nostrclient/api/v1/relay`"
-              />
+              <q-badge outline class="q-ml-sm text-subtitle2" :label="`wss://${host}/nostrclient/api/v1/relay`" />
             </div>
           </div>
         </div>
       </q-card-section>
-      <q-expansion-item
-        group="advanced"
-        icon="settings"
-        label="Test this endpoint"
-        @click="toggleTestPanel"
-      >
+      <q-expansion-item group="advanced" icon="settings" label="Test this endpoint" @click="toggleTestPanel">
         <q-separator></q-separator>
         <q-card-section>
           <div class="row">
@@ -178,13 +103,8 @@
               <span>Sender Private Key:</span>
             </div>
             <div class="col-9">
-              <q-input
-                outlined
-                v-model="testData.senderPrivateKey"
-                dense
-                filled
-                label="Private Key (optional)"
-              ></q-input>
+              <q-input outlined v-model="testData.senderPrivateKey" dense filled
+                label="Private Key (optional)"></q-input>
             </div>
           </div>
           <div class="row q-mt-sm q-mb-lg">
@@ -193,8 +113,7 @@
               <q-badge color="yellow" text-color="black">
                 <span>
                   No not use your real private key! Leave empty for a randomly
-                  generated key.</span
-                >
+                  generated key.</span>
               </q-badge>
             </div>
           </div>
@@ -203,13 +122,7 @@
               <span>Sender Public Key:</span>
             </div>
             <div class="col-9">
-              <q-input
-                outlined
-                v-model="testData.senderPublicKey"
-                dense
-                readonly
-                filled
-              ></q-input>
+              <q-input outlined v-model="testData.senderPublicKey" dense readonly filled></q-input>
             </div>
           </div>
           <div class="row q-mt-md">
@@ -217,15 +130,8 @@
               <span>Test Message:</span>
             </div>
             <div class="col-9">
-              <q-input
-                outlined
-                v-model="testData.message"
-                dense
-                filled
-                rows="3"
-                type="textarea"
-                label="Test Message *"
-              ></q-input>
+              <q-input outlined v-model="testData.message" dense filled rows="3" type="textarea"
+                label="Test Message *"></q-input>
             </div>
           </div>
           <div class="row q-mt-md">
@@ -233,35 +139,22 @@
               <span>Receiver Public Key:</span>
             </div>
             <div class="col-9">
-              <q-input
-                outlined
-                v-model="testData.recieverPublicKey"
-                dense
-                filled
-                label="Public Key (hex or npub) *"
-              ></q-input>
+              <q-input outlined v-model="testData.recieverPublicKey" dense filled
+                label="Public Key (hex or npub) *"></q-input>
             </div>
           </div>
           <div class="row q-mt-sm q-mb-lg">
             <div class="col-3"></div>
             <div class="col-9">
               <q-badge color="yellow" text-color="black">
-                <span
-                  >This is the recipient of the message. Field required.</span
-                >
+                <span>This is the recipient of the message. Field required.</span>
               </q-badge>
             </div>
           </div>
           <div class="row">
             <div class="col-12">
-              <q-btn
-                :disabled="!testData.recieverPublicKey || !testData.message"
-                @click="sendTestMessage"
-                unelevated
-                color="primary"
-                class="float-right"
-                >Send Message</q-btn
-              >
+              <q-btn :disabled="!testData.recieverPublicKey || !testData.message" @click="sendTestMessage" unelevated
+                color="primary" class="float-right">Send Message</q-btn>
             </div>
           </div>
         </q-card-section>
@@ -273,14 +166,7 @@
               <span>Sent Data:</span>
             </div>
             <div class="col-9">
-              <q-input
-                outlined
-                v-model="testData.sentData"
-                dense
-                filled
-                rows="5"
-                type="textarea"
-              ></q-input>
+              <q-input outlined v-model="testData.sentData" dense filled rows="5" type="textarea"></q-input>
             </div>
           </div>
           <div class="row q-mt-md">
@@ -288,14 +174,7 @@
               <span>Received Data:</span>
             </div>
             <div class="col-9">
-              <q-input
-                outlined
-                v-model="testData.receivedData"
-                dense
-                filled
-                rows="5"
-                type="textarea"
-              ></q-input>
+              <q-input outlined v-model="testData.receivedData" dense filled rows="5" type="textarea"></q-input>
             </div>
           </div>
         </q-card-section>
@@ -314,12 +193,8 @@
         </p>
 
         <p>
-          <q-badge
-            outline
-            class="q-ml-sm text-subtitle2"
-            color="primary"
-            :label="`wss://${host}/nostrclient/api/v1/relay`"
-          />
+          <q-badge outline class="q-ml-sm text-subtitle2" color="primary"
+            :label="`wss://${host}/nostrclient/api/v1/relay`" />
         </p>
         Only Admin users can manage this extension.
         <q-card-section></q-card-section>
@@ -329,15 +204,7 @@
 
   <q-dialog v-model="logData.show" position="top">
     <q-card class="q-pa-lg q-pt-xl">
-      <q-input
-        filled
-        dense
-        v-model.trim="logData.data"
-        type="textarea"
-        rows="25"
-        cols="200"
-        label="Log Data"
-      ></q-input>
+      <q-input filled dense v-model.trim="logData.data" type="textarea" rows="25" cols="200" label="Log Data"></q-input>
 
       <div class="row q-mt-lg">
         <q-btn v-close-popup flat color="grey" class="q-ml-auto">Close</q-btn>
@@ -345,38 +212,16 @@
     </q-card>
   </q-dialog>
 
-  <q-dialog v-model="config.showDialog" position="top">
-    <q-card class="q-pa-lg q-pt-xl lnbits__dialog-card">
-      <q-form @submit="updateConfig" class="q-gutter-md">
-        <q-toggle
-          label="Expose Private Websocket"
-          color="secodary"
-          v-model="config.data.private_ws"
-        ></q-toggle>
-        <br />
-        <q-toggle
-          label="Expose Public Websocket"
-          color="secodary"
-          v-model="config.data.public_ws"
-        ></q-toggle>
-        <div class="row q-mt-lg">
-          <q-btn unelevated color="primary" type="submit">Update</q-btn>
-          <q-btn v-close-popup flat color="grey" class="q-ml-auto"
-            >Cancel</q-btn
-          >
-        </div>
-      </q-form>
-    </q-card>
-  </q-dialog>
 </div>
 {% endraw %} {% endblock %} {% block scripts %} {{ window_vars(user) }}
 
 <script>
+  Vue.component(VueQrcode.name, VueQrcode)
+
   var maplrelays = obj => {
     obj._data = _.clone(obj)
     obj.theTime = obj.time * 60 - (Date.now() / 1000 - obj.timestamp)
     obj.time = obj.time + 'mins'
-    obj.status = obj.status || {}
     obj.status = {
       sentEvents: obj.status.num_sent_events,
       receveidEvents: obj.status.num_received_events,
@@ -390,7 +235,7 @@
     if (obj.time_elapsed) {
       obj.date = 'Time elapsed'
     } else {
-      obj.date = Quasar.date.formatDate(
+      obj.date = Quasar.utils.date.formatDate(
         new Date((obj.theTime - 3600) * 1000),
         'HH:mm:ss'
       )
@@ -398,7 +243,7 @@
     return obj
   }
 
-  window.app = Vue.createApp({
+  new Vue({
     el: '#vue',
     mixins: [windowMixin],
     data: function () {
@@ -412,10 +257,6 @@
           show: false,
           data: null
         },
-        config: {
-          showDialog: false,
-          data: {}
-        },
         testData: {
           show: false,
           wsConnection: null,
@@ -451,7 +292,8 @@
               align: 'center',
               label: 'Ping',
               field: 'ping'
-            },
+            }
+            ,
             {
               name: 'delete',
               align: 'center',
@@ -464,19 +306,24 @@
           }
         },
         predefinedRelays: [
-          'wss://relay.damus.io',
-          'wss://nostr-pub.wellorder.net',
-          'wss://relay.nostrconnect.com',
-          'wss://nostr.oxtr.dev',
-          'wss://nostr.wine'
-        ]
+          "wss://relay.damus.io",
+          "wss://nostr-pub.wellorder.net",
+          "wss://nostr.zebedee.cloud",
+          "wss://nodestr.fmt.wiz.biz",
+          "wss://nostr.oxtr.dev",
+          "wss://nostr.wine"
+        ],
       }
     },
     methods: {
       getRelays: function () {
         var self = this
         LNbits.api
-          .request('GET', '/nostrclient/api/v1/relays')
+          .request(
+            'GET',
+            '/nostrclient/api/v1/relays?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey
+          )
           .then(function (response) {
             if (response.data) {
               response.data.map(maplrelays)
@@ -504,9 +351,12 @@
         console.log('ADD RELAY ' + this.relayToAdd)
         let that = this
         LNbits.api
-          .request('POST', '/nostrclient/api/v1/relay', null, {
-            url: this.relayToAdd
-          })
+          .request(
+            'POST',
+            '/nostrclient/api/v1/relay?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey,
+            { url: this.relayToAdd }
+          )
           .then(function (response) {
             console.log('response:', response)
             if (response.data) {
@@ -533,43 +383,23 @@
       },
       deleteRelay(url) {
         LNbits.api
-          .request('DELETE', '/nostrclient/api/v1/relay', null, {url: url})
-          .then(response => {
+          .request(
+            'DELETE',
+            '/nostrclient/api/v1/relay?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey,
+            { url: url }
+          )
+          .then((response) => {
             const relayIndex = this.nostrrelayLinks.indexOf(r => r.url === url)
             if (relayIndex !== -1) {
               this.nostrrelayLinks.splice(relayIndex, 1)
             }
           })
-          .catch(error => {
+          .catch((error) => {
             console.error(error)
             LNbits.utils.notifyApiError(error)
           })
       },
-      getConfig: async function () {
-        try {
-          const {data} = await LNbits.api.request(
-            'GET',
-            '/nostrclient/api/v1/config'
-          )
-          this.config.data = data
-        } catch (error) {
-          LNbits.utils.notifyApiError(error)
-        }
-      },
-      updateConfig: async function () {
-        try {
-          const {data} = await LNbits.api.request(
-            'PUT',
-            '/nostrclient/api/v1/config',
-            null,
-            this.config.data
-          )
-          this.config.data = data
-        } catch (error) {
-          LNbits.utils.notifyApiError(error)
-        }
-        this.config.showDialog = false
-      },
       toggleTestPanel: async function () {
         if (this.testData.show) {
           await this.hideTestPannel()
@@ -607,10 +437,10 @@
       },
       sendTestMessage: async function () {
         try {
-          const {data} = await LNbits.api.request(
+          const { data } = await LNbits.api.request(
             'PUT',
-            '/nostrclient/api/v1/relay/test',
-            null,
+            '/nostrclient/api/v1/relay/test?usr=' + this.g.user.id,
+            this.g.user.wallets[0].adminkey,
             {
               sender_private_key: this.testData.senderPrivateKey,
               reciever_public_key: this.testData.recieverPublicKey,
@@ -628,7 +458,7 @@
           const subscription = JSON.stringify([
             'REQ',
             'test-dms',
-            {kinds: [4], '#p': [event.pubkey]}
+            { kinds: [4], '#p': [event.pubkey] }
           ])
           this.testData.wsConnection.send(subscription)
         } catch (error) {
@@ -690,9 +520,9 @@
       },
       sleep: ms => new Promise(r => setTimeout(r, ms))
     },
-    created: async function () {
+    created: function () {
+      var self = this
       this.getRelays()
-      await this.getConfig()
       setInterval(this.getRelays, 5000)
     }
   })

tests/test_init.py

@@ -1,11 +0,0 @@
-import pytest
-from fastapi import APIRouter
-
-from .. import nostrclient_ext
-
-
-# just import router and add it to a test router
-@pytest.mark.asyncio
-async def test_router():
-    router = APIRouter()
-    router.include_router(nostrclient_ext)

views.py

@@ -1,22 +1,17 @@
-from fastapi import APIRouter, Depends, Request
-from fastapi.responses import HTMLResponse
-from lnbits.core.crud.users import get_user_from_account
-from lnbits.core.models.users import Account
+from fastapi import Depends, Request
+from fastapi.templating import Jinja2Templates
+from starlette.responses import HTMLResponse
+
+from lnbits.core.models import User
 from lnbits.decorators import check_admin
-from lnbits.helpers import template_renderer
 
-nostrclient_generic_router = APIRouter()
+from . import nostr_renderer, nostrclient_ext
+
+templates = Jinja2Templates(directory="templates")
 
 
-def nostr_renderer():
-    return template_renderer(["nostrclient/templates"])
-
-
-@nostrclient_generic_router.get("/", response_class=HTMLResponse)
-async def index(request: Request, account: Account = Depends(check_admin)):
-    user = await get_user_from_account(account)
-    if not user:
-        return HTMLResponse("No user found", status_code=404)
+@nostrclient_ext.get("/", response_class=HTMLResponse)
+async def index(request: Request, user: User = Depends(check_admin)):
     return nostr_renderer().TemplateResponse(
-        "nostrclient/index.html", {"request": request, "user": user.json()}
+        "nostrclient/index.html", {"request": request, "user": user.dict()}
     )

views_api.py

@@ -1,44 +1,42 @@
 import asyncio
 from http import HTTPStatus
+from typing import Optional
 
-from fastapi import APIRouter, Depends, HTTPException, WebSocket
-from lnbits.decorators import check_admin
-from lnbits.helpers import decrypt_internal_message, urlsafe_short_hash
+from fastapi import Depends, WebSocket
 from loguru import logger
+from starlette.exceptions import HTTPException
 
-from .crud import (
-    add_relay,
-    create_config,
-    delete_relay,
-    get_config,
-    get_relays,
-    update_config,
-)
+from lnbits.decorators import check_admin
+from lnbits.helpers import urlsafe_short_hash
+
+from . import nostr, nostrclient_ext, scheduled_tasks
+from .crud import add_relay, delete_relay, get_relays
 from .helpers import normalize_public_key
-from .models import Config, Relay, RelayStatus, TestMessage, TestMessageResponse
+from .models import Relay, RelayList, TestMessage, TestMessageResponse
 from .nostr.key import EncryptedDirectMessage, PrivateKey
-from .router import NostrRouter, all_routers, nostr_client
+from .router import NostrRouter, nostr
 
-nostrclient_api_router = APIRouter()
+# we keep this in
+all_routers: list[NostrRouter] = []
 
 
-@nostrclient_api_router.get("/api/v1/relays", dependencies=[Depends(check_admin)])
-async def api_get_relays() -> list[Relay]:
-    relays = []
-    for url, r in nostr_client.relay_manager.relays.items():
+@nostrclient_ext.get("/api/v1/relays")
+async def api_get_relays() -> RelayList:
+    relays = RelayList(__root__=[])
+    for url, r in nostr.client.relay_manager.relays.items():
         relay_id = urlsafe_short_hash()
-        relays.append(
+        relays.__root__.append(
             Relay(
                 id=relay_id,
                 url=url,
                 connected=r.connected,
-                status=RelayStatus(
-                    num_sent_events=r.num_sent_events,
-                    num_received_events=r.num_received_events,
-                    error_counter=r.error_counter,
-                    error_list=r.error_list,
-                    notice_list=r.notice_list,
-                ),
+                status={
+                    "num_sent_events": r.num_sent_events,
+                    "num_received_events": r.num_received_events,
+                    "error_counter": r.error_counter,
+                    "error_list": r.error_list,
+                    "notice_list": r.notice_list,
+                },
                 ping=r.ping,
                 active=True,
             )
@@ -46,15 +44,15 @@ async def api_get_relays() -> list[Relay]:
     return relays
 
 
-@nostrclient_api_router.post(
+@nostrclient_ext.post(
     "/api/v1/relay", status_code=HTTPStatus.OK, dependencies=[Depends(check_admin)]
 )
-async def api_add_relay(relay: Relay) -> list[Relay]:
+async def api_add_relay(relay: Relay) -> Optional[RelayList]:
     if not relay.url:
         raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="Relay url not provided."
+            status_code=HTTPStatus.BAD_REQUEST, detail=f"Relay url not provided."
         )
-    if relay.url in nostr_client.relay_manager.relays:
+    if relay.url in nostr.client.relay_manager.relays:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
             detail=f"Relay: {relay.url} already exists.",
@@ -62,25 +60,27 @@ async def api_add_relay(relay: Relay) -> list[Relay]:
     relay.id = urlsafe_short_hash()
     await add_relay(relay)
 
-    nostr_client.relay_manager.add_relay(relay.url)
+    nostr.client.relays.append(relay.url)
+    nostr.client.relay_manager.add_relay(relay.url)
+       
 
     return await get_relays()
 
 
-@nostrclient_api_router.delete(
+@nostrclient_ext.delete(
     "/api/v1/relay", status_code=HTTPStatus.OK, dependencies=[Depends(check_admin)]
 )
 async def api_delete_relay(relay: Relay) -> None:
     if not relay.url:
         raise HTTPException(
-            status_code=HTTPStatus.BAD_REQUEST, detail="Relay url not provided."
+            status_code=HTTPStatus.BAD_REQUEST, detail=f"Relay url not provided."
         )
     # we can remove relays during runtime
-    nostr_client.relay_manager.remove_relay(relay.url)
+    nostr.client.relay_manager.remove_relay(relay.url)
     await delete_relay(relay)
 
 
-@nostrclient_api_router.put(
+@nostrclient_ext.put(
     "/api/v1/relay/test", status_code=HTTPStatus.OK, dependencies=[Depends(check_admin)]
 )
 async def api_test_endpoint(data: TestMessage) -> TestMessageResponse:
@@ -88,92 +88,66 @@ async def api_test_endpoint(data: TestMessage) -> TestMessageResponse:
         to_public_key = normalize_public_key(data.reciever_public_key)
 
         pk = bytes.fromhex(data.sender_private_key) if data.sender_private_key else None
-        private_key = PrivateKey(pk) if pk else PrivateKey()
+        private_key = PrivateKey(pk)
 
         dm = EncryptedDirectMessage(
             recipient_pubkey=to_public_key, cleartext_content=data.message
         )
         private_key.sign_event(dm)
 
-        return TestMessageResponse(
-            private_key=private_key.hex(),
-            public_key=to_public_key,
-            event_json=dm.to_message(),
-        )
+        return TestMessageResponse(private_key=private_key.hex(), public_key=to_public_key, event_json=dm.to_message())
     except (ValueError, AssertionError) as ex:
         raise HTTPException(
             status_code=HTTPStatus.BAD_REQUEST,
             detail=str(ex),
-        ) from ex
+        )
     except Exception as ex:
         logger.warning(ex)
         raise HTTPException(
             status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
             detail="Cannot generate test event",
-        ) from ex
+        )
 
 
-@nostrclient_api_router.websocket("/api/v1/{ws_id}")
-async def ws_relay(ws_id: str, websocket: WebSocket) -> None:
-    """Relay multiplexer: one client (per endpoint) <-> multiple relays"""
-
-    logger.info("New websocket connection at: '/api/v1/relay'")
-    try:
-        config = await get_config(owner_id="admin")
-        assert config, "Failed to get config"
-
-        if not config.private_ws and not config.public_ws:
-            raise ValueError("Websocket connections not accepted.")
-
-        if ws_id == "relay":
-            if not config.public_ws:
-                raise ValueError("Public websocket connections not accepted.")
-        else:
-            if not config.private_ws:
-                raise ValueError("Private websocket connections not accepted.")
-            if decrypt_internal_message(ws_id, urlsafe=True) != "relay":
-                raise ValueError("Invalid websocket endpoint.")
-
-        await websocket.accept()
-        router = NostrRouter(websocket)
-        router.start()
-        all_routers.append(router)
-
-        # we kill this websocket and the subscriptions
-        # if the user disconnects and thus `connected==False`
-        while router.connected:
-            await asyncio.sleep(10)
 
+@nostrclient_ext.delete(
+    "/api/v1", status_code=HTTPStatus.OK, dependencies=[Depends(check_admin)]
+)
+async def api_stop():
+    for router in all_routers:
         try:
+            for s in router.subscriptions:
+                nostr.client.relay_manager.close_subscription(s)
             await router.stop()
-        except Exception as e:
-            logger.debug(e)
-
             all_routers.remove(router)
-        logger.info("Closed websocket connection at: '/api/v1/relay'")
-    except ValueError as ex:
-        logger.warning(ex)
-        await websocket.close(reason=str(ex))
+        except Exception as e:
+            logger.error(e)
+    try:
+        nostr.client.relay_manager.close_connections()
+    except Exception as e:
+        logger.error(e)
+
+    for scheduled_task in scheduled_tasks:
+        try:
+            scheduled_task.cancel()
         except Exception as ex:
             logger.warning(ex)
-        await websocket.close(reason="Websocket connection unexpected closed")
-        raise HTTPException(
-            status_code=HTTPStatus.INTERNAL_SERVER_ERROR,
-            detail="Cannot accept websocket connection",
-        ) from ex
+
+    return {"success": True}
 
 
-@nostrclient_api_router.get("/api/v1/config", dependencies=[Depends(check_admin)])
-async def api_get_config() -> Config:
-    config = await get_config(owner_id="admin")
-    if not config:
-        config = await create_config(owner_id="admin")
-        assert config, "Failed to create config"
-    return config
+@nostrclient_ext.websocket("/api/v1/relay")
+async def ws_relay(websocket: WebSocket) -> None:
+    """Relay multiplexer: one client (per endpoint) <-> multiple relays"""
+    await websocket.accept()
+    router = NostrRouter(websocket)
+    await router.start()
+    all_routers.append(router)
 
-
-@nostrclient_api_router.put("/api/v1/config", dependencies=[Depends(check_admin)])
-async def api_update_config(data: Config):
-    config = await update_config(owner_id="admin", config=data)
-    assert config
-    return config.dict()
+    # we kill this websocket and the subscriptions if the user disconnects and thus `connected==False`
+    while True:
+        await asyncio.sleep(10)
+        if not router.connected:
+            await router.stop()
+            all_routers.remove(router)
+            break