Prepare 0.3.116

Reviewed-on: https://git.asonix.dog/asonix/relay/pulls/3

.cargo/config.toml

@@ -0,0 +1,2 @@
+[build]
+rustflags = ["--cfg", "tokio_unstable"]

.env

@@ -1,3 +1,13 @@
 HOSTNAME=localhost:8079
 PORT=8079
+HTTPS=false
+DEBUG=true
 RESTRICTED_MODE=true
+VALIDATE_SIGNATURES=false
+API_TOKEN=somesecretpassword
+FOOTER_BLURB="Contact <a href=\"https://masto.asonix.dog/@asonix\">@asonix</a> for inquiries"
+LOCAL_DOMAINS="masto.asonix.dog"
+LOCAL_BLURB="<p>Welcome to my cool relay where I have cool relay things happening. I hope you enjoy your stay!</p>"
+# OPENTELEMETRY_URL=http://localhost:4317
+PROMETHEUS_ADDR=127.0.0.1
+PROMETHEUS_PORT=9000

.forgejo/workflows/check.yaml

@@ -0,0 +1,61 @@
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  clippy:
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    steps:
+      -
+        name: Checkout relay
+        uses: https://github.com/actions/checkout@v4
+      -
+        name: Cargo Cache
+        uses: https://git.asonix.dog/asonix/actions/cache-rust-dependencies@main
+      -
+        name: Clippy
+        run: |
+          cargo clippy --no-default-features -- -D warnings
+
+  tests:
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    steps:
+      -
+        name: Checkout relay
+        uses: https://github.com/actions/checkout@v4
+      -
+        name: Cargo Cache
+        uses: https://git.asonix.dog/asonix/actions/cache-rust-dependencies@main
+      -
+        name: Test
+        run: cargo test
+
+  check:
+    strategy:
+      fail-fast: false
+      matrix:
+        target:
+          - x86_64-unknown-linux-musl
+          - armv7-unknown-linux-musleabihf
+          - aarch64-unknown-linux-musl
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    steps:
+      -
+        name: Checkout relay
+        uses: https://github.com/actions/checkout@v4
+      -
+        name: Cargo Cache
+        uses: https://git.asonix.dog/asonix/actions/cache-rust-dependencies@main
+      -
+        name: Debug builds
+        run: cargo zigbuild --target ${{ matrix.target }}

.forgejo/workflows/publish.yaml

@@ -0,0 +1,226 @@
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+
+env:
+  REGISTRY_IMAGE: asonix/relay
+
+jobs:
+  clippy:
+    runs-on: base-image
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    steps:
+      -
+        name: Checkout relay
+        uses: https://github.com/actions/checkout@v4
+      -
+        name: Cargo Cache
+        uses: https://git.asonix.dog/asonix/actions/cache-rust-dependencies@main
+      -
+        name: Clippy
+        run: |
+          # cargo clippy --no-default-features -- -D warnings
+          cargo clippy --no-default-features
+
+  tests:
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    steps:
+      -
+        name: Checkout relay
+        uses: https://github.com/actions/checkout@v4
+      -
+        name: Cargo Cache
+        uses: https://git.asonix.dog/asonix/actions/cache-rust-dependencies@main
+      -
+        name: Test
+        run: cargo test
+
+  build:
+    needs:
+      - clippy
+      - tests
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    strategy:
+      fail-fast: false
+      matrix:
+        info:
+          - target: x86_64-unknown-linux-musl
+            artifact: linux-amd64
+            platform: linux/amd64
+          - target: armv7-unknown-linux-musleabihf
+            artifact: linux-arm32v7
+            platform: linux/arm/v7
+          - target: aarch64-unknown-linux-musl
+            artifact: linux-arm64v8
+            platform: linux/arm64
+    steps:
+      -
+        name: Checkout relay
+        uses: https://github.com/actions/checkout@v4
+      -
+        name: Cargo Cache
+        uses: https://git.asonix.dog/asonix/actions/cache-rust-dependencies@main
+      -
+        name: Prepare Platform
+        run: |
+          platform=${{ matrix.info.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+        shell: bash
+      -
+        name: Docker meta
+        id: meta
+        uses: https://github.com/docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          flavor: |
+            latest=auto
+            suffix=-${{ matrix.info.artifact }}
+          tags: |
+            type=raw,value=latest,enable={{ is_default_branch }}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      -
+        name: Set up QEMU
+        uses: https://github.com/docker/setup-qemu-action@v3
+      -
+        name: Set up Docker Buildx
+        uses: https://github.com/docker/setup-buildx-action@v3
+      -
+        name: Docker login
+        uses: https://github.com/docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Compile relay
+        run: cargo zigbuild --target ${{ matrix.info.target }} --release
+      -
+        name: Prepare artifacts
+        run: |
+          mkdir artifacts
+          cp target/${{ matrix.info.target }}/release/relay artifacts/relay-${{ matrix.info.artifact }}
+      -
+        uses: https://github.com/actions/upload-artifact@v3
+        with:
+          name: binaries
+          path: artifacts/
+      -
+        name: Prepare binary
+        run: |
+          cp target/${{ matrix.info.target }}/release/relay docker/forgejo/relay
+      -
+        name: Build and push ${{ matrix.info.platform }} docker image
+        id: build
+        uses: docker/build-push-action@v5
+        with:
+          context: ./docker/forgejo
+          platforms: ${{ matrix.info.platform }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},name-canonical=true,push=true
+      -
+        name: Export digest
+        run: |
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+          echo "Created /tmp/digests/${digest#sha256:}"
+        shell: bash
+      -
+        name: Upload ${{ matrix.info.platform }} digest
+        uses: https://github.com/actions/upload-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  publish-docker:
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    needs: [build]
+    steps:
+      -
+        name: Download digests
+        uses: https://github.com/actions/download-artifact@v3
+        with:
+          name: digests
+          path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+      -
+        name: Docker login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Docker meta
+        id: meta
+        uses: https://github.com/docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          flavor: |
+            latest=auto
+          tags: |
+            type=raw,value=latest,enable={{ is_default_branch }}
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+            type=semver,pattern={{major}}
+      -
+        name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          tags=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "${DOCKER_METADATA_OUTPUT_JSON}")
+          images=$(printf "${{ env.REGISTRY_IMAGE }}@sha256:%s " *)
+          echo "Running 'docker buildx imagetools create ${tags[@]} ${images[@]}'"
+          docker buildx imagetools create ${tags[@]} ${images[@]}
+        shell: bash
+      -
+        name: Inspect Image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+
+  publish-forgejo:
+    needs: [build]
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    steps:
+      - uses: https://github.com/actions/download-artifact@v3
+        with:
+          name: binaries
+          path: artifacts/
+          merge-multiple: true
+      - uses: actions/forgejo-release@v1
+        with:
+          direction: upload
+          token: ${{ secrets.GITHUB_TOKEN }}
+          release-dir: artifacts/
+
+  publish-crate:
+    needs: [build]
+    runs-on: docker
+    container:
+      image: docker.io/asonix/actions-base-image:0.1
+    steps:
+      -
+        name: Checkout relay
+        uses: https://github.com/actions/checkout@v4
+      -
+        name: Cargo Cache
+        uses: https://git.asonix.dog/asonix/actions/cache-rust-dependencies@main
+      -
+        name: Publish Crate
+        run: cargo publish --token ${{ secrets.CRATES_IO_TOKEN }}

.gitignore

@@ -1,3 +1,6 @@
 /target
 /artifacts
 /sled
+/.direnv
+/.envrc
+/result

Cargo.toml

@@ -1,55 +1,114 @@
 [package]
-name = "relay"
+name = "ap-relay"
 description = "A simple activitypub relay"
-version = "0.2.17"
+version = "0.3.116"
 authors = ["asonix <asonix@asonix.dog>"]
-license-file = "LICENSE"
+license = "AGPL-3.0"
 readme = "README.md"
-repository = "https://git.asonix.dog/asonix/ap-relay"
+repository = "https://git.asonix.dog/asonix/relay"
 keywords = ["activitypub", "relay"]
-edition = "2018"
+edition = "2021"
 build = "src/build.rs"
 
+[[bin]]
+name = "relay"
+path = "src/main.rs"
+
+[profile.release]
+strip = true
+
+[features]
+console = ["dep:console-subscriber"]
+default = []
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-anyhow = "1.0"
-actix-rt = "2.0.2"
-actix-web = { version = "4.0.0-beta.7", default-features = false, features = ["compress-brotli", "compress-gzip", "compress-zstd"] }
-actix-webfinger = "0.4.0-beta.3"
-activitystreams = "0.7.0-alpha.10"
-activitystreams-ext = "0.1.0-alpha.2"
-ammonia = "3.1.0"
-async-mutex = "1.0.1"
-async-rwlock = "1.3.0"
-awc = { version = "3.0.0-beta.6", default-features = false, features = ["compress-brotli", "compress-gzip", "compress-zstd", "rustls"] }
-background-jobs = "0.9.0"
-base64 = "0.13"
-chrono = "0.4.19"
-config = "0.11.0"
+actix-web = { version = "4.4.0", default-features = false, features = ["compress-brotli", "compress-gzip", "rustls-0_23"] }
+actix-webfinger = { version = "0.5.0", default-features = false }
+activitystreams = "0.7.0-alpha.25"
+activitystreams-ext = "0.1.0-alpha.3"
+ammonia = "4.0.0"
+async-cpupool = "0.3.0"
+bcrypt = "0.16"
+base64 = "0.22"
+clap = { version = "4.0.0", features = ["derive"] }
+color-eyre = "0.6.2"
+config = { version = "0.14.0", default-features = false, features = ["toml", "json", "yaml"] }
+console-subscriber = { version = "0.4", optional = true }
+dashmap = "6.0.1"
 dotenv = "0.15.0"
-env_logger = "0.9.0"
-futures = "0.3.12"
-http-signature-normalization-actix = { version = "0.5.0-beta.6", default-features = false, features = ["sha-2"] }
-log = "0.4"
-lru = "0.6.0"
+futures-core = "0.3.30"
+lru = "0.12.0"
+metrics = "0.23.0"
+metrics-exporter-prometheus = { version = "0.15.0", default-features = false, features = [
+  "http-listener",
+] }
+metrics-util = "0.17.0"
 mime = "0.3.16"
-pretty_env_logger = "0.4.0"
+minify-html = "0.15.0"
+opentelemetry = "0.27.1"
+opentelemetry_sdk = { version = "0.27", features = ["rt-tokio"] }
+opentelemetry-otlp = { version = "0.27", features = ["grpc-tonic"] }
+pin-project-lite = "0.2.9"
+# pinned to metrics-util
+quanta = "0.12.0"
 rand = "0.8"
-rsa = "0.5"
-rsa-magic-public-key = "0.4.0"
+reqwest = { version = "0.12", default-features = false, features = ["rustls-tls", "stream"]}
+reqwest-middleware = { version = "0.4", default-features = false, features = ["json"] }
+reqwest-tracing = "0.5.0"
+ring = "0.17.5"
+rsa = "0.9"
+rsa-magic-public-key = "0.8.0"
+rustls = { version = "0.23.0", default-features = false, features = ["ring", "logging", "std", "tls12"] }
+rustls-channel-resolver = "0.3.0"
+rustls-pemfile = "2"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-sha2 = "0.9"
-sled = "0.34.6"
-structopt = "0.3.12"
-thiserror = "1.0"
-uuid = { version = "0.8", features = ["v4", "serde"] }
+sled = "0.34.7"
+streem = "0.2.0"
+teloxide = { version = "0.13.0", default-features = false, features = [
+  "ctrlc_handler",
+  "macros",
+  "rustls",
+] }
+thiserror = "2.0"
+time = { version = "0.3.17", features = ["serde"] }
+tracing = "0.1"
+tracing-error = "0.2"
+tracing-log = "0.2"
+tracing-opentelemetry = "0.28"
+tracing-subscriber = { version = "0.3", features = [
+  "ansi",
+  "env-filter",
+  "fmt",
+] }
+tokio = { version = "1", features = ["full", "tracing"] }
+uuid = { version = "1", features = ["v4", "serde"] }
+
+[dependencies.background-jobs]
+version = "0.19.0"
+default-features = false
+features = ["error-logging", "metrics", "tokio"]
+
+[dependencies.http-signature-normalization-actix]
+version = "0.11.1"
+default-features = false
+features = ["server", "ring"]
+
+[dependencies.http-signature-normalization-reqwest]
+version = "0.13.0"
+default-features = false
+features = ["middleware", "ring"]
+
+[dependencies.tracing-actix-web]
+version = "0.7.9"
 
 [build-dependencies]
-anyhow = "1.0"
+color-eyre = "0.6.2"
 dotenv = "0.15.0"
-ructe = { version = "0.13.0", features = ["sass", "mime03"] }
+ructe = { version = "0.17.0", features = ["sass", "mime03"] }
+toml = "0.8.0"
 
 [profile.dev.package.rsa]
 opt-level = 3

README.md

@@ -1,29 +1,55 @@
 # AodeRelay
 _A simple and efficient activitypub relay_
 
+### Installation
+#### Docker
+If running docker, you can start the relay with the following command:
+```
+$ sudo docker run --rm -it \
+    -v "$(pwd):/mnt/" \
+    -e ADDR=0.0.0.0 \
+    -e SLED_PATH=/mnt/sled/db-0.34 \
+    -p 8080:8080 \
+    asonix/relay:0.3.85
+```
+This will launch the relay with the database stored in "./sled/db-0.34" and listening on port 8080
+#### Cargo
+With cargo installed, the relay can be installed to your cargo bin directory with the following command
+```
+$ cargo install ap-relay
+```
+Then it can be run with this:
+```
+$ ADDR=0.0.0.0 relay
+```
+This will launch the relay with the database stored in "./sled/db-0.34" and listening on port 8080
+#### Source
+The relay can be launched directly from this git repository with the following commands:
+```
+$ git clone https://git.asonix.dog/asonix/relay
+$ ADDR=0.0.0.0 cargo run --release
+```
+
 ### Usage
 To simply run the server, the command is as follows
 ```bash
 $ ./relay
 ```
 
+#### Administration
+> **NOTE:** The server _must be running_ in order to update the lists with the following commands
+
 To learn about any other tasks, the `--help` flag can be passed
 ```bash
-$ ./relay --help
-relay 0.2.0
 An activitypub relay
 
-USAGE:
-    relay [FLAGS] [OPTIONS]
+Usage: relay [OPTIONS]
 
-FLAGS:
-    -h, --help       Prints help information
-    -u, --undo       Undo allowing or blocking domains
-    -V, --version    Prints version information
-
-OPTIONS:
-    -a <allowed>...        A list of domains that should be allowed
-    -b <blocks>...         A list of domains that should be blocked
+Options:
+  -b <BLOCKS>       A list of domains that should be blocked
+  -a <ALLOWED>      A list of domains that should be allowed
+  -u, --undo        Undo allowing or blocking domains
+  -h, --help        Print help information
 ```
 
 To add domains to the blocklist, use the `-b` flag and pass a list of domains
@@ -40,13 +66,113 @@ $ ./relay -a asonix.dog blimps.xyz
 $ ./relay -ua asonix.dog blimps.xyz
 ```
 
-Allowed domains are only checked against incoming activities if `RESTRICTED_MODE` is enabled.
-Blocks can be published in the nodeinfo metadata by setting `PUBLISH_BLOCKS` to true
+### Configuration
+By default, all these values are set to development values. These are read from the environment, or
+from the `.env` file in the working directory.
+```env
+HOSTNAME=localhost:8080
+ADDR=127.0.0.1
+PORT=8080
+DEBUG=true
+RESTRICTED_MODE=false
+VALIDATE_SIGNATURES=false
+HTTPS=false
+PRETTY_LOG=true
+PUBLISH_BLOCKS=false
+SLED_PATH=./sled/db-0.34
+```
+To run this server in production, you'll likely want to set most of them
+```env
+HOSTNAME=relay.my.tld
+ADDR=0.0.0.0
+PORT=8080
+DEBUG=false
+RESTRICTED_MODE=false
+VALIDATE_SIGNATURES=true
+HTTPS=true
+PRETTY_LOG=false
+PUBLISH_BLOCKS=true
+SLED_PATH=./sled/db-0.34
+RUST_LOG=warn
+API_TOKEN=somepasswordishtoken
+OPENTELEMETRY_URL=localhost:4317
+TELEGRAM_TOKEN=secret
+TELEGRAM_ADMIN_HANDLE=your_handle
+TLS_KEY=/path/to/key
+TLS_CERT=/path/to/cert
+FOOTER_BLURB="Contact <a href=\"https://masto.asonix.dog/@asonix\">@asonix</a> for inquiries"
+LOCAL_DOMAINS=masto.asonix.dog
+LOCAL_BLURB="<p>Welcome to my cool relay where I have cool relay things happening. I hope you enjoy your stay!</p>"
+PROMETHEUS_ADDR=0.0.0.0
+PROMETHEUS_PORT=9000
+CLIENT_TIMEOUT=10
+DELIVER_CONCURRENCY=8
+SIGNATURE_THREADS=2
+```
 
-For advanced setups, it may be useful to run the relay API and the background tasks in separate
-processes, possibly on separate hosts. The `-j` and `-n` flags have been provided for this purpose.
-By passing `-n`, a relay can be spawned that handles no deliveries. By passing `-j`, a relay will
-not be spawned, but any deliveries existing in the database will be processed.
+#### Descriptions
+##### `HOSTNAME`
+The domain or IP address the relay is hosted on. If you launch the relay on `example.com`, that would be your HOSTNAME. The default is `localhost:8080`
+##### `ADDR`
+The address the server binds to. By default, this is `127.0.0.1`, so for production cases it should be set to `0.0.0.0` or another public address.
+##### `PORT`
+The port the server binds to, this is `8080` by default but can be changed if needed.
+##### `DEBUG`
+Whether to print incoming activities to the console when requests hit the /inbox route. This defaults to `true`, but should be set to `false` in production cases. Since every activity sent to the relay is public anyway, this doesn't represent a security risk.
+##### `RESTRICTED_MODE`
+This setting enables an 'allowlist' setup where only servers that have been explicitly enabled through the `relay -a` command can join the relay. This is `false` by default. If `RESTRICTED_MODE` is not enabled, then manually allowing domains with `relay -a` has no effect.
+##### `VALIDATE_SIGNATURES`
+This setting enforces checking HTTP signatures on incoming activities. It defaults to `true`
+##### `HTTPS`
+Whether the current server is running on an HTTPS port or not. This is used for generating URLs to the current running relay. By default it is set to `true`
+##### `PUBLISH_BLOCKS`
+Whether or not to publish a list of blocked domains in the `nodeinfo` metadata for the server. It defaults to `false`.
+##### `SLED_PATH`
+Where to store the on-disk database of connected servers. This defaults to `./sled/db-0.34`.
+##### `RUST_LOG`
+The log level to print. Available levels are `ERROR`, `WARN`, `INFO`, `DEBUG`, and `TRACE`. You can also specify module paths to enable some logs but not others, such as `RUST_LOG=warn,tracing_actix_web=info,relay=info`. This defaults to `warn`
+##### `SOURCE_REPO`
+The URL to the source code for the relay. This defaults to `https://git.asonix.dog/asonix/relay`, but should be changed if you're running a fork hosted elsewhere.
+##### `REPOSITORY_COMMIT_BASE`
+The base path of the repository commit hash reference. For example, `/src/commit/` for Gitea, `/tree/` for GitLab.
+##### `API_TOKEN`
+The Secret token used to access the admin APIs. This must be set for the commandline to function
+##### `OPENTELEMETRY_URL`
+A URL for exporting opentelemetry spans. This is mostly useful for debugging. There is no default, since most people probably don't run an opentelemetry collector.
+##### `TELEGRAM_TOKEN`
+A Telegram Bot Token for running the relay administration bot. There is no default.
+##### `TELEGRAM_ADMIN_HANDLE`
+The handle of the telegram user allowed to administer the relay. There is no default.
+##### `TLS_KEY`
+Optional - This is specified if you are running the relay directly on the internet and have a TLS key to provide HTTPS for your relay
+##### `TLS_CERT`
+Optional - This is specified if you are running the relay directly on the internet and have a TLS certificate chain to provide HTTPS for your relay
+##### `FOOTER_BLURB`
+Optional - Add custom notes in the footer of the page
+##### `LOCAL_DOMAINS`
+Optional - domains of mastodon servers run by the same admin as the relay
+##### `LOCAL_BLURB`
+Optional - description for the relay
+##### `PROMETHEUS_ADDR`
+Optional - Address to bind to for serving the prometheus scrape endpoint
+##### `PROMETHEUS_PORT`
+Optional - Port to bind to for serving the prometheus scrape endpoint
+##### `CLIENT_TIMEOUT`
+Optional - How long the relay will hold open a connection (in seconds) to a remote server during
+fetches and deliveries. This defaults to 10
+##### `DELIVER_CONCURRENCY`
+Optional - How many deliver requests the relay should allow to be in-flight per thread. the default
+is 8
+##### `SIGNATURE_THREADS`
+Optional - Override number of threads used for signing and verifying requests. Default is
+`std::thread::available_parallelism()` (It tries to detect how many cores you have). If it cannot
+detect the correct number of cores, it falls back to 1.
+##### 'PROXY_URL'
+Optional - URL of an HTTP proxy to forward outbound requests through
+##### 'PROXY_USERNAME'
+Optional - username to provide to the HTTP proxy set with `PROXY_URL` through HTTP Basic Auth
+##### 'PROXY_PASSWORD'
+Optional - password to provide to the HTTP proxy set with `PROXY_URL` through HTTP Basic Auth
 
 ### Subscribing
 Mastodon admins can subscribe to this relay by adding the `/inbox` route to their relay settings.
@@ -66,10 +192,16 @@ example, if the server is `https://relay.my.tld`, the correct URL would be
 - Follow Public, become a listener of the relay
 - Undo Follow {self-actor}, stop listening on the relay, an Undo Follow will be sent back
 - Undo Follow Public, stop listening on the relay
-- Delete {anything}, the Delete {anything} is relayed verbatim to listening servers
+- Delete {anything}, the Delete {anything} is relayed verbatim to listening servers.
     Note that this activity will likely be rejected by the listening servers unless it has been
     signed with a JSON-LD signature
-- Update {anything}, the Update {anything} is relayed verbatim to listening servers
+- Update {anything}, the Update {anything} is relayed verbatim to listening servers.
+    Note that this activity will likely be rejected by the listening servers unless it has been
+    signed with a JSON-LD signature
+- Add {anything}, the Add {anything} is relayed verbatim to listening servers.
+    Note that this activity will likely be rejected by the listening servers unless it has been
+    signed with a JSON-LD signature
+- Remove {anything}, the Remove {anything} is relayed verbatim to listening servers.
     Note that this activity will likely be rejected by the listening servers unless it has been
     signed with a JSON-LD signature
 
@@ -77,46 +209,17 @@ example, if the server is `https://relay.my.tld`, the correct URL would be
 - Webfinger
 - NodeInfo
 
-### Configuration
-By default, all these values are set to development values. These are read from the environment, or
-from the `.env` file in the working directory.
-```env
-HOSTNAME=localhost:8080
-ADDR=127.0.0.1
-PORT=8080
-DEBUG=true
-RESTRICTED_MODE=false
-VALIDATE_SIGNATURES=false
-HTTPS=false
-DATABASE_URL=
-PRETTY_LOG=true
-PUBLISH_BLOCKS=false
-```
-To run this server in production, you'll likely want to set most of them
-```env
-HOSTNAME=relay.my.tld
-ADDR=0.0.0.0
-PORT=8080
-DEBUG=false
-RESTRICTED_MODE=false
-VALIDATE_SIGNATURES=true
-HTTPS=true
-DATABASE_URL=postgres://pg_user:pg_pass@pg_host:pg_port/pg_database
-PRETTY_LOG=false
-PUBLISH_BLOCKS=true
-```
+### Known issues
+Pleroma and Akkoma do not support validating JSON-LD signatures, meaning many activities such as Delete, Update, Add, and Remove will be rejected with a message similar to `WARN: Response from https://example.com/inbox, "Invalid HTTP Signature"`. This is normal and not an issue with the relay.
 
 ### Contributing
-Unless otherwise stated, all contributions to this project will be licensed under the CSL with
-the exceptions listed in the License section of this file.
+Feel free to open issues for anything you find an issue with. Please note that any contributed code will be licensed under the AGPLv3.
 
 ### License
-This work is licensed under the Cooperative Software License. This is not a Free Software
-License, but may be considered a "source-available License." For most hobbyists, self-employed
-developers, worker-owned companies, and cooperatives, this software can be used in most
-projects so long as this software is distributed under the terms of the CSL. For more
-information, see the provided LICENSE file. If none exists, the license can be found online
-[here](https://lynnesbian.space/csl/). If you are a free software project and wish to use this
-software under the terms of the GNU Affero General Public License, please contact me at
-[asonix@asonix.dog](mailto:asonix@asonix.dog) and we can sort that out. If you wish to use this
-project under any other license, especially in proprietary software, the answer is likely no.
+Copyright © 2022 Riley Trautman
+
+AodeRelay is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+
+AodeRelay is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. This file is part of AodeRelay.
+
+You should have received a copy of the GNU General Public License along with AodeRelay. If not, see [http://www.gnu.org/licenses/](http://www.gnu.org/licenses/).

docker/forgejo/Dockerfile

@@ -0,0 +1,24 @@
+FROM alpine:3.19
+
+ARG UID=991
+ARG GID=991
+
+ENV \
+  UID=${UID} \
+  GID=${GID}
+
+USER root
+RUN \
+  addgroup -g "${GID}" app && \
+  adduser -D -G app -u "${UID}" -g "" -h /opt/app app && \
+  apk add tini && \
+  chown -R app:app /mnt
+
+COPY relay /usr/local/bin/relay
+
+USER app
+EXPOSE 6669
+EXPOSE 8080
+VOLUME /mnt
+ENTRYPOINT ["/sbin/tini", "--"]
+CMD ["/usr/local/bin/relay"]

docker/prod/Dockerfile.amd64

@@ -1,73 +0,0 @@
-FROM rustembedded/cross:x86_64-unknown-linux-musl AS amd64-builder
-
-ARG UID=991
-ARG GID=991
-
-ENV TOOLCHAIN=stable
-ENV TARGET=x86_64-unknown-linux-musl
-ENV TOOL=x86_64-linux-musl
-
-RUN \
- apt-get update && \
- apt-get upgrade -y
-
-RUN \
- addgroup --gid "${GID}" build && \
- adduser \
-    --disabled-password \
-    --gecos "" \
-    --ingroup build \
-    --uid "${UID}" \
-    --home /opt/build \
-    build
-
-ADD https://sh.rustup.rs /opt/build/rustup.sh
-
-RUN \
- chown -R build:build /opt/build
-
-USER build
-WORKDIR /opt/build
-
-ENV PATH="$PATH:/opt/build/.cargo/bin"
-
-RUN \
- chmod +x rustup.sh && \
- ./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \
- rustup target add $TARGET
-
-FROM amd64-builder as builder
-
-ARG TAG=master
-ARG REPOSITORY=https://git.asonix.dog/asonix/relay
-ARG BINARY=relay
-
-RUN \
- git clone -b $TAG $REPOSITORY repo
-
-WORKDIR /opt/build/repo
-
-RUN \
- cargo build --release --target $TARGET && \
- $TOOL-strip target/$TARGET/release/$BINARY
-
-FROM amd64/alpine:3.14
-
-ARG UID=991
-ARG GID=991
-ARG BINARY=relay
-ARG TARGET=x86_64-unknown-linux-musl
-
-RUN \
- apk add tini && \
- addgroup --gid $GID relay && \
- adduser -D -G relay -u $UID -g "" -h /opt/relay relay && \
- chown -R relay:relay /opt/relay
-
-COPY --from=builder /opt/build/repo/target/$TARGET/release/$BINARY /usr/bin/$BINARY
-
-EXPOSE 8080
-WORKDIR /opt/relay
-USER relay
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["relay"]

docker/prod/Dockerfile.arm32v7

@@ -1,73 +0,0 @@
-FROM rustembedded/cross:arm-unknown-linux-musleabihf AS arm32v7-builder
-
-ARG UID=991
-ARG GID=991
-
-ENV TOOLCHAIN=stable
-ENV TARGET=arm-unknown-linux-musleabihf
-ENV TOOL=arm-linux-musleabihf
-
-RUN \
- apt-get update && \
- apt-get upgrade -y
-
-RUN \
- addgroup --gid "${GID}" build && \
- adduser \
-    --disabled-password \
-    --gecos "" \
-    --ingroup build \
-    --uid "${UID}" \
-    --home /opt/build \
-    build
-
-ADD https://sh.rustup.rs /opt/build/rustup.sh
-
-RUN \
- chown -R build:build /opt/build
-
-USER build
-WORKDIR /opt/build
-
-ENV PATH="$PATH:/opt/build/.cargo/bin"
-
-RUN \
- chmod +x rustup.sh && \
- ./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \
- rustup target add $TARGET
-
-FROM arm32v7-builder as builder
-
-ARG TAG=master
-ARG REPOSITORY=https://git.asonix.dog/asonix/relay
-ARG BINARY=relay
-
-RUN \
- git clone -b $TAG $REPOSITORY repo
-
-WORKDIR /opt/build/repo
-
-RUN \
- cargo build --release --target $TARGET && \
- $TOOL-strip target/$TARGET/release/$BINARY
-
-FROM arm32v7/alpine:3.14
-
-ARG UID=991
-ARG GID=991
-ARG BINARY=relay
-ARG TARGET=arm-unknown-linux-musleabihf
-
-RUN \
- apk add tini && \
- addgroup --gid $GID relay && \
- adduser -D -G relay -u $UID -g "" -h /opt/relay relay && \
- chown -R relay:relay /opt/relay
-
-COPY --from=builder /opt/build/repo/target/$TARGET/release/$BINARY /usr/bin/$BINARY
-
-EXPOSE 8080
-WORKDIR /opt/relay
-USER relay
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["relay"]

docker/prod/Dockerfile.arm64v8

@@ -1,73 +0,0 @@
-FROM rustembedded/cross:aarch64-unknown-linux-musl AS aarch64-builder
-
-ARG UID=991
-ARG GID=991
-
-ENV TOOLCHAIN=stable
-ENV TARGET=aarch64-unknown-linux-musl
-ENV TOOL=aarch64-linux-musl
-
-RUN \
- apt-get update && \
- apt-get upgrade -y
-
-RUN \
- addgroup --gid "${GID}" build && \
- adduser \
-    --disabled-password \
-    --gecos "" \
-    --ingroup build \
-    --uid "${UID}" \
-    --home /opt/build \
-    build
-
-ADD https://sh.rustup.rs /opt/build/rustup.sh
-
-RUN \
- chown -R build:build /opt/build
-
-USER build
-WORKDIR /opt/build
-
-ENV PATH="$PATH:/opt/build/.cargo/bin"
-
-RUN \
- chmod +x rustup.sh && \
- ./rustup.sh --default-toolchain $TOOLCHAIN --profile minimal -y && \
- rustup target add $TARGET
-
-FROM aarch64-builder as builder
-
-ARG TAG=master
-ARG REPOSITORY=https://git.asonix.dog/asonix/relay
-ARG BINARY=relay
-
-RUN \
- git clone -b $TAG $REPOSITORY repo
-
-WORKDIR /opt/build/repo
-
-RUN \
- cargo build --release --target $TARGET && \
- $TOOL-strip target/$TARGET/release/$BINARY
-
-FROM arm64v8/alpine:3.14
-
-ARG UID=991
-ARG GID=991
-ARG BINARY=relay
-ARG TARGET=aarch64-unknown-linux-musl
-
-RUN \
- apk add tini && \
- addgroup --gid $GID relay && \
- adduser -D -G relay -u $UID -g "" -h /opt/relay relay && \
- chown -R relay:relay /opt/relay
-
-COPY --from=builder /opt/build/repo/target/$TARGET/release/$BINARY /usr/bin/$BINARY
-
-EXPOSE 8080
-WORKDIR /opt/relay
-USER relay
-ENTRYPOINT ["/sbin/tini", "--"]
-CMD ["relay"]

docker/prod/deploy.sh

@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-TAG=$1
-
-function require() {
-    if [ "$1" = "" ]; then
-        echo "input '$2' required"
-        print_help
-        exit 1
-    fi
-}
-
-function print_help() {
-    echo "build.sh"
-    echo ""
-    echo "Usage:"
-    echo "      build.sh [tag]"
-    echo ""
-    echo "Args:"
-    echo "      tag: The git tag to create and publish"
-}
-
-function build_image() {
-    repo=$1
-    tag=$2
-    arch=$3
-
-    docker build \
-        --pull \
-        --build-arg TAG="${tag}" \
-        -f "Dockerfile.${arch}" \
-        -t "${repo}:${tag}-${arch}" \
-        -t "${repo}:latest-${arch}" \
-        .
-
-    docker push "${repo}:${tag}-${arch}"
-    docker push "${repo}:latest-${arch}"
-}
-
-require "$TAG" "tag"
-
-if ! docker run --rm -it arm64v8/ubuntu:19.10 /bin/bash -c 'echo "docker is configured correctly"'; then
-    echo "docker is not configured to run on qemu-emulated architectures, fixing will require sudo"
-    sudo docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
-fi
-
-set -xe
-
-git checkout main
-git commit -m "Version $TAG" || true
-git tag $TAG
-
-git push origin $TAG
-git push
-
-build_image "asonix/relay" "$TAG" "arm64v8"
-build_image "asonix/relay" "$TAG" "arm32v7"
-build_image "asonix/relay" "$TAG" "amd64"
-
-./manifest.sh "asonix/relay" "$TAG"
-./manifest.sh "asonix/relay" "latest"

docker/prod/docker-compose.yml

@@ -0,0 +1,20 @@
+version: '3.3'
+
+services:
+  relay:
+    image: asonix/relay:0.3.115
+    ports:
+      - "8079:8079"
+    restart: always
+    environment:
+      - HOSTNAME=relay.my.tld
+      - ADDR=0.0.0.0
+      - PORT=8080
+      - DEBUG=false
+      - RESTRICTED_MODE=false
+      - VALIDATE_SIGNATURES=true
+      - HTTPS=true
+      - SLED_PATH=/mnt/sled/db-0.34
+      - PRETTY_LOG=false
+      - PUBLISH_BLOCKS=true
+      - API_TOKEN=somepasswordishtoken

docker/prod/manifest.sh

@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-function require() {
-    if [ "$1" = "" ]; then
-        echo "input '$2' required"
-        print_help
-        exit 1
-    fi
-}
-function print_help() {
-    echo "deploy.sh"
-    echo ""
-    echo "Usage:"
-    echo "	manifest.sh [tag]"
-    echo ""
-    echo "Args:"
-    echo "	repo: The docker repository to push the manifest to"
-    echo "	tag: The git tag to be applied to the image manifest"
-}
-
-repo=$1
-tag=$2
-
-require "$repo" "repo"
-require "$tag" "tag"
-
-set -xe
-
-docker manifest create $repo:$tag \
-    -a $repo:$tag-arm64v8 \
-    -a $repo:$tag-arm32v7 \
-    -a $repo:$tag-amd64
-
-docker manifest annotate $repo:$tag \
-    $repo:$tag-arm64v8 --os linux --arch arm64 --variant v8
-
-docker manifest annotate $repo:$tag \
-    $repo:$tag-arm32v7 --os linux --arch arm --variant v7
-
-docker manifest annotate $repo:$tag \
-    $repo:$tag-amd64 --os linux --arch amd64
-
-docker manifest push $repo:$tag --purge

flake.lock

@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1710146030,
+        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1733550349,
+        "narHash": "sha256-NcGumB4Lr6KSDq+nIqXtNA8QwAQKDSZT7N9OTGWbTrs=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e2605d0744c2417b09f8bf850dfca42fcf537d34",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

flake.nix

@@ -0,0 +1,34 @@
+{
+  description = "relay";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { self, nixpkgs, flake-utils }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        pkgs = import nixpkgs {
+          inherit system;
+        };
+      in
+      {
+        packages = rec {
+          relay = pkgs.callPackage ./relay.nix { };
+
+          default = relay;
+        };
+
+        apps = rec {
+          dev = flake-utils.lib.mkApp { drv = self.packages.${system}.pict-rs-proxy; };
+          default = dev;
+        };
+
+        devShell = with pkgs; mkShell {
+          nativeBuildInputs = [ cargo cargo-outdated cargo-zigbuild clippy gcc protobuf rust-analyzer rustc rustfmt ];
+
+          RUST_SRC_PATH = "${pkgs.rust.packages.stable.rustPlatform.rustLibSrc}";
+        };
+      });
+}

relay.nix

@@ -0,0 +1,23 @@
+{ lib
+, nixosTests
+, rustPlatform
+}:
+
+rustPlatform.buildRustPackage {
+  pname = "relay";
+  version = "0.3.116";
+  src = ./.;
+  cargoLock.lockFile = ./Cargo.lock;
+
+  RUSTFLAGS = "--cfg tokio_unstable";
+
+  nativeBuildInputs = [ ];
+
+  passthru.tests = { inherit (nixosTests) relay; };
+
+  meta = with lib; {
+    description = "An ActivityPub relay";
+    homepage = "https://git.asonix.dog/asonix/relay";
+    license = with licenses; [ agpl3Plus ];
+  };
+}

scss/index.scss

@@ -41,7 +41,7 @@ header {
     }
 }
 
-section {
+article {
     background-color: #fff;
     color: #333;
     border: 1px solid #e5e5e5;
@@ -51,8 +51,16 @@ section {
     max-width: 700px;
     padding-bottom: 32px;
 
-    > p:first-child {
-        margin-top: 0;
+    section {
+      border-bottom: 1px solid #e5e5e5;
+
+      > h4:first-child,
+      > p:first-child {
+          margin-top: 0;
+      }
+      > p:last-child {
+        margin-bottom: 0;
+      }
     }
 
     h3 {
@@ -67,13 +75,13 @@ section {
 
     li {
         padding-top: 36px;
-        border-bottom: 1px solid #e5e5e5;
     }
 
     .padded {
         padding: 0 24px;
     }
 
+    .local-explainer,
     .joining {
         padding: 24px;
     }
@@ -174,9 +182,11 @@ footer {
 
                 li {
                     padding: 0;
-                    border-bottom: none;
                 }
             }
+            article section {
+              border-bottom: none;
+            }
         }
     }
 
@@ -226,7 +236,7 @@ footer {
         padding: 24px;
     }
 
-    section {
+    article {
         border-left: none;
         border-right: none;
         border-radius: 0;

src/admin.rs

@@ -0,0 +1,32 @@
+use activitystreams::iri_string::types::IriString;
+use std::collections::{BTreeMap, BTreeSet};
+use time::OffsetDateTime;
+
+pub mod client;
+pub mod routes;
+
+#[derive(serde::Deserialize, serde::Serialize)]
+pub(crate) struct Domains {
+    domains: Vec<String>,
+}
+
+#[derive(serde::Deserialize, serde::Serialize)]
+pub(crate) struct AllowedDomains {
+    pub(crate) allowed_domains: Vec<String>,
+}
+
+#[derive(serde::Deserialize, serde::Serialize)]
+pub(crate) struct BlockedDomains {
+    pub(crate) blocked_domains: Vec<String>,
+}
+
+#[derive(serde::Deserialize, serde::Serialize)]
+pub(crate) struct ConnectedActors {
+    pub(crate) connected_actors: Vec<IriString>,
+}
+
+#[derive(serde::Deserialize, serde::Serialize)]
+pub(crate) struct LastSeen {
+    pub(crate) last_seen: BTreeMap<OffsetDateTime, BTreeSet<String>>,
+    pub(crate) never: Vec<String>,
+}

src/admin/client.rs

@@ -0,0 +1,133 @@
+use crate::{
+    admin::{AllowedDomains, BlockedDomains, ConnectedActors, Domains, LastSeen},
+    collector::Snapshot,
+    config::{AdminUrlKind, Config},
+    error::{Error, ErrorKind},
+    extractors::XApiToken,
+};
+use reqwest_middleware::ClientWithMiddleware;
+use serde::de::DeserializeOwned;
+
+pub(crate) async fn allow(
+    client: &ClientWithMiddleware,
+    config: &Config,
+    domains: Vec<String>,
+) -> Result<(), Error> {
+    post_domains(client, config, domains, AdminUrlKind::Allow).await
+}
+
+pub(crate) async fn disallow(
+    client: &ClientWithMiddleware,
+    config: &Config,
+    domains: Vec<String>,
+) -> Result<(), Error> {
+    post_domains(client, config, domains, AdminUrlKind::Disallow).await
+}
+
+pub(crate) async fn block(
+    client: &ClientWithMiddleware,
+    config: &Config,
+    domains: Vec<String>,
+) -> Result<(), Error> {
+    post_domains(client, config, domains, AdminUrlKind::Block).await
+}
+
+pub(crate) async fn unblock(
+    client: &ClientWithMiddleware,
+    config: &Config,
+    domains: Vec<String>,
+) -> Result<(), Error> {
+    post_domains(client, config, domains, AdminUrlKind::Unblock).await
+}
+
+pub(crate) async fn allowed(
+    client: &ClientWithMiddleware,
+    config: &Config,
+) -> Result<AllowedDomains, Error> {
+    get_results(client, config, AdminUrlKind::Allowed).await
+}
+
+pub(crate) async fn blocked(
+    client: &ClientWithMiddleware,
+    config: &Config,
+) -> Result<BlockedDomains, Error> {
+    get_results(client, config, AdminUrlKind::Blocked).await
+}
+
+pub(crate) async fn connected(
+    client: &ClientWithMiddleware,
+    config: &Config,
+) -> Result<ConnectedActors, Error> {
+    get_results(client, config, AdminUrlKind::Connected).await
+}
+
+pub(crate) async fn stats(
+    client: &ClientWithMiddleware,
+    config: &Config,
+) -> Result<Snapshot, Error> {
+    get_results(client, config, AdminUrlKind::Stats).await
+}
+
+pub(crate) async fn last_seen(
+    client: &ClientWithMiddleware,
+    config: &Config,
+) -> Result<LastSeen, Error> {
+    get_results(client, config, AdminUrlKind::LastSeen).await
+}
+
+async fn get_results<T: DeserializeOwned>(
+    client: &ClientWithMiddleware,
+    config: &Config,
+    url_kind: AdminUrlKind,
+) -> Result<T, Error> {
+    let x_api_token = config.x_api_token().ok_or(ErrorKind::MissingApiToken)?;
+
+    let iri = config.generate_admin_url(url_kind);
+
+    let res = client
+        .get(iri.as_str())
+        .header(XApiToken::http1_name(), x_api_token.to_string())
+        .send()
+        .await
+        .map_err(|e| ErrorKind::SendRequest(iri.to_string(), e.to_string()))?;
+
+    if !res.status().is_success() {
+        return Err(ErrorKind::Status(
+            iri.to_string(),
+            crate::http1::status_to_http02(res.status()),
+        )
+        .into());
+    }
+
+    let t = res
+        .json()
+        .await
+        .map_err(|e| ErrorKind::ReceiveResponse(iri.to_string(), e.to_string()))?;
+
+    Ok(t)
+}
+
+async fn post_domains(
+    client: &ClientWithMiddleware,
+    config: &Config,
+    domains: Vec<String>,
+    url_kind: AdminUrlKind,
+) -> Result<(), Error> {
+    let x_api_token = config.x_api_token().ok_or(ErrorKind::MissingApiToken)?;
+
+    let iri = config.generate_admin_url(url_kind);
+
+    let res = client
+        .post(iri.as_str())
+        .header(XApiToken::http1_name(), x_api_token.to_string())
+        .json(&Domains { domains })
+        .send()
+        .await
+        .map_err(|e| ErrorKind::SendRequest(iri.to_string(), e.to_string()))?;
+
+    if !res.status().is_success() {
+        tracing::warn!("Failed to allow domains");
+    }
+
+    Ok(())
+}

src/admin/routes.rs

@@ -0,0 +1,90 @@
+use crate::{
+    admin::{AllowedDomains, BlockedDomains, ConnectedActors, Domains, LastSeen},
+    collector::{MemoryCollector, Snapshot},
+    error::Error,
+    extractors::Admin,
+};
+use actix_web::{
+    web::{Data, Json},
+    HttpResponse,
+};
+use std::collections::{BTreeMap, BTreeSet};
+use time::OffsetDateTime;
+
+pub(crate) async fn allow(
+    admin: Admin,
+    Json(Domains { domains }): Json<Domains>,
+) -> Result<HttpResponse, Error> {
+    admin.db_ref().add_allows(domains).await?;
+
+    Ok(HttpResponse::NoContent().finish())
+}
+
+pub(crate) async fn disallow(
+    admin: Admin,
+    Json(Domains { domains }): Json<Domains>,
+) -> Result<HttpResponse, Error> {
+    admin.db_ref().remove_allows(domains).await?;
+
+    Ok(HttpResponse::NoContent().finish())
+}
+
+pub(crate) async fn block(
+    admin: Admin,
+    Json(Domains { domains }): Json<Domains>,
+) -> Result<HttpResponse, Error> {
+    admin.db_ref().add_blocks(domains).await?;
+
+    Ok(HttpResponse::NoContent().finish())
+}
+
+pub(crate) async fn unblock(
+    admin: Admin,
+    Json(Domains { domains }): Json<Domains>,
+) -> Result<HttpResponse, Error> {
+    admin.db_ref().remove_blocks(domains).await?;
+
+    Ok(HttpResponse::NoContent().finish())
+}
+
+pub(crate) async fn allowed(admin: Admin) -> Result<Json<AllowedDomains>, Error> {
+    let allowed_domains = admin.db_ref().allows().await?;
+
+    Ok(Json(AllowedDomains { allowed_domains }))
+}
+
+pub(crate) async fn blocked(admin: Admin) -> Result<Json<BlockedDomains>, Error> {
+    let blocked_domains = admin.db_ref().blocks().await?;
+
+    Ok(Json(BlockedDomains { blocked_domains }))
+}
+
+pub(crate) async fn connected(admin: Admin) -> Result<Json<ConnectedActors>, Error> {
+    let connected_actors = admin.db_ref().connected_ids().await?;
+
+    Ok(Json(ConnectedActors { connected_actors }))
+}
+
+pub(crate) async fn stats(
+    _admin: Admin,
+    collector: Data<MemoryCollector>,
+) -> Result<Json<Snapshot>, Error> {
+    Ok(Json(collector.snapshot()))
+}
+
+pub(crate) async fn last_seen(admin: Admin) -> Result<Json<LastSeen>, Error> {
+    let nodes = admin.db_ref().last_seen().await?;
+
+    let mut last_seen: BTreeMap<OffsetDateTime, BTreeSet<String>> = BTreeMap::new();
+    let mut never = Vec::new();
+
+    for (domain, datetime) in nodes {
+        if let Some(datetime) = datetime {
+            last_seen.entry(datetime).or_default().insert(domain);
+        } else {
+            never.push(domain);
+        }
+    }
+
+    Ok(Json(LastSeen { last_seen, never }))
+}

src/apub.rs

@@ -1,19 +1,29 @@
-use activitystreams_ext::{Ext1, UnparsedExtension};
 use activitystreams::{
     activity::ActorAndObject,
     actor::{Actor, ApActor},
+    iri_string::types::IriString,
     unparsed::UnparsedMutExt,
-    url::Url,
 };
+use activitystreams_ext::{Ext1, UnparsedExtension};
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PublicKeyInner {
-    pub id: Url,
-    pub owner: Url,
+    pub id: IriString,
+    pub owner: IriString,
     pub public_key_pem: String,
 }
 
+impl std::fmt::Debug for PublicKeyInner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("PublicKeyInner")
+            .field("id", &self.id.to_string())
+            .field("owner", &self.owner.to_string())
+            .field("public_key_pem", &self.public_key_pem)
+            .finish()
+    }
+}
+
 #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct PublicKey {
@@ -24,11 +34,13 @@ pub struct PublicKey {
 #[serde(rename_all = "PascalCase")]
 pub enum ValidTypes {
     Accept,
+    Add,
     Announce,
     Create,
     Delete,
     Follow,
     Reject,
+    Remove,
     Undo,
     Update,
 }

src/args.rs

@@ -1,21 +1,42 @@
-use structopt::StructOpt;
+use clap::Parser;
 
-#[derive(Debug, StructOpt)]
+#[derive(Debug, Parser)]
 #[structopt(name = "relay", about = "An activitypub relay")]
 pub(crate) struct Args {
-    #[structopt(short, help = "A list of domains that should be blocked")]
+    #[arg(short, help = "A list of domains that should be blocked")]
     blocks: Vec<String>,
 
-    #[structopt(short, help = "A list of domains that should be allowed")]
+    #[arg(short, help = "A list of domains that should be allowed")]
     allowed: Vec<String>,
 
-    #[structopt(short, long, help = "Undo allowing or blocking domains")]
+    #[arg(short, long, help = "Undo allowing or blocking domains")]
     undo: bool,
+
+    #[arg(short, long, help = "List allowed and blocked domains")]
+    list: bool,
+
+    #[arg(short, long, help = "Get statistics from the server")]
+    stats: bool,
+
+    #[arg(
+        short,
+        long,
+        help = "List domains by when they were last succesfully contacted"
+    )]
+    contacted: bool,
 }
 
 impl Args {
+    pub(crate) fn any(&self) -> bool {
+        !self.blocks.is_empty()
+            || !self.allowed.is_empty()
+            || self.list
+            || self.stats
+            || self.contacted
+    }
+
     pub(crate) fn new() -> Self {
-        Self::from_args()
+        Self::parse()
     }
 
     pub(crate) fn blocks(&self) -> &[String] {
@@ -29,4 +50,16 @@ impl Args {
     pub(crate) fn undo(&self) -> bool {
         self.undo
     }
+
+    pub(crate) fn list(&self) -> bool {
+        self.list
+    }
+
+    pub(crate) fn stats(&self) -> bool {
+        self.stats
+    }
+
+    pub(crate) fn contacted(&self) -> bool {
+        self.contacted
+    }
 }

src/build.rs

@@ -1,8 +1,53 @@
 use ructe::Ructe;
+use std::{fs::File, io::Read, path::Path, process::Command};
 
-fn main() -> Result<(), anyhow::Error> {
+fn git_info() {
+    if let Ok(output) = Command::new("git").args(["rev-parse", "HEAD"]).output() {
+        if output.status.success() {
+            let git_hash = String::from_utf8_lossy(&output.stdout);
+            println!("cargo:rustc-env=GIT_HASH={git_hash}");
+            println!("cargo:rustc-env=GIT_SHORT_HASH={}", &git_hash[..8])
+        }
+    }
+
+    if let Ok(output) = Command::new("git")
+        .args(["rev-parse", "--abbrev-ref", "HEAD"])
+        .output()
+    {
+        if output.status.success() {
+            let git_branch = String::from_utf8_lossy(&output.stdout);
+            println!("cargo:rustc-env=GIT_BRANCH={git_branch}");
+        }
+    }
+}
+
+fn version_info() -> color_eyre::Result<()> {
+    let cargo_toml = Path::new(&std::env::var("CARGO_MANIFEST_DIR")?).join("Cargo.toml");
+
+    let mut file = File::open(cargo_toml)?;
+
+    let mut cargo_data = String::new();
+    file.read_to_string(&mut cargo_data)?;
+
+    let data: toml::Value = toml::from_str(&cargo_data)?;
+
+    if let Some(version) = data["package"]["version"].as_str() {
+        println!("cargo:rustc-env=PKG_VERSION={version}");
+    }
+
+    if let Some(name) = data["package"]["name"].as_str() {
+        println!("cargo:rustc-env=PKG_NAME={name}");
+    }
+
+    Ok(())
+}
+
+fn main() -> color_eyre::Result<()> {
     dotenv::dotenv().ok();
 
+    git_info();
+    version_info()?;
+
     let mut ructe = Ructe::from_env()?;
     let mut statics = ructe.statics()?;
     statics.add_sass_file("scss/index.scss")?;

src/collector.rs

@@ -0,0 +1,425 @@
+use metrics::{Key, Metadata, Recorder, SetRecorderError};
+use metrics_util::{
+    registry::{AtomicStorage, GenerationalStorage, Recency, Registry},
+    MetricKindMask, Summary,
+};
+use quanta::Clock;
+use std::{
+    collections::{BTreeMap, HashMap},
+    sync::{atomic::Ordering, Arc, RwLock},
+    time::Duration,
+};
+
+const SECONDS: u64 = 1;
+const MINUTES: u64 = 60 * SECONDS;
+const HOURS: u64 = 60 * MINUTES;
+const DAYS: u64 = 24 * HOURS;
+
+pub(crate) fn recordable(len: usize) -> u32 {
+    ((len as u64) % u64::from(u32::MAX)) as u32
+}
+
+type DistributionMap = BTreeMap<Vec<(String, String)>, Summary>;
+
+#[derive(Clone)]
+pub struct MemoryCollector {
+    inner: Arc<Inner>,
+}
+
+struct Inner {
+    descriptions: RwLock<HashMap<String, metrics::SharedString>>,
+    distributions: RwLock<HashMap<String, DistributionMap>>,
+    recency: Recency<Key>,
+    registry: Registry<Key, GenerationalStorage<AtomicStorage>>,
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+struct Counter {
+    labels: BTreeMap<String, String>,
+    value: u64,
+}
+
+impl std::fmt::Display for Counter {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let labels = self
+            .labels
+            .iter()
+            .map(|(k, v)| format!("{k}: {v}"))
+            .collect::<Vec<_>>()
+            .join(", ");
+
+        write!(f, "{labels} - {}", self.value)
+    }
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+struct Gauge {
+    labels: BTreeMap<String, String>,
+    value: f64,
+}
+
+impl std::fmt::Display for Gauge {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let labels = self
+            .labels
+            .iter()
+            .map(|(k, v)| format!("{k}: {v}"))
+            .collect::<Vec<_>>()
+            .join(", ");
+
+        write!(f, "{labels} - {}", self.value)
+    }
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+struct Histogram {
+    labels: BTreeMap<String, String>,
+    value: Vec<(f64, Option<f64>)>,
+}
+
+impl std::fmt::Display for Histogram {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let labels = self
+            .labels
+            .iter()
+            .map(|(k, v)| format!("{k}: {v}"))
+            .collect::<Vec<_>>()
+            .join(", ");
+
+        let value = self
+            .value
+            .iter()
+            .map(|(k, v)| {
+                if let Some(v) = v {
+                    format!("{k}: {v:.6}")
+                } else {
+                    format!("{k}: None,")
+                }
+            })
+            .collect::<Vec<_>>()
+            .join(", ");
+
+        write!(f, "{labels} - {value}")
+    }
+}
+
+#[derive(Debug, serde::Deserialize, serde::Serialize)]
+pub(crate) struct Snapshot {
+    counters: HashMap<String, Vec<Counter>>,
+    gauges: HashMap<String, Vec<Gauge>>,
+    histograms: HashMap<String, Vec<Histogram>>,
+}
+
+const PAIRS: [((&str, &str), &str); 2] = [
+    (
+        (
+            "background-jobs.worker.started",
+            "background-jobs.worker.finished",
+        ),
+        "background-jobs.worker.running",
+    ),
+    (
+        (
+            "background-jobs.job.started",
+            "background-jobs.job.finished",
+        ),
+        "background-jobs.job.running",
+    ),
+];
+
+#[derive(Default)]
+struct MergeCounter {
+    start: Option<Counter>,
+    finish: Option<Counter>,
+}
+
+impl MergeCounter {
+    fn merge(self) -> Option<Counter> {
+        match (self.start, self.finish) {
+            (Some(start), Some(end)) => Some(Counter {
+                labels: start.labels,
+                value: start.value.saturating_sub(end.value),
+            }),
+            (Some(only), None) => Some(only),
+            (None, Some(only)) => Some(Counter {
+                labels: only.labels,
+                value: 0,
+            }),
+            (None, None) => None,
+        }
+    }
+}
+
+impl Snapshot {
+    pub(crate) fn present(self) {
+        if !self.counters.is_empty() {
+            println!("Counters");
+            let mut merging = HashMap::new();
+            for (key, counters) in self.counters {
+                if let Some(((start, _), name)) = PAIRS
+                    .iter()
+                    .find(|((start, finish), _)| *start == key || *finish == key)
+                {
+                    let entry = merging.entry(name).or_insert_with(HashMap::new);
+
+                    for counter in counters {
+                        let merge_counter = entry
+                            .entry(counter.labels.clone())
+                            .or_insert_with(MergeCounter::default);
+                        if key == *start {
+                            merge_counter.start = Some(counter);
+                        } else {
+                            merge_counter.finish = Some(counter);
+                        }
+                    }
+
+                    continue;
+                }
+
+                println!("\t{key}");
+                for counter in counters {
+                    println!("\t\t{counter}");
+                }
+            }
+
+            for (key, counters) in merging {
+                println!("\t{key}");
+
+                for (_, counter) in counters {
+                    if let Some(counter) = counter.merge() {
+                        println!("\t\t{counter}");
+                    }
+                }
+            }
+        }
+
+        if !self.gauges.is_empty() {
+            println!("Gauges");
+            for (key, gauges) in self.gauges {
+                println!("\t{key}");
+
+                for gauge in gauges {
+                    println!("\t\t{gauge}");
+                }
+            }
+        }
+
+        if !self.histograms.is_empty() {
+            println!("Histograms");
+            for (key, histograms) in self.histograms {
+                println!("\t{key}");
+
+                for histogram in histograms {
+                    println!("\t\t{histogram}");
+                }
+            }
+        }
+    }
+}
+
+fn key_to_parts(key: &Key) -> (String, Vec<(String, String)>) {
+    let labels = key
+        .labels()
+        .map(|label| (label.key().to_string(), label.value().to_string()))
+        .collect();
+    let name = key.name().to_string();
+    (name, labels)
+}
+
+impl Inner {
+    fn snapshot_counters(&self) -> HashMap<String, Vec<Counter>> {
+        let mut counters = HashMap::new();
+
+        for (key, counter) in self.registry.get_counter_handles() {
+            let gen = counter.get_generation();
+            if !self.recency.should_store_counter(&key, gen, &self.registry) {
+                continue;
+            }
+
+            let (name, labels) = key_to_parts(&key);
+            let value = counter.get_inner().load(Ordering::Acquire);
+            counters.entry(name).or_insert_with(Vec::new).push(Counter {
+                labels: labels.into_iter().collect(),
+                value,
+            });
+        }
+
+        counters
+    }
+
+    fn snapshot_gauges(&self) -> HashMap<String, Vec<Gauge>> {
+        let mut gauges = HashMap::new();
+
+        for (key, gauge) in self.registry.get_gauge_handles() {
+            let gen = gauge.get_generation();
+            if !self.recency.should_store_gauge(&key, gen, &self.registry) {
+                continue;
+            }
+
+            let (name, labels) = key_to_parts(&key);
+            let value = f64::from_bits(gauge.get_inner().load(Ordering::Acquire));
+            gauges.entry(name).or_insert_with(Vec::new).push(Gauge {
+                labels: labels.into_iter().collect(),
+                value,
+            })
+        }
+
+        gauges
+    }
+
+    fn snapshot_histograms(&self) -> HashMap<String, Vec<Histogram>> {
+        for (key, histogram) in self.registry.get_histogram_handles() {
+            let gen = histogram.get_generation();
+            let (name, labels) = key_to_parts(&key);
+
+            if !self
+                .recency
+                .should_store_histogram(&key, gen, &self.registry)
+            {
+                let mut d = self.distributions.write().unwrap();
+                let delete_by_name = if let Some(by_name) = d.get_mut(&name) {
+                    by_name.remove(&labels);
+                    by_name.is_empty()
+                } else {
+                    false
+                };
+                drop(d);
+
+                if delete_by_name {
+                    self.descriptions.write().unwrap().remove(&name);
+                }
+
+                continue;
+            }
+
+            let mut d = self.distributions.write().unwrap();
+            let outer_entry = d.entry(name.clone()).or_default();
+
+            let entry = outer_entry
+                .entry(labels)
+                .or_insert_with(Summary::with_defaults);
+
+            histogram.get_inner().clear_with(|samples| {
+                for sample in samples {
+                    entry.add(*sample);
+                }
+            });
+
+            let mut total_len = 0;
+            for dist_map in d.values() {
+                total_len += dist_map.len();
+            }
+
+            metrics::gauge!("relay.collector.distributions.size").set(recordable(total_len));
+        }
+
+        let d = self.distributions.read().unwrap().clone();
+        d.into_iter()
+            .map(|(key, value)| {
+                (
+                    key,
+                    value
+                        .into_iter()
+                        .map(|(labels, summary)| Histogram {
+                            labels: labels.into_iter().collect(),
+                            value: [0.001, 0.01, 0.05, 0.1, 0.5, 0.9, 0.99, 1.0]
+                                .into_iter()
+                                .map(|q| (q, summary.quantile(q)))
+                                .collect(),
+                        })
+                        .collect(),
+                )
+            })
+            .collect()
+    }
+
+    fn snapshot(&self) -> Snapshot {
+        Snapshot {
+            counters: self.snapshot_counters(),
+            gauges: self.snapshot_gauges(),
+            histograms: self.snapshot_histograms(),
+        }
+    }
+}
+
+impl MemoryCollector {
+    pub(crate) fn new() -> Self {
+        MemoryCollector {
+            inner: Arc::new(Inner {
+                descriptions: Default::default(),
+                distributions: Default::default(),
+                recency: Recency::new(
+                    Clock::new(),
+                    MetricKindMask::ALL,
+                    Some(Duration::from_secs(5 * DAYS)),
+                ),
+                registry: Registry::new(GenerationalStorage::atomic()),
+            }),
+        }
+    }
+
+    pub(crate) fn snapshot(&self) -> Snapshot {
+        self.inner.snapshot()
+    }
+
+    fn add_description_if_missing(
+        &self,
+        key: &metrics::KeyName,
+        description: metrics::SharedString,
+    ) {
+        let mut d = self.inner.descriptions.write().unwrap();
+        d.entry(key.as_str().to_owned()).or_insert(description);
+        metrics::gauge!("relay.collector.descriptions.size").set(recordable(d.len()));
+    }
+
+    pub(crate) fn install(&self) -> Result<(), SetRecorderError<Self>> {
+        metrics::set_global_recorder(self.clone())
+    }
+}
+
+impl Recorder for MemoryCollector {
+    fn describe_counter(
+        &self,
+        key: metrics::KeyName,
+        _: Option<metrics::Unit>,
+        description: metrics::SharedString,
+    ) {
+        self.add_description_if_missing(&key, description)
+    }
+
+    fn describe_gauge(
+        &self,
+        key: metrics::KeyName,
+        _: Option<metrics::Unit>,
+        description: metrics::SharedString,
+    ) {
+        self.add_description_if_missing(&key, description)
+    }
+
+    fn describe_histogram(
+        &self,
+        key: metrics::KeyName,
+        _: Option<metrics::Unit>,
+        description: metrics::SharedString,
+    ) {
+        self.add_description_if_missing(&key, description)
+    }
+
+    fn register_counter(&self, key: &Key, _: &Metadata<'_>) -> metrics::Counter {
+        self.inner
+            .registry
+            .get_or_create_counter(key, |c| c.clone().into())
+    }
+
+    fn register_gauge(&self, key: &Key, _: &Metadata<'_>) -> metrics::Gauge {
+        self.inner
+            .registry
+            .get_or_create_gauge(key, |c| c.clone().into())
+    }
+
+    fn register_histogram(&self, key: &Key, _: &Metadata<'_>) -> metrics::Histogram {
+        self.inner
+            .registry
+            .get_or_create_histogram(key, |c| c.clone().into())
+    }
+}

src/config.rs

@@ -1,14 +1,22 @@
 use crate::{
-    data::{ActorCache, State},
-    error::MyError,
-    middleware::MyVerify,
-    requests::Requests,
+    error::Error,
+    extractors::{AdminConfig, XApiToken},
+};
+use activitystreams::{
+    iri,
+    iri_string::{
+        format::ToDedicatedString,
+        resolve::FixedBaseResolver,
+        types::{IriAbsoluteString, IriFragmentStr, IriRelativeStr, IriString},
+    },
 };
-use activitystreams::{uri, url::Url};
 use config::Environment;
-use http_signature_normalization_actix::prelude::{VerifyDigest, VerifySignature};
-use sha2::{Digest, Sha256};
-use std::{net::IpAddr, path::PathBuf};
+use http_signature_normalization_actix::{digest::ring::Sha256, prelude::VerifyDigest};
+use rustls::sign::CertifiedKey;
+use std::{
+    net::{IpAddr, SocketAddr},
+    path::PathBuf,
+};
 use uuid::Uuid;
 
 #[derive(Clone, Debug, serde::Deserialize)]
@@ -20,13 +28,30 @@ pub(crate) struct ParsedConfig {
     restricted_mode: bool,
     validate_signatures: bool,
     https: bool,
-    pretty_log: bool,
     publish_blocks: bool,
     sled_path: PathBuf,
-    source_repo: Url,
+    source_repo: IriString,
+    repository_commit_base: String,
+    opentelemetry_url: Option<IriString>,
+    telegram_token: Option<String>,
+    telegram_admin_handle: Option<String>,
+    api_token: Option<String>,
+    tls_key: Option<PathBuf>,
+    tls_cert: Option<PathBuf>,
+    footer_blurb: Option<String>,
+    local_domains: Option<String>,
+    local_blurb: Option<String>,
+    prometheus_addr: Option<IpAddr>,
+    prometheus_port: Option<u16>,
+    deliver_concurrency: u64,
+    client_timeout: u64,
+    proxy_url: Option<IriString>,
+    proxy_username: Option<String>,
+    proxy_password: Option<String>,
+    signature_threads: Option<usize>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone)]
 pub struct Config {
     hostname: String,
     addr: IpAddr,
@@ -34,13 +59,44 @@ pub struct Config {
     debug: bool,
     restricted_mode: bool,
     validate_signatures: bool,
-    pretty_log: bool,
     publish_blocks: bool,
-    base_uri: Url,
+    base_uri: IriAbsoluteString,
     sled_path: PathBuf,
-    source_repo: Url,
+    source_repo: IriString,
+    opentelemetry_url: Option<IriString>,
+    telegram_token: Option<String>,
+    telegram_admin_handle: Option<String>,
+    api_token: Option<String>,
+    tls: Option<TlsConfig>,
+    footer_blurb: Option<String>,
+    local_domains: Vec<String>,
+    local_blurb: Option<String>,
+    prometheus_config: Option<PrometheusConfig>,
+    deliver_concurrency: u64,
+    client_timeout: u64,
+    proxy_config: Option<ProxyConfig>,
+    signature_threads: Option<usize>,
 }
 
+#[derive(Clone)]
+struct TlsConfig {
+    key: PathBuf,
+    cert: PathBuf,
+}
+
+#[derive(Clone, Debug)]
+struct PrometheusConfig {
+    addr: IpAddr,
+    port: u16,
+}
+
+#[derive(Clone, Debug)]
+struct ProxyConfig {
+    url: IriString,
+    auth: Option<(String, String)>,
+}
+
+#[derive(Debug)]
 pub enum UrlKind {
     Activity,
     Actor,
@@ -54,27 +110,154 @@ pub enum UrlKind {
     Outbox,
 }
 
+#[derive(Debug)]
+pub enum AdminUrlKind {
+    Allow,
+    Disallow,
+    Block,
+    Unblock,
+    Allowed,
+    Blocked,
+    Connected,
+    Stats,
+    LastSeen,
+}
+
+impl std::fmt::Debug for Config {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Config")
+            .field("hostname", &self.hostname)
+            .field("addr", &self.addr)
+            .field("port", &self.port)
+            .field("debug", &self.debug)
+            .field("restricted_mode", &self.restricted_mode)
+            .field("validate_signatures", &self.validate_signatures)
+            .field("publish_blocks", &self.publish_blocks)
+            .field("base_uri", &self.base_uri.to_string())
+            .field("sled_path", &self.sled_path)
+            .field("source_repo", &self.source_repo.to_string())
+            .field(
+                "opentelemetry_url",
+                &self.opentelemetry_url.as_ref().map(|url| url.to_string()),
+            )
+            .field("telegram_token", &"[redacted]")
+            .field("telegram_admin_handle", &self.telegram_admin_handle)
+            .field("api_token", &"[redacted]")
+            .field("tls_key", &"[redacted]")
+            .field("tls_cert", &"[redacted]")
+            .field("footer_blurb", &self.footer_blurb)
+            .field("local_domains", &self.local_domains)
+            .field("local_blurb", &self.local_blurb)
+            .field("prometheus_config", &self.prometheus_config)
+            .field("deliver_concurrency", &self.deliver_concurrency)
+            .field("client_timeout", &self.client_timeout)
+            .field("proxy_config", &self.proxy_config)
+            .field("signature_threads", &self.signature_threads)
+            .finish()
+    }
+}
+
 impl Config {
-    pub(crate) fn build() -> Result<Self, MyError> {
-        let mut config = config::Config::new();
-        config
+    pub(crate) fn build() -> Result<Self, Error> {
+        let config = config::Config::builder()
             .set_default("hostname", "localhost:8080")?
             .set_default("addr", "127.0.0.1")?
-            .set_default("port", 8080)?
+            .set_default("port", 8080u64)?
             .set_default("debug", true)?
             .set_default("restricted_mode", false)?
-            .set_default("validate_signatures", false)?
-            .set_default("https", false)?
-            .set_default("pretty_log", true)?
+            .set_default("validate_signatures", true)?
+            .set_default("https", true)?
             .set_default("publish_blocks", false)?
             .set_default("sled_path", "./sled/db-0-34")?
             .set_default("source_repo", "https://git.asonix.dog/asonix/relay")?
-            .merge(Environment::new())?;
+            .set_default("repository_commit_base", "/src/commit/")?
+            .set_default("opentelemetry_url", None as Option<&str>)?
+            .set_default("telegram_token", None as Option<&str>)?
+            .set_default("telegram_admin_handle", None as Option<&str>)?
+            .set_default("api_token", None as Option<&str>)?
+            .set_default("tls_key", None as Option<&str>)?
+            .set_default("tls_cert", None as Option<&str>)?
+            .set_default("footer_blurb", None as Option<&str>)?
+            .set_default("local_domains", None as Option<&str>)?
+            .set_default("local_blurb", None as Option<&str>)?
+            .set_default("prometheus_addr", None as Option<&str>)?
+            .set_default("prometheus_port", None as Option<u16>)?
+            .set_default("deliver_concurrency", 8u64)?
+            .set_default("client_timeout", 10u64)?
+            .set_default("proxy_url", None as Option<&str>)?
+            .set_default("proxy_username", None as Option<&str>)?
+            .set_default("proxy_password", None as Option<&str>)?
+            .set_default("signature_threads", None as Option<u64>)?
+            .add_source(Environment::default())
+            .build()?;
 
-        let config: ParsedConfig = config.try_into()?;
+        let config: ParsedConfig = config.try_deserialize()?;
 
         let scheme = if config.https { "https" } else { "http" };
-        let base_uri = uri!(format!("{}://{}", scheme, config.hostname));
+        let base_uri = iri!(format!("{scheme}://{}", config.hostname)).into_absolute();
+
+        let tls = match (config.tls_key, config.tls_cert) {
+            (Some(key), Some(cert)) => Some(TlsConfig { key, cert }),
+            (Some(_), None) => {
+                tracing::warn!("TLS_KEY is set but TLS_CERT isn't , not building TLS config");
+                None
+            }
+            (None, Some(_)) => {
+                tracing::warn!("TLS_CERT is set but TLS_KEY isn't , not building TLS config");
+                None
+            }
+            (None, None) => None,
+        };
+
+        let local_domains = config
+            .local_domains
+            .iter()
+            .flat_map(|s| s.split(','))
+            .map(|d| d.to_string())
+            .collect();
+
+        let prometheus_config = match (config.prometheus_addr, config.prometheus_port) {
+            (Some(addr), Some(port)) => Some(PrometheusConfig { addr, port }),
+            (Some(_), None) => {
+                tracing::warn!("PROMETHEUS_ADDR is set but PROMETHEUS_PORT is not set, not building Prometheus config");
+                None
+            }
+            (None, Some(_)) => {
+                tracing::warn!("PROMETHEUS_PORT is set but PROMETHEUS_ADDR is not set, not building Prometheus config");
+                None
+            }
+            (None, None) => None,
+        };
+
+        let proxy_config = match (config.proxy_username, config.proxy_password) {
+            (Some(username), Some(password)) => config.proxy_url.map(|url| ProxyConfig {
+                url,
+                auth: Some((username, password)),
+            }),
+            (Some(_), None) => {
+                tracing::warn!(
+                    "PROXY_USERNAME is set but PROXY_PASSWORD is not set, not setting Proxy Auth"
+                );
+                config.proxy_url.map(|url| ProxyConfig { url, auth: None })
+            }
+            (None, Some(_)) => {
+                tracing::warn!(
+                    "PROXY_PASSWORD is set but PROXY_USERNAME is not set, not setting Proxy Auth"
+                );
+                config.proxy_url.map(|url| ProxyConfig { url, auth: None })
+            }
+            (None, None) => config.proxy_url.map(|url| ProxyConfig { url, auth: None }),
+        };
+
+        let source_url = match Self::git_hash() {
+            Some(hash) => format!(
+                "{}{}{hash}",
+                config.source_repo, config.repository_commit_base
+            )
+            .parse()
+            .expect("constructed source URL is valid"),
+            None => config.source_repo.clone(),
+        };
 
         Ok(Config {
             hostname: config.hostname,
@@ -83,22 +266,125 @@ impl Config {
             debug: config.debug,
             restricted_mode: config.restricted_mode,
             validate_signatures: config.validate_signatures,
-            pretty_log: config.pretty_log,
             publish_blocks: config.publish_blocks,
             base_uri,
             sled_path: config.sled_path,
-            source_repo: config.source_repo,
+            source_repo: source_url,
+            opentelemetry_url: config.opentelemetry_url,
+            telegram_token: config.telegram_token,
+            telegram_admin_handle: config.telegram_admin_handle,
+            api_token: config.api_token,
+            tls,
+            footer_blurb: config.footer_blurb,
+            local_domains,
+            local_blurb: config.local_blurb,
+            prometheus_config,
+            deliver_concurrency: config.deliver_concurrency,
+            client_timeout: config.client_timeout,
+            proxy_config,
+            signature_threads: config.signature_threads,
         })
     }
 
+    pub(crate) fn signature_threads(&self) -> usize {
+        self.signature_threads
+            .unwrap_or_else(|| {
+                std::thread::available_parallelism()
+                    .map(usize::from)
+                    .map_err(|e| tracing::warn!("Failed to get parallelism, {e}"))
+                    .unwrap_or(1)
+            })
+            .max(1)
+    }
+
+    pub(crate) fn client_timeout(&self) -> u64 {
+        self.client_timeout
+    }
+
+    pub(crate) fn deliver_concurrency(&self) -> u64 {
+        self.deliver_concurrency
+    }
+
+    pub(crate) fn prometheus_bind_address(&self) -> Option<SocketAddr> {
+        let config = self.prometheus_config.as_ref()?;
+
+        Some((config.addr, config.port).into())
+    }
+
+    pub(crate) async fn open_keys(&self) -> Result<Option<CertifiedKey>, Error> {
+        let tls = if let Some(tls) = &self.tls {
+            tls
+        } else {
+            tracing::info!("No TLS config present");
+            return Ok(None);
+        };
+
+        let certs_bytes = tokio::fs::read(&tls.cert).await?;
+        let certs =
+            rustls_pemfile::certs(&mut certs_bytes.as_slice()).collect::<Result<Vec<_>, _>>()?;
+
+        if certs.is_empty() {
+            tracing::warn!("No certs read from certificate file");
+            return Ok(None);
+        }
+
+        let key_bytes = tokio::fs::read(&tls.key).await?;
+        let key = if let Some(key) = rustls_pemfile::private_key(&mut key_bytes.as_slice())? {
+            key
+        } else {
+            tracing::warn!("Failed to read private key");
+            return Ok(None);
+        };
+
+        let key = rustls::crypto::ring::sign::any_supported_type(&key)?;
+
+        Ok(Some(CertifiedKey::new(certs, key)))
+    }
+
+    pub(crate) fn footer_blurb(&self) -> Option<crate::templates::Html<String>> {
+        if let Some(blurb) = &self.footer_blurb {
+            if !blurb.is_empty() {
+                return Some(crate::templates::Html(
+                    ammonia::Builder::new()
+                        .add_tag_attributes("a", &["rel"])
+                        .add_tag_attributes("area", &["rel"])
+                        .add_tag_attributes("link", &["rel"])
+                        .link_rel(None)
+                        .clean(blurb)
+                        .to_string(),
+                ));
+            }
+        }
+
+        None
+    }
+
+    pub(crate) fn local_blurb(&self) -> Option<crate::templates::Html<String>> {
+        if let Some(blurb) = &self.local_blurb {
+            if !blurb.is_empty() {
+                return Some(crate::templates::Html(
+                    ammonia::Builder::new()
+                        .add_tag_attributes("a", &["rel"])
+                        .add_tag_attributes("area", &["rel"])
+                        .add_tag_attributes("link", &["rel"])
+                        .link_rel(None)
+                        .clean(blurb)
+                        .to_string(),
+                ));
+            }
+        }
+
+        None
+    }
+
+    pub(crate) fn local_domains(&self) -> &[String] {
+        &self.local_domains
+    }
+
     pub(crate) fn sled_path(&self) -> &PathBuf {
         &self.sled_path
     }
 
-    pub(crate) fn pretty_log(&self) -> bool {
-        self.pretty_log
-    }
-
     pub(crate) fn validate_signatures(&self) -> bool {
         self.validate_signatures
     }
@@ -111,16 +397,21 @@ impl Config {
         }
     }
 
-    pub(crate) fn signature_middleware(
-        &self,
-        requests: Requests,
-        actors: ActorCache,
-        state: State,
-    ) -> VerifySignature<MyVerify> {
-        if self.validate_signatures {
-            VerifySignature::new(MyVerify(requests, actors, state), Default::default())
+    pub(crate) fn x_api_token(&self) -> Option<XApiToken> {
+        self.api_token.clone().map(XApiToken::new)
+    }
+
+    pub(crate) fn admin_config(&self) -> Option<actix_web::web::Data<AdminConfig>> {
+        if let Some(api_token) = &self.api_token {
+            match AdminConfig::build(api_token) {
+                Ok(conf) => Some(actix_web::web::Data::new(conf)),
+                Err(e) => {
+                    tracing::error!("Error creating admin config: {e}");
+                    None
+                }
+            }
         } else {
-            VerifySignature::new(MyVerify(requests, actors, state), Default::default()).optional()
+            None
         }
     }
 
@@ -148,37 +439,145 @@ impl Config {
         format!("relay@{}", self.hostname)
     }
 
-    pub(crate) fn software_name(&self) -> String {
-        "AodeRelay".to_owned()
+    pub(crate) fn software_name() -> &'static str {
+        "AodeRelay"
     }
 
-    pub(crate) fn software_version(&self) -> String {
-        "v0.2.0-main".to_owned()
+    pub(crate) fn software_version() -> String {
+        if let Some(git) = Self::git_version() {
+            return format!("v{}-{git}", Self::version());
+        }
+
+        format!("v{}", Self::version())
     }
 
-    pub(crate) fn source_code(&self) -> &Url {
+    fn git_version() -> Option<String> {
+        let branch = Self::git_branch()?;
+        let hash = Self::git_short_hash()?;
+
+        Some(format!("{branch}-{hash}"))
+    }
+
+    fn name() -> &'static str {
+        env!("PKG_NAME")
+    }
+
+    fn version() -> &'static str {
+        env!("PKG_VERSION")
+    }
+
+    fn git_branch() -> Option<&'static str> {
+        option_env!("GIT_BRANCH")
+    }
+
+    fn git_hash() -> Option<&'static str> {
+        option_env!("GIT_HASH")
+    }
+
+    fn git_short_hash() -> Option<&'static str> {
+        option_env!("GIT_SHORT_HASH")
+    }
+
+    pub(crate) fn user_agent(&self) -> String {
+        format!(
+            "{} ({}/{}; +{})",
+            Self::software_name(),
+            Self::name(),
+            Self::software_version(),
+            self.generate_url(UrlKind::Index),
+        )
+    }
+
+    pub(crate) fn proxy_config(&self) -> Option<(&IriString, Option<(&str, &str)>)> {
+        self.proxy_config.as_ref().map(|ProxyConfig { url, auth }| {
+            (url, auth.as_ref().map(|(u, p)| (u.as_str(), p.as_str())))
+        })
+    }
+
+    pub(crate) fn source_code(&self) -> &IriString {
         &self.source_repo
     }
 
-    pub(crate) fn generate_url(&self, kind: UrlKind) -> Url {
-        let mut url = self.base_uri.clone();
+    pub(crate) fn opentelemetry_url(&self) -> Option<&IriString> {
+        self.opentelemetry_url.as_ref()
+    }
 
-        match kind {
-            UrlKind::Activity => url.set_path(&format!("activity/{}", Uuid::new_v4())),
-            UrlKind::Actor => url.set_path("actor"),
-            UrlKind::Followers => url.set_path("followers"),
-            UrlKind::Following => url.set_path("following"),
-            UrlKind::Inbox => url.set_path("inbox"),
-            UrlKind::Index => (),
+    pub(crate) fn telegram_info(&self) -> Option<(&str, &str)> {
+        self.telegram_token.as_deref().and_then(|token| {
+            let handle = self.telegram_admin_handle.as_deref()?;
+            Some((token, handle))
+        })
+    }
+
+    pub(crate) fn generate_url(&self, kind: UrlKind) -> IriString {
+        self.do_generate_url(kind).expect("Generated valid IRI")
+    }
+
+    fn do_generate_url(&self, kind: UrlKind) -> Result<IriString, Error> {
+        let iri = match kind {
+            UrlKind::Activity => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new(&format!("activity/{}", Uuid::new_v4()))?.as_ref())
+                .try_to_dedicated_string()?,
+            UrlKind::Actor => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new("actor")?.as_ref())
+                .try_to_dedicated_string()?,
+            UrlKind::Followers => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new("followers")?.as_ref())
+                .try_to_dedicated_string()?,
+            UrlKind::Following => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new("following")?.as_ref())
+                .try_to_dedicated_string()?,
+            UrlKind::Inbox => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new("inbox")?.as_ref())
+                .try_to_dedicated_string()?,
+            UrlKind::Index => self.base_uri.clone().into(),
             UrlKind::MainKey => {
-                url.set_path("actor");
-                url.set_fragment(Some("main-key"));
+                let actor = IriRelativeStr::new("actor")?;
+                let fragment = IriFragmentStr::new("main-key")?;
+
+                let mut resolved = FixedBaseResolver::new(self.base_uri.as_ref())
+                    .resolve(actor.as_ref())
+                    .try_to_dedicated_string()?;
+
+                resolved.set_fragment(Some(fragment));
+                resolved
             }
-            UrlKind::Media(uuid) => url.set_path(&format!("media/{}", uuid)),
-            UrlKind::NodeInfo => url.set_path("nodeinfo/2.0.json"),
-            UrlKind::Outbox => url.set_path("outbox"),
+            UrlKind::Media(uuid) => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new(&format!("media/{uuid}"))?.as_ref())
+                .try_to_dedicated_string()?,
+            UrlKind::NodeInfo => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new("nodeinfo/2.0.json")?.as_ref())
+                .try_to_dedicated_string()?,
+            UrlKind::Outbox => FixedBaseResolver::new(self.base_uri.as_ref())
+                .resolve(IriRelativeStr::new("outbox")?.as_ref())
+                .try_to_dedicated_string()?,
         };
 
-        url
+        Ok(iri)
+    }
+
+    pub(crate) fn generate_admin_url(&self, kind: AdminUrlKind) -> IriString {
+        self.do_generate_admin_url(kind)
+            .expect("Generated valid IRI")
+    }
+
+    fn do_generate_admin_url(&self, kind: AdminUrlKind) -> Result<IriString, Error> {
+        let path = match kind {
+            AdminUrlKind::Allow => "api/v1/admin/allow",
+            AdminUrlKind::Disallow => "api/v1/admin/disallow",
+            AdminUrlKind::Block => "api/v1/admin/block",
+            AdminUrlKind::Unblock => "api/v1/admin/unblock",
+            AdminUrlKind::Allowed => "api/v1/admin/allowed",
+            AdminUrlKind::Blocked => "api/v1/admin/blocked",
+            AdminUrlKind::Connected => "api/v1/admin/connected",
+            AdminUrlKind::Stats => "api/v1/admin/stats",
+            AdminUrlKind::LastSeen => "api/v1/admin/last_seen",
+        };
+
+        let iri = FixedBaseResolver::new(self.base_uri.as_ref())
+            .resolve(IriRelativeStr::new(path)?.as_ref())
+            .try_to_dedicated_string()?;
+
+        Ok(iri)
     }
 }

src/data.rs

@@ -1,9 +1,11 @@
 mod actor;
+mod last_online;
 mod media;
 mod node;
 mod state;
 
 pub(crate) use actor::ActorCache;
+pub(crate) use last_online::LastOnline;
 pub(crate) use media::MediaCache;
 pub(crate) use node::{Node, NodeCache};
 pub(crate) use state::State;

src/data/actor.rs

@@ -1,10 +1,10 @@
 use crate::{
     apub::AcceptedActors,
     db::{Actor, Db},
-    error::MyError,
-    requests::Requests,
+    error::{Error, ErrorKind},
+    requests::{BreakerStrategy, Requests},
 };
-use activitystreams::{prelude::*, url::Url};
+use activitystreams::{iri_string::types::IriString, prelude::*};
 use std::time::{Duration, SystemTime};
 
 const REFETCH_DURATION: Duration = Duration::from_secs(60 * 30);
@@ -17,10 +17,7 @@ pub enum MaybeCached<T> {
 
 impl<T> MaybeCached<T> {
     pub(crate) fn is_cached(&self) -> bool {
-        match self {
-            MaybeCached::Cached(_) => true,
-            _ => false,
-        }
+        matches!(self, MaybeCached::Cached(_))
     }
 
     pub(crate) fn into_inner(self) -> T {
@@ -30,7 +27,7 @@ impl<T> MaybeCached<T> {
     }
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct ActorCache {
     db: Db,
 }
@@ -40,11 +37,12 @@ impl ActorCache {
         ActorCache { db }
     }
 
+    #[tracing::instrument(level = "debug" name = "Get Actor", skip_all, fields(id = id.to_string().as_str()))]
     pub(crate) async fn get(
         &self,
-        id: &Url,
+        id: &IriString,
         requests: &Requests,
-    ) -> Result<MaybeCached<Actor>, MyError> {
+    ) -> Result<MaybeCached<Actor>, Error> {
         if let Some(actor) = self.db.actor(id.clone()).await? {
             if actor.saved_at + REFETCH_DURATION > SystemTime::now() {
                 return Ok(MaybeCached::Cached(actor));
@@ -56,34 +54,39 @@ impl ActorCache {
             .map(MaybeCached::Fetched)
     }
 
-    pub(crate) async fn add_connection(&self, actor: Actor) -> Result<(), MyError> {
+    #[tracing::instrument(level = "debug", name = "Add Connection", skip(self))]
+    pub(crate) async fn add_connection(&self, actor: Actor) -> Result<(), Error> {
         self.db.add_connection(actor.id.clone()).await?;
         self.db.save_actor(actor).await
     }
 
-    pub(crate) async fn remove_connection(&self, actor: &Actor) -> Result<(), MyError> {
+    #[tracing::instrument(level = "debug", name = "Remove Connection", skip(self))]
+    pub(crate) async fn remove_connection(&self, actor: &Actor) -> Result<(), Error> {
         self.db.remove_connection(actor.id.clone()).await
     }
 
+    #[tracing::instrument(level = "debug", name = "Fetch remote actor", skip_all, fields(id = id.to_string().as_str()))]
     pub(crate) async fn get_no_cache(
         &self,
-        id: &Url,
+        id: &IriString,
         requests: &Requests,
-    ) -> Result<Actor, MyError> {
-        let accepted_actor = requests.fetch::<AcceptedActors>(id.as_str()).await?;
+    ) -> Result<Actor, Error> {
+        let accepted_actor = requests
+            .fetch::<AcceptedActors>(id, BreakerStrategy::Require2XX)
+            .await?;
 
-        let input_domain = id.domain().ok_or(MyError::MissingDomain)?;
+        let input_authority = id.authority_components().ok_or(ErrorKind::MissingDomain)?;
         let accepted_actor_id = accepted_actor
-            .id(&input_domain)?
-            .ok_or(MyError::MissingId)?;
+            .id(input_authority.host(), input_authority.port())?
+            .ok_or(ErrorKind::MissingId)?;
 
         let inbox = get_inbox(&accepted_actor)?.clone();
 
         let actor = Actor {
-            id: accepted_actor_id.clone().into(),
+            id: accepted_actor_id.clone(),
             public_key: accepted_actor.ext_one.public_key.public_key_pem,
             public_key_id: accepted_actor.ext_one.public_key.id,
-            inbox: inbox.into(),
+            inbox,
             saved_at: SystemTime::now(),
         };
 
@@ -93,9 +96,9 @@ impl ActorCache {
     }
 }
 
-fn get_inbox(actor: &AcceptedActors) -> Result<&Url, MyError> {
+fn get_inbox(actor: &AcceptedActors) -> Result<&IriString, Error> {
     Ok(actor
         .endpoints()?
-        .and_then(|e| e.shared_inbox)
+        .and_then(|e| e.shared_inbox.as_ref())
         .unwrap_or(actor.inbox()?))
 }

src/data/last_online.rs

@@ -0,0 +1,28 @@
+use activitystreams::iri_string::types::IriStr;
+use std::{collections::HashMap, sync::Mutex};
+use time::OffsetDateTime;
+
+pub(crate) struct LastOnline {
+    domains: Mutex<HashMap<String, OffsetDateTime>>,
+}
+
+impl LastOnline {
+    pub(crate) fn mark_seen(&self, iri: &IriStr) {
+        if let Some(authority) = iri.authority_str() {
+            let mut guard = self.domains.lock().unwrap();
+            guard.insert(authority.to_string(), OffsetDateTime::now_utc());
+            metrics::gauge!("relay.last-online.size",)
+                .set(crate::collector::recordable(guard.len()));
+        }
+    }
+
+    pub(crate) fn take(&self) -> HashMap<String, OffsetDateTime> {
+        std::mem::take(&mut *self.domains.lock().unwrap())
+    }
+
+    pub(crate) fn empty() -> Self {
+        Self {
+            domains: Mutex::new(HashMap::default()),
+        }
+    }
+}

src/data/media.rs

@@ -1,15 +1,8 @@
-use crate::{
-    db::{Db, MediaMeta},
-    error::MyError,
-};
-use activitystreams::url::Url;
-use actix_web::web::Bytes;
-use std::time::{Duration, SystemTime};
+use crate::{db::Db, error::Error};
+use activitystreams::iri_string::types::IriString;
 use uuid::Uuid;
 
-static MEDIA_DURATION: Duration = Duration::from_secs(60 * 60 * 24 * 2);
-
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct MediaCache {
     db: Db,
 }
@@ -19,61 +12,22 @@ impl MediaCache {
         MediaCache { db }
     }
 
-    pub(crate) async fn get_uuid(&self, url: Url) -> Result<Option<Uuid>, MyError> {
+    #[tracing::instrument(level = "debug", name = "Get media uuid", skip_all, fields(url = url.to_string().as_str()))]
+    pub(crate) async fn get_uuid(&self, url: IriString) -> Result<Option<Uuid>, Error> {
         self.db.media_id(url).await
     }
 
-    pub(crate) async fn get_url(&self, uuid: Uuid) -> Result<Option<Url>, MyError> {
+    #[tracing::instrument(level = "debug", name = "Get media url", skip(self))]
+    pub(crate) async fn get_url(&self, uuid: Uuid) -> Result<Option<IriString>, Error> {
         self.db.media_url(uuid).await
     }
 
-    pub(crate) async fn is_outdated(&self, uuid: Uuid) -> Result<bool, MyError> {
-        if let Some(meta) = self.db.media_meta(uuid).await? {
-            if meta.saved_at + MEDIA_DURATION > SystemTime::now() {
-                return Ok(false);
-            }
-        }
-
-        Ok(true)
-    }
-
-    pub(crate) async fn get_bytes(&self, uuid: Uuid) -> Result<Option<(String, Bytes)>, MyError> {
-        if let Some(meta) = self.db.media_meta(uuid).await? {
-            if meta.saved_at + MEDIA_DURATION > SystemTime::now() {
-                return self
-                    .db
-                    .media_bytes(uuid)
-                    .await
-                    .map(|opt| opt.map(|bytes| (meta.media_type, bytes)));
-            }
-        }
-
-        Ok(None)
-    }
-
-    pub(crate) async fn store_url(&self, url: Url) -> Result<Uuid, MyError> {
+    #[tracing::instrument(name = "Store media url", skip_all, fields(url = url.to_string().as_str()))]
+    pub(crate) async fn store_url(&self, url: IriString) -> Result<Uuid, Error> {
         let uuid = Uuid::new_v4();
 
         self.db.save_url(url, uuid).await?;
 
         Ok(uuid)
     }
-
-    pub(crate) async fn store_bytes(
-        &self,
-        uuid: Uuid,
-        media_type: String,
-        bytes: Bytes,
-    ) -> Result<(), MyError> {
-        self.db
-            .save_bytes(
-                uuid,
-                MediaMeta {
-                    media_type,
-                    saved_at: SystemTime::now(),
-                },
-                bytes,
-            )
-            .await
-    }
 }

src/data/node.rs

@@ -1,29 +1,41 @@
 use crate::{
     db::{Contact, Db, Info, Instance},
-    error::MyError,
+    error::{Error, ErrorKind},
 };
-use activitystreams::url::Url;
+use activitystreams::{iri, iri_string::types::IriString};
 use std::time::{Duration, SystemTime};
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub struct NodeCache {
     db: Db,
 }
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub struct Node {
-    pub(crate) base: Url,
+    pub(crate) base: IriString,
     pub(crate) info: Option<Info>,
     pub(crate) instance: Option<Instance>,
     pub(crate) contact: Option<Contact>,
 }
 
+impl std::fmt::Debug for Node {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Node")
+            .field("base", &self.base.to_string())
+            .field("info", &self.info)
+            .field("instance", &self.instance)
+            .field("contact", &self.contact)
+            .finish()
+    }
+}
+
 impl NodeCache {
     pub(crate) fn new(db: Db) -> Self {
         NodeCache { db }
     }
 
-    pub(crate) async fn nodes(&self) -> Result<Vec<Node>, MyError> {
+    #[tracing::instrument(level = "debug", name = "Get nodes", skip(self))]
+    pub(crate) async fn nodes(&self) -> Result<Vec<Node>, Error> {
         let infos = self.db.connected_info().await?;
         let instances = self.db.connected_instance().await?;
         let contacts = self.db.connected_contact().await?;
@@ -34,21 +46,19 @@ impl NodeCache {
             .await?
             .into_iter()
             .map(move |actor_id| {
-                let info = infos.get(&actor_id).map(|info| info.clone());
-                let instance = instances.get(&actor_id).map(|instance| instance.clone());
-                let contact = contacts.get(&actor_id).map(|contact| contact.clone());
+                let info = infos.get(&actor_id).cloned();
+                let instance = instances.get(&actor_id).cloned();
+                let contact = contacts.get(&actor_id).cloned();
 
-                Node::new(actor_id)
-                    .info(info)
-                    .instance(instance)
-                    .contact(contact)
+                Node::new(actor_id).map(|node| node.info(info).instance(instance).contact(contact))
             })
-            .collect();
+            .collect::<Result<Vec<Node>, Error>>()?;
 
         Ok(vec)
     }
 
-    pub(crate) async fn is_nodeinfo_outdated(&self, actor_id: Url) -> bool {
+    #[tracing::instrument(level = "debug", name = "Is NodeInfo Outdated", skip_all, fields(actor_id = actor_id.to_string().as_str()))]
+    pub(crate) async fn is_nodeinfo_outdated(&self, actor_id: IriString) -> bool {
         self.db
             .info(actor_id)
             .await
@@ -56,7 +66,8 @@ impl NodeCache {
             .unwrap_or(true)
     }
 
-    pub(crate) async fn is_contact_outdated(&self, actor_id: Url) -> bool {
+    #[tracing::instrument(level = "debug", name = "Is Contact Outdated", skip_all, fields(actor_id = actor_id.to_string().as_str()))]
+    pub(crate) async fn is_contact_outdated(&self, actor_id: IriString) -> bool {
         self.db
             .contact(actor_id)
             .await
@@ -64,7 +75,8 @@ impl NodeCache {
             .unwrap_or(true)
     }
 
-    pub(crate) async fn is_instance_outdated(&self, actor_id: Url) -> bool {
+    #[tracing::instrument(level = "debug", name = "Is Instance Outdated", skip_all, fields(actor_id = actor_id.to_string().as_str()))]
+    pub(crate) async fn is_instance_outdated(&self, actor_id: IriString) -> bool {
         self.db
             .instance(actor_id)
             .await
@@ -72,13 +84,14 @@ impl NodeCache {
             .unwrap_or(true)
     }
 
+    #[tracing::instrument(level = "debug", name = "Save node info", skip_all, fields(actor_id = actor_id.to_string().as_str(), software, version, reg))]
     pub(crate) async fn set_info(
         &self,
-        actor_id: Url,
+        actor_id: IriString,
         software: String,
         version: String,
         reg: bool,
-    ) -> Result<(), MyError> {
+    ) -> Result<(), Error> {
         self.db
             .save_info(
                 actor_id,
@@ -92,15 +105,28 @@ impl NodeCache {
             .await
     }
 
+    #[tracing::instrument(
+        level = "debug",
+        name = "Save instance info",
+        skip_all,
+        fields(
+            actor_id = actor_id.to_string().as_str(),
+            title,
+            description,
+            version,
+            reg,
+            requires_approval
+        )
+    )]
     pub(crate) async fn set_instance(
         &self,
-        actor_id: Url,
+        actor_id: IriString,
         title: String,
         description: String,
         version: String,
         reg: bool,
         requires_approval: bool,
-    ) -> Result<(), MyError> {
+    ) -> Result<(), Error> {
         self.db
             .save_instance(
                 actor_id,
@@ -116,14 +142,26 @@ impl NodeCache {
             .await
     }
 
+    #[tracing::instrument(
+        level = "debug",
+        name = "Save contact info",
+        skip_all,
+        fields(
+            actor_id = actor_id.to_string().as_str(),
+            username,
+            display_name,
+            url = url.to_string().as_str(),
+            avatar = avatar.to_string().as_str()
+        )
+    )]
     pub(crate) async fn set_contact(
         &self,
-        actor_id: Url,
+        actor_id: IriString,
         username: String,
         display_name: String,
-        url: Url,
-        avatar: Url,
-    ) -> Result<(), MyError> {
+        url: IriString,
+        avatar: IriString,
+    ) -> Result<(), Error> {
         self.db
             .save_contact(
                 actor_id,
@@ -140,17 +178,18 @@ impl NodeCache {
 }
 
 impl Node {
-    fn new(mut url: Url) -> Self {
-        url.set_fragment(None);
-        url.set_query(None);
-        url.set_path("");
+    fn new(url: IriString) -> Result<Self, Error> {
+        let authority = url.authority_str().ok_or(ErrorKind::MissingDomain)?;
+        let scheme = url.scheme_str();
 
-        Node {
-            base: url,
+        let base = iri!(format!("{scheme}://{authority}"));
+
+        Ok(Node {
+            base,
             info: None,
             instance: None,
             contact: None,
-        }
+        })
     }
 
     fn info(mut self, info: Option<Info>) -> Self {

src/data/state.rs

@@ -1,62 +1,64 @@
 use crate::{
-    config::{Config, UrlKind},
     data::NodeCache,
     db::Db,
-    error::MyError,
+    error::Error,
     requests::{Breakers, Requests},
+    spawner::Spawner,
 };
-use activitystreams::url::Url;
+use activitystreams::iri_string::types::IriString;
 use actix_web::web;
-use async_rwlock::RwLock;
-use log::info;
 use lru::LruCache;
 use rand::thread_rng;
+use reqwest_middleware::ClientWithMiddleware;
 use rsa::{RsaPrivateKey, RsaPublicKey};
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
+
+use super::LastOnline;
 
 #[derive(Clone)]
 pub struct State {
+    pub(crate) requests: Requests,
     pub(crate) public_key: RsaPublicKey,
-    private_key: RsaPrivateKey,
-    config: Config,
-    object_cache: Arc<RwLock<LruCache<Url, Url>>>,
-    node_cache: NodeCache,
+    object_cache: Arc<RwLock<LruCache<IriString, IriString>>>,
+    pub(crate) node_cache: NodeCache,
     breakers: Breakers,
+    pub(crate) last_online: Arc<LastOnline>,
     pub(crate) db: Db,
 }
 
+impl std::fmt::Debug for State {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("State")
+            .field("node_cache", &self.node_cache)
+            .field("breakers", &self.breakers)
+            .field("db", &self.db)
+            .finish()
+    }
+}
+
 impl State {
-    pub(crate) fn node_cache(&self) -> NodeCache {
-        self.node_cache.clone()
-    }
-
-    pub(crate) fn requests(&self) -> Requests {
-        Requests::new(
-            self.config.generate_url(UrlKind::MainKey).to_string(),
-            self.private_key.clone(),
-            format!(
-                "Actix Web 3.0.0-alpha.1 ({}/{}; +{})",
-                self.config.software_name(),
-                self.config.software_version(),
-                self.config.generate_url(UrlKind::Index),
-            ),
-            self.breakers.clone(),
+    #[tracing::instrument(
+        level = "debug",
+        name = "Get inboxes for other domains",
+        skip_all,
+        fields(
+            existing_inbox = existing_inbox.to_string().as_str(),
+            authority
         )
-    }
-
+    )]
     pub(crate) async fn inboxes_without(
         &self,
-        existing_inbox: &Url,
-        domain: &str,
-    ) -> Result<Vec<Url>, MyError> {
+        existing_inbox: &IriString,
+        authority: &str,
+    ) -> Result<Vec<IriString>, Error> {
         Ok(self
             .db
             .inboxes()
             .await?
             .iter()
             .filter_map(|inbox| {
-                if let Some(dom) = inbox.domain() {
-                    if inbox != existing_inbox && dom != domain {
+                if let Some(authority_str) = inbox.authority_str() {
+                    if inbox != existing_inbox && authority_str != authority {
                         return Some(inbox.clone());
                     }
                 }
@@ -66,19 +68,32 @@ impl State {
             .collect())
     }
 
-    pub(crate) async fn is_cached(&self, object_id: &Url) -> bool {
-        self.object_cache.read().await.contains(object_id)
+    pub(crate) fn is_cached(&self, object_id: &IriString) -> bool {
+        self.object_cache.read().unwrap().contains(object_id)
     }
 
-    pub(crate) async fn cache(&self, object_id: Url, actor_id: Url) {
-        self.object_cache.write().await.put(object_id, actor_id);
+    pub(crate) fn cache(&self, object_id: IriString, actor_id: IriString) {
+        let mut guard = self.object_cache.write().unwrap();
+        guard.put(object_id, actor_id);
+        metrics::gauge!("relay.object-cache.size").set(crate::collector::recordable(guard.len()));
     }
 
-    pub(crate) async fn build(config: Config, db: Db) -> Result<Self, MyError> {
+    pub(crate) fn is_connected(&self, iri: &IriString) -> bool {
+        self.breakers.should_try(iri)
+    }
+
+    #[tracing::instrument(level = "debug", name = "Building state", skip_all)]
+    pub(crate) async fn build(
+        db: Db,
+        key_id: String,
+        spawner: Spawner,
+        client: ClientWithMiddleware,
+    ) -> Result<Self, Error> {
         let private_key = if let Ok(Some(key)) = db.private_key().await {
+            tracing::debug!("Using existing key");
             key
         } else {
-            info!("Generating new keys");
+            tracing::info!("Generating new keys");
             let key = web::block(move || {
                 let mut rng = thread_rng();
                 RsaPrivateKey::new(&mut rng, 4096)
@@ -92,14 +107,28 @@ impl State {
 
         let public_key = private_key.to_public_key();
 
-        let state = State {
-            public_key,
+        let breakers = Breakers::default();
+        let last_online = Arc::new(LastOnline::empty());
+
+        let requests = Requests::new(
+            key_id,
             private_key,
-            config,
-            object_cache: Arc::new(RwLock::new(LruCache::new(1024 * 8))),
+            breakers.clone(),
+            last_online.clone(),
+            spawner,
+            client,
+        );
+
+        let state = State {
+            requests,
+            public_key,
+            object_cache: Arc::new(RwLock::new(LruCache::new(
+                (1024 * 8).try_into().expect("nonzero"),
+            ))),
             node_cache: NodeCache::new(db.clone()),
-            breakers: Breakers::default(),
+            breakers,
             db,
+            last_online,
         };
 
         Ok(state)

src/db.rs

@@ -1,20 +1,32 @@
-use crate::{config::Config, error::MyError};
-use activitystreams::url::Url;
-use actix_web::web::Bytes;
+use crate::{
+    config::Config,
+    error::{Error, ErrorKind},
+};
+use activitystreams::iri_string::types::IriString;
 use rsa::{
-    pkcs8::{FromPrivateKey, ToPrivateKey},
+    pkcs8::{DecodePrivateKey, EncodePrivateKey},
     RsaPrivateKey,
 };
-use sled::Tree;
-use std::{collections::HashMap, sync::Arc, time::SystemTime};
+use sled::{transaction::TransactionError, Batch, Transactional, Tree};
+use std::{
+    collections::{BTreeMap, HashMap},
+    sync::{
+        atomic::{AtomicU64, Ordering},
+        Arc,
+    },
+    time::SystemTime,
+};
+use time::OffsetDateTime;
 use uuid::Uuid;
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 pub(crate) struct Db {
     inner: Arc<Inner>,
 }
 
 struct Inner {
+    healthz: Tree,
+    healthz_counter: Arc<AtomicU64>,
     actor_id_actor: Tree,
     public_key_id_actor_id: Tree,
     connected_actor_ids: Tree,
@@ -23,27 +35,40 @@ struct Inner {
     settings: Tree,
     media_url_media_id: Tree,
     media_id_media_url: Tree,
-    media_id_media_bytes: Tree,
-    media_id_media_meta: Tree,
     actor_id_info: Tree,
     actor_id_instance: Tree,
     actor_id_contact: Tree,
+    last_seen: Tree,
     restricted_mode: bool,
 }
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+impl std::fmt::Debug for Inner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Inner")
+            .field("restricted_mode", &self.restricted_mode)
+            .finish()
+    }
+}
+
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub struct Actor {
-    pub(crate) id: Url,
+    pub(crate) id: IriString,
     pub(crate) public_key: String,
-    pub(crate) public_key_id: Url,
-    pub(crate) inbox: Url,
+    pub(crate) public_key_id: IriString,
+    pub(crate) inbox: IriString,
     pub(crate) saved_at: SystemTime,
 }
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-pub(crate) struct MediaMeta {
-    pub(crate) media_type: String,
-    pub(crate) saved_at: SystemTime,
+impl std::fmt::Debug for Actor {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Actor")
+            .field("id", &self.id.to_string())
+            .field("public_key", &self.public_key)
+            .field("public_key_id", &self.public_key_id.to_string())
+            .field("inbox", &self.inbox.to_string())
+            .field("saved_at", &self.saved_at)
+            .finish()
+    }
 }
 
 #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
@@ -64,21 +89,33 @@ pub struct Instance {
     pub(crate) updated: SystemTime,
 }
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub struct Contact {
     pub(crate) username: String,
     pub(crate) display_name: String,
-    pub(crate) url: Url,
-    pub(crate) avatar: Url,
+    pub(crate) url: IriString,
+    pub(crate) avatar: IriString,
     pub(crate) updated: SystemTime,
 }
 
+impl std::fmt::Debug for Contact {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Info")
+            .field("username", &self.username)
+            .field("display_name", &self.display_name)
+            .field("url", &self.url.to_string())
+            .field("avatar", &self.avatar.to_string())
+            .field("updated", &self.updated)
+            .finish()
+    }
+}
+
 impl Inner {
-    fn connected_by_domain(&self, domains: &[String]) -> impl DoubleEndedIterator<Item = Url> {
-        let reversed: Vec<_> = domains
-            .into_iter()
-            .map(|s| domain_key(s.as_str()))
-            .collect();
+    fn connected_by_domain(
+        &self,
+        domains: &[String],
+    ) -> impl DoubleEndedIterator<Item = IriString> {
+        let reversed: Vec<_> = domains.iter().map(|s| domain_key(s.as_str())).collect();
 
         self.connected_actor_ids
             .iter()
@@ -86,7 +123,7 @@ impl Inner {
             .filter_map(|res| res.ok())
             .filter_map(url_from_ivec)
             .filter_map(move |url| {
-                let connected_domain = url.domain()?;
+                let connected_domain = url.authority_str()?;
                 let connected_rdnn = domain_key(connected_domain);
 
                 for rdnn in &reversed {
@@ -107,7 +144,15 @@ impl Inner {
             .map(|s| String::from_utf8_lossy(&s).to_string())
     }
 
-    fn connected(&self) -> impl DoubleEndedIterator<Item = Url> {
+    fn allowed(&self) -> impl DoubleEndedIterator<Item = String> {
+        self.allowed_domains
+            .iter()
+            .values()
+            .filter_map(|res| res.ok())
+            .map(|s| String::from_utf8_lossy(&s).to_string())
+    }
+
+    fn connected(&self) -> impl DoubleEndedIterator<Item = IriString> {
         self.connected_actor_ids
             .iter()
             .values()
@@ -115,7 +160,7 @@ impl Inner {
             .filter_map(url_from_ivec)
     }
 
-    fn connected_actors<'a>(&'a self) -> impl DoubleEndedIterator<Item = Actor> + 'a {
+    fn connected_actors(&self) -> impl DoubleEndedIterator<Item = Actor> + '_ {
         self.connected_actor_ids
             .iter()
             .values()
@@ -127,7 +172,7 @@ impl Inner {
             })
     }
 
-    fn connected_info<'a>(&'a self) -> impl DoubleEndedIterator<Item = (Url, Info)> + 'a {
+    fn connected_info(&self) -> impl DoubleEndedIterator<Item = (IriString, Info)> + '_ {
         self.connected_actor_ids
             .iter()
             .values()
@@ -141,7 +186,7 @@ impl Inner {
             })
     }
 
-    fn connected_instance<'a>(&'a self) -> impl DoubleEndedIterator<Item = (Url, Instance)> + 'a {
+    fn connected_instance(&self) -> impl DoubleEndedIterator<Item = (IriString, Instance)> + '_ {
         self.connected_actor_ids
             .iter()
             .values()
@@ -155,7 +200,7 @@ impl Inner {
             })
     }
 
-    fn connected_contact<'a>(&'a self) -> impl DoubleEndedIterator<Item = (Url, Contact)> + 'a {
+    fn connected_contact(&self) -> impl DoubleEndedIterator<Item = (IriString, Contact)> + '_ {
         self.connected_actor_ids
             .iter()
             .values()
@@ -169,9 +214,9 @@ impl Inner {
             })
     }
 
-    fn is_allowed(&self, domain: &str) -> bool {
-        let prefix = domain_prefix(domain);
-        let reverse_domain = domain_key(domain);
+    fn is_allowed(&self, authority: &str) -> bool {
+        let prefix = domain_prefix(authority);
+        let reverse_domain = domain_key(authority);
 
         if self.restricted_mode {
             self.allowed_domains
@@ -194,14 +239,16 @@ impl Inner {
 }
 
 impl Db {
-    pub(crate) fn build(config: &Config) -> Result<Self, MyError> {
+    pub(crate) fn build(config: &Config) -> Result<Self, Error> {
         let db = sled::open(config.sled_path())?;
         Self::build_inner(config.restricted_mode(), db)
     }
 
-    fn build_inner(restricted_mode: bool, db: sled::Db) -> Result<Self, MyError> {
+    fn build_inner(restricted_mode: bool, db: sled::Db) -> Result<Self, Error> {
         Ok(Db {
             inner: Arc::new(Inner {
+                healthz: db.open_tree("healthz")?,
+                healthz_counter: Arc::new(AtomicU64::new(0)),
                 actor_id_actor: db.open_tree("actor-id-actor")?,
                 public_key_id_actor_id: db.open_tree("public-key-id-actor-id")?,
                 connected_actor_ids: db.open_tree("connected-actor-ids")?,
@@ -210,11 +257,10 @@ impl Db {
                 settings: db.open_tree("settings")?,
                 media_url_media_id: db.open_tree("media-url-media-id")?,
                 media_id_media_url: db.open_tree("media-id-media-url")?,
-                media_id_media_bytes: db.open_tree("media-id-media-bytes")?,
-                media_id_media_meta: db.open_tree("media-id-media-meta")?,
                 actor_id_info: db.open_tree("actor-id-info")?,
                 actor_id_instance: db.open_tree("actor-id-instance")?,
                 actor_id_contact: db.open_tree("actor-id-contact")?,
+                last_seen: db.open_tree("last-seen")?,
                 restricted_mode,
             }),
         })
@@ -222,8 +268,8 @@ impl Db {
 
     async fn unblock<T>(
         &self,
-        f: impl Fn(&Inner) -> Result<T, MyError> + Send + 'static,
-    ) -> Result<T, MyError>
+        f: impl FnOnce(&Inner) -> Result<T, Error> + Send + 'static,
+    ) -> Result<T, Error>
     where
         T: Send + 'static,
     {
@@ -234,11 +280,73 @@ impl Db {
         Ok(t)
     }
 
-    pub(crate) async fn connected_ids(&self) -> Result<Vec<Url>, MyError> {
+    pub(crate) async fn check_health(&self) -> Result<(), Error> {
+        let next = self.inner.healthz_counter.fetch_add(1, Ordering::Relaxed);
+        self.unblock(move |inner| {
+            let res = inner
+                .healthz
+                .insert("healthz", &next.to_be_bytes()[..])
+                .map_err(Error::from);
+
+            metrics::gauge!("relay.db.healthz.size")
+                .set(crate::collector::recordable(inner.healthz.len()));
+
+            res
+        })
+        .await?;
+        self.inner.healthz.flush_async().await?;
+        self.unblock(move |inner| inner.healthz.get("healthz").map_err(Error::from))
+            .await?;
+        Ok(())
+    }
+
+    pub(crate) async fn mark_last_seen(
+        &self,
+        nodes: HashMap<String, OffsetDateTime>,
+    ) -> Result<(), Error> {
+        let mut batch = Batch::default();
+
+        for (domain, datetime) in nodes {
+            let datetime_string = serde_json::to_vec(&datetime)?;
+
+            batch.insert(domain.as_bytes(), datetime_string);
+        }
+
+        self.unblock(move |inner| inner.last_seen.apply_batch(batch).map_err(Error::from))
+            .await
+    }
+
+    pub(crate) async fn last_seen(
+        &self,
+    ) -> Result<BTreeMap<String, Option<OffsetDateTime>>, Error> {
+        self.unblock(|inner| {
+            let mut map = BTreeMap::new();
+
+            for iri in inner.connected() {
+                let Some(authority_str) = iri.authority_str() else {
+                    continue;
+                };
+
+                if let Some(datetime) = inner.last_seen.get(authority_str)? {
+                    map.insert(
+                        authority_str.to_string(),
+                        Some(serde_json::from_slice(&datetime)?),
+                    );
+                } else {
+                    map.insert(authority_str.to_string(), None);
+                }
+            }
+
+            Ok(map)
+        })
+        .await
+    }
+
+    pub(crate) async fn connected_ids(&self) -> Result<Vec<IriString>, Error> {
         self.unblock(|inner| Ok(inner.connected().collect())).await
     }
 
-    pub(crate) async fn save_info(&self, actor_id: Url, info: Info) -> Result<(), MyError> {
+    pub(crate) async fn save_info(&self, actor_id: IriString, info: Info) -> Result<(), Error> {
         self.unblock(move |inner| {
             let vec = serde_json::to_vec(&info)?;
 
@@ -246,33 +354,36 @@ impl Db {
                 .actor_id_info
                 .insert(actor_id.as_str().as_bytes(), vec)?;
 
+            metrics::gauge!("relay.db.actor-id-info.size")
+                .set(crate::collector::recordable(inner.actor_id_info.len()));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn info(&self, actor_id: Url) -> Result<Option<Info>, MyError> {
+    pub(crate) async fn info(&self, actor_id: IriString) -> Result<Option<Info>, Error> {
         self.unblock(move |inner| {
-            if let Some(ivec) = inner.actor_id_info.get(actor_id.as_str().as_bytes())? {
-                let info = serde_json::from_slice(&ivec)?;
-                Ok(Some(info))
-            } else {
-                Ok(None)
-            }
+            inner
+                .actor_id_info
+                .get(actor_id.as_str().as_bytes())?
+                .map(|ivec| serde_json::from_slice(&ivec))
+                .transpose()
+                .map_err(Error::from)
         })
         .await
     }
 
-    pub(crate) async fn connected_info(&self) -> Result<HashMap<Url, Info>, MyError> {
+    pub(crate) async fn connected_info(&self) -> Result<HashMap<IriString, Info>, Error> {
         self.unblock(|inner| Ok(inner.connected_info().collect()))
             .await
     }
 
     pub(crate) async fn save_instance(
         &self,
-        actor_id: Url,
+        actor_id: IriString,
         instance: Instance,
-    ) -> Result<(), MyError> {
+    ) -> Result<(), Error> {
         self.unblock(move |inner| {
             let vec = serde_json::to_vec(&instance)?;
 
@@ -280,33 +391,36 @@ impl Db {
                 .actor_id_instance
                 .insert(actor_id.as_str().as_bytes(), vec)?;
 
+            metrics::gauge!("relay.db.actor-id-instance.size")
+                .set(crate::collector::recordable(inner.actor_id_instance.len()));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn instance(&self, actor_id: Url) -> Result<Option<Instance>, MyError> {
+    pub(crate) async fn instance(&self, actor_id: IriString) -> Result<Option<Instance>, Error> {
         self.unblock(move |inner| {
-            if let Some(ivec) = inner.actor_id_instance.get(actor_id.as_str().as_bytes())? {
-                let instance = serde_json::from_slice(&ivec)?;
-                Ok(Some(instance))
-            } else {
-                Ok(None)
-            }
+            inner
+                .actor_id_instance
+                .get(actor_id.as_str().as_bytes())?
+                .map(|ivec| serde_json::from_slice(&ivec))
+                .transpose()
+                .map_err(Error::from)
         })
         .await
     }
 
-    pub(crate) async fn connected_instance(&self) -> Result<HashMap<Url, Instance>, MyError> {
+    pub(crate) async fn connected_instance(&self) -> Result<HashMap<IriString, Instance>, Error> {
         self.unblock(|inner| Ok(inner.connected_instance().collect()))
             .await
     }
 
     pub(crate) async fn save_contact(
         &self,
-        actor_id: Url,
+        actor_id: IriString,
         contact: Contact,
-    ) -> Result<(), MyError> {
+    ) -> Result<(), Error> {
         self.unblock(move |inner| {
             let vec = serde_json::to_vec(&contact)?;
 
@@ -314,29 +428,32 @@ impl Db {
                 .actor_id_contact
                 .insert(actor_id.as_str().as_bytes(), vec)?;
 
+            metrics::gauge!("relay.db.actor-id-contact.size")
+                .set(crate::collector::recordable(inner.actor_id_contact.len()));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn contact(&self, actor_id: Url) -> Result<Option<Contact>, MyError> {
+    pub(crate) async fn contact(&self, actor_id: IriString) -> Result<Option<Contact>, Error> {
         self.unblock(move |inner| {
-            if let Some(ivec) = inner.actor_id_contact.get(actor_id.as_str().as_bytes())? {
-                let contact = serde_json::from_slice(&ivec)?;
-                Ok(Some(contact))
-            } else {
-                Ok(None)
-            }
+            inner
+                .actor_id_contact
+                .get(actor_id.as_str().as_bytes())?
+                .map(|ivec| serde_json::from_slice(&ivec))
+                .transpose()
+                .map_err(Error::from)
         })
         .await
     }
 
-    pub(crate) async fn connected_contact(&self) -> Result<HashMap<Url, Contact>, MyError> {
+    pub(crate) async fn connected_contact(&self) -> Result<HashMap<IriString, Contact>, Error> {
         self.unblock(|inner| Ok(inner.connected_contact().collect()))
             .await
     }
 
-    pub(crate) async fn save_url(&self, url: Url, id: Uuid) -> Result<(), MyError> {
+    pub(crate) async fn save_url(&self, url: IriString, id: Uuid) -> Result<(), Error> {
         self.unblock(move |inner| {
             inner
                 .media_id_media_url
@@ -344,97 +461,61 @@ impl Db {
             inner
                 .media_url_media_id
                 .insert(url.as_str().as_bytes(), id.as_bytes())?;
-            Ok(())
-        })
-        .await
-    }
 
-    pub(crate) async fn save_bytes(
-        &self,
-        id: Uuid,
-        meta: MediaMeta,
-        bytes: Bytes,
-    ) -> Result<(), MyError> {
-        self.unblock(move |inner| {
-            let vec = serde_json::to_vec(&meta)?;
-
-            inner
-                .media_id_media_bytes
-                .insert(id.as_bytes(), bytes.as_ref())?;
-            inner.media_id_media_meta.insert(id.as_bytes(), vec)?;
+            metrics::gauge!("relay.db.media-id-media-url.size")
+                .set(crate::collector::recordable(inner.media_id_media_url.len()));
+            metrics::gauge!("relay.db.media-url-media-id.size")
+                .set(crate::collector::recordable(inner.media_url_media_id.len()));
 
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn media_id(&self, url: Url) -> Result<Option<Uuid>, MyError> {
+    pub(crate) async fn media_id(&self, url: IriString) -> Result<Option<Uuid>, Error> {
         self.unblock(move |inner| {
-            if let Some(ivec) = inner.media_url_media_id.get(url.as_str().as_bytes())? {
-                Ok(uuid_from_ivec(ivec))
-            } else {
-                Ok(None)
-            }
+            Ok(inner
+                .media_url_media_id
+                .get(url.as_str().as_bytes())?
+                .and_then(uuid_from_ivec))
         })
         .await
     }
 
-    pub(crate) async fn media_url(&self, id: Uuid) -> Result<Option<Url>, MyError> {
+    pub(crate) async fn media_url(&self, id: Uuid) -> Result<Option<IriString>, Error> {
         self.unblock(move |inner| {
-            if let Some(ivec) = inner.media_id_media_url.get(id.as_bytes())? {
-                Ok(url_from_ivec(ivec))
-            } else {
-                Ok(None)
-            }
+            Ok(inner
+                .media_id_media_url
+                .get(id.as_bytes())?
+                .and_then(url_from_ivec))
         })
         .await
     }
 
-    pub(crate) async fn media_bytes(&self, id: Uuid) -> Result<Option<Bytes>, MyError> {
-        self.unblock(move |inner| {
-            if let Some(ivec) = inner.media_id_media_bytes.get(id.as_bytes())? {
-                Ok(Some(Bytes::copy_from_slice(&ivec)))
-            } else {
-                Ok(None)
-            }
-        })
-        .await
-    }
-
-    pub(crate) async fn media_meta(&self, id: Uuid) -> Result<Option<MediaMeta>, MyError> {
-        self.unblock(move |inner| {
-            if let Some(ivec) = inner.media_id_media_meta.get(id.as_bytes())? {
-                let meta = serde_json::from_slice(&ivec)?;
-                Ok(Some(meta))
-            } else {
-                Ok(None)
-            }
-        })
-        .await
-    }
-
-    pub(crate) async fn blocks(&self) -> Result<Vec<String>, MyError> {
+    pub(crate) async fn blocks(&self) -> Result<Vec<String>, Error> {
         self.unblock(|inner| Ok(inner.blocks().collect())).await
     }
 
-    pub(crate) async fn inboxes(&self) -> Result<Vec<Url>, MyError> {
+    pub(crate) async fn allows(&self) -> Result<Vec<String>, Error> {
+        self.unblock(|inner| Ok(inner.allowed().collect())).await
+    }
+
+    pub(crate) async fn inboxes(&self) -> Result<Vec<IriString>, Error> {
         self.unblock(|inner| Ok(inner.connected_actors().map(|actor| actor.inbox).collect()))
             .await
     }
 
-    pub(crate) async fn is_connected(&self, mut id: Url) -> Result<bool, MyError> {
-        id.set_path("");
-        id.set_query(None);
-        id.set_fragment(None);
+    pub(crate) async fn is_connected(&self, base_id: IriString) -> Result<bool, Error> {
+        let scheme = base_id.scheme_str();
+        let authority = base_id.authority_str().ok_or(ErrorKind::MissingDomain)?;
+        let prefix = format!("{scheme}://{authority}");
 
         self.unblock(move |inner| {
             let connected = inner
                 .connected_actor_ids
-                .scan_prefix(id.as_str().as_bytes())
+                .scan_prefix(prefix.as_bytes())
                 .values()
-                .filter_map(|res| res.ok())
-                .next()
-                .is_some();
+                .any(|res| res.is_ok());
 
             Ok(connected)
         })
@@ -443,34 +524,30 @@ impl Db {
 
     pub(crate) async fn actor_id_from_public_key_id(
         &self,
-        public_key_id: Url,
-    ) -> Result<Option<Url>, MyError> {
+        public_key_id: IriString,
+    ) -> Result<Option<IriString>, Error> {
         self.unblock(move |inner| {
-            if let Some(ivec) = inner
+            Ok(inner
                 .public_key_id_actor_id
                 .get(public_key_id.as_str().as_bytes())?
-            {
-                Ok(url_from_ivec(ivec))
-            } else {
-                Ok(None)
-            }
+                .and_then(url_from_ivec))
         })
         .await
     }
 
-    pub(crate) async fn actor(&self, actor_id: Url) -> Result<Option<Actor>, MyError> {
+    pub(crate) async fn actor(&self, actor_id: IriString) -> Result<Option<Actor>, Error> {
         self.unblock(move |inner| {
-            if let Some(ivec) = inner.actor_id_actor.get(actor_id.as_str().as_bytes())? {
-                let actor = serde_json::from_slice(&ivec)?;
-                Ok(Some(actor))
-            } else {
-                Ok(None)
-            }
+            inner
+                .actor_id_actor
+                .get(actor_id.as_str().as_bytes())?
+                .map(|ivec| serde_json::from_slice(&ivec))
+                .transpose()
+                .map_err(Error::from)
         })
         .await
     }
 
-    pub(crate) async fn save_actor(&self, actor: Actor) -> Result<(), MyError> {
+    pub(crate) async fn save_actor(&self, actor: Actor) -> Result<(), Error> {
         self.unblock(move |inner| {
             let vec = serde_json::to_vec(&actor)?;
 
@@ -481,102 +558,172 @@ impl Db {
             inner
                 .actor_id_actor
                 .insert(actor.id.as_str().as_bytes(), vec)?;
+
+            metrics::gauge!("relay.db.public-key-actor-id.size").set(crate::collector::recordable(
+                inner.public_key_id_actor_id.len(),
+            ));
+
+            metrics::gauge!("relay.db.actor-id-actor.size").set(crate::collector::recordable(
+                inner.public_key_id_actor_id.len(),
+            ));
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn remove_connection(&self, actor_id: Url) -> Result<(), MyError> {
-        log::debug!("Removing Connection: {}", actor_id);
+    pub(crate) async fn remove_connection(&self, actor_id: IriString) -> Result<(), Error> {
+        tracing::debug!("Removing Connection: {actor_id}");
         self.unblock(move |inner| {
             inner
                 .connected_actor_ids
                 .remove(actor_id.as_str().as_bytes())?;
 
+            metrics::gauge!("relay.db.connected-actor-ids.size").set(crate::collector::recordable(
+                inner.connected_actor_ids.len(),
+            ));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn add_connection(&self, actor_id: Url) -> Result<(), MyError> {
-        log::debug!("Adding Connection: {}", actor_id);
+    pub(crate) async fn add_connection(&self, actor_id: IriString) -> Result<(), Error> {
+        tracing::debug!("Adding Connection: {actor_id}");
         self.unblock(move |inner| {
             inner
                 .connected_actor_ids
                 .insert(actor_id.as_str().as_bytes(), actor_id.as_str().as_bytes())?;
 
+            metrics::gauge!("relay.db.connected-actor-ids.size").set(crate::collector::recordable(
+                inner.connected_actor_ids.len(),
+            ));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn add_blocks(&self, domains: Vec<String>) -> Result<(), MyError> {
+    pub(crate) async fn add_blocks(&self, domains: Vec<String>) -> Result<(), Error> {
         self.unblock(move |inner| {
-            for connected in inner.connected_by_domain(&domains) {
-                inner
-                    .connected_actor_ids
-                    .remove(connected.as_str().as_bytes())?;
-            }
+            let connected_by_domain = inner.connected_by_domain(&domains).collect::<Vec<_>>();
 
-            for domain in &domains {
-                inner
-                    .blocked_domains
-                    .insert(domain_key(domain), domain.as_bytes())?;
-                inner.allowed_domains.remove(domain_key(domain))?;
-            }
+            let res = (
+                &inner.connected_actor_ids,
+                &inner.blocked_domains,
+                &inner.allowed_domains,
+            )
+                .transaction(|(connected, blocked, allowed)| {
+                    let mut connected_batch = Batch::default();
+                    let mut blocked_batch = Batch::default();
+                    let mut allowed_batch = Batch::default();
 
-            Ok(())
+                    for connected in &connected_by_domain {
+                        connected_batch.remove(connected.as_str().as_bytes());
+                    }
+
+                    for authority in &domains {
+                        blocked_batch
+                            .insert(domain_key(authority).as_bytes(), authority.as_bytes());
+                        allowed_batch.remove(domain_key(authority).as_bytes());
+                    }
+
+                    connected.apply_batch(&connected_batch)?;
+                    blocked.apply_batch(&blocked_batch)?;
+                    allowed.apply_batch(&allowed_batch)?;
+
+                    Ok(())
+                });
+
+            metrics::gauge!("relay.db.connected-actor-ids.size").set(crate::collector::recordable(
+                inner.connected_actor_ids.len(),
+            ));
+            metrics::gauge!("relay.db.blocked-domains.size")
+                .set(crate::collector::recordable(inner.blocked_domains.len()));
+            metrics::gauge!("relay.db.allowed-domains.size")
+                .set(crate::collector::recordable(inner.allowed_domains.len()));
+
+            match res {
+                Ok(()) => Ok(()),
+                Err(TransactionError::Abort(e) | TransactionError::Storage(e)) => Err(e.into()),
+            }
         })
         .await
     }
 
-    pub(crate) async fn remove_blocks(&self, domains: Vec<String>) -> Result<(), MyError> {
+    pub(crate) async fn remove_blocks(&self, domains: Vec<String>) -> Result<(), Error> {
         self.unblock(move |inner| {
-            for domain in &domains {
-                inner.blocked_domains.remove(domain_key(domain))?;
+            let mut blocked_batch = Batch::default();
+
+            for authority in &domains {
+                blocked_batch.remove(domain_key(authority).as_bytes());
             }
 
+            inner.blocked_domains.apply_batch(blocked_batch)?;
+
+            metrics::gauge!("relay.db.blocked-domains.size")
+                .set(crate::collector::recordable(inner.blocked_domains.len()));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn add_allows(&self, domains: Vec<String>) -> Result<(), MyError> {
+    pub(crate) async fn add_allows(&self, domains: Vec<String>) -> Result<(), Error> {
         self.unblock(move |inner| {
-            for domain in &domains {
-                inner
-                    .allowed_domains
-                    .insert(domain_key(domain), domain.as_bytes())?;
+            let mut allowed_batch = Batch::default();
+
+            for authority in &domains {
+                allowed_batch.insert(domain_key(authority).as_bytes(), authority.as_bytes());
             }
 
+            inner.allowed_domains.apply_batch(allowed_batch)?;
+
+            metrics::gauge!("relay.db.allowed-domains.size")
+                .set(crate::collector::recordable(inner.allowed_domains.len()));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn remove_allows(&self, domains: Vec<String>) -> Result<(), MyError> {
+    pub(crate) async fn remove_allows(&self, domains: Vec<String>) -> Result<(), Error> {
         self.unblock(move |inner| {
             if inner.restricted_mode {
-                for connected in inner.connected_by_domain(&domains) {
-                    inner
-                        .connected_actor_ids
-                        .remove(connected.as_str().as_bytes())?;
+                let connected_by_domain = inner.connected_by_domain(&domains).collect::<Vec<_>>();
+
+                let mut connected_batch = Batch::default();
+
+                for connected in &connected_by_domain {
+                    connected_batch.remove(connected.as_str().as_bytes());
                 }
+
+                inner.connected_actor_ids.apply_batch(connected_batch)?;
+
+                metrics::gauge!("relay.db.connected-actor-ids.size").set(
+                    crate::collector::recordable(inner.connected_actor_ids.len()),
+                );
             }
 
-            for domain in &domains {
-                inner.allowed_domains.remove(domain_key(domain))?;
+            let mut allowed_batch = Batch::default();
+
+            for authority in &domains {
+                allowed_batch.remove(domain_key(authority).as_bytes());
             }
 
+            inner.allowed_domains.apply_batch(allowed_batch)?;
+
+            metrics::gauge!("relay.db.allowed-domains.size")
+                .set(crate::collector::recordable(inner.allowed_domains.len()));
+
             Ok(())
         })
         .await
     }
 
-    pub(crate) async fn is_allowed(&self, url: Url) -> Result<bool, MyError> {
+    pub(crate) async fn is_allowed(&self, url: IriString) -> Result<bool, Error> {
         self.unblock(move |inner| {
-            if let Some(domain) = url.domain() {
-                Ok(inner.is_allowed(domain))
+            if let Some(authority) = url.authority_str() {
+                Ok(inner.is_allowed(authority))
             } else {
                 Ok(false)
             }
@@ -584,7 +731,7 @@ impl Db {
         .await
     }
 
-    pub(crate) async fn private_key(&self) -> Result<Option<RsaPrivateKey>, MyError> {
+    pub(crate) async fn private_key(&self) -> Result<Option<RsaPrivateKey>, Error> {
         self.unblock(|inner| {
             if let Some(ivec) = inner.settings.get("private-key")? {
                 let key_str = String::from_utf8_lossy(&ivec);
@@ -601,25 +748,29 @@ impl Db {
     pub(crate) async fn update_private_key(
         &self,
         private_key: &RsaPrivateKey,
-    ) -> Result<(), MyError> {
-        let pem_pkcs8 = private_key.to_pkcs8_pem()?;
+    ) -> Result<(), Error> {
+        let pem_pkcs8 = private_key.to_pkcs8_pem(rsa::pkcs8::LineEnding::default())?;
 
         self.unblock(move |inner| {
             inner
                 .settings
                 .insert("private-key".as_bytes(), pem_pkcs8.as_bytes())?;
+
+            metrics::gauge!("relay.db.settings.size")
+                .set(crate::collector::recordable(inner.settings.len()));
+
             Ok(())
         })
         .await
     }
 }
 
-fn domain_key(domain: &str) -> String {
-    domain.split('.').rev().collect::<Vec<_>>().join(".") + "."
+fn domain_key(authority: &str) -> String {
+    authority.split('.').rev().collect::<Vec<_>>().join(".") + "."
 }
 
-fn domain_prefix(domain: &str) -> String {
-    domain
+fn domain_prefix(authority: &str) -> String {
+    authority
         .split('.')
         .rev()
         .take(2)
@@ -628,8 +779,8 @@ fn domain_prefix(domain: &str) -> String {
         + "."
 }
 
-fn url_from_ivec(ivec: sled::IVec) -> Option<Url> {
-    String::from_utf8_lossy(&ivec).parse::<Url>().ok()
+fn url_from_ivec(ivec: sled::IVec) -> Option<IriString> {
+    String::from_utf8_lossy(&ivec).parse::<IriString>().ok()
 }
 
 fn uuid_from_ivec(ivec: sled::IVec) -> Option<Uuid> {
@@ -639,14 +790,14 @@ fn uuid_from_ivec(ivec: sled::IVec) -> Option<Uuid> {
 #[cfg(test)]
 mod tests {
     use super::Db;
-    use activitystreams::url::Url;
+    use activitystreams::iri_string::types::IriString;
     use std::future::Future;
 
     #[test]
     fn connect_and_verify() {
         run(|db| async move {
-            let example_actor: Url = "http://example.com/actor".parse().unwrap();
-            let example_sub_actor: Url = "http://example.com/users/fake".parse().unwrap();
+            let example_actor: IriString = "http://example.com/actor".parse().unwrap();
+            let example_sub_actor: IriString = "http://example.com/users/fake".parse().unwrap();
             db.add_connection(example_actor.clone()).await.unwrap();
             assert!(db.is_connected(example_sub_actor).await.unwrap());
         })
@@ -655,8 +806,8 @@ mod tests {
     #[test]
     fn disconnect_and_verify() {
         run(|db| async move {
-            let example_actor: Url = "http://example.com/actor".parse().unwrap();
-            let example_sub_actor: Url = "http://example.com/users/fake".parse().unwrap();
+            let example_actor: IriString = "http://example.com/actor".parse().unwrap();
+            let example_sub_actor: IriString = "http://example.com/users/fake".parse().unwrap();
             db.add_connection(example_actor.clone()).await.unwrap();
             assert!(db.is_connected(example_sub_actor.clone()).await.unwrap());
 
@@ -668,7 +819,7 @@ mod tests {
     #[test]
     fn connected_actor_in_connected_list() {
         run(|db| async move {
-            let example_actor: Url = "http://example.com/actor".parse().unwrap();
+            let example_actor: IriString = "http://example.com/actor".parse().unwrap();
             db.add_connection(example_actor.clone()).await.unwrap();
 
             assert!(db.connected_ids().await.unwrap().contains(&example_actor));
@@ -678,7 +829,7 @@ mod tests {
     #[test]
     fn disconnected_actor_not_in_connected_list() {
         run(|db| async move {
-            let example_actor: Url = "http://example.com/actor".parse().unwrap();
+            let example_actor: IriString = "http://example.com/actor".parse().unwrap();
             db.add_connection(example_actor.clone()).await.unwrap();
             db.remove_connection(example_actor.clone()).await.unwrap();
 
@@ -693,6 +844,11 @@ mod tests {
     {
         let db =
             Db::build_inner(true, sled::Config::new().temporary(true).open().unwrap()).unwrap();
-        actix_rt::System::new().block_on((f)(db));
+
+        tokio::runtime::Builder::new_current_thread()
+            .enable_all()
+            .build()
+            .unwrap()
+            .block_on((f)(db));
     }
 }

src/error.rs

@@ -1,41 +1,169 @@
-use activitystreams::{error::DomainError, url::ParseError};
+use activitystreams::checked::CheckError;
 use actix_web::{
     error::{BlockingError, ResponseError},
     http::StatusCode,
     HttpResponse,
 };
-use http_signature_normalization_actix::PrepareSignError;
-use log::error;
-use std::{convert::Infallible, fmt::Debug, io::Error};
+use background_jobs::BoxError;
+use color_eyre::eyre::Error as Report;
+use http_signature_normalization_reqwest::SignError;
+use std::{convert::Infallible, io, sync::Arc};
+use tokio::task::JoinError;
+
+#[derive(Clone)]
+struct ArcKind {
+    kind: Arc<ErrorKind>,
+}
+
+impl std::fmt::Debug for ArcKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.kind.fmt(f)
+    }
+}
+
+impl std::fmt::Display for ArcKind {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.kind.fmt(f)
+    }
+}
+
+impl std::error::Error for ArcKind {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.kind.source()
+    }
+}
+
+pub(crate) struct Error {
+    kind: ArcKind,
+    display: Box<str>,
+    debug: Box<str>,
+}
+
+impl Error {
+    fn kind(&self) -> &ErrorKind {
+        &self.kind.kind
+    }
+
+    pub(crate) fn is_breaker(&self) -> bool {
+        matches!(self.kind(), ErrorKind::Breaker)
+    }
+
+    pub(crate) fn is_not_found(&self) -> bool {
+        matches!(self.kind(), ErrorKind::Status(_, StatusCode::NOT_FOUND))
+    }
+
+    pub(crate) fn is_bad_request(&self) -> bool {
+        matches!(self.kind(), ErrorKind::Status(_, StatusCode::BAD_REQUEST))
+    }
+
+    pub(crate) fn is_gone(&self) -> bool {
+        matches!(self.kind(), ErrorKind::Status(_, StatusCode::GONE))
+    }
+
+    pub(crate) fn is_malformed_json(&self) -> bool {
+        matches!(self.kind(), ErrorKind::Json(_))
+    }
+}
+
+impl std::fmt::Debug for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&self.debug)
+    }
+}
+
+impl std::fmt::Display for Error {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.write_str(&self.display)
+    }
+}
+
+impl std::error::Error for Error {
+    fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
+        self.kind().source()
+    }
+}
+
+impl<T> From<T> for Error
+where
+    ErrorKind: From<T>,
+{
+    fn from(error: T) -> Self {
+        let kind = ArcKind {
+            kind: Arc::new(ErrorKind::from(error)),
+        };
+        let report = Report::new(kind.clone());
+        let display = format!("{report}");
+        let debug = format!("{report:?}");
+
+        Error {
+            kind,
+            display: Box::from(display),
+            debug: Box::from(debug),
+        }
+    }
+}
 
 #[derive(Debug, thiserror::Error)]
-pub(crate) enum MyError {
-    #[error("Error queueing job, {0}")]
-    Queue(anyhow::Error),
+pub(crate) enum ErrorKind {
+    #[error("Error in extractor")]
+    Extractor(#[from] crate::extractors::ErrorKind),
 
-    #[error("Error in configuration, {0}")]
+    #[error("Error queueing job")]
+    Queue(#[from] BoxError),
+
+    #[error("Error in configuration")]
     Config(#[from] config::ConfigError),
 
-    #[error("Couldn't parse key, {0}")]
+    #[error("Couldn't parse key")]
     Pkcs8(#[from] rsa::pkcs8::Error),
 
-    #[error("Couldn't parse URI, {0}")]
-    Uri(#[from] ParseError),
+    #[error("Couldn't encode public key")]
+    Spki(#[from] rsa::pkcs8::spki::Error),
 
-    #[error("Couldn't perform IO, {0}")]
-    Io(#[from] Error),
+    #[error("Couldn't sign request")]
+    SignRequest,
+
+    #[error("Response body from server exceeded limits")]
+    BodyTooLarge,
+
+    #[error("Couldn't make request")]
+    Reqwest(#[from] reqwest::Error),
+
+    #[error("Couldn't make request")]
+    ReqwestMiddleware(#[from] reqwest_middleware::Error),
+
+    #[error("Couldn't parse IRI")]
+    ParseIri(#[from] activitystreams::iri_string::validate::Error),
+
+    #[error("Couldn't normalize IRI")]
+    NormalizeIri(#[from] std::collections::TryReserveError),
+
+    #[error("Couldn't perform IO")]
+    Io(#[from] io::Error),
 
     #[error("Couldn't sign string, {0}")]
     Rsa(rsa::errors::Error),
 
-    #[error("Couldn't use db, {0}")]
+    #[error("Couldn't use db")]
     Sled(#[from] sled::Error),
 
-    #[error("Couldn't do the json thing, {0}")]
+    #[error("Couldn't do the json thing")]
     Json(#[from] serde_json::Error),
 
-    #[error("Couldn't build signing string, {0}")]
-    PrepareSign(#[from] PrepareSignError),
+    #[error("Couldn't sign request")]
+    Sign(#[from] SignError),
+
+    #[error("Couldn't sign digest")]
+    Signature(#[from] rsa::signature::Error),
+
+    #[error("Couldn't prepare TLS private key")]
+    PrepareKey(#[from] rustls::Error),
+
+    #[error("Couldn't verify signature")]
+    VerifySignature,
+
+    #[error("Failed to encode key der")]
+    DerEncode,
 
     #[error("Couldn't parse the signature header")]
     HeaderValidation(#[from] actix_web::http::header::InvalidHeaderValue),
@@ -56,19 +184,16 @@ pub(crate) enum MyError {
     BadActor(String, String),
 
     #[error("Signature verification is required, but no signature was given")]
-    NoSignature(String),
+    NoSignature(Option<String>),
 
     #[error("Wrong ActivityPub kind, {0}")]
     Kind(String),
 
-    #[error("Too many CPUs, {0}")]
+    #[error("Too many CPUs")]
     CpuCount(#[from] std::num::TryFromIntError),
 
-    #[error("{0}")]
-    HostMismatch(#[from] DomainError),
-
-    #[error("Invalid or missing content type")]
-    ContentType,
+    #[error("Host mismatch")]
+    HostMismatch(#[from] CheckError),
 
     #[error("Couldn't flush buffer")]
     FlushBuffer,
@@ -100,7 +225,7 @@ pub(crate) enum MyError {
     #[error("Input is missing a 'id' field")]
     MissingId,
 
-    #[error("Url is missing a domain")]
+    #[error("IriString is missing a domain")]
     MissingDomain,
 
     #[error("URI is missing domain field")]
@@ -111,19 +236,27 @@ pub(crate) enum MyError {
 
     #[error("Not trying request due to failed breaker")]
     Breaker,
+
+    #[error("Failed to extract fields from {0}")]
+    Extract(&'static str),
+
+    #[error("No API Token supplied")]
+    MissingApiToken,
 }
 
-impl ResponseError for MyError {
+impl ResponseError for Error {
     fn status_code(&self) -> StatusCode {
-        match self {
-            MyError::NotAllowed(_) | MyError::WrongActor(_) | MyError::BadActor(_, _) => {
+        match self.kind() {
+            ErrorKind::NotAllowed(_) | ErrorKind::WrongActor(_) | ErrorKind::BadActor(_, _) => {
                 StatusCode::FORBIDDEN
             }
-            MyError::NotSubscribed(_) => StatusCode::UNAUTHORIZED,
-            MyError::Duplicate => StatusCode::ACCEPTED,
-            MyError::Kind(_) | MyError::MissingKind | MyError::MissingId | MyError::ObjectCount => {
-                StatusCode::BAD_REQUEST
-            }
+            ErrorKind::NotSubscribed(_) => StatusCode::UNAUTHORIZED,
+            ErrorKind::Duplicate => StatusCode::ACCEPTED,
+            ErrorKind::Kind(_)
+            | ErrorKind::MissingKind
+            | ErrorKind::MissingId
+            | ErrorKind::ObjectCount
+            | ErrorKind::NoSignature(_) => StatusCode::BAD_REQUEST,
             _ => StatusCode::INTERNAL_SERVER_ERROR,
         }
     }
@@ -133,27 +266,45 @@ impl ResponseError for MyError {
             .insert_header(("Content-Type", "application/activity+json"))
             .body(
                 serde_json::to_string(&serde_json::json!({
-                    "error": self.to_string(),
+                    "error": self.kind().to_string(),
                 }))
-                .unwrap_or("{}".to_string()),
+                .unwrap_or_else(|_| "{}".to_string()),
             )
     }
 }
 
-impl From<BlockingError> for MyError {
+impl From<BlockingError> for ErrorKind {
     fn from(_: BlockingError) -> Self {
-        MyError::Canceled
+        ErrorKind::Canceled
     }
 }
 
-impl From<Infallible> for MyError {
+impl From<JoinError> for ErrorKind {
+    fn from(_: JoinError) -> Self {
+        ErrorKind::Canceled
+    }
+}
+
+impl From<Infallible> for ErrorKind {
     fn from(i: Infallible) -> Self {
         match i {}
     }
 }
 
-impl From<rsa::errors::Error> for MyError {
+impl From<rsa::errors::Error> for ErrorKind {
     fn from(e: rsa::errors::Error) -> Self {
-        MyError::Rsa(e)
+        ErrorKind::Rsa(e)
+    }
+}
+
+impl From<http_signature_normalization_actix::Canceled> for ErrorKind {
+    fn from(_: http_signature_normalization_actix::Canceled) -> Self {
+        Self::Canceled
+    }
+}
+
+impl From<http_signature_normalization_reqwest::Canceled> for ErrorKind {
+    fn from(_: http_signature_normalization_reqwest::Canceled) -> Self {
+        Self::Canceled
     }
 }

src/extractors.rs

@@ -0,0 +1,202 @@
+use actix_web::{
+    dev::Payload,
+    error::ParseError,
+    http::header::{from_one_raw_str, Header, HeaderName, HeaderValue, TryIntoHeaderValue},
+    web::Data,
+    FromRequest, HttpMessage, HttpRequest,
+};
+use bcrypt::{BcryptError, DEFAULT_COST};
+use http_signature_normalization_actix::{prelude::InvalidHeaderValue, Canceled, Spawn};
+use std::{convert::Infallible, str::FromStr, time::Instant};
+
+use crate::{db::Db, error::Error, future::LocalBoxFuture, spawner::Spawner};
+
+#[derive(Clone)]
+pub(crate) struct AdminConfig {
+    hashed_api_token: String,
+}
+
+impl AdminConfig {
+    pub(crate) fn build(api_token: &str) -> Result<Self, Error> {
+        Ok(AdminConfig {
+            hashed_api_token: bcrypt::hash(api_token, DEFAULT_COST).map_err(Error::bcrypt_hash)?,
+        })
+    }
+
+    fn verify(&self, token: XApiToken) -> Result<bool, Error> {
+        bcrypt::verify(token.0, &self.hashed_api_token).map_err(Error::bcrypt_verify)
+    }
+}
+
+pub(crate) struct Admin {
+    db: Data<Db>,
+}
+
+type PrepareTuple = (Data<Db>, Data<AdminConfig>, Data<Spawner>, XApiToken);
+
+impl Admin {
+    fn prepare_verify(req: &HttpRequest) -> Result<PrepareTuple, Error> {
+        let hashed_api_token = req
+            .app_data::<Data<AdminConfig>>()
+            .ok_or_else(Error::missing_config)?
+            .clone();
+
+        let x_api_token = XApiToken::parse(req).map_err(Error::parse_header)?;
+
+        let db = req
+            .app_data::<Data<Db>>()
+            .ok_or_else(Error::missing_db)?
+            .clone();
+
+        let spawner = req
+            .app_data::<Data<Spawner>>()
+            .ok_or_else(Error::missing_spawner)?
+            .clone();
+
+        Ok((db, hashed_api_token, spawner, x_api_token))
+    }
+
+    #[tracing::instrument(level = "debug", skip_all)]
+    async fn verify(
+        hashed_api_token: Data<AdminConfig>,
+        spawner: Data<Spawner>,
+        x_api_token: XApiToken,
+    ) -> Result<(), Error> {
+        let span = tracing::Span::current();
+        if spawner
+            .spawn_blocking(move || span.in_scope(|| hashed_api_token.verify(x_api_token)))
+            .await
+            .map_err(Error::canceled)??
+        {
+            return Ok(());
+        }
+
+        Err(Error::invalid())
+    }
+
+    pub(crate) fn db_ref(&self) -> &Db {
+        &self.db
+    }
+}
+
+impl Error {
+    fn invalid() -> Self {
+        Error::from(ErrorKind::Invalid)
+    }
+
+    fn missing_config() -> Self {
+        Error::from(ErrorKind::MissingConfig)
+    }
+
+    fn missing_db() -> Self {
+        Error::from(ErrorKind::MissingDb)
+    }
+
+    fn missing_spawner() -> Self {
+        Error::from(ErrorKind::MissingSpawner)
+    }
+
+    fn bcrypt_verify(e: BcryptError) -> Self {
+        Error::from(ErrorKind::BCryptVerify(e))
+    }
+
+    fn bcrypt_hash(e: BcryptError) -> Self {
+        Error::from(ErrorKind::BCryptHash(e))
+    }
+
+    fn parse_header(e: ParseError) -> Self {
+        Error::from(ErrorKind::ParseHeader(e))
+    }
+
+    fn canceled(_: Canceled) -> Self {
+        Error::from(ErrorKind::Canceled)
+    }
+}
+
+#[derive(Debug, thiserror::Error)]
+pub(crate) enum ErrorKind {
+    #[error("Invalid API Token")]
+    Invalid,
+
+    #[error("Missing Config")]
+    MissingConfig,
+
+    #[error("Missing Db")]
+    MissingDb,
+
+    #[error("Missing Spawner")]
+    MissingSpawner,
+
+    #[error("Panic in verify")]
+    Canceled,
+
+    #[error("Verifying")]
+    BCryptVerify(#[source] BcryptError),
+
+    #[error("Hashing")]
+    BCryptHash(#[source] BcryptError),
+
+    #[error("Parse Header")]
+    ParseHeader(#[source] ParseError),
+}
+
+impl FromRequest for Admin {
+    type Error = Error;
+    type Future = LocalBoxFuture<'static, Result<Self, Self::Error>>;
+
+    fn from_request(req: &HttpRequest, _: &mut Payload) -> Self::Future {
+        let now = Instant::now();
+        let res = Self::prepare_verify(req);
+        Box::pin(async move {
+            let (db, c, s, t) = res?;
+            Self::verify(c, s, t).await?;
+            metrics::histogram!("relay.admin.verify")
+                .record(now.elapsed().as_micros() as f64 / 1_000_000_f64);
+            Ok(Admin { db })
+        })
+    }
+}
+
+pub(crate) struct XApiToken(String);
+
+impl XApiToken {
+    pub(crate) fn new(token: String) -> Self {
+        Self(token)
+    }
+
+    pub(crate) const fn http1_name() -> reqwest::header::HeaderName {
+        reqwest::header::HeaderName::from_static("x-api-token")
+    }
+}
+
+impl Header for XApiToken {
+    fn name() -> HeaderName {
+        HeaderName::from_static("x-api-token")
+    }
+
+    fn parse<M: HttpMessage>(msg: &M) -> Result<Self, ParseError> {
+        from_one_raw_str(msg.headers().get(Self::name()))
+    }
+}
+
+impl TryIntoHeaderValue for XApiToken {
+    type Error = InvalidHeaderValue;
+
+    fn try_into_value(self) -> Result<HeaderValue, Self::Error> {
+        HeaderValue::from_str(&self.0)
+    }
+}
+
+impl FromStr for XApiToken {
+    type Err = Infallible;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(XApiToken(s.to_string()))
+    }
+}
+
+impl std::fmt::Display for XApiToken {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}

src/future.rs

@@ -0,0 +1,4 @@
+use std::{future::Future, pin::Pin};
+
+pub(crate) type LocalBoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + 'a>>;
+pub(crate) type BoxFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;

src/http1.rs

@@ -0,0 +1,18 @@
+pub(crate) fn name_to_http02(
+    name: &reqwest::header::HeaderName,
+) -> actix_web::http::header::HeaderName {
+    actix_web::http::header::HeaderName::from_bytes(name.as_ref())
+        .expect("headername conversions always work")
+}
+
+pub(crate) fn value_to_http02(
+    value: &reqwest::header::HeaderValue,
+) -> actix_web::http::header::HeaderValue {
+    actix_web::http::header::HeaderValue::from_bytes(value.as_bytes())
+        .expect("headervalue conversions always work")
+}
+
+pub(crate) fn status_to_http02(status: reqwest::StatusCode) -> actix_web::http::StatusCode {
+    actix_web::http::StatusCode::from_u16(status.as_u16())
+        .expect("statuscode conversions always work")
+}

src/jobs.rs

@@ -0,0 +1,201 @@
+pub mod apub;
+mod contact;
+mod deliver;
+mod deliver_many;
+mod instance;
+mod nodeinfo;
+mod process_listeners;
+mod record_last_online;
+
+pub(crate) use self::{
+    contact::QueryContact, deliver::Deliver, deliver_many::DeliverMany, instance::QueryInstance,
+    nodeinfo::QueryNodeinfo,
+};
+
+use crate::{
+    config::Config,
+    data::{ActorCache, MediaCache, State},
+    error::{Error, ErrorKind},
+    jobs::{process_listeners::Listeners, record_last_online::RecordLastOnline},
+};
+use background_jobs::{
+    memory_storage::{Storage, TokioTimer},
+    metrics::MetricsStorage,
+    tokio::{QueueHandle, WorkerConfig},
+    Job,
+};
+use std::time::Duration;
+
+fn debug_object(activity: &serde_json::Value) -> &serde_json::Value {
+    let mut object = &activity["object"]["type"];
+
+    if object.is_null() {
+        object = &activity["object"]["id"];
+    }
+
+    if object.is_null() {
+        object = &activity["object"];
+    }
+
+    object
+}
+
+pub(crate) fn build_storage() -> MetricsStorage<Storage<TokioTimer>> {
+    MetricsStorage::wrap(Storage::new(TokioTimer))
+}
+
+pub(crate) fn create_workers(
+    storage: MetricsStorage<Storage<TokioTimer>>,
+    state: State,
+    actors: ActorCache,
+    media: MediaCache,
+    config: Config,
+) -> std::io::Result<JobServer> {
+    let deliver_concurrency = config.deliver_concurrency();
+
+    let queue_handle = WorkerConfig::new(storage, move |queue_handle| {
+        JobState::new(
+            state.clone(),
+            actors.clone(),
+            JobServer::new(queue_handle),
+            media.clone(),
+            config.clone(),
+        )
+    })
+    .register::<Deliver>()
+    .register::<DeliverMany>()
+    .register::<QueryNodeinfo>()
+    .register::<QueryInstance>()
+    .register::<Listeners>()
+    .register::<QueryContact>()
+    .register::<RecordLastOnline>()
+    .register::<apub::Announce>()
+    .register::<apub::Follow>()
+    .register::<apub::Forward>()
+    .register::<apub::Reject>()
+    .register::<apub::Undo>()
+    .set_worker_count("maintenance", 2)
+    .set_worker_count("apub", 2)
+    .set_worker_count("deliver", deliver_concurrency)
+    .start()?;
+
+    queue_handle.every(Duration::from_secs(60 * 5), Listeners)?;
+    queue_handle.every(Duration::from_secs(60 * 10), RecordLastOnline)?;
+
+    Ok(JobServer::new(queue_handle))
+}
+
+#[derive(Clone, Debug)]
+pub(crate) struct JobState {
+    state: State,
+    actors: ActorCache,
+    config: Config,
+    media: MediaCache,
+    job_server: JobServer,
+}
+
+#[derive(Clone)]
+pub(crate) struct JobServer {
+    remote: QueueHandle,
+}
+
+impl std::fmt::Debug for JobServer {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("JobServer")
+            .field("queue_handle", &"QueueHandle")
+            .finish()
+    }
+}
+
+impl JobState {
+    fn new(
+        state: State,
+        actors: ActorCache,
+        job_server: JobServer,
+        media: MediaCache,
+        config: Config,
+    ) -> Self {
+        JobState {
+            state,
+            actors,
+            config,
+            media,
+            job_server,
+        }
+    }
+}
+
+impl JobServer {
+    fn new(remote_handle: QueueHandle) -> Self {
+        JobServer {
+            remote: remote_handle,
+        }
+    }
+
+    pub(crate) async fn queue<J>(&self, job: J) -> Result<(), Error>
+    where
+        J: Job,
+    {
+        self.remote
+            .queue(job)
+            .await
+            .map_err(ErrorKind::Queue)
+            .map_err(Into::into)
+    }
+}
+
+struct Boolish {
+    inner: bool,
+}
+
+impl std::ops::Deref for Boolish {
+    type Target = bool;
+
+    fn deref(&self) -> &Self::Target {
+        &self.inner
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for Boolish {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        #[derive(serde::Deserialize)]
+        #[serde(untagged)]
+        enum BoolThing {
+            Bool(bool),
+            String(String),
+        }
+
+        let thing: BoolThing = serde::Deserialize::deserialize(deserializer)?;
+
+        match thing {
+            BoolThing::Bool(inner) => Ok(Boolish { inner }),
+            BoolThing::String(s) if s.to_lowercase() == "false" => Ok(Boolish { inner: false }),
+            BoolThing::String(_) => Ok(Boolish { inner: true }),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::Boolish;
+
+    #[test]
+    fn boolish_works() {
+        const CASES: &[(&str, bool)] = &[
+            ("false", false),
+            ("\"false\"", false),
+            ("\"FALSE\"", false),
+            ("true", true),
+            ("\"true\"", true),
+            ("\"anything else\"", true),
+        ];
+
+        for (case, output) in CASES {
+            let b: Boolish = serde_json::from_str(case).unwrap();
+            assert_eq!(*b, *output);
+        }
+    }
+}

src/jobs/apub.rs

@@ -2,14 +2,14 @@ use crate::{
     config::{Config, UrlKind},
     data::State,
     db::Actor,
-    error::MyError,
+    error::{Error, ErrorKind},
 };
 use activitystreams::{
     activity::{Follow as AsFollow, Undo as AsUndo},
     context,
+    iri_string::types::IriString,
     prelude::*,
     security,
-    url::Url,
 };
 use std::convert::TryInto;
 
@@ -23,20 +23,27 @@ pub(crate) use self::{
     announce::Announce, follow::Follow, forward::Forward, reject::Reject, undo::Undo,
 };
 
-async fn get_inboxes(state: &State, actor: &Actor, object_id: &Url) -> Result<Vec<Url>, MyError> {
-    let domain = object_id.host().ok_or(MyError::Domain)?.to_string();
+async fn get_inboxes(
+    state: &State,
+    actor: &Actor,
+    object_id: &IriString,
+) -> Result<Vec<IriString>, Error> {
+    let authority = object_id
+        .authority_str()
+        .ok_or(ErrorKind::Domain)?
+        .to_string();
 
-    state.inboxes_without(&actor.inbox, &domain).await
+    state.inboxes_without(&actor.inbox, &authority).await
 }
 
-fn prepare_activity<T, U, V, Kind>(
+fn prepare_activity<T, U, V>(
     mut t: T,
-    id: impl TryInto<Url, Error = U>,
-    to: impl TryInto<Url, Error = V>,
-) -> Result<T, MyError>
+    id: impl TryInto<IriString, Error = U>,
+    to: impl TryInto<IriString, Error = V>,
+) -> Result<T, Error>
 where
-    T: ObjectExt<Kind> + BaseExt<Kind>,
-    MyError: From<U> + From<V>,
+    T: ObjectExt + BaseExt,
+    Error: From<U> + From<V>,
 {
     t.set_id(id.try_into()?)
         .set_many_tos(vec![to.try_into()?])
@@ -45,7 +52,11 @@ where
 }
 
 // Generate a type that says "I want to stop following you"
-fn generate_undo_follow(config: &Config, actor_id: &Url, my_id: &Url) -> Result<AsUndo, MyError> {
+fn generate_undo_follow(
+    config: &Config,
+    actor_id: &IriString,
+    my_id: &IriString,
+) -> Result<AsUndo, Error> {
     let mut follow = AsFollow::new(my_id.clone(), actor_id.clone());
 
     follow.set_id(config.generate_url(UrlKind::Activity));

src/jobs/apub/announce.rs

@@ -1,37 +1,48 @@
 use crate::{
     config::{Config, UrlKind},
     db::Actor,
-    error::MyError,
+    error::Error,
+    future::BoxFuture,
     jobs::{
         apub::{get_inboxes, prepare_activity},
         DeliverMany, JobState,
     },
 };
-use activitystreams::{activity::Announce as AsAnnounce, url::Url};
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
+use activitystreams::{activity::Announce as AsAnnounce, iri_string::types::IriString};
+use background_jobs::Job;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct Announce {
-    object_id: Url,
+    object_id: IriString,
     actor: Actor,
 }
 
+impl std::fmt::Debug for Announce {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Announce")
+            .field("object_id", &self.object_id.to_string())
+            .field("actor_id", &self.actor.id)
+            .finish()
+    }
+}
+
 impl Announce {
-    pub fn new(object_id: Url, actor: Actor) -> Self {
+    pub fn new(object_id: IriString, actor: Actor) -> Self {
         Announce { object_id, actor }
     }
 
-    async fn perform(self, state: JobState) -> Result<(), anyhow::Error> {
+    #[tracing::instrument(name = "Announce", skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
         let activity_id = state.config.generate_url(UrlKind::Activity);
 
         let announce = generate_announce(&state.config, &activity_id, &self.object_id)?;
         let inboxes = get_inboxes(&state.state, &self.actor, &self.object_id).await?;
         state
             .job_server
-            .queue(DeliverMany::new(inboxes, announce)?)?;
+            .queue(DeliverMany::new(inboxes, announce)?)
+            .await?;
 
-        state.state.cache(self.object_id, activity_id).await;
+        state.state.cache(self.object_id, activity_id);
         Ok(())
     }
 }
@@ -39,9 +50,9 @@ impl Announce {
 // Generate a type that says "Look at this object"
 fn generate_announce(
     config: &Config,
-    activity_id: &Url,
-    object_id: &Url,
-) -> Result<AsAnnounce, MyError> {
+    activity_id: &IriString,
+    object_id: &IriString,
+) -> Result<AsAnnounce, Error> {
     let announce = AsAnnounce::new(config.generate_url(UrlKind::Actor), object_id.clone());
 
     prepare_activity(
@@ -51,11 +62,13 @@ fn generate_announce(
     )
 }
 
-impl ActixJob for Announce {
+impl Job for Announce {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), anyhow::Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::apub::Announce";
+    const QUEUE: &'static str = "apub";
 
     fn run(self, state: Self::State) -> Self::Future {
         Box::pin(self.perform(state))

src/jobs/apub/follow.rs

@@ -2,29 +2,39 @@ use crate::{
     apub::AcceptedActivities,
     config::{Config, UrlKind},
     db::Actor,
-    error::MyError,
+    error::{Error, ErrorKind},
+    future::BoxFuture,
     jobs::{apub::prepare_activity, Deliver, JobState, QueryInstance, QueryNodeinfo},
 };
 use activitystreams::{
     activity::{Accept as AsAccept, Follow as AsFollow},
+    iri_string::types::IriString,
     prelude::*,
-    url::Url,
 };
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
+use background_jobs::Job;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct Follow {
     input: AcceptedActivities,
     actor: Actor,
 }
 
+impl std::fmt::Debug for Follow {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Follow")
+            .field("input", &self.input.id_unchecked())
+            .field("actor", &self.actor.id)
+            .finish()
+    }
+}
+
 impl Follow {
     pub fn new(input: AcceptedActivities, actor: Actor) -> Self {
         Follow { input, actor }
     }
 
-    async fn perform(self, state: JobState) -> Result<(), anyhow::Error> {
+    #[tracing::instrument(name = "Follow", skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
         let my_id = state.config.generate_url(UrlKind::Actor);
 
         // if following relay directly, not just following 'public', followback
@@ -34,7 +44,8 @@ impl Follow {
             let follow = generate_follow(&state.config, &self.actor.id, &my_id)?;
             state
                 .job_server
-                .queue(Deliver::new(self.actor.inbox.clone(), follow)?)?;
+                .queue(Deliver::new(self.actor.inbox.clone(), follow)?)
+                .await?;
         }
 
         state.actors.add_connection(self.actor.clone()).await?;
@@ -42,26 +53,35 @@ impl Follow {
         let accept = generate_accept_follow(
             &state.config,
             &self.actor.id,
-            self.input.id_unchecked().ok_or(MyError::MissingId)?,
+            self.input.id_unchecked().ok_or(ErrorKind::MissingId)?,
             &my_id,
         )?;
 
         state
             .job_server
-            .queue(Deliver::new(self.actor.inbox, accept)?)?;
+            .queue(Deliver::new(self.actor.inbox, accept)?)
+            .await?;
 
         state
             .job_server
-            .queue(QueryInstance::new(self.actor.id.clone()))?;
+            .queue(QueryInstance::new(self.actor.id.clone()))
+            .await?;
 
-        state.job_server.queue(QueryNodeinfo::new(self.actor.id))?;
+        state
+            .job_server
+            .queue(QueryNodeinfo::new(self.actor.id))
+            .await?;
 
         Ok(())
     }
 }
 
 // Generate a type that says "I want to follow you"
-fn generate_follow(config: &Config, actor_id: &Url, my_id: &Url) -> Result<AsFollow, MyError> {
+fn generate_follow(
+    config: &Config,
+    actor_id: &IriString,
+    my_id: &IriString,
+) -> Result<AsFollow, Error> {
     let follow = AsFollow::new(my_id.clone(), actor_id.clone());
 
     prepare_activity(
@@ -74,10 +94,10 @@ fn generate_follow(config: &Config, actor_id: &Url, my_id: &Url) -> Result<AsFol
 // Generate a type that says "I accept your follow request"
 fn generate_accept_follow(
     config: &Config,
-    actor_id: &Url,
-    input_id: &Url,
-    my_id: &Url,
-) -> Result<AsAccept, MyError> {
+    actor_id: &IriString,
+    input_id: &IriString,
+    my_id: &IriString,
+) -> Result<AsAccept, Error> {
     let mut follow = AsFollow::new(actor_id.clone(), my_id.clone());
 
     follow.set_id(input_id.clone());
@@ -91,11 +111,13 @@ fn generate_accept_follow(
     )
 }
 
-impl ActixJob for Follow {
+impl Job for Follow {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), anyhow::Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::apub::Follow";
+    const QUEUE: &'static str = "apub";
 
     fn run(self, state: Self::State) -> Self::Future {
         Box::pin(self.perform(state))

src/jobs/apub/forward.rs

@@ -1,46 +1,59 @@
 use crate::{
     apub::AcceptedActivities,
     db::Actor,
-    error::MyError,
+    error::{Error, ErrorKind},
+    future::BoxFuture,
     jobs::{apub::get_inboxes, DeliverMany, JobState},
 };
 use activitystreams::prelude::*;
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
+use background_jobs::Job;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct Forward {
     input: AcceptedActivities,
     actor: Actor,
 }
 
+impl std::fmt::Debug for Forward {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Forward")
+            .field("input", &self.input.id_unchecked())
+            .field("actor", &self.actor.id)
+            .finish()
+    }
+}
+
 impl Forward {
     pub fn new(input: AcceptedActivities, actor: Actor) -> Self {
         Forward { input, actor }
     }
 
-    async fn perform(self, state: JobState) -> Result<(), anyhow::Error> {
+    #[tracing::instrument(name = "Forward", skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
         let object_id = self
             .input
-            .object()
+            .object_unchecked()
             .as_single_id()
-            .ok_or(MyError::MissingId)?;
+            .ok_or(ErrorKind::MissingId)?;
 
         let inboxes = get_inboxes(&state.state, &self.actor, object_id).await?;
 
         state
             .job_server
-            .queue(DeliverMany::new(inboxes, self.input)?)?;
+            .queue(DeliverMany::new(inboxes, self.input)?)
+            .await?;
 
         Ok(())
     }
 }
 
-impl ActixJob for Forward {
+impl Job for Forward {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), anyhow::Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::apub::Forward";
+    const QUEUE: &'static str = "apub";
 
     fn run(self, state: Self::State) -> Self::Future {
         Box::pin(self.perform(state))

src/jobs/apub/reject.rs

@@ -1,32 +1,45 @@
 use crate::{
     config::UrlKind,
     db::Actor,
+    error::Error,
+    future::BoxFuture,
     jobs::{apub::generate_undo_follow, Deliver, JobState},
 };
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
+use background_jobs::Job;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct Reject(pub(crate) Actor);
 
+impl std::fmt::Debug for Reject {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Reject").field("actor", &self.0.id).finish()
+    }
+}
+
 impl Reject {
-    async fn perform(self, state: JobState) -> Result<(), anyhow::Error> {
+    #[tracing::instrument(name = "Reject", skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
         state.actors.remove_connection(&self.0).await?;
 
         let my_id = state.config.generate_url(UrlKind::Actor);
         let undo = generate_undo_follow(&state.config, &self.0.id, &my_id)?;
 
-        state.job_server.queue(Deliver::new(self.0.inbox, undo)?)?;
+        state
+            .job_server
+            .queue(Deliver::new(self.0.inbox, undo)?)
+            .await?;
 
         Ok(())
     }
 }
 
-impl ActixJob for Reject {
+impl Job for Reject {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), anyhow::Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::apub::Reject";
+    const QUEUE: &'static str = "apub";
 
     fn run(self, state: Self::State) -> Self::Future {
         Box::pin(self.perform(state))

src/jobs/apub/undo.rs

@@ -2,23 +2,35 @@ use crate::{
     apub::AcceptedActivities,
     config::UrlKind,
     db::Actor,
+    error::Error,
+    future::BoxFuture,
     jobs::{apub::generate_undo_follow, Deliver, JobState},
 };
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
+use activitystreams::prelude::BaseExt;
+use background_jobs::Job;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct Undo {
     input: AcceptedActivities,
     actor: Actor,
 }
 
+impl std::fmt::Debug for Undo {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Undo")
+            .field("input", &self.input.id_unchecked())
+            .field("actor", &self.actor.id)
+            .finish()
+    }
+}
+
 impl Undo {
     pub(crate) fn new(input: AcceptedActivities, actor: Actor) -> Self {
         Undo { input, actor }
     }
 
-    async fn perform(self, state: JobState) -> Result<(), anyhow::Error> {
+    #[tracing::instrument(name = "Undo", skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
         let was_following = state.state.db.is_connected(self.actor.id.clone()).await?;
 
         state.actors.remove_connection(&self.actor).await?;
@@ -28,18 +40,21 @@ impl Undo {
             let undo = generate_undo_follow(&state.config, &self.actor.id, &my_id)?;
             state
                 .job_server
-                .queue(Deliver::new(self.actor.inbox, undo)?)?;
+                .queue(Deliver::new(self.actor.inbox, undo)?)
+                .await?;
         }
 
         Ok(())
     }
 }
 
-impl ActixJob for Undo {
+impl Job for Undo {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), anyhow::Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::apub::Undo";
+    const QUEUE: &'static str = "apub";
 
     fn run(self, state: Self::State) -> Self::Future {
         Box::pin(self.perform(state))

src/jobs/cache_media.rs

@@ -1,44 +0,0 @@
-use crate::jobs::JobState;
-use anyhow::Error;
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
-use uuid::Uuid;
-
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
-pub(crate) struct CacheMedia {
-    uuid: Uuid,
-}
-
-impl CacheMedia {
-    pub(crate) fn new(uuid: Uuid) -> Self {
-        CacheMedia { uuid }
-    }
-
-    async fn perform(self, state: JobState) -> Result<(), Error> {
-        if !state.media.is_outdated(self.uuid).await? {
-            return Ok(());
-        }
-
-        if let Some(url) = state.media.get_url(self.uuid).await? {
-            let (content_type, bytes) = state.requests.fetch_bytes(url.as_str()).await?;
-
-            state
-                .media
-                .store_bytes(self.uuid, content_type, bytes)
-                .await?;
-        }
-
-        Ok(())
-    }
-}
-
-impl ActixJob for CacheMedia {
-    type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), Error>>>>;
-
-    const NAME: &'static str = "relay::jobs::CacheMedia";
-
-    fn run(self, state: Self::State) -> Self::Future {
-        Box::pin(self.perform(state))
-    }
-}

src/jobs/contact.rs

@@ -1,17 +1,30 @@
-use crate::{apub::AcceptedActors, jobs::JobState};
-use activitystreams::{object::Image, prelude::*, url::Url};
-use anyhow::Error;
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
+use crate::{
+    apub::AcceptedActors,
+    error::{Error, ErrorKind},
+    future::BoxFuture,
+    jobs::JobState,
+    requests::BreakerStrategy,
+};
+use activitystreams::{iri_string::types::IriString, object::Image, prelude::*};
+use background_jobs::Job;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct QueryContact {
-    actor_id: Url,
-    contact_id: Url,
+    actor_id: IriString,
+    contact_id: IriString,
+}
+
+impl std::fmt::Debug for QueryContact {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("QueryContact")
+            .field("actor_id", &self.actor_id.to_string())
+            .field("contact_id", &self.contact_id.to_string())
+            .finish()
+    }
 }
 
 impl QueryContact {
-    pub(crate) fn new(actor_id: Url, contact_id: Url) -> Self {
+    pub(crate) fn new(actor_id: IriString, contact_id: IriString) -> Self {
         QueryContact {
             actor_id,
             contact_id,
@@ -20,6 +33,7 @@ impl QueryContact {
 
     async fn perform(self, state: JobState) -> Result<(), Error> {
         let contact_outdated = state
+            .state
             .node_cache
             .is_contact_outdated(self.actor_id.clone())
             .await;
@@ -28,15 +42,25 @@ impl QueryContact {
             return Ok(());
         }
 
-        let contact = state
+        let contact = match state
+            .state
             .requests
-            .fetch::<AcceptedActors>(self.contact_id.as_str())
-            .await?;
+            .fetch::<AcceptedActors>(&self.contact_id, BreakerStrategy::Allow404AndBelow)
+            .await
+        {
+            Ok(contact) => contact,
+            Err(e) if e.is_breaker() => {
+                tracing::debug!("Not retrying due to failed breaker");
+                return Ok(());
+            }
+            Err(e) => return Err(e),
+        };
 
-        let (username, display_name, url, avatar) = to_contact(contact)
-            .ok_or_else(|| anyhow::anyhow!("Failed to extract fields from contact"))?;
+        let (username, display_name, url, avatar) =
+            to_contact(contact).ok_or(ErrorKind::Extract("contact"))?;
 
         state
+            .state
             .node_cache
             .set_contact(self.actor_id, username, display_name, url, avatar)
             .await?;
@@ -45,7 +69,7 @@ impl QueryContact {
     }
 }
 
-fn to_contact(contact: AcceptedActors) -> Option<(String, String, Url, Url)> {
+fn to_contact(contact: AcceptedActors) -> Option<(String, String, IriString, IriString)> {
     let username = contact.preferred_username()?.to_owned();
     let display_name = contact.name()?.as_one()?.as_xsd_string()?.to_owned();
 
@@ -61,11 +85,13 @@ fn to_contact(contact: AcceptedActors) -> Option<(String, String, Url, Url)> {
     Some((username, display_name, url, avatar))
 }
 
-impl ActixJob for QueryContact {
+impl Job for QueryContact {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::QueryContact";
+    const QUEUE: &'static str = "maintenance";
 
     fn run(self, state: Self::State) -> Self::Future {
         Box::pin(self.perform(state))
@@ -76,7 +102,7 @@ impl ActixJob for QueryContact {
 mod tests {
     use super::to_contact;
 
-    const HYNET_ADMIN: &'static str = r#"{"@context":["https://www.w3.org/ns/activitystreams","https://soc.hyena.network/schemas/litepub-0.1.jsonld",{"@language":"und"}],"alsoKnownAs":[],"attachment":[{"name":"Website","type":"PropertyValue","value":"https://hyena.network/"},{"name":"Services","type":"PropertyValue","value":"Pleroma, Invidious, SearX, XMPP"},{"name":"CW","type":"PropertyValue","value":"all long posts"}],"capabilities":{"acceptsChatMessages":true},"discoverable":true,"endpoints":{"oauthAuthorizationEndpoint":"https://soc.hyena.network/oauth/authorize","oauthRegistrationEndpoint":"https://soc.hyena.network/api/v1/apps","oauthTokenEndpoint":"https://soc.hyena.network/oauth/token","sharedInbox":"https://soc.hyena.network/inbox","uploadMedia":"https://soc.hyena.network/api/ap/upload_media"},"followers":"https://soc.hyena.network/users/HyNET/followers","following":"https://soc.hyena.network/users/HyNET/following","icon":{"type":"Image","url":"https://soc.hyena.network/media/ab149b1e0196ffdbecc6830c7f6f1a14dd8d8408ec7db0f1e8ad9d40e600ea73.gif"},"id":"https://soc.hyena.network/users/HyNET","image":{"type":"Image","url":"https://soc.hyena.network/media/12ba78d3015e13aa65ac4e106e574dd7bf959614585f10ce85de40e0148da677.png"},"inbox":"https://soc.hyena.network/users/HyNET/inbox","manuallyApprovesFollowers":false,"name":"HyNET Announcement System :glider:","outbox":"https://soc.hyena.network/users/HyNET/outbox","preferredUsername":"HyNET","publicKey":{"id":"https://soc.hyena.network/users/HyNET#main-key","owner":"https://soc.hyena.network/users/HyNET","publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyF74womumWRhR7RW4Q6a\n2+Av/Ue8QHiKwjQARJEakbKnKgkI5FRFVVOfMiYVJp/juNt4GLgK15panBqJa9Yt\nWACiHQjBd2yVI5tIHiae0uBj5SdUVuduoycVLG0lpJsg12p8m/vL1oaeLqehTqa6\nsYplQh1GCLet0cUdn/66Cj2pAPD3V7Bz3VnG+oyXIsGQbBB8RHnWhFH8b0qQOyur\nJRAB8aye6QAL2sQbfISM2lycWzNeIHkqsUb7FdqdhQ+Ze0rETRGDkOO2Qvpg0hQm\n6owMsHnHA/DzyOHLy6Yf+I3OUlBC/P1SSAKwORsifFDXL322AEqoDi5ZpwzG9m5z\nAQIDAQAB\n-----END PUBLIC KEY-----\n\n"},"summary":"Ran by <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"9s8j4AHGt3ED0P0b6e\" href=\"https://soc.hyena.network/users/mel\" rel=\"ugc\">@<span>mel</span></a></span> :adm1::adm2: <br/>For direct help with the service, send <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"9s8j4AHGt3ED0P0b6e\" href=\"https://soc.hyena.network/users/mel\" rel=\"ugc\">@<span>mel</span></a></span> a message.","tag":[{"icon":{"type":"Image","url":"https://soc.hyena.network/emoji/Signs/adm1.png"},"id":"https://soc.hyena.network/emoji/Signs/adm1.png","name":":adm1:","type":"Emoji","updated":"1970-01-01T00:00:00Z"},{"icon":{"type":"Image","url":"https://soc.hyena.network/emoji/Signs/adm2.png"},"id":"https://soc.hyena.network/emoji/Signs/adm2.png","name":":adm2:","type":"Emoji","updated":"1970-01-01T00:00:00Z"},{"icon":{"type":"Image","url":"https://soc.hyena.network/emoji/misc/glider.png"},"id":"https://soc.hyena.network/emoji/misc/glider.png","name":":glider:","type":"Emoji","updated":"1970-01-01T00:00:00Z"}],"type":"Service","url":"https://soc.hyena.network/users/HyNET"}"#;
+    const HYNET_ADMIN: &str = r#"{"@context":["https://www.w3.org/ns/activitystreams","https://soc.hyena.network/schemas/litepub-0.1.jsonld",{"@language":"und"}],"alsoKnownAs":[],"attachment":[{"name":"Website","type":"PropertyValue","value":"https://hyena.network/"},{"name":"Services","type":"PropertyValue","value":"Pleroma, Invidious, SearX, XMPP"},{"name":"CW","type":"PropertyValue","value":"all long posts"}],"capabilities":{"acceptsChatMessages":true},"discoverable":true,"endpoints":{"oauthAuthorizationEndpoint":"https://soc.hyena.network/oauth/authorize","oauthRegistrationEndpoint":"https://soc.hyena.network/api/v1/apps","oauthTokenEndpoint":"https://soc.hyena.network/oauth/token","sharedInbox":"https://soc.hyena.network/inbox","uploadMedia":"https://soc.hyena.network/api/ap/upload_media"},"followers":"https://soc.hyena.network/users/HyNET/followers","following":"https://soc.hyena.network/users/HyNET/following","icon":{"type":"Image","url":"https://soc.hyena.network/media/ab149b1e0196ffdbecc6830c7f6f1a14dd8d8408ec7db0f1e8ad9d40e600ea73.gif"},"id":"https://soc.hyena.network/users/HyNET","image":{"type":"Image","url":"https://soc.hyena.network/media/12ba78d3015e13aa65ac4e106e574dd7bf959614585f10ce85de40e0148da677.png"},"inbox":"https://soc.hyena.network/users/HyNET/inbox","manuallyApprovesFollowers":false,"name":"HyNET Announcement System :glider:","outbox":"https://soc.hyena.network/users/HyNET/outbox","preferredUsername":"HyNET","publicKey":{"id":"https://soc.hyena.network/users/HyNET#main-key","owner":"https://soc.hyena.network/users/HyNET","publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyF74womumWRhR7RW4Q6a\n2+Av/Ue8QHiKwjQARJEakbKnKgkI5FRFVVOfMiYVJp/juNt4GLgK15panBqJa9Yt\nWACiHQjBd2yVI5tIHiae0uBj5SdUVuduoycVLG0lpJsg12p8m/vL1oaeLqehTqa6\nsYplQh1GCLet0cUdn/66Cj2pAPD3V7Bz3VnG+oyXIsGQbBB8RHnWhFH8b0qQOyur\nJRAB8aye6QAL2sQbfISM2lycWzNeIHkqsUb7FdqdhQ+Ze0rETRGDkOO2Qvpg0hQm\n6owMsHnHA/DzyOHLy6Yf+I3OUlBC/P1SSAKwORsifFDXL322AEqoDi5ZpwzG9m5z\nAQIDAQAB\n-----END PUBLIC KEY-----\n\n"},"summary":"Ran by <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"9s8j4AHGt3ED0P0b6e\" href=\"https://soc.hyena.network/users/mel\" rel=\"ugc\">@<span>mel</span></a></span> :adm1::adm2: <br/>For direct help with the service, send <span class=\"h-card\"><a class=\"u-url mention\" data-user=\"9s8j4AHGt3ED0P0b6e\" href=\"https://soc.hyena.network/users/mel\" rel=\"ugc\">@<span>mel</span></a></span> a message.","tag":[{"icon":{"type":"Image","url":"https://soc.hyena.network/emoji/Signs/adm1.png"},"id":"https://soc.hyena.network/emoji/Signs/adm1.png","name":":adm1:","type":"Emoji","updated":"1970-01-01T00:00:00Z"},{"icon":{"type":"Image","url":"https://soc.hyena.network/emoji/Signs/adm2.png"},"id":"https://soc.hyena.network/emoji/Signs/adm2.png","name":":adm2:","type":"Emoji","updated":"1970-01-01T00:00:00Z"},{"icon":{"type":"Image","url":"https://soc.hyena.network/emoji/misc/glider.png"},"id":"https://soc.hyena.network/emoji/misc/glider.png","name":":glider:","type":"Emoji","updated":"1970-01-01T00:00:00Z"}],"type":"Service","url":"https://soc.hyena.network/users/HyNET"}"#;
 
     #[test]
     fn parse_hynet() {

src/jobs/deliver.rs

@@ -1,17 +1,30 @@
-use crate::{error::MyError, jobs::JobState};
-use activitystreams::url::Url;
-use anyhow::Error;
-use background_jobs::{ActixJob, Backoff};
-use std::{future::Future, pin::Pin};
+use crate::{
+    error::Error,
+    future::BoxFuture,
+    jobs::{debug_object, JobState},
+    requests::BreakerStrategy,
+};
+use activitystreams::iri_string::types::IriString;
+use background_jobs::{Backoff, Job};
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct Deliver {
-    to: Url,
+    to: IriString,
     data: serde_json::Value,
 }
 
+impl std::fmt::Debug for Deliver {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Deliver")
+            .field("to", &self.to.to_string())
+            .field("activity", &self.data["type"])
+            .field("object", debug_object(&self.data))
+            .finish()
+    }
+}
+
 impl Deliver {
-    pub(crate) fn new<T>(to: Url, data: T) -> Result<Self, MyError>
+    pub(crate) fn new<T>(to: IriString, data: T) -> Result<Self, Error>
     where
         T: serde::ser::Serialize,
     {
@@ -20,20 +33,39 @@ impl Deliver {
             data: serde_json::to_value(data)?,
         })
     }
+
+    #[tracing::instrument(name = "Deliver", skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
+        if let Err(e) = state
+            .state
+            .requests
+            .deliver(&self.to, &self.data, BreakerStrategy::Allow401AndBelow)
+            .await
+        {
+            if e.is_breaker() {
+                tracing::debug!("Not trying due to failed breaker");
+                return Ok(());
+            }
+            if e.is_bad_request() {
+                tracing::debug!("Server didn't understand the activity");
+                return Ok(());
+            }
+            return Err(e);
+        }
+        Ok(())
+    }
 }
 
-impl ActixJob for Deliver {
+impl Job for Deliver {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::Deliver";
+    const QUEUE: &'static str = "deliver";
     const BACKOFF: Backoff = Backoff::Exponential(8);
 
     fn run(self, state: Self::State) -> Self::Future {
-        Box::pin(async move {
-            state.requests.deliver(self.to, &self.data).await?;
-
-            Ok(())
-        })
+        Box::pin(self.perform(state))
     }
 }

src/jobs/deliver_many.rs

@@ -1,20 +1,28 @@
 use crate::{
-    error::MyError,
-    jobs::{Deliver, JobState},
+    error::Error,
+    future::BoxFuture,
+    jobs::{debug_object, Deliver, JobState},
 };
-use activitystreams::url::Url;
-use anyhow::Error;
-use background_jobs::ActixJob;
-use futures::future::{ready, Ready};
+use activitystreams::iri_string::types::IriString;
+use background_jobs::Job;
 
-#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+#[derive(Clone, serde::Deserialize, serde::Serialize)]
 pub(crate) struct DeliverMany {
-    to: Vec<Url>,
+    to: Vec<IriString>,
     data: serde_json::Value,
 }
 
+impl std::fmt::Debug for DeliverMany {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("DeliverMany")
+            .field("activity", &self.data["type"])
+            .field("object", debug_object(&self.data))
+            .finish()
+    }
+}
+
 impl DeliverMany {
-    pub(crate) fn new<T>(to: Vec<Url>, data: T) -> Result<Self, MyError>
+    pub(crate) fn new<T>(to: Vec<IriString>, data: T) -> Result<Self, Error>
     where
         T: serde::ser::Serialize,
     {
@@ -24,24 +32,28 @@ impl DeliverMany {
         })
     }
 
-    fn perform(self, state: JobState) -> Result<(), Error> {
+    #[tracing::instrument(name = "Deliver many", skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
         for inbox in self.to {
             state
                 .job_server
-                .queue(Deliver::new(inbox, self.data.clone())?)?;
+                .queue(Deliver::new(inbox, self.data.clone())?)
+                .await?;
         }
 
         Ok(())
     }
 }
 
-impl ActixJob for DeliverMany {
+impl Job for DeliverMany {
     type State = JobState;
-    type Future = Ready<Result<(), Error>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::DeliverMany";
+    const QUEUE: &'static str = "deliver";
 
     fn run(self, state: Self::State) -> Self::Future {
-        ready(self.perform(state))
+        Box::pin(self.perform(state))
     }
 }

src/jobs/mod.rs

@@ -1,122 +0,0 @@
-pub mod apub;
-mod cache_media;
-mod contact;
-mod deliver;
-mod deliver_many;
-mod instance;
-mod nodeinfo;
-mod process_listeners;
-
-pub(crate) use self::{
-    cache_media::CacheMedia, contact::QueryContact, deliver::Deliver, deliver_many::DeliverMany,
-    instance::QueryInstance, nodeinfo::QueryNodeinfo,
-};
-
-use crate::{
-    config::Config,
-    data::{ActorCache, MediaCache, NodeCache, State},
-    db::Db,
-    error::MyError,
-    jobs::process_listeners::Listeners,
-    requests::Requests,
-};
-use background_jobs::{memory_storage::Storage, Job, QueueHandle, WorkerConfig};
-use std::time::Duration;
-
-pub(crate) fn create_server() -> JobServer {
-    let shared = background_jobs::create_server(Storage::new());
-
-    shared.every(Duration::from_secs(60 * 5), Listeners);
-
-    JobServer::new(shared)
-}
-
-pub(crate) fn create_workers(
-    db: Db,
-    state: State,
-    actors: ActorCache,
-    job_server: JobServer,
-    media: MediaCache,
-    config: Config,
-) {
-    let remote_handle = job_server.remote.clone();
-
-    WorkerConfig::new(move || {
-        JobState::new(
-            db.clone(),
-            state.clone(),
-            actors.clone(),
-            job_server.clone(),
-            media.clone(),
-            config.clone(),
-        )
-    })
-    .register::<Deliver>()
-    .register::<DeliverMany>()
-    .register::<QueryNodeinfo>()
-    .register::<QueryInstance>()
-    .register::<Listeners>()
-    .register::<CacheMedia>()
-    .register::<QueryContact>()
-    .register::<apub::Announce>()
-    .register::<apub::Follow>()
-    .register::<apub::Forward>()
-    .register::<apub::Reject>()
-    .register::<apub::Undo>()
-    .set_worker_count("default", 16)
-    .start(remote_handle);
-}
-
-#[derive(Clone)]
-pub(crate) struct JobState {
-    db: Db,
-    requests: Requests,
-    state: State,
-    actors: ActorCache,
-    config: Config,
-    media: MediaCache,
-    node_cache: NodeCache,
-    job_server: JobServer,
-}
-
-#[derive(Clone)]
-pub(crate) struct JobServer {
-    remote: QueueHandle,
-}
-
-impl JobState {
-    fn new(
-        db: Db,
-        state: State,
-        actors: ActorCache,
-        job_server: JobServer,
-        media: MediaCache,
-        config: Config,
-    ) -> Self {
-        JobState {
-            requests: state.requests(),
-            node_cache: state.node_cache(),
-            db,
-            actors,
-            config,
-            media,
-            state,
-            job_server,
-        }
-    }
-}
-
-impl JobServer {
-    fn new(remote_handle: QueueHandle) -> Self {
-        JobServer {
-            remote: remote_handle,
-        }
-    }
-
-    pub(crate) fn queue<J>(&self, job: J) -> Result<(), MyError>
-    where
-        J: Job,
-    {
-        self.remote.queue(job).map_err(MyError::Queue)
-    }
-}

src/jobs/process_listeners.rs

@@ -1,29 +1,35 @@
-use crate::jobs::{instance::QueryInstance, nodeinfo::QueryNodeinfo, JobState};
-use anyhow::Error;
-use background_jobs::ActixJob;
-use std::{future::Future, pin::Pin};
+use crate::{
+    error::Error,
+    future::BoxFuture,
+    jobs::{instance::QueryInstance, nodeinfo::QueryNodeinfo, JobState},
+};
+use background_jobs::Job;
 
 #[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
 pub(crate) struct Listeners;
 
 impl Listeners {
+    #[tracing::instrument(name = "Spawn query instances", skip(state))]
     async fn perform(self, state: JobState) -> Result<(), Error> {
         for actor_id in state.state.db.connected_ids().await? {
             state
                 .job_server
-                .queue(QueryInstance::new(actor_id.clone()))?;
-            state.job_server.queue(QueryNodeinfo::new(actor_id))?;
+                .queue(QueryInstance::new(actor_id.clone()))
+                .await?;
+            state.job_server.queue(QueryNodeinfo::new(actor_id)).await?;
         }
 
         Ok(())
     }
 }
 
-impl ActixJob for Listeners {
+impl Job for Listeners {
     type State = JobState;
-    type Future = Pin<Box<dyn Future<Output = Result<(), Error>>>>;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
 
     const NAME: &'static str = "relay::jobs::Listeners";
+    const QUEUE: &'static str = "maintenance";
 
     fn run(self, state: Self::State) -> Self::Future {
         Box::pin(self.perform(state))

src/jobs/record_last_online.rs

@@ -0,0 +1,28 @@
+use crate::{error::Error, future::BoxFuture, jobs::JobState};
+use background_jobs::{Backoff, Job};
+
+#[derive(Clone, Debug, serde::Deserialize, serde::Serialize)]
+pub(crate) struct RecordLastOnline;
+
+impl RecordLastOnline {
+    #[tracing::instrument(skip(state))]
+    async fn perform(self, state: JobState) -> Result<(), Error> {
+        let nodes = state.state.last_online.take();
+
+        state.state.db.mark_last_seen(nodes).await
+    }
+}
+
+impl Job for RecordLastOnline {
+    type State = JobState;
+    type Error = Error;
+    type Future = BoxFuture<'static, Result<(), Self::Error>>;
+
+    const NAME: &'static str = "relay::jobs::RecordLastOnline";
+    const QUEUE: &'static str = "maintenance";
+    const BACKOFF: Backoff = Backoff::Linear(1);
+
+    fn run(self, state: Self::State) -> Self::Future {
+        Box::pin(self.perform(state))
+    }
+}

src/main.rs

@@ -1,100 +1,374 @@
-use actix_web::{
-    middleware::{Compress, Logger},
-    web, App, HttpServer,
-};
+// need this for ructe
+#![allow(clippy::needless_borrow)]
 
+use std::time::Duration;
+
+use activitystreams::iri_string::types::IriString;
+use actix_web::{middleware::Compress, web, App, HttpServer};
+use collector::MemoryCollector;
+#[cfg(feature = "console")]
+use console_subscriber::ConsoleLayer;
+use error::Error;
+use http_signature_normalization_actix::middleware::VerifySignature;
+use metrics_exporter_prometheus::PrometheusBuilder;
+use metrics_util::layers::FanoutBuilder;
+use opentelemetry::{trace::TracerProvider, KeyValue};
+use opentelemetry_otlp::WithExportConfig;
+use opentelemetry_sdk::Resource;
+use reqwest_middleware::ClientWithMiddleware;
+use rustls::ServerConfig;
+use tokio::task::JoinHandle;
+use tracing_actix_web::TracingLogger;
+use tracing_error::ErrorLayer;
+use tracing_log::LogTracer;
+use tracing_subscriber::{filter::Targets, layer::SubscriberExt, Layer};
+
+mod admin;
 mod apub;
 mod args;
+mod collector;
 mod config;
 mod data;
 mod db;
 mod error;
+mod extractors;
+mod future;
+mod http1;
 mod jobs;
 mod middleware;
 mod requests;
 mod routes;
+mod spawner;
+mod stream;
+mod telegram;
+
+use crate::config::UrlKind;
 
 use self::{
     args::Args,
     config::Config,
     data::{ActorCache, MediaCache, State},
     db::Db,
-    jobs::{create_server, create_workers},
-    middleware::{DebugPayload, RelayResolver},
-    routes::{actor, inbox, index, nodeinfo, nodeinfo_meta, statics},
+    jobs::create_workers,
+    middleware::{DebugPayload, MyVerify, RelayResolver, Timings},
+    routes::{actor, healthz, inbox, index, nodeinfo, nodeinfo_meta, statics},
+    spawner::Spawner,
 };
 
-#[actix_rt::main]
-async fn main() -> Result<(), anyhow::Error> {
+fn init_subscriber(
+    software_name: &'static str,
+    opentelemetry_url: Option<&IriString>,
+) -> color_eyre::Result<()> {
+    LogTracer::init()?;
+    color_eyre::install()?;
+
+    let targets: Targets = std::env::var("RUST_LOG")
+        .unwrap_or_else(|_| "info".into())
+        .parse()?;
+
+    let format_layer = tracing_subscriber::fmt::layer().with_filter(targets.clone());
+
+    #[cfg(feature = "console")]
+    let console_layer = ConsoleLayer::builder()
+        .with_default_env()
+        .server_addr(([0, 0, 0, 0], 6669))
+        .event_buffer_capacity(1024 * 1024)
+        .spawn();
+
+    let subscriber = tracing_subscriber::Registry::default()
+        .with(format_layer)
+        .with(ErrorLayer::default());
+
+    #[cfg(feature = "console")]
+    let subscriber = subscriber.with(console_layer);
+
+    if let Some(url) = opentelemetry_url {
+        let exporter = opentelemetry_otlp::SpanExporter::builder()
+            .with_tonic()
+            .with_endpoint(url.as_str())
+            .build()?;
+
+        let tracer_provider = opentelemetry_sdk::trace::TracerProvider::builder()
+            .with_resource(Resource::new(vec![KeyValue::new(
+                "service.name",
+                software_name,
+            )]))
+            .with_batch_exporter(exporter, opentelemetry_sdk::runtime::Tokio)
+            .build();
+
+        let otel_layer = tracing_opentelemetry::layer()
+            .with_tracer(tracer_provider.tracer(software_name))
+            .with_filter(targets);
+
+        let subscriber = subscriber.with(otel_layer);
+        tracing::subscriber::set_global_default(subscriber)?;
+    } else {
+        tracing::subscriber::set_global_default(subscriber)?;
+    }
+
+    Ok(())
+}
+
+fn build_client(
+    user_agent: &str,
+    timeout_seconds: u64,
+    proxy: Option<(&IriString, Option<(&str, &str)>)>,
+) -> Result<ClientWithMiddleware, Error> {
+    let builder = reqwest::Client::builder().user_agent(user_agent.to_string());
+
+    let builder = if let Some((url, auth)) = proxy {
+        let proxy = reqwest::Proxy::all(url.as_str())?;
+
+        let proxy = if let Some((username, password)) = auth {
+            proxy.basic_auth(username, password)
+        } else {
+            proxy
+        };
+
+        builder.proxy(proxy)
+    } else {
+        builder
+    };
+
+    let client = builder
+        .timeout(Duration::from_secs(timeout_seconds))
+        .build()?;
+
+    let client_with_middleware = reqwest_middleware::ClientBuilder::new(client)
+        .with(reqwest_tracing::TracingMiddleware::default())
+        .build();
+
+    Ok(client_with_middleware)
+}
+
+#[tokio::main]
+async fn main() -> color_eyre::Result<()> {
     dotenv::dotenv().ok();
 
     let config = Config::build()?;
 
-    if config.debug() {
-        std::env::set_var(
-            "RUST_LOG",
-            "debug,h2=info,trust_dns_resolver=info,trust_dns_proto=info,rustls=info,html5ever=info",
-        )
-    } else {
-        std::env::set_var("RUST_LOG", "info")
-    }
-
-    if config.pretty_log() {
-        pretty_env_logger::init();
-    } else {
-        env_logger::init();
-    }
-
-    let db = Db::build(&config)?;
+    init_subscriber(Config::software_name(), config.opentelemetry_url())?;
 
     let args = Args::new();
 
-    if !args.blocks().is_empty() || !args.allowed().is_empty() {
-        if args.undo() {
-            db.remove_blocks(args.blocks().to_vec()).await?;
-            db.remove_allows(args.allowed().to_vec()).await?;
-        } else {
-            db.add_blocks(args.blocks().to_vec()).await?;
-            db.add_allows(args.allowed().to_vec()).await?;
-        }
+    if args.any() {
+        client_main(config, args).await??;
         return Ok(());
     }
 
-    let media = MediaCache::new(db.clone());
-    let state = State::build(config.clone(), db.clone()).await?;
-    let actors = ActorCache::new(db.clone());
-    let job_server = create_server();
+    let collector = MemoryCollector::new();
 
-    create_workers(
-        db.clone(),
-        state.clone(),
-        actors.clone(),
-        job_server.clone(),
-        media.clone(),
-        config.clone(),
-    );
+    if let Some(bind_addr) = config.prometheus_bind_address() {
+        let (recorder, exporter) = PrometheusBuilder::new()
+            .with_http_listener(bind_addr)
+            .build()?;
+
+        tokio::spawn(exporter);
+        let recorder = FanoutBuilder::default()
+            .add_recorder(recorder)
+            .add_recorder(collector.clone())
+            .build();
+        metrics::set_global_recorder(recorder).map_err(|e| color_eyre::eyre::eyre!("{e}"))?;
+    } else {
+        collector.install()?;
+    }
+
+    tracing::info!("Opening DB");
+    let db = Db::build(&config)?;
+
+    tracing::info!("Building caches");
+    let actors = ActorCache::new(db.clone());
+    let media = MediaCache::new(db.clone());
+
+    server_main(db, actors, media, collector, config).await?;
+
+    tracing::info!("Application exit");
+
+    Ok(())
+}
+
+fn client_main(config: Config, args: Args) -> JoinHandle<color_eyre::Result<()>> {
+    tokio::spawn(do_client_main(config, args))
+}
+
+async fn do_client_main(config: Config, args: Args) -> color_eyre::Result<()> {
+    let client = build_client(
+        &config.user_agent(),
+        config.client_timeout(),
+        config.proxy_config(),
+    )?;
+
+    if !args.blocks().is_empty() || !args.allowed().is_empty() {
+        if args.undo() {
+            admin::client::unblock(&client, &config, args.blocks().to_vec()).await?;
+            admin::client::disallow(&client, &config, args.allowed().to_vec()).await?;
+        } else {
+            admin::client::block(&client, &config, args.blocks().to_vec()).await?;
+            admin::client::allow(&client, &config, args.allowed().to_vec()).await?;
+        }
+        println!("Updated lists");
+    }
+
+    if args.contacted() {
+        let last_seen = admin::client::last_seen(&client, &config).await?;
+
+        let mut report = String::from("Contacted:");
+
+        if !last_seen.never.is_empty() {
+            report += "\nNever seen:\n";
+        }
+
+        for domain in last_seen.never {
+            report += "\t";
+            report += &domain;
+            report += "\n";
+        }
+
+        if !last_seen.last_seen.is_empty() {
+            report += "\nSeen:\n";
+        }
+
+        for (datetime, domains) in last_seen.last_seen {
+            for domain in domains {
+                report += "\t";
+                report += &datetime.to_string();
+                report += " - ";
+                report += &domain;
+                report += "\n";
+            }
+        }
+
+        report += "\n";
+        println!("{report}");
+    }
+
+    if args.list() {
+        let (blocked, allowed, connected) = tokio::try_join!(
+            admin::client::blocked(&client, &config),
+            admin::client::allowed(&client, &config),
+            admin::client::connected(&client, &config)
+        )?;
+
+        let mut report = String::from("Report:\n");
+        if !allowed.allowed_domains.is_empty() {
+            report += "\nAllowed\n\t";
+            report += &allowed.allowed_domains.join("\n\t");
+        }
+        if !blocked.blocked_domains.is_empty() {
+            report += "\n\nBlocked\n\t";
+            report += &blocked.blocked_domains.join("\n\t");
+        }
+        if !connected.connected_actors.is_empty() {
+            report += "\n\nConnected\n\t";
+            report += &connected.connected_actors.join("\n\t");
+        }
+        report += "\n";
+        println!("{report}");
+    }
+
+    if args.stats() {
+        let stats = admin::client::stats(&client, &config).await?;
+        stats.present();
+    }
+
+    Ok(())
+}
+
+const VERIFY_RATIO: usize = 7;
+
+async fn server_main(
+    db: Db,
+    actors: ActorCache,
+    media: MediaCache,
+    collector: MemoryCollector,
+    config: Config,
+) -> color_eyre::Result<()> {
+    let client = build_client(
+        &config.user_agent(),
+        config.client_timeout(),
+        config.proxy_config(),
+    )?;
+
+    tracing::info!("Creating state");
+
+    let (signature_threads, verify_threads) = match config.signature_threads() {
+        0 | 1 => (1, 1),
+        n if n <= VERIFY_RATIO => (n, 1),
+        n => {
+            let verify_threads = (n / VERIFY_RATIO).max(1);
+            let signature_threads = n.saturating_sub(verify_threads).max(VERIFY_RATIO);
+
+            (signature_threads, verify_threads)
+        }
+    };
+
+    let verify_spawner = Spawner::build("verify-cpu", verify_threads.try_into()?)?;
+    let sign_spawner = Spawner::build("sign-cpu", signature_threads.try_into()?)?;
+
+    let key_id = config.generate_url(UrlKind::MainKey).to_string();
+    let state = State::build(db.clone(), key_id, sign_spawner.clone(), client).await?;
+
+    if let Some((token, admin_handle)) = config.telegram_info() {
+        tracing::info!("Creating telegram handler");
+        telegram::start(admin_handle.to_owned(), db.clone(), token);
+    }
+
+    let cert_resolver = config
+        .open_keys()
+        .await?
+        .map(rustls_channel_resolver::channel::<32>);
 
     let bind_address = config.bind_address();
-    HttpServer::new(move || {
-        App::new()
-            .wrap(Compress::default())
-            .wrap(Logger::default())
+    let sign_spawner2 = sign_spawner.clone();
+    let verify_spawner2 = verify_spawner.clone();
+    let config2 = config.clone();
+    let job_store = jobs::build_storage();
+    let server = HttpServer::new(move || {
+        let job_server = create_workers(
+            job_store.clone(),
+            state.clone(),
+            actors.clone(),
+            media.clone(),
+            config.clone(),
+        )
+        .expect("Failed to create job server");
+
+        let app = App::new()
             .app_data(web::Data::new(db.clone()))
             .app_data(web::Data::new(state.clone()))
-            .app_data(web::Data::new(state.requests()))
+            .app_data(web::Data::new(
+                state.requests.clone().spawner(verify_spawner.clone()),
+            ))
             .app_data(web::Data::new(actors.clone()))
             .app_data(web::Data::new(config.clone()))
-            .app_data(web::Data::new(job_server.clone()))
+            .app_data(web::Data::new(job_server))
             .app_data(web::Data::new(media.clone()))
+            .app_data(web::Data::new(collector.clone()))
+            .app_data(web::Data::new(verify_spawner.clone()));
+
+        let app = if let Some(data) = config.admin_config() {
+            app.app_data(data)
+        } else {
+            app
+        };
+
+        app.wrap(Compress::default())
+            .wrap(TracingLogger::default())
+            .wrap(Timings)
+            .route("/healthz", web::get().to(healthz))
             .service(web::resource("/").route(web::get().to(index)))
             .service(web::resource("/media/{path}").route(web::get().to(routes::media)))
             .service(
                 web::resource("/inbox")
-                    .wrap(config.digest_middleware())
-                    .wrap(config.signature_middleware(
-                        state.requests(),
-                        actors.clone(),
-                        state.clone(),
+                    .wrap(config.digest_middleware().spawner(verify_spawner.clone()))
+                    .wrap(VerifySignature::new(
+                        MyVerify(
+                            state.requests.clone().spawner(verify_spawner.clone()),
+                            actors.clone(),
+                            state.clone(),
+                            verify_spawner.clone(),
+                        ),
+                        http_signature_normalization_actix::Config::new(),
                     ))
                     .wrap(DebugPayload(config.debug()))
                     .route(web::post().to(inbox)),
@@ -107,10 +381,59 @@ async fn main() -> Result<(), anyhow::Error> {
                     .service(web::resource("/nodeinfo").route(web::get().to(nodeinfo_meta))),
             )
             .service(web::resource("/static/{filename}").route(web::get().to(statics)))
-    })
-    .bind(bind_address)?
-    .run()
-    .await?;
+            .service(
+                web::scope("/api/v1").service(
+                    web::scope("/admin")
+                        .route("/allow", web::post().to(admin::routes::allow))
+                        .route("/disallow", web::post().to(admin::routes::disallow))
+                        .route("/block", web::post().to(admin::routes::block))
+                        .route("/unblock", web::post().to(admin::routes::unblock))
+                        .route("/allowed", web::get().to(admin::routes::allowed))
+                        .route("/blocked", web::get().to(admin::routes::blocked))
+                        .route("/connected", web::get().to(admin::routes::connected))
+                        .route("/stats", web::get().to(admin::routes::stats))
+                        .route("/last_seen", web::get().to(admin::routes::last_seen)),
+                ),
+            )
+    });
+
+    if let Some((cert_tx, cert_rx)) = cert_resolver {
+        let handle = tokio::spawn(async move {
+            let mut interval = tokio::time::interval(Duration::from_secs(30));
+            interval.tick().await;
+
+            loop {
+                interval.tick().await;
+
+                match config2.open_keys().await {
+                    Ok(Some(key)) => cert_tx.update(key),
+                    Ok(None) => tracing::warn!("Missing TLS keys"),
+                    Err(e) => tracing::error!("Failed to read TLS keys {e}"),
+                }
+            }
+        });
+
+        tracing::info!("Binding to {}:{} with TLS", bind_address.0, bind_address.1);
+        let server_config = ServerConfig::builder()
+            .with_no_client_auth()
+            .with_cert_resolver(cert_rx);
+        server
+            .bind_rustls_0_23(bind_address, server_config)?
+            .run()
+            .await?;
+
+        handle.abort();
+        let _ = handle.await;
+    } else {
+        tracing::info!("Binding to {}:{}", bind_address.0, bind_address.1);
+        server.bind(bind_address)?.run().await?;
+    }
+
+    sign_spawner2.close().await;
+    verify_spawner2.close().await;
+
+    tracing::info!("Server closed");
+
     Ok(())
 }
 

src/middleware.rs

@@ -1,7 +1,9 @@
 mod payload;
+mod timings;
 mod verifier;
 mod webfinger;
 
 pub(crate) use payload::DebugPayload;
+pub(crate) use timings::Timings;
 pub(crate) use verifier::MyVerify;
 pub(crate) use webfinger::RelayResolver;

src/middleware/payload.rs

@@ -1,15 +1,14 @@
 use actix_web::{
     dev::{Payload, Service, ServiceRequest, Transform},
-    http::{Method, StatusCode},
+    http::Method,
     web::BytesMut,
-    HttpMessage, HttpResponse, ResponseError,
+    HttpMessage,
 };
-use futures::{
-    future::{ok, LocalBoxFuture, Ready, TryFutureExt},
-    stream::{once, TryStreamExt},
+use std::{
+    future::{ready, Ready},
+    task::{Context, Poll},
 };
-use log::{error, info};
-use std::task::{Context, Poll};
+use streem::IntoStreamer;
 
 #[derive(Clone, Debug)]
 pub(crate) struct DebugPayload(pub bool);
@@ -18,20 +17,6 @@ pub(crate) struct DebugPayload(pub bool);
 #[derive(Clone, Debug)]
 pub(crate) struct DebugPayloadMiddleware<S>(bool, S);
 
-#[derive(Clone, Debug, thiserror::Error)]
-#[error("Failed to read payload")]
-pub(crate) struct DebugError;
-
-impl ResponseError for DebugError {
-    fn status_code(&self) -> StatusCode {
-        StatusCode::BAD_REQUEST
-    }
-
-    fn error_response(&self) -> HttpResponse {
-        HttpResponse::new(self.status_code())
-    }
-}
-
 impl<S> Transform<S, ServiceRequest> for DebugPayload
 where
     S: Service<ServiceRequest, Error = actix_web::Error>,
@@ -45,7 +30,7 @@ where
     type Future = Ready<Result<Self::Transform, Self::InitError>>;
 
     fn new_transform(&self, service: S) -> Self::Future {
-        ok(DebugPayloadMiddleware(self.0, service))
+        ready(Ok(DebugPayloadMiddleware(self.0, service)))
     }
 }
 
@@ -57,7 +42,7 @@ where
 {
     type Response = S::Response;
     type Error = S::Error;
-    type Future = LocalBoxFuture<'static, Result<S::Response, S::Error>>;
+    type Future = S::Future;
 
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         self.1.poll_ready(cx)
@@ -65,26 +50,28 @@ where
 
     fn call(&self, mut req: ServiceRequest) -> Self::Future {
         if self.0 && req.method() == Method::POST {
-            let pl = req.take_payload();
-            req.set_payload(Payload::Stream(Box::pin(once(
-                pl.try_fold(BytesMut::new(), |mut acc, bytes| async {
-                    acc.extend(bytes);
-                    Ok(acc)
-                })
-                .map_ok(|bytes| {
-                    let bytes = bytes.freeze();
-                    info!("{}", String::from_utf8_lossy(&bytes));
-                    bytes
-                }),
-            ))));
+            let mut pl = req.take_payload().into_streamer();
 
-            let fut = self.1.call(req);
+            req.set_payload(Payload::Stream {
+                payload: Box::pin(streem::try_from_fn(|yielder| async move {
+                    let mut buf = BytesMut::new();
 
-            Box::pin(async move { fut.await })
+                    while let Some(bytes) = pl.try_next().await? {
+                        buf.extend(bytes);
+                    }
+
+                    let bytes = buf.freeze();
+                    tracing::info!("{}", String::from_utf8_lossy(&bytes));
+
+                    yielder.yield_ok(bytes).await;
+
+                    Ok(())
+                })),
+            });
+
+            self.1.call(req)
         } else {
-            let fut = self.1.call(req);
-
-            Box::pin(async move { fut.await })
+            self.1.call(req)
         }
     }
 }

src/middleware/timings.rs

@@ -0,0 +1,143 @@
+use actix_web::{
+    body::MessageBody,
+    dev::{Service, ServiceRequest, ServiceResponse, Transform},
+    http::StatusCode,
+};
+use std::{
+    future::{ready, Future, Ready},
+    time::Instant,
+};
+
+pub(crate) struct Timings;
+pub(crate) struct TimingsMiddleware<S>(S);
+
+struct LogOnDrop {
+    begin: Instant,
+    path: String,
+    method: String,
+    arm: bool,
+}
+
+pin_project_lite::pin_project! {
+    pub(crate) struct TimingsFuture<F> {
+        #[pin]
+        future: F,
+
+        log_on_drop: Option<LogOnDrop>,
+    }
+}
+
+pin_project_lite::pin_project! {
+    pub(crate) struct TimingsBody<B> {
+        #[pin]
+        body: B,
+
+        log_on_drop: LogOnDrop,
+    }
+}
+
+impl Drop for LogOnDrop {
+    fn drop(&mut self) {
+        if self.arm {
+            let duration = self.begin.elapsed();
+            metrics::histogram!("relay.request.complete", "path" => self.path.clone(), "method" => self.method.clone()).record(duration);
+        }
+    }
+}
+
+impl<S, B> Transform<S, ServiceRequest> for Timings
+where
+    S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = actix_web::Error>,
+    S::Future: 'static,
+{
+    type Response = ServiceResponse<TimingsBody<B>>;
+    type Error = S::Error;
+    type InitError = ();
+    type Transform = TimingsMiddleware<S>;
+    type Future = Ready<Result<Self::Transform, Self::InitError>>;
+
+    fn new_transform(&self, service: S) -> Self::Future {
+        ready(Ok(TimingsMiddleware(service)))
+    }
+}
+
+impl<S, B> Service<ServiceRequest> for TimingsMiddleware<S>
+where
+    S: Service<ServiceRequest, Response = ServiceResponse<B>, Error = actix_web::Error>,
+    S::Future: 'static,
+{
+    type Response = ServiceResponse<TimingsBody<B>>;
+    type Error = S::Error;
+    type Future = TimingsFuture<S::Future>;
+
+    fn poll_ready(
+        &self,
+        ctx: &mut core::task::Context<'_>,
+    ) -> std::task::Poll<Result<(), Self::Error>> {
+        self.0.poll_ready(ctx)
+    }
+
+    fn call(&self, req: ServiceRequest) -> Self::Future {
+        let log_on_drop = LogOnDrop {
+            begin: Instant::now(),
+            path: format!("{:?}", req.match_pattern()),
+            method: req.method().to_string(),
+            arm: false,
+        };
+
+        let future = self.0.call(req);
+
+        TimingsFuture {
+            future,
+            log_on_drop: Some(log_on_drop),
+        }
+    }
+}
+
+impl<F, B> Future for TimingsFuture<F>
+where
+    F: Future<Output = Result<ServiceResponse<B>, actix_web::Error>>,
+{
+    type Output = Result<ServiceResponse<TimingsBody<B>>, actix_web::Error>;
+
+    fn poll(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Self::Output> {
+        let this = self.project();
+
+        let res = std::task::ready!(this.future.poll(cx));
+
+        let mut log_on_drop = this
+            .log_on_drop
+            .take()
+            .expect("TimingsFuture polled after completion");
+
+        let status = match &res {
+            Ok(res) => res.status(),
+            Err(e) => e.as_response_error().status_code(),
+        };
+
+        log_on_drop.arm =
+            status != StatusCode::NOT_FOUND && status != StatusCode::METHOD_NOT_ALLOWED;
+
+        let res = res.map(|r| r.map_body(|_, body| TimingsBody { body, log_on_drop }));
+
+        std::task::Poll::Ready(res)
+    }
+}
+
+impl<B: MessageBody> MessageBody for TimingsBody<B> {
+    type Error = B::Error;
+
+    fn size(&self) -> actix_web::body::BodySize {
+        self.body.size()
+    }
+
+    fn poll_next(
+        self: std::pin::Pin<&mut Self>,
+        cx: &mut std::task::Context<'_>,
+    ) -> std::task::Poll<Option<Result<actix_web::web::Bytes, Self::Error>>> {
+        self.project().body.poll_next(cx)
+    }
+}

src/middleware/verifier.rs

@@ -1,29 +1,32 @@
 use crate::{
     apub::AcceptedActors,
     data::{ActorCache, State},
-    error::MyError,
-    requests::Requests,
+    error::{Error, ErrorKind},
+    requests::{BreakerStrategy, Requests},
+    spawner::Spawner,
 };
-use activitystreams::{base::BaseExt, uri, url::Url};
-use actix_web::web;
-use http_signature_normalization_actix::{prelude::*, verify::DeprecatedAlgorithm};
-use log::error;
-use rsa::{hash::Hash, padding::PaddingScheme, pkcs8::FromPublicKey, PublicKey, RsaPublicKey};
-use sha2::{Digest, Sha256};
+use activitystreams::{base::BaseExt, iri, iri_string::types::IriString};
+use base64::{engine::general_purpose::STANDARD, Engine};
+use http_signature_normalization_actix::{prelude::*, verify::DeprecatedAlgorithm, Spawn};
+use rsa::{pkcs1::EncodeRsaPublicKey, pkcs8::DecodePublicKey, RsaPublicKey};
 use std::{future::Future, pin::Pin};
 
-#[derive(Clone)]
-pub(crate) struct MyVerify(pub Requests, pub ActorCache, pub State);
+#[derive(Clone, Debug)]
+pub(crate) struct MyVerify(pub Requests, pub ActorCache, pub State, pub Spawner);
 
 impl MyVerify {
+    #[tracing::instrument("Verify request", skip(self, signature, signing_string))]
     async fn verify(
         &self,
         algorithm: Option<Algorithm>,
         key_id: String,
         signature: String,
         signing_string: String,
-    ) -> Result<bool, MyError> {
-        let public_key_id = uri!(key_id);
+    ) -> Result<bool, Error> {
+        let public_key_id = iri!(key_id);
+
+        // receiving an activity from a domain indicates it is probably online
+        self.0.reset_breaker(&public_key_id);
 
         let actor_id = if let Some(mut actor_id) = self
             .2
@@ -32,7 +35,7 @@ impl MyVerify {
             .await?
         {
             if !self.2.db.is_allowed(actor_id.clone()).await? {
-                return Err(MyError::NotAllowed(key_id));
+                return Err(ErrorKind::NotAllowed(key_id).into());
             }
 
             actor_id.set_fragment(None);
@@ -44,12 +47,18 @@ impl MyVerify {
                 Some(Algorithm::Hs2019) => (),
                 Some(Algorithm::Deprecated(DeprecatedAlgorithm::RsaSha256)) => (),
                 Some(other) => {
-                    return Err(MyError::Algorithm(other.to_string()));
+                    return Err(ErrorKind::Algorithm(other.to_string()).into());
                 }
                 None => (),
             };
 
-            let res = do_verify(&actor.public_key, signature.clone(), signing_string.clone()).await;
+            let res = do_verify(
+                &self.3,
+                &actor.public_key,
+                signature.clone(),
+                signing_string.clone(),
+            )
+            .await;
 
             if let Err(e) = res {
                 if !was_cached {
@@ -61,11 +70,21 @@ impl MyVerify {
 
             actor_id
         } else {
-            self.0
-                .fetch::<PublicKeyResponse>(public_key_id.as_str())
-                .await?
-                .actor_id()
-                .ok_or_else(|| MyError::MissingId)?
+            match self
+                .0
+                .fetch::<PublicKeyResponse>(&public_key_id, BreakerStrategy::Require2XX)
+                .await
+            {
+                Ok(res) => res.actor_id().ok_or(ErrorKind::MissingId),
+                Err(e) => {
+                    if e.is_gone() {
+                        tracing::warn!("Actor gone: {public_key_id}");
+                        return Ok(false);
+                    } else {
+                        return Err(e);
+                    }
+                }
+            }?
         };
 
         // Previously we verified the sig from an actor's local cache
@@ -73,7 +92,7 @@ impl MyVerify {
         // Now we make sure we fetch an updated actor
         let actor = self.1.get_no_cache(&actor_id, &self.0).await?;
 
-        do_verify(&actor.public_key, signature, signing_string).await?;
+        do_verify(&self.3, &actor.public_key, signature, signing_string).await?;
 
         Ok(true)
     }
@@ -85,51 +104,59 @@ impl MyVerify {
 enum PublicKeyResponse {
     PublicKey {
         #[allow(dead_code)]
-        id: Url,
-        owner: Url,
+        id: IriString,
+        owner: IriString,
         #[allow(dead_code)]
         public_key_pem: String,
     },
-    Actor(AcceptedActors),
+    Actor(Box<AcceptedActors>),
 }
 
 impl PublicKeyResponse {
-    fn actor_id(&self) -> Option<Url> {
+    fn actor_id(&self) -> Option<IriString> {
         match self {
             PublicKeyResponse::PublicKey { owner, .. } => Some(owner.clone()),
-            PublicKeyResponse::Actor(actor) => actor.id_unchecked().map(|url| url.clone()),
+            PublicKeyResponse::Actor(actor) => actor.id_unchecked().cloned(),
         }
     }
 }
 
+#[tracing::instrument("Verify signature")]
 async fn do_verify(
+    spawner: &Spawner,
     public_key: &str,
     signature: String,
     signing_string: String,
-) -> Result<(), MyError> {
-    let public_key = RsaPublicKey::from_public_key_pem(public_key)?;
+) -> Result<(), Error> {
+    let public_key = RsaPublicKey::from_public_key_pem(public_key.trim())?;
+    let public_key_der = public_key
+        .to_pkcs1_der()
+        .map_err(|_| ErrorKind::DerEncode)?;
+    let public_key = ring::signature::UnparsedPublicKey::new(
+        &ring::signature::RSA_PKCS1_2048_8192_SHA256,
+        public_key_der,
+    );
 
-    web::block(move || {
-        let decoded = base64::decode(signature)?;
-        let hashed = Sha256::digest(signing_string.as_bytes());
+    let span = tracing::Span::current();
+    spawner
+        .spawn_blocking(move || {
+            span.in_scope(|| {
+                let decoded = STANDARD.decode(signature)?;
 
-        public_key.verify(
-            PaddingScheme::PKCS1v15Sign {
-                hash: Some(Hash::SHA2_256),
-            },
-            &hashed,
-            &decoded,
-        )?;
+                public_key
+                    .verify(signing_string.as_bytes(), decoded.as_slice())
+                    .map_err(|_| ErrorKind::VerifySignature)?;
 
-        Ok(()) as Result<(), MyError>
-    })
-    .await??;
+                Ok(()) as Result<(), Error>
+            })
+        })
+        .await??;
 
     Ok(())
 }
 
 impl SignatureVerify for MyVerify {
-    type Error = MyError;
+    type Error = Error;
     type Future = Pin<Box<dyn Future<Output = Result<bool, Self::Error>>>>;
 
     fn signature_verify(
@@ -144,10 +171,39 @@ impl SignatureVerify for MyVerify {
         Box::pin(async move {
             this.verify(algorithm, key_id, signature, signing_string)
                 .await
-                .map_err(|e| {
-                    error!("Failed to verify, {}", e);
-                    e
-                })
         })
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use crate::apub::AcceptedActors;
+    use rsa::{pkcs8::DecodePublicKey, RsaPublicKey};
+
+    const ASONIX_DOG_ACTOR: &str = r#"{"@context":["https://www.w3.org/ns/activitystreams","https://w3id.org/security/v1",{"manuallyApprovesFollowers":"as:manuallyApprovesFollowers","toot":"http://joinmastodon.org/ns#","featured":{"@id":"toot:featured","@type":"@id"},"featuredTags":{"@id":"toot:featuredTags","@type":"@id"},"alsoKnownAs":{"@id":"as:alsoKnownAs","@type":"@id"},"movedTo":{"@id":"as:movedTo","@type":"@id"},"schema":"http://schema.org#","PropertyValue":"schema:PropertyValue","value":"schema:value","discoverable":"toot:discoverable","Device":"toot:Device","Ed25519Signature":"toot:Ed25519Signature","Ed25519Key":"toot:Ed25519Key","Curve25519Key":"toot:Curve25519Key","EncryptedMessage":"toot:EncryptedMessage","publicKeyBase64":"toot:publicKeyBase64","deviceId":"toot:deviceId","claim":{"@type":"@id","@id":"toot:claim"},"fingerprintKey":{"@type":"@id","@id":"toot:fingerprintKey"},"identityKey":{"@type":"@id","@id":"toot:identityKey"},"devices":{"@type":"@id","@id":"toot:devices"},"messageFranking":"toot:messageFranking","messageType":"toot:messageType","cipherText":"toot:cipherText","suspended":"toot:suspended"}],"id":"https://masto.asonix.dog/actor","type":"Application","inbox":"https://masto.asonix.dog/actor/inbox","outbox":"https://masto.asonix.dog/actor/outbox","preferredUsername":"masto.asonix.dog","url":"https://masto.asonix.dog/about/more?instance_actor=true","manuallyApprovesFollowers":true,"publicKey":{"id":"https://masto.asonix.dog/actor#main-key","owner":"https://masto.asonix.dog/actor","publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx8zXS0QNg9YGUBsxAOBH\nJaxIn7i6t+Z4UOpSFDVa2kP0NvQgIJsq3wzRqvaiuncRWpkyFk1fTakiRGD32xnY\nt+juuAaIBlU8eswKyANFqhcLAvFHmT3rA1848M4/YM19djvlL/PR9T53tPNHU+el\nS9MlsG3o6Zsj8YaUJtCI8RgEuJoROLHUb/V9a3oMQ7CfuIoSvF3VEz3/dRT09RW6\n0wQX7yhka9WlKuayWLWmTcB9lAIX6neBk+qKc8VSEsO7mHkzB8mRgVcS2uYZl1eA\nD8/jTT+SlpeFNDZk0Oh35GNFoOxh9qjRw3NGxu7jJCVBehDODzasOv4xDxKAhONa\njQIDAQAB\n-----END PUBLIC KEY-----\n"},"endpoints":{"sharedInbox":"https://masto.asonix.dog/inbox"}}"#;
+    const KARJALAZET_RELAY: &str = r#"{"@context":["https://www.w3.org/ns/activitystreams","https://pleroma.karjalazet.se/schemas/litepub-0.1.jsonld",{"@language":"und"}],"alsoKnownAs":[],"attachment":[],"capabilities":{},"discoverable":false,"endpoints":{"oauthAuthorizationEndpoint":"https://pleroma.karjalazet.se/oauth/authorize","oauthRegistrationEndpoint":"https://pleroma.karjalazet.se/api/v1/apps","oauthTokenEndpoint":"https://pleroma.karjalazet.se/oauth/token","sharedInbox":"https://pleroma.karjalazet.se/inbox","uploadMedia":"https://pleroma.karjalazet.se/api/ap/upload_media"},"featured":"https://pleroma.karjalazet.se/relay/collections/featured","followers":"https://pleroma.karjalazet.se/relay/followers","following":"https://pleroma.karjalazet.se/relay/following","id":"https://pleroma.karjalazet.se/relay","inbox":"https://pleroma.karjalazet.se/relay/inbox","manuallyApprovesFollowers":false,"name":null,"outbox":"https://pleroma.karjalazet.se/relay/outbox","preferredUsername":"relay","publicKey":{"id":"https://pleroma.karjalazet.se/relay#main-key","owner":"https://pleroma.karjalazet.se/relay","publicKeyPem":"-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucoyCht6QpEzUPdQWP/J\nJYxObSH3MCcXBnG4d0OX78QshloeAHhl78EZ5c8I0ePmIjDg2NFK3/pG0EvSrHe2\nIZHnHaN5emgCb2ifNya5W572yfQXo1tUQy+ZXtbTUA7BWbr4LuCvd+HUavMwbx72\neraSZTiQj//ObwpbXFoZO5I/+e5avGmVnfmr/y2cG95hqFDtI3438RgZyBjY5kJM\nY1MLWoY9itGSfYmBtxRj3umlC2bPuBB+hHUJi6TvP7NO6zuUZ66m4ETyuBDi8iP6\ngnUp3Q4+1/I3nDUmhjt7OXckUcX3r5M4UHD3VVUFG0aZw6WWMEAxlyFf/07fCkhR\nBwIDAQAB\n-----END PUBLIC KEY-----\n\n"},"summary":"","tag":[],"type":"Person","url":"https://pleroma.karjalazet.se/relay"}"#;
+    const ASONIX_DOG_KEY: &str = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx8zXS0QNg9YGUBsxAOBH\nJaxIn7i6t+Z4UOpSFDVa2kP0NvQgIJsq3wzRqvaiuncRWpkyFk1fTakiRGD32xnY\nt+juuAaIBlU8eswKyANFqhcLAvFHmT3rA1848M4/YM19djvlL/PR9T53tPNHU+el\nS9MlsG3o6Zsj8YaUJtCI8RgEuJoROLHUb/V9a3oMQ7CfuIoSvF3VEz3/dRT09RW6\n0wQX7yhka9WlKuayWLWmTcB9lAIX6neBk+qKc8VSEsO7mHkzB8mRgVcS2uYZl1eA\nD8/jTT+SlpeFNDZk0Oh35GNFoOxh9qjRw3NGxu7jJCVBehDODzasOv4xDxKAhONa\njQIDAQAB\n-----END PUBLIC KEY-----\n";
+    const KARJALAZET_KEY: &str = "-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAucoyCht6QpEzUPdQWP/J\nJYxObSH3MCcXBnG4d0OX78QshloeAHhl78EZ5c8I0ePmIjDg2NFK3/pG0EvSrHe2\nIZHnHaN5emgCb2ifNya5W572yfQXo1tUQy+ZXtbTUA7BWbr4LuCvd+HUavMwbx72\neraSZTiQj//ObwpbXFoZO5I/+e5avGmVnfmr/y2cG95hqFDtI3438RgZyBjY5kJM\nY1MLWoY9itGSfYmBtxRj3umlC2bPuBB+hHUJi6TvP7NO6zuUZ66m4ETyuBDi8iP6\ngnUp3Q4+1/I3nDUmhjt7OXckUcX3r5M4UHD3VVUFG0aZw6WWMEAxlyFf/07fCkhR\nBwIDAQAB\n-----END PUBLIC KEY-----\n\n";
+
+    #[test]
+    fn handles_masto_keys() {
+        println!("{ASONIX_DOG_KEY}");
+        let _ = RsaPublicKey::from_public_key_pem(ASONIX_DOG_KEY.trim()).unwrap();
+    }
+
+    #[test]
+    fn handles_pleromo_keys() {
+        println!("{KARJALAZET_KEY}");
+        let _ = RsaPublicKey::from_public_key_pem(KARJALAZET_KEY.trim()).unwrap();
+    }
+
+    #[test]
+    fn handles_pleromo_relay_format() {
+        let _: AcceptedActors = serde_json::from_str(KARJALAZET_RELAY).unwrap();
+    }
+
+    #[test]
+    fn handles_masto_relay_format() {
+        let _: AcceptedActors = serde_json::from_str(ASONIX_DOG_ACTOR).unwrap();
+    }
+}

src/middleware/webfinger.rs

@@ -1,11 +1,11 @@
 use crate::{
     config::{Config, UrlKind},
     data::State,
+    future::LocalBoxFuture,
 };
 use actix_web::web::Data;
 use actix_webfinger::{Resolver, Webfinger};
 use rsa_magic_public_key::AsMagicPublicKey;
-use std::{future::Future, pin::Pin};
 
 pub(crate) struct RelayResolver;
 
@@ -13,21 +13,27 @@ pub(crate) struct RelayResolver;
 #[error("Error resolving webfinger data")]
 pub(crate) struct RelayError;
 
-type FutResult<T, E> = dyn Future<Output = Result<T, E>>;
-
 impl Resolver for RelayResolver {
     type State = (Data<State>, Data<Config>);
     type Error = RelayError;
 
     fn find(
+        scheme: Option<&str>,
         account: &str,
         domain: &str,
         (state, config): Self::State,
-    ) -> Pin<Box<FutResult<Option<Webfinger>, Self::Error>>> {
+    ) -> LocalBoxFuture<'static, Result<Option<Webfinger>, Self::Error>> {
         let domain = domain.to_owned();
         let account = account.to_owned();
+        let scheme = scheme.map(|scheme| scheme.to_owned());
 
         let fut = async move {
+            if let Some(scheme) = scheme {
+                if scheme != "acct:" {
+                    return Ok(None);
+                }
+            }
+
             if domain != config.hostname() {
                 return Ok(None);
             }

src/requests.rs

@@ -1,35 +1,59 @@
-use crate::error::MyError;
-use activitystreams::url::Url;
-use actix_web::{http::header::Date, web::Bytes};
-use async_mutex::Mutex;
-use async_rwlock::RwLock;
-use awc::Client;
-use chrono::{DateTime, Utc};
-use http_signature_normalization_actix::prelude::*;
-use log::{debug, info, warn};
-use rsa::{hash::Hash, padding::PaddingScheme, RsaPrivateKey};
-use sha2::{Digest, Sha256};
-use std::{
-    cell::RefCell,
-    collections::HashMap,
-    rc::Rc,
-    sync::{
-        atomic::{AtomicUsize, Ordering},
-        Arc,
-    },
-    time::SystemTime,
+use crate::{
+    data::LastOnline,
+    error::{Error, ErrorKind},
+    spawner::Spawner,
+    stream::{aggregate, limit_stream},
 };
+use activitystreams::iri_string::types::IriString;
+use actix_web::http::header::Date;
+use base64::{engine::general_purpose::STANDARD, Engine};
+use dashmap::DashMap;
+use http_signature_normalization_reqwest::{digest::ring::Sha256, prelude::*};
+use reqwest_middleware::ClientWithMiddleware;
+use ring::{
+    rand::SystemRandom,
+    signature::{RsaKeyPair, RSA_PKCS1_SHA256},
+};
+use rsa::{pkcs1::EncodeRsaPrivateKey, RsaPrivateKey};
+use std::{
+    sync::Arc,
+    time::{Duration, SystemTime},
+};
+
+const ONE_SECOND: u64 = 1;
+const ONE_MINUTE: u64 = 60 * ONE_SECOND;
+const ONE_HOUR: u64 = 60 * ONE_MINUTE;
+const ONE_DAY: u64 = 24 * ONE_HOUR;
+
+// 20 KB
+const JSON_SIZE_LIMIT: usize = 20 * 1024;
+
+#[derive(Debug)]
+pub(crate) enum BreakerStrategy {
+    // Requires a successful response
+    Require2XX,
+    // Allows HTTP 2xx-401
+    Allow401AndBelow,
+    // Allows HTTP 2xx-404
+    Allow404AndBelow,
+}
 
 #[derive(Clone)]
 pub(crate) struct Breakers {
-    inner: Arc<RwLock<HashMap<String, Arc<Mutex<Breaker>>>>>,
+    inner: Arc<DashMap<String, Breaker>>,
+}
+
+impl std::fmt::Debug for Breakers {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Breakers").finish()
+    }
 }
 
 impl Breakers {
-    async fn should_try(&self, url: &Url) -> bool {
-        if let Some(domain) = url.domain() {
-            if let Some(breaker) = self.inner.read().await.get(domain) {
-                breaker.lock().await.should_try()
+    pub(crate) fn should_try(&self, url: &IriString) -> bool {
+        if let Some(authority) = url.authority_str() {
+            if let Some(breaker) = self.inner.get(authority) {
+                breaker.should_try()
             } else {
                 true
             }
@@ -38,15 +62,14 @@ impl Breakers {
         }
     }
 
-    async fn fail(&self, url: &Url) {
-        if let Some(domain) = url.domain() {
+    fn fail(&self, url: &IriString) {
+        if let Some(authority) = url.authority_str() {
             let should_write = {
-                let read = self.inner.read().await;
-
-                if let Some(breaker) = read.get(domain) {
-                    let owned_breaker = Arc::clone(&breaker);
-                    drop(breaker);
-                    owned_breaker.lock().await.fail();
+                if let Some(mut breaker) = self.inner.get_mut(authority) {
+                    breaker.fail();
+                    if !breaker.should_try() {
+                        tracing::warn!("Failed breaker for {authority}");
+                    }
                     false
                 } else {
                     true
@@ -54,24 +77,17 @@ impl Breakers {
             };
 
             if should_write {
-                let mut hm = self.inner.write().await;
-                let breaker = hm
-                    .entry(domain.to_owned())
-                    .or_insert(Arc::new(Mutex::new(Breaker::default())));
-                breaker.lock().await.fail();
+                let mut breaker = self.inner.entry(authority.to_owned()).or_default();
+                breaker.fail();
             }
         }
     }
 
-    async fn succeed(&self, url: &Url) {
-        if let Some(domain) = url.domain() {
+    fn succeed(&self, url: &IriString) {
+        if let Some(authority) = url.authority_str() {
             let should_write = {
-                let read = self.inner.read().await;
-
-                if let Some(breaker) = read.get(domain) {
-                    let owned_breaker = Arc::clone(&breaker);
-                    drop(breaker);
-                    owned_breaker.lock().await.succeed();
+                if let Some(mut breaker) = self.inner.get_mut(authority) {
+                    breaker.succeed();
                     false
                 } else {
                     true
@@ -79,11 +95,8 @@ impl Breakers {
             };
 
             if should_write {
-                let mut hm = self.inner.write().await;
-                let breaker = hm
-                    .entry(domain.to_owned())
-                    .or_insert(Arc::new(Mutex::new(Breaker::default())));
-                breaker.lock().await.succeed();
+                let mut breaker = self.inner.entry(authority.to_owned()).or_default();
+                breaker.succeed();
             }
         }
     }
@@ -92,46 +105,42 @@ impl Breakers {
 impl Default for Breakers {
     fn default() -> Self {
         Breakers {
-            inner: Arc::new(RwLock::new(HashMap::new())),
+            inner: Arc::new(DashMap::new()),
         }
     }
 }
 
+#[derive(Debug)]
 struct Breaker {
     failures: usize,
-    last_attempt: DateTime<Utc>,
-    last_success: DateTime<Utc>,
+    last_attempt: SystemTime,
+    last_success: SystemTime,
 }
 
 impl Breaker {
-    const fn failure_threshold() -> usize {
-        10
-    }
-
-    fn failure_wait() -> chrono::Duration {
-        chrono::Duration::days(1)
-    }
+    const FAILURE_WAIT: Duration = Duration::from_secs(ONE_DAY);
+    const FAILURE_THRESHOLD: usize = 10;
 
     fn should_try(&self) -> bool {
-        self.failures < Self::failure_threshold()
-            || self.last_attempt + Self::failure_wait() < Utc::now()
+        self.failures < Self::FAILURE_THRESHOLD
+            || self.last_attempt + Self::FAILURE_WAIT < SystemTime::now()
     }
 
     fn fail(&mut self) {
         self.failures += 1;
-        self.last_attempt = Utc::now();
+        self.last_attempt = SystemTime::now();
     }
 
     fn succeed(&mut self) {
         self.failures = 0;
-        self.last_attempt = Utc::now();
-        self.last_success = Utc::now();
+        self.last_attempt = SystemTime::now();
+        self.last_success = SystemTime::now();
     }
 }
 
 impl Default for Breaker {
     fn default() -> Self {
-        let now = Utc::now();
+        let now = SystemTime::now();
 
         Breaker {
             failures: 0,
@@ -143,271 +152,307 @@ impl Default for Breaker {
 
 #[derive(Clone)]
 pub(crate) struct Requests {
-    client: Rc<RefCell<Client>>,
-    consecutive_errors: Rc<AtomicUsize>,
-    error_limit: usize,
+    client: ClientWithMiddleware,
     key_id: String,
-    user_agent: String,
-    private_key: RsaPrivateKey,
-    config: Config,
+    private_key: Arc<RsaKeyPair>,
+    rng: SystemRandom,
+    config: Config<Spawner>,
     breakers: Breakers,
+    last_online: Arc<LastOnline>,
+}
+
+impl std::fmt::Debug for Requests {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Requests")
+            .field("key_id", &self.key_id)
+            .field("config", &self.config)
+            .field("breakers", &self.breakers)
+            .finish()
+    }
 }
 
 impl Requests {
+    #[allow(clippy::too_many_arguments)]
     pub(crate) fn new(
         key_id: String,
         private_key: RsaPrivateKey,
-        user_agent: String,
         breakers: Breakers,
+        last_online: Arc<LastOnline>,
+        spawner: Spawner,
+        client: ClientWithMiddleware,
     ) -> Self {
+        let private_key_der = private_key.to_pkcs1_der().expect("Can encode der");
+        let private_key = ring::signature::RsaKeyPair::from_der(private_key_der.as_bytes())
+            .expect("Key is valid");
         Requests {
-            client: Rc::new(RefCell::new(
-                Client::builder()
-                    .header("User-Agent", user_agent.clone())
-                    .finish(),
-            )),
-            consecutive_errors: Rc::new(AtomicUsize::new(0)),
-            error_limit: 3,
+            client,
             key_id,
-            user_agent,
-            private_key,
-            config: Config::default().mastodon_compat(),
+            private_key: Arc::new(private_key),
+            rng: SystemRandom::new(),
+            config: Config::new_with_spawner(spawner).mastodon_compat(),
             breakers,
+            last_online,
         }
     }
 
-    fn count_err(&self) {
-        let count = self.consecutive_errors.fetch_add(1, Ordering::Relaxed);
-        if count + 1 >= self.error_limit {
-            warn!("{} consecutive errors, rebuilding http client", count);
-            *self.client.borrow_mut() = Client::builder()
-                .header("User-Agent", self.user_agent.clone())
-                .finish();
-            self.reset_err();
-        }
+    pub(crate) fn spawner(mut self, spawner: Spawner) -> Self {
+        self.config = self.config.set_spawner(spawner);
+        self
     }
 
-    fn reset_err(&self) {
-        self.consecutive_errors.swap(0, Ordering::Relaxed);
+    pub(crate) fn reset_breaker(&self, iri: &IriString) {
+        self.breakers.succeed(iri);
     }
 
-    pub(crate) async fn fetch_json<T>(&self, url: &str) -> Result<T, MyError>
-    where
-        T: serde::de::DeserializeOwned,
-    {
-        self.do_fetch(url, "application/json").await
-    }
-
-    pub(crate) async fn fetch<T>(&self, url: &str) -> Result<T, MyError>
-    where
-        T: serde::de::DeserializeOwned,
-    {
-        self.do_fetch(url, "application/activity+json").await
-    }
-
-    async fn do_fetch<T>(&self, url: &str, accept: &str) -> Result<T, MyError>
-    where
-        T: serde::de::DeserializeOwned,
-    {
-        let parsed_url = url.parse::<Url>()?;
-
-        if !self.breakers.should_try(&parsed_url).await {
-            return Err(MyError::Breaker);
-        }
-
-        let signer = self.signer();
-
-        let client: Client = self.client.borrow().clone();
-        let res = client
-            .get(url)
-            .insert_header(("Accept", accept))
-            .insert_header(Date(SystemTime::now().into()))
-            .signature(
-                self.config.clone(),
-                self.key_id.clone(),
-                move |signing_string| signer.sign(signing_string),
-            )
-            .await?
-            .send()
-            .await;
-
+    async fn check_response(
+        &self,
+        parsed_url: &IriString,
+        strategy: BreakerStrategy,
+        res: Result<reqwest::Response, reqwest_middleware::Error>,
+    ) -> Result<reqwest::Response, Error> {
         if res.is_err() {
-            self.count_err();
-            self.breakers.fail(&parsed_url).await;
+            self.breakers.fail(&parsed_url);
         }
 
-        let mut res = res.map_err(|e| MyError::SendRequest(url.to_string(), e.to_string()))?;
+        let res = res?;
 
-        self.reset_err();
+        let status = res.status();
 
-        if !res.status().is_success() {
-            if let Ok(bytes) = res.body().await {
-                if let Ok(s) = String::from_utf8(bytes.as_ref().to_vec()) {
-                    if !s.is_empty() {
-                        debug!("Response from {}, {}", url, s);
-                    }
+        let success = match strategy {
+            BreakerStrategy::Require2XX => status.is_success(),
+            BreakerStrategy::Allow401AndBelow => (200..=401).contains(&status.as_u16()),
+            BreakerStrategy::Allow404AndBelow => (200..=404).contains(&status.as_u16()),
+        };
+
+        if !success {
+            self.breakers.fail(&parsed_url);
+
+            if let Ok(s) = res.text().await {
+                if !s.is_empty() {
+                    tracing::debug!("Response from {parsed_url}, {s}");
                 }
             }
 
-            self.breakers.fail(&parsed_url).await;
-
-            return Err(MyError::Status(url.to_string(), res.status()));
+            return Err(ErrorKind::Status(
+                parsed_url.to_string(),
+                crate::http1::status_to_http02(status),
+            )
+            .into());
         }
 
-        self.breakers.succeed(&parsed_url).await;
+        // only actually succeed a breaker on 2xx response
+        if status.is_success() {
+            self.last_online.mark_seen(&parsed_url);
+            self.breakers.succeed(&parsed_url);
+        }
 
-        let body = res
-            .body()
+        Ok(res)
+    }
+
+    #[tracing::instrument(name = "Fetch Json", skip(self), fields(signing_string))]
+    pub(crate) async fn fetch_json<T>(
+        &self,
+        url: &IriString,
+        strategy: BreakerStrategy,
+    ) -> Result<T, Error>
+    where
+        T: serde::de::DeserializeOwned,
+    {
+        self.do_fetch(url, "application/json", strategy).await
+    }
+
+    #[tracing::instrument(name = "Fetch Json", skip(self), fields(signing_string))]
+    pub(crate) async fn fetch_json_msky<T>(
+        &self,
+        url: &IriString,
+        strategy: BreakerStrategy,
+    ) -> Result<T, Error>
+    where
+        T: serde::de::DeserializeOwned,
+    {
+        let stream = self
+            .do_deliver(
+                url,
+                &serde_json::json!({}),
+                "application/json",
+                "application/json",
+                strategy,
+            )
+            .await?
+            .bytes_stream();
+
+        let body = aggregate(limit_stream(stream, JSON_SIZE_LIMIT)).await?;
+
+        Ok(serde_json::from_slice(&body)?)
+    }
+
+    #[tracing::instrument(name = "Fetch Activity+Json", skip(self), fields(signing_string))]
+    pub(crate) async fn fetch<T>(
+        &self,
+        url: &IriString,
+        strategy: BreakerStrategy,
+    ) -> Result<T, Error>
+    where
+        T: serde::de::DeserializeOwned,
+    {
+        self.do_fetch(url, "application/activity+json", strategy)
             .await
-            .map_err(|e| MyError::ReceiveResponse(url.to_string(), e.to_string()))?;
-
-        Ok(serde_json::from_slice(body.as_ref())?)
     }
 
-    pub(crate) async fn fetch_bytes(&self, url: &str) -> Result<(String, Bytes), MyError> {
-        let parsed_url = url.parse::<Url>()?;
-
-        if !self.breakers.should_try(&parsed_url).await {
-            return Err(MyError::Breaker);
-        }
-
-        info!("Fetching bytes for {}", url);
-        let signer = self.signer();
-
-        let client: Client = self.client.borrow().clone();
-        let res = client
-            .get(url)
-            .insert_header(("Accept", "*/*"))
-            .insert_header(Date(SystemTime::now().into()))
-            .signature(
-                self.config.clone(),
-                self.key_id.clone(),
-                move |signing_string| signer.sign(signing_string),
-            )
-            .await?
-            .send()
-            .await;
-
-        if res.is_err() {
-            self.breakers.fail(&parsed_url).await;
-            self.count_err();
-        }
-
-        let mut res = res.map_err(|e| MyError::SendRequest(url.to_string(), e.to_string()))?;
-
-        self.reset_err();
-
-        let content_type = if let Some(content_type) = res.headers().get("content-type") {
-            if let Ok(s) = content_type.to_str() {
-                s.to_owned()
-            } else {
-                return Err(MyError::ContentType);
-            }
-        } else {
-            return Err(MyError::ContentType);
-        };
-
-        if !res.status().is_success() {
-            if let Ok(bytes) = res.body().await {
-                if let Ok(s) = String::from_utf8(bytes.as_ref().to_vec()) {
-                    if !s.is_empty() {
-                        debug!("Response from {}, {}", url, s);
-                    }
-                }
-            }
-
-            self.breakers.fail(&parsed_url).await;
-
-            return Err(MyError::Status(url.to_string(), res.status()));
-        }
-
-        self.breakers.succeed(&parsed_url).await;
-
-        let bytes = match res.body().limit(1024 * 1024 * 4).await {
-            Err(e) => {
-                return Err(MyError::ReceiveResponse(url.to_string(), e.to_string()));
-            }
-            Ok(bytes) => bytes,
-        };
-
-        Ok((content_type, bytes))
-    }
-
-    pub(crate) async fn deliver<T>(&self, inbox: Url, item: &T) -> Result<(), MyError>
+    async fn do_fetch<T>(
+        &self,
+        url: &IriString,
+        accept: &str,
+        strategy: BreakerStrategy,
+    ) -> Result<T, Error>
     where
-        T: serde::ser::Serialize,
+        T: serde::de::DeserializeOwned,
     {
-        if !self.breakers.should_try(&inbox).await {
-            return Err(MyError::Breaker);
+        let stream = self
+            .do_fetch_response(url, accept, strategy)
+            .await?
+            .bytes_stream();
+
+        let body = aggregate(limit_stream(stream, JSON_SIZE_LIMIT)).await?;
+
+        Ok(serde_json::from_slice(&body)?)
+    }
+
+    #[tracing::instrument(name = "Fetch response", skip(self), fields(signing_string))]
+    pub(crate) async fn fetch_response(
+        &self,
+        url: &IriString,
+        strategy: BreakerStrategy,
+    ) -> Result<reqwest::Response, Error> {
+        self.do_fetch_response(url, "*/*", strategy).await
+    }
+
+    pub(crate) async fn do_fetch_response(
+        &self,
+        url: &IriString,
+        accept: &str,
+        strategy: BreakerStrategy,
+    ) -> Result<reqwest::Response, Error> {
+        if !self.breakers.should_try(url) {
+            return Err(ErrorKind::Breaker.into());
         }
 
         let signer = self.signer();
+        let span = tracing::Span::current();
+
+        let request = self
+            .client
+            .get(url.as_str())
+            .header("Accept", accept)
+            .header("Date", Date(SystemTime::now().into()).to_string())
+            .signature(&self.config, self.key_id.clone(), move |signing_string| {
+                span.record("signing_string", signing_string);
+                span.in_scope(|| signer.sign(signing_string))
+            })
+            .await?;
+
+        let res = self.client.execute(request).await;
+
+        let res = self.check_response(url, strategy, res).await?;
+
+        Ok(res)
+    }
+
+    #[tracing::instrument(
+        "Deliver to Inbox",
+        skip_all,
+        fields(inbox = inbox.to_string().as_str(), signing_string)
+    )]
+    pub(crate) async fn deliver<T>(
+        &self,
+        inbox: &IriString,
+        item: &T,
+        strategy: BreakerStrategy,
+    ) -> Result<(), Error>
+    where
+        T: serde::ser::Serialize + std::fmt::Debug,
+    {
+        self.do_deliver(
+            inbox,
+            item,
+            "application/activity+json",
+            "application/activity+json",
+            strategy,
+        )
+        .await?;
+        Ok(())
+    }
+
+    async fn do_deliver<T>(
+        &self,
+        inbox: &IriString,
+        item: &T,
+        content_type: &str,
+        accept: &str,
+        strategy: BreakerStrategy,
+    ) -> Result<reqwest::Response, Error>
+    where
+        T: serde::ser::Serialize + std::fmt::Debug,
+    {
+        if !self.breakers.should_try(&inbox) {
+            return Err(ErrorKind::Breaker.into());
+        }
+
+        let signer = self.signer();
+        let span = tracing::Span::current();
         let item_string = serde_json::to_string(item)?;
 
-        let client: Client = self.client.borrow().clone();
-        let res = client
+        let request = self
+            .client
             .post(inbox.as_str())
-            .insert_header(("Accept", "application/activity+json"))
-            .insert_header(("Content-Type", "application/activity+json"))
-            .insert_header(Date(SystemTime::now().into()))
+            .header("Accept", accept)
+            .header("Content-Type", content_type)
+            .header("Date", Date(SystemTime::now().into()).to_string())
             .signature_with_digest(
                 self.config.clone(),
                 self.key_id.clone(),
                 Sha256::new(),
                 item_string,
-                move |signing_string| signer.sign(signing_string),
+                move |signing_string| {
+                    span.record("signing_string", signing_string);
+                    span.in_scope(|| signer.sign(signing_string))
+                },
             )
-            .await?
-            .send()
-            .await;
+            .await?;
 
-        if res.is_err() {
-            self.count_err();
-            self.breakers.fail(&inbox).await;
-        }
+        let res = self.client.execute(request).await;
 
-        let mut res = res.map_err(|e| MyError::SendRequest(inbox.to_string(), e.to_string()))?;
+        let res = self.check_response(inbox, strategy, res).await?;
 
-        self.reset_err();
-
-        if !res.status().is_success() {
-            if let Ok(bytes) = res.body().await {
-                if let Ok(s) = String::from_utf8(bytes.as_ref().to_vec()) {
-                    if !s.is_empty() {
-                        debug!("Response from {}, {}", inbox.as_str(), s);
-                    }
-                }
-            }
-
-            self.breakers.fail(&inbox).await;
-            return Err(MyError::Status(inbox.to_string(), res.status()));
-        }
-
-        self.breakers.succeed(&inbox).await;
-
-        Ok(())
+        Ok(res)
     }
 
     fn signer(&self) -> Signer {
         Signer {
             private_key: self.private_key.clone(),
+            rng: self.rng.clone(),
         }
     }
 }
 
 struct Signer {
-    private_key: RsaPrivateKey,
+    private_key: Arc<RsaKeyPair>,
+    rng: SystemRandom,
 }
 
 impl Signer {
-    fn sign(&self, signing_string: &str) -> Result<String, MyError> {
-        let hashed = Sha256::digest(signing_string.as_bytes());
-        let bytes = self.private_key.sign(
-            PaddingScheme::PKCS1v15Sign {
-                hash: Some(Hash::SHA2_256),
-            },
-            &hashed,
-        )?;
-        Ok(base64::encode(bytes))
+    fn sign(&self, signing_string: &str) -> Result<String, Error> {
+        let mut signature = vec![0; self.private_key.public().modulus_len()];
+
+        self.private_key
+            .sign(
+                &RSA_PKCS1_SHA256,
+                &self.rng,
+                signing_string.as_bytes(),
+                &mut signature,
+            )
+            .map_err(|_| ErrorKind::SignRequest)?;
+
+        Ok(STANDARD.encode(&signature))
     }
 }

src/routes.rs

@@ -1,4 +1,5 @@
 mod actor;
+mod healthz;
 mod inbox;
 mod index;
 mod media;
@@ -7,6 +8,7 @@ mod statics;
 
 pub(crate) use self::{
     actor::route as actor,
+    healthz::route as healthz,
     inbox::route as inbox,
     index::route as index,
     media::route as media,

src/routes/actor.rs

@@ -2,7 +2,7 @@ use crate::{
     apub::{PublicKey, PublicKeyInner},
     config::{Config, UrlKind},
     data::State,
-    error::MyError,
+    error::Error,
     routes::ok,
 };
 use activitystreams::{
@@ -13,19 +13,22 @@ use activitystreams::{
 };
 use activitystreams_ext::Ext1;
 use actix_web::{web, Responder};
-use rsa::pkcs8::ToPublicKey;
+use rsa::pkcs8::EncodePublicKey;
 
+#[tracing::instrument(name = "Actor", skip(config, state))]
 pub(crate) async fn route(
     state: web::Data<State>,
     config: web::Data<Config>,
-) -> Result<impl Responder, MyError> {
+) -> Result<impl Responder, Error> {
     let mut application = Ext1::new(
         ApActor::new(config.generate_url(UrlKind::Inbox), Application::new()),
         PublicKey {
             public_key: PublicKeyInner {
-                id: config.generate_url(UrlKind::MainKey).into(),
-                owner: config.generate_url(UrlKind::Actor).into(),
-                public_key_pem: state.public_key.to_public_key_pem()?,
+                id: config.generate_url(UrlKind::MainKey),
+                owner: config.generate_url(UrlKind::Actor),
+                public_key_pem: state
+                    .public_key
+                    .to_public_key_pem(rsa::pkcs8::LineEnding::default())?,
             },
         },
     );

src/routes/healthz.rs

@@ -0,0 +1,7 @@
+use crate::{data::State, error::Error};
+use actix_web::{web, HttpResponse};
+
+pub(crate) async fn route(state: web::Data<State>) -> Result<HttpResponse, Error> {
+    state.db.check_health().await?;
+    Ok(HttpResponse::Ok().finish())
+}

src/routes/inbox.rs

@@ -3,19 +3,21 @@ use crate::{
     config::{Config, UrlKind},
     data::{ActorCache, State},
     db::Actor,
-    error::MyError,
+    error::{Error, ErrorKind},
     jobs::apub::{Announce, Follow, Forward, Reject, Undo},
     jobs::JobServer,
     requests::Requests,
     routes::accepted,
 };
 use activitystreams::{
-    activity, base::AnyBase, prelude::*, primitives::OneOrMany, public, url::Url,
+    activity, base::AnyBase, iri_string::types::IriString, prelude::*, primitives::OneOrMany,
+    public,
 };
 use actix_web::{web, HttpResponse};
 use http_signature_normalization_actix::prelude::{DigestVerified, SignatureVerified};
-use log::error;
 
+#[tracing::instrument(name = "Inbox", skip_all, fields(id = tracing::field::debug(&input.id_unchecked()), kind = tracing::field::debug(&input.kind())))]
+#[allow(clippy::too_many_arguments)]
 pub(crate) async fn route(
     state: web::Data<State>,
     actors: web::Data<ActorCache>,
@@ -23,91 +25,110 @@ pub(crate) async fn route(
     client: web::Data<Requests>,
     jobs: web::Data<JobServer>,
     input: web::Json<AcceptedActivities>,
-    verified: Option<(SignatureVerified, DigestVerified)>,
-) -> Result<HttpResponse, MyError> {
+    digest_verified: Option<DigestVerified>,
+    signature_verified: Option<SignatureVerified>,
+) -> Result<HttpResponse, Error> {
     let input = input.into_inner();
 
-    let actor = actors
-        .get(
-            input.actor()?.as_single_id().ok_or(MyError::MissingId)?,
-            &client,
-        )
-        .await?
-        .into_inner();
+    let kind = input.kind().ok_or(ErrorKind::MissingKind)?;
+
+    if digest_verified.is_some() && signature_verified.is_none() && *kind == ValidTypes::Delete {
+        return Ok(accepted(serde_json::json!({})));
+    } else if config.validate_signatures()
+        && (digest_verified.is_none() || signature_verified.is_none())
+    {
+        return Err(ErrorKind::NoSignature(None).into());
+    }
+
+    let actor_id = if input.id_unchecked().is_some() {
+        input.actor()?.as_single_id().ok_or(ErrorKind::MissingId)?
+    } else {
+        input
+            .actor_unchecked()
+            .as_single_id()
+            .ok_or(ErrorKind::MissingId)?
+    };
+
+    let actor = actors.get(actor_id, &client).await?.into_inner();
+
+    if let Some(verified) = signature_verified {
+        if actor.public_key_id.as_str() != verified.key_id() {
+            tracing::error!("Actor signed with wrong key");
+            return Err(ErrorKind::BadActor(
+                actor.public_key_id.to_string(),
+                verified.key_id().to_owned(),
+            )
+            .into());
+        }
+    } else if config.validate_signatures() {
+        tracing::error!("This case should never be reachable, since I handle signature checks earlier in the flow. If you see this in a log it means I did it wrong");
+        return Err(ErrorKind::NoSignature(Some(actor.public_key_id.to_string())).into());
+    }
 
     let is_allowed = state.db.is_allowed(actor.id.clone()).await?;
     let is_connected = state.db.is_connected(actor.id.clone()).await?;
 
     if !is_allowed {
-        return Err(MyError::NotAllowed(actor.id.to_string()));
+        return Err(ErrorKind::NotAllowed(actor.id.to_string()).into());
     }
 
     if !is_connected && !valid_without_listener(&input)? {
-        return Err(MyError::NotSubscribed(actor.id.to_string()));
+        return Err(ErrorKind::NotSubscribed(actor.id.to_string()).into());
     }
 
-    if config.validate_signatures() && verified.is_none() {
-        return Err(MyError::NoSignature(actor.public_key_id.to_string()));
-    } else if config.validate_signatures() {
-        if let Some((verified, _)) = verified {
-            if actor.public_key_id.as_str() != verified.key_id() {
-                error!("Bad actor, more info: {:?}", input);
-                return Err(MyError::BadActor(
-                    actor.public_key_id.to_string(),
-                    verified.key_id().to_owned(),
-                ));
-            }
-        }
-    }
-
-    match input.kind().ok_or(MyError::MissingKind)? {
+    match kind {
         ValidTypes::Accept => handle_accept(&config, input).await?,
         ValidTypes::Reject => handle_reject(&config, &jobs, input, actor).await?,
         ValidTypes::Announce | ValidTypes::Create => {
             handle_announce(&state, &jobs, input, actor).await?
         }
         ValidTypes::Follow => handle_follow(&config, &jobs, input, actor).await?,
-        ValidTypes::Delete | ValidTypes::Update => handle_forward(&jobs, input, actor).await?,
+        ValidTypes::Add | ValidTypes::Delete | ValidTypes::Remove | ValidTypes::Update => {
+            handle_forward(&jobs, input, actor).await?
+        }
         ValidTypes::Undo => handle_undo(&config, &jobs, input, actor, is_connected).await?,
     };
 
     Ok(accepted(serde_json::json!({})))
 }
 
-fn valid_without_listener(input: &AcceptedActivities) -> Result<bool, MyError> {
+fn valid_without_listener(input: &AcceptedActivities) -> Result<bool, Error> {
     match input.kind() {
         Some(ValidTypes::Follow) => Ok(true),
-        Some(ValidTypes::Undo) => Ok(single_object(input.object())?.is_kind("Follow")),
+        Some(ValidTypes::Undo) => Ok(single_object(input.object_unchecked())?.is_kind("Follow")),
         _ => Ok(false),
     }
 }
 
-fn kind_str(base: &AnyBase) -> Result<&str, MyError> {
-    base.kind_str().ok_or(MyError::MissingKind)
+fn kind_str(base: &AnyBase) -> Result<&str, Error> {
+    base.kind_str()
+        .ok_or(ErrorKind::MissingKind)
+        .map_err(Into::into)
 }
 
-fn id_string(id: Option<&Url>) -> Result<String, MyError> {
-    id.map(|s| s.to_string()).ok_or(MyError::MissingId)
+fn id_string(id: Option<&IriString>) -> Result<String, Error> {
+    id.map(|s| s.to_string())
+        .ok_or(ErrorKind::MissingId)
+        .map_err(Into::into)
 }
 
-fn single_object(o: &OneOrMany<AnyBase>) -> Result<&AnyBase, MyError> {
-    o.as_one().ok_or(MyError::ObjectCount)
+fn single_object(o: &OneOrMany<AnyBase>) -> Result<&AnyBase, Error> {
+    o.as_one().ok_or(ErrorKind::ObjectCount).map_err(Into::into)
 }
 
-async fn handle_accept(config: &Config, input: AcceptedActivities) -> Result<(), MyError> {
-    let base = single_object(input.object())?.clone();
+async fn handle_accept(config: &Config, input: AcceptedActivities) -> Result<(), Error> {
+    let base = single_object(input.object_unchecked())?.clone();
     let follow = if let Some(follow) = activity::Follow::from_any_base(base)? {
         follow
     } else {
-        return Err(MyError::Kind(
-            kind_str(single_object(input.object())?)?.to_owned(),
-        ));
+        return Err(ErrorKind::Kind(
+            kind_str(single_object(input.object_unchecked())?)?.to_owned(),
+        )
+        .into());
     };
 
     if !follow.actor_is(&config.generate_url(UrlKind::Actor)) {
-        return Err(MyError::WrongActor(id_string(
-            follow.actor()?.as_single_id(),
-        )?));
+        return Err(ErrorKind::WrongActor(id_string(follow.actor()?.as_single_id())?).into());
     }
 
     Ok(())
@@ -118,23 +139,22 @@ async fn handle_reject(
     jobs: &JobServer,
     input: AcceptedActivities,
     actor: Actor,
-) -> Result<(), MyError> {
-    let base = single_object(input.object())?.clone();
+) -> Result<(), Error> {
+    let base = single_object(input.object_unchecked())?.clone();
     let follow = if let Some(follow) = activity::Follow::from_any_base(base)? {
         follow
     } else {
-        return Err(MyError::Kind(
-            kind_str(single_object(input.object())?)?.to_owned(),
-        ));
+        return Err(ErrorKind::Kind(
+            kind_str(single_object(input.object_unchecked())?)?.to_owned(),
+        )
+        .into());
     };
 
     if !follow.actor_is(&config.generate_url(UrlKind::Actor)) {
-        return Err(MyError::WrongActor(id_string(
-            follow.actor()?.as_single_id(),
-        )?));
+        return Err(ErrorKind::WrongActor(id_string(follow.actor()?.as_single_id())?).into());
     }
 
-    jobs.queue(Reject(actor))?;
+    jobs.queue(Reject(actor)).await?;
 
     Ok(())
 }
@@ -145,33 +165,34 @@ async fn handle_undo(
     input: AcceptedActivities,
     actor: Actor,
     is_listener: bool,
-) -> Result<(), MyError> {
-    let any_base = single_object(input.object())?.clone();
+) -> Result<(), Error> {
+    let any_base = single_object(input.object_unchecked())?.clone();
     let undone_object =
-        AcceptedUndoObjects::from_any_base(any_base)?.ok_or(MyError::ObjectFormat)?;
+        AcceptedUndoObjects::from_any_base(any_base)?.ok_or(ErrorKind::ObjectFormat)?;
 
     if !undone_object.is_kind(&UndoTypes::Follow) {
         if is_listener {
-            jobs.queue(Forward::new(input, actor))?;
+            jobs.queue(Forward::new(input, actor)).await?;
             return Ok(());
         } else {
-            return Err(MyError::NotSubscribed(actor.id.to_string()));
+            return Err(ErrorKind::NotSubscribed(actor.id.to_string()).into());
         }
     }
 
-    let my_id: Url = config.generate_url(UrlKind::Actor);
+    let my_id: IriString = config.generate_url(UrlKind::Actor);
 
     if !undone_object.object_is(&my_id) && !undone_object.object_is(&public()) {
-        return Err(MyError::WrongActor(id_string(
-            undone_object.object().as_single_id(),
-        )?));
+        return Err(ErrorKind::WrongActor(id_string(
+            undone_object.object_unchecked().as_single_id(),
+        )?)
+        .into());
     }
 
     if !is_listener {
         return Ok(());
     }
 
-    jobs.queue(Undo::new(input, actor))?;
+    jobs.queue(Undo::new(input, actor)).await?;
     Ok(())
 }
 
@@ -179,8 +200,8 @@ async fn handle_forward(
     jobs: &JobServer,
     input: AcceptedActivities,
     actor: Actor,
-) -> Result<(), MyError> {
-    jobs.queue(Forward::new(input, actor))?;
+) -> Result<(), Error> {
+    jobs.queue(Forward::new(input, actor)).await?;
 
     Ok(())
 }
@@ -190,14 +211,18 @@ async fn handle_announce(
     jobs: &JobServer,
     input: AcceptedActivities,
     actor: Actor,
-) -> Result<(), MyError> {
-    let object_id = input.object().as_single_id().ok_or(MyError::MissingId)?;
+) -> Result<(), Error> {
+    let object_id = input
+        .object_unchecked()
+        .as_single_id()
+        .ok_or(ErrorKind::MissingId)?;
 
-    if state.is_cached(object_id).await {
-        return Err(MyError::Duplicate);
+    if state.is_cached(object_id) {
+        return Err(ErrorKind::Duplicate.into());
     }
 
-    jobs.queue(Announce::new(object_id.to_owned(), actor))?;
+    jobs.queue(Announce::new(object_id.to_owned(), actor))
+        .await?;
 
     Ok(())
 }
@@ -207,16 +232,16 @@ async fn handle_follow(
     jobs: &JobServer,
     input: AcceptedActivities,
     actor: Actor,
-) -> Result<(), MyError> {
-    let my_id: Url = config.generate_url(UrlKind::Actor);
+) -> Result<(), Error> {
+    let my_id: IriString = config.generate_url(UrlKind::Actor);
 
     if !input.object_is(&my_id) && !input.object_is(&public()) {
-        return Err(MyError::WrongActor(id_string(
-            input.object().as_single_id(),
-        )?));
+        return Err(
+            ErrorKind::WrongActor(id_string(input.object_unchecked().as_single_id())?).into(),
+        );
     }
 
-    jobs.queue(Follow::new(input, actor))?;
+    jobs.queue(Follow::new(input, actor)).await?;
 
     Ok(())
 }

src/routes/index.rs

@@ -1,22 +1,91 @@
-use crate::{config::Config, data::State, error::MyError};
+use crate::{
+    config::Config,
+    data::{Node, State},
+    error::{Error, ErrorKind},
+};
 use actix_web::{web, HttpResponse};
-use log::error;
 use rand::{seq::SliceRandom, thread_rng};
 use std::io::BufWriter;
 
+const MINIFY_CONFIG: minify_html::Cfg = minify_html::Cfg {
+    do_not_minify_doctype: true,
+    ensure_spec_compliant_unquoted_attribute_values: true,
+    keep_closing_tags: true,
+    keep_html_and_head_opening_tags: false,
+    keep_spaces_between_attributes: true,
+    keep_comments: false,
+    keep_input_type_text_attr: true,
+    keep_ssi_comments: false,
+    preserve_brace_template_syntax: false,
+    preserve_chevron_percent_template_syntax: false,
+    minify_css: true,
+    minify_js: true,
+    remove_bangs: true,
+    remove_processing_instructions: true,
+};
+
+fn open_reg(node: &Node) -> bool {
+    node.instance
+        .as_ref()
+        .map(|i| i.reg)
+        .or_else(|| node.info.as_ref().map(|i| i.reg))
+        .unwrap_or(false)
+}
+
+#[tracing::instrument(name = "Index", skip(config, state))]
 pub(crate) async fn route(
     state: web::Data<State>,
     config: web::Data<Config>,
-) -> Result<HttpResponse, MyError> {
-    let mut nodes = state.node_cache().nodes().await?;
-    nodes.shuffle(&mut thread_rng());
+) -> Result<HttpResponse, Error> {
+    let all_nodes = state.node_cache.nodes().await?;
+
+    let mut nodes = Vec::new();
+    let mut local = Vec::new();
+
+    for node in all_nodes {
+        if !state.is_connected(&node.base) {
+            continue;
+        }
+
+        if node
+            .base
+            .authority_str()
+            .map(|authority| {
+                config
+                    .local_domains()
+                    .iter()
+                    .any(|domain| domain.as_str() == authority)
+            })
+            .unwrap_or(false)
+        {
+            local.push(node);
+        } else {
+            nodes.push(node);
+        }
+    }
+
+    nodes.sort_by(|lhs, rhs| match (open_reg(lhs), open_reg(rhs)) {
+        (true, true) | (false, false) => std::cmp::Ordering::Equal,
+        (true, false) => std::cmp::Ordering::Less,
+        (false, true) => std::cmp::Ordering::Greater,
+    });
+
+    if let Some((i, _)) = nodes.iter().enumerate().find(|(_, node)| !open_reg(node)) {
+        nodes[..i].shuffle(&mut thread_rng());
+        nodes[i..].shuffle(&mut thread_rng());
+    } else {
+        nodes.shuffle(&mut thread_rng());
+    }
+
     let mut buf = BufWriter::new(Vec::new());
 
-    crate::templates::index(&mut buf, &nodes, &config)?;
-    let buf = buf.into_inner().map_err(|e| {
-        error!("Error rendering template, {}", e.error());
-        MyError::FlushBuffer
+    crate::templates::index_html(&mut buf, &local, &nodes, &config)?;
+    let html = buf.into_inner().map_err(|e| {
+        tracing::error!("Error rendering template, {}", e.error());
+        ErrorKind::FlushBuffer
     })?;
 
-    Ok(HttpResponse::Ok().content_type("text/html").body(buf))
+    let html = minify_html::minify(&html, &MINIFY_CONFIG);
+
+    Ok(HttpResponse::Ok().content_type("text/html").body(html))
 }

src/routes/media.rs

@@ -1,41 +1,42 @@
-use crate::{data::MediaCache, error::MyError, requests::Requests};
-use actix_web::{
-    http::header::{CacheControl, CacheDirective},
-    web, HttpResponse,
+use crate::{
+    data::MediaCache,
+    error::Error,
+    requests::{BreakerStrategy, Requests},
+    stream::limit_stream,
 };
+use actix_web::{body::BodyStream, web, HttpResponse};
 use uuid::Uuid;
 
+// 16 MB
+const IMAGE_SIZE_LIMIT: usize = 16 * 1024 * 1024;
+
+#[tracing::instrument(name = "Media", skip(media, requests))]
 pub(crate) async fn route(
     media: web::Data<MediaCache>,
     requests: web::Data<Requests>,
     uuid: web::Path<Uuid>,
-) -> Result<HttpResponse, MyError> {
+) -> Result<HttpResponse, Error> {
     let uuid = uuid.into_inner();
 
-    if let Some((content_type, bytes)) = media.get_bytes(uuid).await? {
-        return Ok(cached(content_type, bytes));
-    }
-
     if let Some(url) = media.get_url(uuid).await? {
-        let (content_type, bytes) = requests.fetch_bytes(url.as_str()).await?;
-
-        media
-            .store_bytes(uuid, content_type.clone(), bytes.clone())
+        let res = requests
+            .fetch_response(&url, BreakerStrategy::Allow404AndBelow)
             .await?;
 
-        return Ok(cached(content_type, bytes));
+        let mut response = HttpResponse::build(crate::http1::status_to_http02(res.status()));
+
+        for (name, value) in res.headers().iter().filter(|(h, _)| *h != "connection") {
+            response.insert_header((
+                crate::http1::name_to_http02(name),
+                crate::http1::value_to_http02(value),
+            ));
+        }
+
+        return Ok(response.body(BodyStream::new(limit_stream(
+            res.bytes_stream(),
+            IMAGE_SIZE_LIMIT,
+        ))));
     }
 
     Ok(HttpResponse::NotFound().finish())
 }
-
-fn cached(content_type: String, bytes: web::Bytes) -> HttpResponse {
-    HttpResponse::Ok()
-        .insert_header(CacheControl(vec![
-            CacheDirective::Public,
-            CacheDirective::MaxAge(60 * 60 * 24),
-            CacheDirective::Extension("immutable".to_owned(), None),
-        ]))
-        .content_type(content_type)
-        .body(bytes)
-}

src/routes/nodeinfo.rs

@@ -5,6 +5,7 @@ use crate::{
 use actix_web::{web, Responder};
 use actix_webfinger::Link;
 
+#[tracing::instrument(name = "Well Known NodeInfo", skip(config))]
 pub(crate) async fn well_known(config: web::Data<Config>) -> impl Responder {
     web::Json(Links {
         links: vec![Link {
@@ -14,7 +15,8 @@ pub(crate) async fn well_known(config: web::Data<Config>) -> impl Responder {
             kind: None,
         }],
     })
-    .with_header(("Content-Type", "application/jrd+json"))
+    .customize()
+    .insert_header(("Content-Type", "application/jrd+json"))
 }
 
 #[derive(serde::Serialize)]
@@ -22,22 +24,40 @@ struct Links {
     links: Vec<Link>,
 }
 
+#[tracing::instrument(name = "NodeInfo", skip_all)]
 pub(crate) async fn route(
     config: web::Data<Config>,
     state: web::Data<State>,
 ) -> web::Json<NodeInfo> {
+    let inboxes = state.db.inboxes().await;
+
+    let blocks = if config.publish_blocks() {
+        Some(state.db.blocks().await.unwrap_or_default())
+    } else {
+        None
+    };
+
+    let peers = inboxes
+        .unwrap_or_default()
+        .iter()
+        .filter_map(|listener| listener.authority_str())
+        .map(|s| s.to_owned())
+        .collect();
+
+    let open_registrations = !config.restricted_mode();
+
     web::Json(NodeInfo {
         version: NodeInfoVersion,
         software: Software {
-            name: config.software_name().to_lowercase(),
-            version: config.software_version(),
+            name: Config::software_name().to_lowercase(),
+            version: Config::software_version(),
         },
         protocols: vec![Protocol::ActivityPub],
         services: Services {
             inbound: vec![],
             outbound: vec![],
         },
-        open_registrations: false,
+        open_registrations,
         usage: Usage {
             users: Users {
                 total: 1,
@@ -47,22 +67,7 @@ pub(crate) async fn route(
             local_posts: 0,
             local_comments: 0,
         },
-        metadata: Metadata {
-            peers: state
-                .db
-                .inboxes()
-                .await
-                .unwrap_or(vec![])
-                .iter()
-                .filter_map(|listener| listener.domain())
-                .map(|s| s.to_owned())
-                .collect(),
-            blocks: if config.publish_blocks() {
-                Some(state.db.blocks().await.unwrap_or(vec![]))
-            } else {
-                None
-            },
-        },
+        metadata: Metadata { peers, blocks },
     })
 }
 

src/routes/statics.rs

@@ -4,6 +4,8 @@ use actix_web::{
     web, HttpResponse,
 };
 
+#[allow(clippy::async_yields_async)]
+#[tracing::instrument(name = "Statics")]
 pub(crate) async fn route(filename: web::Path<String>) -> HttpResponse {
     if let Some(data) = StaticFile::get(&filename.into_inner()) {
         HttpResponse::Ok()

src/spawner.rs

@@ -0,0 +1,92 @@
+use async_cpupool::CpuPool;
+use http_signature_normalization_actix::{Canceled, Spawn};
+use std::time::Duration;
+
+#[derive(Clone)]
+pub(crate) struct Spawner {
+    pool: CpuPool,
+}
+
+impl Spawner {
+    pub(crate) fn build(name: &'static str, threads: u16) -> color_eyre::Result<Self> {
+        let pool = CpuPool::configure()
+            .name(name)
+            .max_threads(threads)
+            .build()?;
+
+        Ok(Spawner { pool })
+    }
+
+    pub(crate) async fn close(self) {
+        self.pool.close().await;
+    }
+}
+
+impl std::fmt::Debug for Spawner {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("Spawner").finish()
+    }
+}
+
+async fn timer<Fut>(fut: Fut) -> Fut::Output
+where
+    Fut: std::future::Future,
+{
+    let id = uuid::Uuid::new_v4();
+
+    metrics::counter!("relay.spawner.wait-timer.start").increment(1);
+
+    let mut interval = tokio::time::interval(Duration::from_secs(5));
+
+    // pass the first tick (instant)
+    interval.tick().await;
+
+    let mut fut = std::pin::pin!(fut);
+
+    let mut counter = 0;
+    loop {
+        tokio::select! {
+            out = &mut fut => {
+                metrics::counter!("relay.spawner.wait-timer.end").increment(1);
+                return out;
+            }
+            _ = interval.tick() => {
+                counter += 1;
+                metrics::counter!("relay.spawner.wait-timer.pending").increment(1);
+                tracing::warn!("Blocking operation {id} is taking a long time, {} seconds", counter * 5);
+            }
+        }
+    }
+}
+
+impl Spawn for Spawner {
+    type Future<T> = std::pin::Pin<Box<dyn std::future::Future<Output = Result<T, Canceled>>>>;
+
+    fn spawn_blocking<Func, Out>(&self, func: Func) -> Self::Future<Out>
+    where
+        Func: FnOnce() -> Out + Send + 'static,
+        Out: Send + 'static,
+    {
+        let pool = self.pool.clone();
+
+        Box::pin(async move { timer(pool.spawn(func)).await.map_err(|_| Canceled) })
+    }
+}
+
+impl http_signature_normalization_reqwest::Spawn for Spawner {
+    type Future<T> = std::pin::Pin<Box<dyn std::future::Future<Output = Result<T, http_signature_normalization_reqwest::Canceled>> + Send>> where T: Send;
+
+    fn spawn_blocking<Func, Out>(&self, func: Func) -> Self::Future<Out>
+    where
+        Func: FnOnce() -> Out + Send + 'static,
+        Out: Send + 'static,
+    {
+        let pool = self.pool.clone();
+
+        Box::pin(async move {
+            timer(pool.spawn(func))
+                .await
+                .map_err(|_| http_signature_normalization_reqwest::Canceled)
+        })
+    }
+}

src/stream.rs

@@ -0,0 +1,59 @@
+use crate::error::{Error, ErrorKind};
+use actix_web::web::{Bytes, BytesMut};
+use futures_core::Stream;
+use streem::IntoStreamer;
+
+pub(crate) fn limit_stream<'a, S>(
+    input: S,
+    limit: usize,
+) -> impl Stream<Item = Result<Bytes, Error>> + Send + 'a
+where
+    S: Stream<Item = reqwest::Result<Bytes>> + Send + 'a,
+{
+    streem::try_from_fn(move |yielder| async move {
+        let stream = std::pin::pin!(input);
+        let mut stream = stream.into_streamer();
+
+        let mut count = 0;
+
+        while let Some(bytes) = stream.try_next().await? {
+            count += bytes.len();
+
+            if count > limit {
+                return Err(ErrorKind::BodyTooLarge.into());
+            }
+
+            yielder.yield_ok(bytes).await;
+        }
+
+        Ok(())
+    })
+}
+
+pub(crate) async fn aggregate<S>(input: S) -> Result<Bytes, Error>
+where
+    S: Stream<Item = Result<Bytes, Error>>,
+{
+    let stream = std::pin::pin!(input);
+    let mut streamer = stream.into_streamer();
+
+    let mut buf = Vec::new();
+
+    while let Some(bytes) = streamer.try_next().await? {
+        buf.push(bytes);
+    }
+
+    if buf.len() == 1 {
+        return Ok(buf.pop().expect("buf has exactly one element"));
+    }
+
+    let total_size: usize = buf.iter().map(|b| b.len()).sum();
+
+    let mut bytes_mut = BytesMut::with_capacity(total_size);
+
+    for bytes in &buf {
+        bytes_mut.extend_from_slice(&bytes);
+    }
+
+    Ok(bytes_mut.freeze())
+}

src/telegram.rs

@@ -0,0 +1,130 @@
+use crate::db::Db;
+use std::sync::Arc;
+use teloxide::{
+    dispatching::{Dispatcher, UpdateFilterExt},
+    requests::{Requester, ResponseResult},
+    types::{Message, Update},
+    utils::command::BotCommands,
+    Bot,
+};
+
+#[derive(BotCommands, Clone, Debug)]
+#[command(
+    rename_rule = "lowercase",
+    description = "These commands are for administering AodeRelay"
+)]
+enum Command {
+    #[command(description = "Display this text.")]
+    Start,
+
+    #[command(description = "Display this text.")]
+    Help,
+
+    #[command(description = "Block a domain from the relay.")]
+    Block { domain: String },
+
+    #[command(description = "Unblock a domain from the relay.")]
+    Unblock { domain: String },
+
+    #[command(description = "Allow a domain to connect to the relay (for RESTRICTED_MODE)")]
+    Allow { domain: String },
+
+    #[command(description = "Disallow a domain to connect to the relay (for RESTRICTED_MODE)")]
+    Disallow { domain: String },
+
+    #[command(description = "List blocked domains")]
+    ListBlocks,
+
+    #[command(description = "List allowed domains")]
+    ListAllowed,
+
+    #[command(description = "List connected domains")]
+    ListConnected,
+}
+
+pub(crate) fn start(admin_handle: String, db: Db, token: &str) {
+    let bot = Bot::new(token);
+    let admin_handle = Arc::new(admin_handle);
+
+    tokio::spawn(async move {
+        let command_handler = teloxide::filter_command::<Command, _>().endpoint(
+            move |bot: Bot, msg: Message, cmd: Command| {
+                let admin_handle = admin_handle.clone();
+                let db = db.clone();
+
+                async move {
+                    if !is_admin(&admin_handle, &msg) {
+                        bot.send_message(msg.chat.id, "You are not authorized")
+                            .await?;
+                        return Ok(());
+                    }
+
+                    answer(bot, msg, cmd, db).await
+                }
+            },
+        );
+
+        let message_handler = Update::filter_message().branch(command_handler);
+
+        Dispatcher::builder(bot, message_handler)
+            .build()
+            .dispatch()
+            .await;
+    });
+}
+
+fn is_admin(admin_handle: &str, message: &Message) -> bool {
+    message
+        .from
+        .as_ref()
+        .and_then(|user| user.username.as_deref())
+        .map(|username| username == admin_handle)
+        .unwrap_or(false)
+}
+
+#[tracing::instrument(skip(bot, msg, db))]
+async fn answer(bot: Bot, msg: Message, cmd: Command, db: Db) -> ResponseResult<()> {
+    match cmd {
+        Command::Help | Command::Start => {
+            bot.send_message(msg.chat.id, Command::descriptions().to_string())
+                .await?;
+        }
+        Command::Block { domain } if db.add_blocks(vec![domain.clone()]).await.is_ok() => {
+            bot.send_message(msg.chat.id, format!("{domain} has been blocked"))
+                .await?;
+        }
+        Command::Unblock { domain } if db.remove_blocks(vec![domain.clone()]).await.is_ok() => {
+            bot.send_message(msg.chat.id, format!("{domain} has been unblocked"))
+                .await?;
+        }
+        Command::Allow { domain } if db.add_allows(vec![domain.clone()]).await.is_ok() => {
+            bot.send_message(msg.chat.id, format!("{domain} has been allowed"))
+                .await?;
+        }
+        Command::Disallow { domain } if db.remove_allows(vec![domain.clone()]).await.is_ok() => {
+            bot.send_message(msg.chat.id, format!("{domain} has been disallowed"))
+                .await?;
+        }
+        Command::ListAllowed => {
+            if let Ok(allowed) = db.allows().await {
+                bot.send_message(msg.chat.id, allowed.join("\n")).await?;
+            }
+        }
+        Command::ListBlocks => {
+            if let Ok(blocks) = db.blocks().await {
+                bot.send_message(msg.chat.id, blocks.join("\n")).await?;
+            }
+        }
+        Command::ListConnected => {
+            if let Ok(connected) = db.connected_ids().await {
+                bot.send_message(msg.chat.id, connected.join("\n")).await?;
+            }
+        }
+        _ => {
+            bot.send_message(msg.chat.id, "Internal server error")
+                .await?;
+        }
+    }
+
+    Ok(())
+}

systemd/example-relay.service

@@ -0,0 +1,15 @@
+[Unit]
+Description=Activitypub Relay
+Documentation=https://git.asonix.dog/asonix/relay
+Wants=network.target
+After=network.target
+
+[Install]
+WantedBy=multi-user.target
+
+[Service]
+Type=simple
+EnvironmentFile=/etc/systemd/system/example-relay.service.env
+ExecStart=/path/to/relay
+Restart=always
+

systemd/example-relay.service.env

@@ -0,0 +1,19 @@
+HOSTNAME='relay.example.com'
+ADDR='0.0.0.0'
+PORT='8080'
+RESTRICTED_MODE='true'
+VALIDATE_SIGNATURES='true'
+HTTPS='true'
+PRETTY_LOG='false'
+PUBLISH_BLOCKS='true'
+DEBUG='false'
+SLED_PATH='/opt/sled'
+TELEGRAM_ADMIN_HANDLE='myhandle'
+RUST_BACKTRACE='full'
+FOOTER_BLURB='Contact <a href="https://masto.example.com/@example">@example</a> for inquiries.'
+LOCAL_DOMAINS='masto.example.com'
+LOCAL_BLURB='<p>An ActivityPub relay for servers. Currently running somewhere. Let me know if you want to join!</p>'
+OPENTELEMETRY_URL='http://otel.example.com:4317'
+API_TOKEN='blahblahblahblahblahblahblah'
+TELEGRAM_TOKEN='blahblahblahblahblahblahblah'
+

systemd/example-relay.socket

@@ -0,0 +1,11 @@
+[Unit]
+Description=Activitypub Relay Socket
+Before=multi-user.target
+After=network.target
+
+[Socket]
+Service=example-relay.service
+ListenStream=8080
+
+[Install]
+WantedBy=sockets.target

templates/admin.rs.html

@@ -1,20 +1,18 @@
 @use crate::db::Contact;
-@use activitystreams::url::Url;
+@use activitystreams::iri_string::types::IriString;
 
-@(contact: &Contact, base: &Url)
+@(contact: &Contact, base: &IriString)
 
 <div class="admin">
-    <div class="left">
-        <figure class="avatar">
-            <img src="@contact.avatar" alt="@contact.display_name's avatar">
-        </figure>
-    </div>
-    <div class="right">
-        <p class="display-name"><a href="@contact.url">@contact.display_name</a></p>
-        @if let Some(domain) = base.domain() {
-            <p class="username">@@@contact.username@@@domain</p>
-        } else {
-            <p class="username">@@@contact.username</p>
-        }
-    </div>
+  <div class="left">
+    <figure class="avatar">
+      <img loading="lazy" src="@contact.avatar" alt="@contact.display_name's avatar">
+    </figure>
+  </div>
+  <div class="right">
+    <p class="display-name"><a href="@contact.url">@contact.display_name</a></p>
+    <p class="username">
+      @@@contact.username@if let Some(authority) = base.authority_str() {@@@authority}
+    </p>
+  </div>
 </div>

templates/index.rs.html

@@ -1,81 +1,124 @@
 @use crate::{
-    config::{Config, UrlKind},
-    data::Node,
-    templates::{info, instance, statics::index_css},
+config::{Config, UrlKind},
+data::Node,
+templates::{info_html, instance_html, statics::index_css},
 };
 
-@(nodes: &[Node], config: &Config)
+@(local: &[Node], nodes: &[Node], config: &Config)
 
 <!doctype html>
 <html>
-    <head lang="en">
-        <meta charset="utf-8" />
-        <meta name="viewport" content="width=device-width, initial-scale=1" />
-        <title>@config.hostname() | ActivityPub Relay</title>
-        <link rel="stylesheet" href="/static/@index_css.name" type="text/css" />
-    </head>
-    <body>
-        <header>
-            <div class="header-text">
-                <h1>@config.software_name()<span class="smaller">@config.software_version()</span></h1>
-                <p>on @config.hostname()</p>
-            </div>
-        </header>
-        <main>
-            <section>
-                <h3>Connected Servers</h3>
-                @if nodes.is_empty() {
-                    <p>There are no connected servers at this time.</p>
-                } else {
-                    <ul>
-                        @for node in nodes {
-                            @if let Some(inst) = node.instance.as_ref() {
-                                <li>
-                                    @:instance(inst, node.info.as_ref().map(|info| { info.software.as_ref() }), node.contact.as_ref(), &node.base)
-                                </li>
-                            } else {
-                                @if let Some(inf) = node.info.as_ref() {
-                                    <li>
-                                        @:info(&inf, &node.base)
-                                    </li>
-                                }
-                            }
-                        }
-                    </ul>
-                }
-            </section>
-            <section>
-                <h3>Joining</h3>
-                <article class="joining">
-                    <p>
-                        If you are the admin of a server that supports activitypub relays, you can add
-                        this relay to your server.
-                    </p>
-                    <h4>Mastodon</h4>
-                    <p>
-                        Mastodon admins can add this relay by adding
-                        <pre>@config.generate_url(UrlKind::Inbox)</pre> in their relay settings.
-                    </p>
-                    <h4>Pleroma</h4>
-                    <p>
-                        Pleroma admins can add this relay by adding
-                        <pre>@config.generate_url(UrlKind::Actor)</pre>
-                        to their relay settings (I don't actually know how pleroma handles adding
-                        relays, is it still a mix command?).
-                    </p>
-                    <h4>Others</h4>
-                    <p>
-                        Consult the documentation for your server. It's likely that it follows either
-                        Mastodon or Pleroma's relay formatting.
-                    </p>
-                </article>
-            </section>
-        </main>
-        <footer>
-            <p>
-                The source code for this project can be found at
-                <a href="@config.source_code()">@config.source_code()</a>
-            </p>
-        </footer>
-    </body>
+
+<head lang="en">
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>@config.hostname() | ActivityPub Relay</title>
+  <link rel="stylesheet" href="/static/@index_css.name" type="text/css" />
+</head>
+
+<body>
+  <header>
+    <div class="header-text">
+      <h1>@Config::software_name()<span class="smaller">@Config::software_version()</span></h1>
+      <p>on @config.hostname()</p>
+    </div>
+  </header>
+  <main>
+    @if !local.is_empty() || config.local_blurb().is_some() {
+    <article>
+      <h3>About</h3>
+      <section class="local-explainer">
+        @if let Some(blurb) = config.local_blurb() {
+        @blurb
+        } else {
+        <p>These domains are run by the same admins as this relay.</p>
+        }
+      </section>
+      @if !local.is_empty() {
+      <ul>
+        @for node in local {
+        @if let Some(inst) = node.instance.as_ref() {
+        <li>
+          @:instance_html(inst, node.info.as_ref().map(|info| { info.software.as_ref() }), node.contact.as_ref(),
+          &node.base)
+        </li>
+        } else {
+        @if let Some(inf) = node.info.as_ref() {
+        <li>
+          @:info_html(inf, &node.base)
+        </li>
+        }
+        }
+        }
+      </ul>
+      }
+    </article>
+    }
+    <article>
+      <h3>Joining</h3>
+      <section class="joining">
+        @if config.restricted_mode() {
+        <h4>
+          This relay is Restricted
+        </h4>
+        <p>
+          This relay is currently in Restricted Mode, which means servers need to be approved ahead of time by the relay
+          administrator. Please contact the admin before attempting to join.
+        </p>
+        } else {
+        <p>
+          If you are the admin of a server that supports activitypub relays, you can add
+          this relay to your server.
+        </p>
+        }
+        <h4>Mastodon</h4>
+        <p>
+          Mastodon admins can add this relay by adding
+        <pre>@config.generate_url(UrlKind::Inbox)</pre> in their relay settings.
+        </p>
+        <h4>Pleroma</h4>
+        <p>
+          Pleroma admins can add this relay by adding
+        <pre>@config.generate_url(UrlKind::Actor)</pre> to their relay settings.
+        </p>
+        <h4>Others</h4>
+        <p>
+          Consult the documentation for your server. It's likely that it follows either
+          Mastodon or Pleroma's relay formatting.
+        </p>
+      </section>
+    </article>
+    @if !nodes.is_empty() {
+    <article>
+      <h3>@nodes.len() Connected Servers</h3>
+      <ul>
+        @for node in nodes {
+        @if let Some(inst) = node.instance.as_ref() {
+        <li>
+          @:instance_html(inst, node.info.as_ref().map(|info| { info.software.as_ref() }), node.contact.as_ref(),
+          &node.base)
+        </li>
+        } else {
+        @if let Some(inf) = node.info.as_ref() {
+        <li>
+          @:info_html(inf, &node.base)
+        </li>
+        }
+        }
+        }
+      </ul>
+    </article>
+    }
+  </main>
+  <footer>
+    @if let Some(blurb) = config.footer_blurb() {
+    <div>@blurb</div>
+    }
+    <p>
+      The source code for this project can be found at
+      <a href="@config.source_code()">@config.source_code()</a>
+    </p>
+  </footer>
+</body>
+
 </html>

templates/info.rs.html

@@ -1,16 +1,16 @@
 @use crate::db::Info;
-@use activitystreams::url::Url;
+@use activitystreams::iri_string::types::IriString;
 
-@(info: &Info, base: &Url)
+@(info: &Info, base: &IriString)
 
-<article class="info">
-    @if let Some(domain) = base.domain() {
-        <h4 class="padded"><a href="@base">@domain</a></h4>
+<section class="info">
+  @if let Some(authority) = base.authority_str() {
+  <h4 class="padded"><a href="@base">@authority</a></h4>
+  }
+  <p class="padded">
+    Running @info.software, version @info.version.
+    @if info.reg {
+    Registration is open
     }
-    <p class="padded">
-        Running @info.software, version @info.version.
-        @if info.reg {
-            Registration is open
-        }
-    </p>
-</article>
+  </p>
+</section>

templates/instance.rs.html

@@ -1,37 +1,37 @@
-@use crate::{db::{Contact, Instance}, templates::admin};
-@use activitystreams::url::Url;
+@use crate::{db::{Contact, Instance}, templates::admin_html};
+@use activitystreams::iri_string::types::IriString;
 
-@(instance: &Instance, software: Option<&str>, contact: Option<&Contact>, base: &Url)
+@(instance: &Instance, software: Option<&str>, contact: Option<&Contact>, base: &IriString)
 
-<article class="instance">
-    <h4 class="padded"><a href="@base">@instance.title</a></h4>
-    <p class="padded">
+    <section class="instance">
+      <h4 class="padded"><a href="@base">@instance.title</a></h4>
+      <p class="padded">
         @if let Some(software) = software {
-            Running @software, version @instance.version.
+        Running @software, version @instance.version.
         }
         @if instance.reg {
-            <br>Registration is open.
-            @if instance.requires_approval {
-                Accounts must be approved by an admin.
-            }
-        } else{
-            Registration is closed
+        <br>Registration is open.
+        @if instance.requires_approval {
+        Accounts must be approved by an admin.
         }
-    </p>
-    @if !instance.description.trim().is_empty() || contact.is_some() {
-        <div class="instance-info">
-            @if !instance.description.trim().is_empty() {
-                <h5 class="instance-description">@instance.title's description:</h5>
-                <div class="description">
-                    <div class="please-stay">
-                        @Html(instance.description.trim())
-                    </div>
-                </div>
-            }
-            @if let Some(contact) = contact {
-                <h5 class="instance-admin">@instance.title's admin:</h5>
-                @:admin(contact, base)
-            }
+        } else{
+        Registration is closed
+        }
+      </p>
+      @if !instance.description.trim().is_empty() || contact.is_some() {
+      <div class="instance-info">
+        @if !instance.description.trim().is_empty() {
+        <h5 class="instance-description">@instance.title's description:</h5>
+        <div class="description">
+          <div class="please-stay">
+            @Html(instance.description.trim())
+          </div>
         </div>
-    }
-</article>
+        }
+        @if let Some(contact) = contact {
+        <h5 class="instance-admin">@instance.title's admin:</h5>
+        @:admin_html(contact, base)
+        }
+      </div>
+      }
+    </section>