improvement: upgrade docker builder and base images

improvement: upgrade multiple dependencies
Updating anyhow v1.0.65 -> v1.0.66 Updating async-trait v0.1.57 -> v0.1.58 Updating axum v0.5.16 -> v0.5.17 Updating axum-core v0.2.8 -> v0.2.9 Updating base64 v0.13.0 -> v0.13.1 Updating bumpalo v3.11.0 -> v3.11.1 Updating cc v1.0.73 -> v1.0.74 Updating cxx v1.0.79 -> v1.0.80 Updating cxx-build v1.0.79 -> v1.0.80 Updating cxxbridge-flags v1.0.79 -> v1.0.80 Updating cxxbridge-macro v1.0.79 -> v1.0.80 Updating futures v0.3.24 -> v0.3.25 Updating futures-channel v0.3.24 -> v0.3.25 Updating futures-core v0.3.24 -> v0.3.25 Updating futures-executor v0.3.24 -> v0.3.25 Updating futures-io v0.3.24 -> v0.3.25 Updating futures-macro v0.3.24 -> v0.3.25 Updating futures-sink v0.3.24 -> v0.3.25 Updating futures-task v0.3.24 -> v0.3.25 Updating futures-util v0.3.24 -> v0.3.25 Updating getrandom v0.2.7 -> v0.2.8 Updating h2 v0.3.14 -> v0.3.15 Updating hyper v0.14.20 -> v0.14.22 Updating iana-time-zone v0.1.51 -> v0.1.53 Updating libc v0.2.135 -> v0.2.137 Updating mio v0.8.4 -> v0.8.5 Updating native-tls v0.2.10 -> v0.2.11 Updating num_cpus v1.13.1 -> v1.14.0 Updating once_cell v1.15.0 -> v1.16.0 Updating openssl-sys v0.9.76 -> v0.9.77 Updating parking_lot_core v0.9.3 -> v0.9.4 Updating pest v2.4.0 -> v2.4.1 Updating pest_derive v2.4.0 -> v2.4.1 Updating pest_generator v2.4.0 -> v2.4.1 Updating pest_meta v2.4.0 -> v2.4.1 Updating pkg-config v0.3.25 -> v0.3.26 Updating ppv-lite86 v0.2.16 -> v0.2.17 Updating prost v0.11.0 -> v0.11.2 Updating prost-derive v0.11.0 -> v0.11.2 Updating prost-types v0.11.1 -> v0.11.2 Updating serde v1.0.145 -> v1.0.147 Updating serde_derive v1.0.145 -> v1.0.147 Updating serde_json v1.0.86 -> v1.0.87 Updating syn v1.0.102 -> v1.0.103 Adding windows-sys v0.42.0 Adding windows_aarch64_gnullvm v0.42.0 Adding windows_aarch64_msvc v0.42.0 Adding windows_i686_gnu v0.42.0 Adding windows_i686_msvc v0.42.0 Adding windows_x86_64_gnu v0.42.0 Adding windows_x86_64_gnullvm v0.42.0 Adding windows_x86_64_msvc v0.42.0
2025-09-01 03:40:46 -04:00 · 2022-11-05 13:24:17 -05:00 · 2022-11-05 10:59:03 -05:00 · 2022-11-05 10:35:38 -05:00 · 2022-11-05 10:29:25 -05:00 · 2022-11-05 07:42:08 -05:00
10 changed files with 240 additions and 123 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -54,9 +54,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.65"
+version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98161a4e3e2184da77bb14f02184cdd111e83bbbcc9979dfee3c44b9a85f5602"
+checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"

 [[package]]
 name = "async-stream"
@@ -81,9 +81,9 @@ dependencies = [

 [[package]]
 name = "async-trait"
-version = "0.1.57"
+version = "0.1.58"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76464446b8bc32758d7e88ee1a804d9914cd9b1cb264c029899680b0be29826f"
+checksum = "1e805d94e6b5001b651426cf4cd446b1ab5f319d27bab5c644f61de0a804360c"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -107,9 +107,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "axum"
-version = "0.5.16"
+version = "0.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9e3356844c4d6a6d6467b8da2cffb4a2820be256f50a3a386c9d152bab31043"
+checksum = "acee9fd5073ab6b045a275b3e709c163dd36c90685219cb21804a147b58dba43"
 dependencies = [
 "async-trait",
 "axum-core",
@@ -136,9 +136,9 @@ dependencies = [

 [[package]]
 name = "axum-core"
-version = "0.2.8"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9f0c0a60006f2a293d82d571f635042a72edf927539b7685bd62d361963839b"
+checksum = "37e5939e02c56fecd5c017c37df4238c0a839fa76b7f97acdd7efb804fd181cc"
 dependencies = [
 "async-trait",
 "bytes",
@@ -152,9 +152,9 @@ dependencies = [

 [[package]]
 name = "base64"
-version = "0.13.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"

 [[package]]
 name = "bitcoin_hashes"
@@ -182,9 +182,9 @@ dependencies = [

 [[package]]
 name = "bumpalo"
-version = "3.11.0"
+version = "3.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1ad822118d20d2c234f427000d5acc36eabe1e29a348c89b63dd60b13f28e5d"
+checksum = "572f695136211188308f16ad2ca5c851a712c464060ae6974944458eb83880ba"

 [[package]]
 name = "byteorder"
@@ -200,9 +200,9 @@ checksum = "ec8a7b6a70fde80372154c65702f00a0f56f3e1c36abbc6c440484be248856db"

 [[package]]
 name = "cc"
-version = "1.0.73"
+version = "1.0.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
+checksum = "581f5dba903aac52ea3feb5ec4810848460ee833876f1f9b0fdeab1f19091574"

 [[package]]
 name = "cfg-if"
@@ -381,9 +381,9 @@ dependencies = [

 [[package]]
 name = "cxx"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f83d0ebf42c6eafb8d7c52f7e5f2d3003b89c7aa4fd2b79229209459a849af8"
+checksum = "6b7d4e43b25d3c994662706a1d4fcfc32aaa6afd287502c111b237093bb23f3a"
 dependencies = [
 "cc",
 "cxxbridge-flags",
@@ -393,9 +393,9 @@ dependencies = [

 [[package]]
 name = "cxx-build"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07d050484b55975889284352b0ffc2ecbda25c0c55978017c132b29ba0818a86"
+checksum = "84f8829ddc213e2c1368e51a2564c552b65a8cb6a28f31e576270ac81d5e5827"
 dependencies = [
 "cc",
 "codespan-reporting",
@@ -408,15 +408,15 @@ dependencies = [

 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99d2199b00553eda8012dfec8d3b1c75fce747cf27c169a270b3b99e3448ab78"
+checksum = "e72537424b474af1460806647c41d4b6d35d09ef7fe031c5c2fa5766047cc56a"

 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.79"
+version = "1.0.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb67a6de1f602736dd7eaead0080cf3435df806c61b24b13328db128c58868f"
+checksum = "309e4fb93eed90e1e14bea0da16b209f81813ba9fc7830c20ed151dd7bc0a4d7"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -530,9 +530,9 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"

 [[package]]
 name = "futures"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f21eda599937fba36daeb58a22e8f5cee2d14c4a17b5b7739c7c8e5e3b8230c"
+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -545,9 +545,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30bdd20c28fadd505d0fd6712cdfcb0d4b5648baf45faef7f852afb2399bb050"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
 dependencies = [
 "futures-core",
 "futures-sink",
@@ -555,15 +555,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e5aa3de05362c3fb88de6531e6296e85cde7739cccad4b9dfeeb7f6ebce56bf"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"

 [[package]]
 name = "futures-executor"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ff63c23854bee61b6e9cd331d523909f238fc7636290b96826e9cfa5faa00ab"
+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
 dependencies = [
 "futures-core",
 "futures-task",
@@ -572,15 +572,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbf4d2a7a308fd4578637c0b17c7e1c7ba127b8f6ba00b29f717e9655d85eb68"
+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"

 [[package]]
 name = "futures-macro"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42cd15d1c7456c04dbdf7e88bcd69760d74f3a798d6444e16974b505b0e62f17"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -589,15 +589,15 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b20ba5a92e727ba30e72834706623d94ac93a725410b6a6b6fbc1b07f7ba56"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"

 [[package]]
 name = "futures-task"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6508c467c73851293f390476d4491cf4d227dbabcd4170f3bb6044959b294f1"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"

 [[package]]
 name = "futures-timer"
@@ -607,9 +607,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"

 [[package]]
 name = "futures-util"
-version = "0.3.24"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44fb6cb1be61cc1d2e43b262516aafcf63b241cffdb1d3fa115f91d9c7b09c90"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
 "futures-channel",
 "futures-core",
@@ -635,9 +635,9 @@ dependencies = [

 [[package]]
 name = "getrandom"
-version = "0.2.7"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6"
+checksum = "c05aeb6a22b8f62540c194aac980f2115af067bfe15a0734d7277a768d396b31"
 dependencies = [
 "cfg-if",
 "libc",
@@ -663,9 +663,9 @@ dependencies = [

 [[package]]
 name = "h2"
-version = "0.3.14"
+version = "0.3.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca32592cf21ac7ccab1825cd87f6c9b3d9022c44d086172ed0966bec8af30be"
+checksum = "5f9f29bc9dda355256b2916cf526ab02ce0aeaaaf2bad60d65ef3f12f11dd0f4"
 dependencies = [
 "bytes",
 "fnv",
@@ -789,9 +789,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"

 [[package]]
 name = "hyper"
-version = "0.14.20"
+version = "0.14.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02c929dc5c39e335a03c405292728118860721b10190d98c2a0f0efd5baafbac"
+checksum = "abfba89e19b959ca163c7752ba59d737c1ceea53a5d31a149c805446fc958064"
 dependencies = [
 "bytes",
 "futures-channel",
@@ -838,9 +838,9 @@ dependencies = [

 [[package]]
 name = "iana-time-zone"
-version = "0.1.51"
+version = "0.1.53"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5a6ef98976b22b3b7f2f3a806f858cb862044cfa66805aa3ad84cb3d3b785ed"
+checksum = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765"
 dependencies = [
 "android_system_properties",
 "core-foundation-sys",
@@ -932,9 +932,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.135"
+version = "0.2.137"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
+checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"

 [[package]]
 name = "libsqlite3-sys"
@@ -1043,21 +1043,21 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
+checksum = "e5d732bc30207a6423068df043e3d02e0735b155ad7ce1a6f76fe2baa5b158de"
 dependencies = [
 "libc",
 "log",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
 name = "native-tls"
-version = "0.2.10"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9"
+checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
 dependencies = [
 "lazy_static",
 "libc",
@@ -1095,7 +1095,7 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"

 [[package]]
 name = "nostr-rs-relay"
-version = "0.7.0"
+version = "0.7.1"
 dependencies = [
 "anyhow",
 "bitcoin_hashes",
@@ -1208,9 +1208,9 @@ dependencies = [

 [[package]]
 name = "num_cpus"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1"
+checksum = "f6058e64324c71e02bc2b150e4f3bc8286db6c83092132ffa3f6b1eab0f9def5"
 dependencies = [
 "hermit-abi",
 "libc",
@@ -1218,9 +1218,9 @@ dependencies = [

 [[package]]
 name = "once_cell"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e82dad04139b71a90c080c8463fe0dc7902db5192d939bd0950f074d014339e1"
+checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"

 [[package]]
 name = "openssl"
@@ -1256,9 +1256,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"

 [[package]]
 name = "openssl-sys"
-version = "0.9.76"
+version = "0.9.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5230151e44c0f05157effb743e8d517472843121cf9243e8b81393edb5acd9ce"
+checksum = "b03b84c3b2d099b81f0953422b4d4ad58761589d0229b5506356afca05a3670a"
 dependencies = [
 "autocfg 1.1.0",
 "cc",
@@ -1289,15 +1289,15 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
+checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
 dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall",
 "smallvec",
- "windows-sys",
+ "windows-sys 0.42.0",
 ]

 [[package]]
@@ -1325,9 +1325,9 @@ checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"

 [[package]]
 name = "pest"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc7bc69c062e492337d74d59b120c274fd3d261b6bf6d3207d499b4b379c41a"
+checksum = "a528564cc62c19a7acac4d81e01f39e53e25e17b934878f4c6d25cc2836e62f8"
 dependencies = [
 "thiserror",
 "ucd-trie",
@@ -1335,9 +1335,9 @@ dependencies = [

 [[package]]
 name = "pest_derive"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60b75706b9642ebcb34dab3bc7750f811609a0eb1dd8b88c2d15bf628c1c65b2"
+checksum = "d5fd9bc6500181952d34bd0b2b0163a54d794227b498be0b7afa7698d0a7b18f"
 dependencies = [
 "pest",
 "pest_generator",
@@ -1345,9 +1345,9 @@ dependencies = [

 [[package]]
 name = "pest_generator"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f9272122f5979a6511a749af9db9bfc810393f63119970d7085fed1c4ea0db"
+checksum = "d2610d5ac5156217b4ff8e46ddcef7cdf44b273da2ac5bca2ecbfa86a330e7c4"
 dependencies = [
 "pest",
 "pest_meta",
@@ -1358,9 +1358,9 @@ dependencies = [

 [[package]]
 name = "pest_meta"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c8717927f9b79515e565a64fe46c38b8cd0427e64c40680b14a7365ab09ac8d"
+checksum = "824749bf7e21dd66b36fbe26b3f45c713879cccd4a009a917ab8e045ca8246fe"
 dependencies = [
 "once_cell",
 "pest",
@@ -1401,15 +1401,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pkg-config"
-version = "0.3.25"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+checksum = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160"

 [[package]]
 name = "ppv-lite86"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"

 [[package]]
 name = "proc-macro2"
@@ -1422,9 +1422,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.11.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "399c3c31cdec40583bb68f0b18403400d01ec4289c383aa047560439952c4dd7"
+checksum = "a0841812012b2d4a6145fae9a6af1534873c32aa67fff26bd09f8fa42c83f95a"
 dependencies = [
 "bytes",
 "prost-derive",
@@ -1432,9 +1432,9 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.11.0"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7345d5f0e08c0536d7ac7229952590239e77abf0a0100a1b1d890add6ea96364"
+checksum = "164ae68b6587001ca506d3bf7f1000bfa248d0e1217b618108fba4ec1d0cc306"
 dependencies = [
 "anyhow",
 "itertools",
@@ -1445,9 +1445,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dfaa718ad76a44b3415e6c4d53b17c8f99160dcb3a99b10470fce8ad43f6e3e"
+checksum = "747761bc3dc48f9a34553bf65605cf6cb6288ba219f3450b4275dbd81539551a"
 dependencies = [
 "bytes",
 "prost",
@@ -1746,7 +1746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
 dependencies = [
 "lazy_static",
- "windows-sys",
+ "windows-sys 0.36.1",
 ]

 [[package]]
@@ -1816,18 +1816,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.145"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.145"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -1836,9 +1836,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
+checksum = "6ce777b7b150d76b9cf60d28b55f5847135a003f7d7350c6be7a773508ce7d45"
 dependencies = [
 "indexmap",
 "itoa",
@@ -1913,9 +1913,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.102"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
+checksum = "a864042229133ada95abf3b54fdc62ef5ccabe9515b64717bcb9a1919e59445d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -2515,43 +2515,100 @@ version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
 dependencies = [
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_msvc",
+ "windows_aarch64_msvc 0.36.1",
+ "windows_i686_gnu 0.36.1",
+ "windows_i686_msvc 0.36.1",
+ "windows_x86_64_gnu 0.36.1",
+ "windows_x86_64_msvc 0.36.1",
 ]

+[[package]]
+name = "windows-sys"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc 0.42.0",
+ "windows_i686_gnu 0.42.0",
+ "windows_i686_msvc 0.42.0",
+ "windows_x86_64_gnu 0.42.0",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc 0.42.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"

+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"

+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"

+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"

+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.36.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"

+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+
 [[package]]
 name = "yaml-rust"
 version = "0.4.5"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nostr-rs-relay"
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"

 [dependencies]
--- a/5
+++ b/5
@@ -1,4 +1,4 @@
-FROM docker.io/library/rust:1.64.0@sha256:5cf09a76cb9baf4990d121221bbad64927cc5690ee54f246487e302ddc2ba300 as builder
+FROM docker.io/library/rust:1.65.0@sha256:1bca14676a365d0ed37a1e2a1da86c2bcf883fdf6e6886469434763d94d4afd5 as builder

 RUN USER=root cargo new --bin nostr-rs-relay
 WORKDIR ./nostr-rs-relay
@@ -12,7 +12,8 @@ COPY ./src ./src
 RUN rm ./target/release/deps/nostr*relay*
 RUN cargo build --release

-FROM docker.io/library/debian:bullseye-20221004-slim@sha256:8b702518a671c926b5ece4efe386a476eb4777646a36d996d4bd50944f2f11a2
+FROM docker.io/library/debian:bullseye-20221024-slim@sha256:76cdda8fe5eb597ef5e712e4c9a9f5f1fb119e69f353daaa7bd6d0f6e66e541d
+
 ARG APP=/usr/src/app
 ARG APP_DATA=/usr/src/app/db
 RUN apt-get update \
--- a/config.toml
+++ b/config.toml
@@ -46,6 +46,14 @@ address = "0.0.0.0"
 # Listen on this port
 port = 8080

+# If present, read this HTTP header for logging client IP addresses.
+# Examples for common proxies, cloudflare:
+#remote_ip_header = "x-forwarded-for"
+#remote_ip_header = "cf-connecting-ip"
+
+# Websocket ping interval in seconds, defaults to 5 minutes
+#ping_interval = 300
+
 [options]
 # Reject events that have timestamps greater than this many seconds in
 # the future.  Recommended to reject anything greater than 30 minutes
--- a/src/config.rs
+++ b/src/config.rs
@@ -28,9 +28,10 @@ pub struct Database {
 pub struct Network {
    pub port: u16,
    pub address: String,
+    pub remote_ip_header: Option<String>, // retrieve client IP from this HTTP header if present
+    pub ping_interval_seconds: u32,
 }

-//
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[allow(unused)]
 pub struct Options {
@@ -207,7 +208,9 @@ impl Default for Settings {
            },
            network: Network {
                port: 8080,
+                ping_interval_seconds: 300,
                address: "0.0.0.0".to_owned(),
+                remote_ip_header: None,
            },
            limits: Limits {
                messages_per_sec: None,
--- a/src/conn.rs
+++ b/src/conn.rs
@@ -14,6 +14,8 @@ const MAX_SUBSCRIPTION_ID_LEN: usize = 256;

 /// State for a client connection
 pub struct ClientConn {
+    /// Client IP (either from socket, or configured proxy header
+    client_ip: String,
    /// Unique client identifier generated at connection time
    client_id: Uuid,
    /// The current set of active client subscriptions
@@ -24,16 +26,17 @@ pub struct ClientConn {

 impl Default for ClientConn {
    fn default() -> Self {
-        Self::new()
+        Self::new("unknown".to_owned())
    }
 }

 impl ClientConn {
    /// Create a new, empty connection state.
    #[must_use]
-    pub fn new() -> Self {
+    pub fn new(client_ip: String) -> Self {
        let client_id = Uuid::new_v4();
        ClientConn {
+            client_ip,
            client_id,
            subscriptions: HashMap::new(),
            max_subs: 32,
@@ -47,6 +50,11 @@ impl ClientConn {
        self.client_id.to_string().chars().take(8).collect()
    }

+    #[must_use]
+    pub fn ip(&self) -> &str {
+        &self.client_ip
+    }
+
    /// Find all matching subscriptions.
    #[must_use]
    pub fn get_matching_subscriptions(&self, e: &Event) -> Vec<&str> {
@@ -102,7 +110,7 @@ impl ClientConn {
        // TODO: return notice if subscription did not exist.
        self.subscriptions.remove(&c.id);
        debug!(
-            "removed subscription, currently have {} active subs (cid={})",
+            "removed subscription, currently have {} active subs (cid={:?})",
            self.subscriptions.len(),
            self.client_id
        );
--- a/src/db.rs
+++ b/src/db.rs
@@ -216,13 +216,13 @@ pub async fn db_writer(
            // TODO: cache recent list of authors to remove a DB call.
            let start = Instant::now();
            if event.kind >= 20000 && event.kind < 30000 {
+                bcast_tx.send(event.clone()).ok();
                info!(
                    "published ephemeral event {:?} from {:?} in {:?}",
                    event.get_event_id_prefix(),
                    event.get_author_prefix(),
                    start.elapsed()
                );
-                bcast_tx.send(event.clone()).ok();
                event_write = true
            } else {
                match write_event(&mut pool.get()?, &event) {
@@ -316,7 +316,7 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
                    if is_lower_hex(tagval) && (tagval.len() % 2 == 0) {
                        tx.execute(
 			    "INSERT OR IGNORE INTO tag (event_id, name, value_hex) VALUES (?1, ?2, ?3)",
-			    params![ev_id, &tagname, hex::decode(&tagval).ok()],
+			    params![ev_id, &tagname, hex::decode(tagval).ok()],
 			)?;
                    } else {
                        tx.execute(
@@ -510,7 +510,7 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
            let mut blob_vals: Vec<Box<dyn ToSql>> = vec![];
            for v in val {
                if (v.len() % 2 == 0) && is_lower_hex(v) {
-                    if let Ok(h) = hex::decode(&v) {
+                    if let Ok(h) = hex::decode(v) {
                        blob_vals.push(Box::new(h));
                    }
                } else {
--- a/src/main.rs
+++ b/src/main.rs
@@ -34,11 +34,11 @@ fn main() {
        // enable tracing with tokio-console
        ConsoleLayer::builder().with_default_env().init();
    }
-
    // update with database location
    if let Some(db) = db_dir {
        settings.database.data_directory = db;
    }
+
    let (_, ctrl_rx): (MpscSender<()>, MpscReceiver<()>) = syncmpsc::channel();
    // run this in a new thread
    let handle = thread::spawn(|| {
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -332,7 +332,7 @@ fn mig_5_to_6(conn: &mut PooledConnection) -> Result<usize> {
                if (tagval.len() % 2 == 0) && is_lower_hex(tagval) {
                    tx.execute(
                        "INSERT INTO tag (event_id, name, value_hex) VALUES (?1, ?2, ?3);",
-                        params![event_id, tagname, hex::decode(&tagval).ok()],
+                        params![event_id, tagname, hex::decode(tagval).ok()],
                    )?;
                } else {
                    // otherwise, insert as text
--- a/src/server.rs
+++ b/src/server.rs
@@ -13,6 +13,7 @@ use crate::nip05;
 use crate::subscription::Subscription;
 use futures::SinkExt;
 use futures::StreamExt;
+use http::header::HeaderMap;
 use hyper::header::ACCEPT;
 use hyper::service::{make_service_fn, service_fn};
 use hyper::upgrade::Upgraded;
@@ -84,11 +85,32 @@ async fn handle_web_request(
                                    Some(config),
                                )
                                .await;
-
+                                let user_agent = get_header_string("user-agent", request.headers());
+                                // determine the remote IP from headers if the exist
+                                let header_ip = settings
+                                    .network
+                                    .remote_ip_header
+                                    .as_ref()
+                                    .and_then(|x| get_header_string(x, request.headers()));
+                                // use the socket addr as a backup
+                                let remote_ip =
+                                    header_ip.unwrap_or_else(|| remote_addr.ip().to_string());
+                                let client_info = ClientInfo {
+                                    remote_ip,
+                                    user_agent,
+                                };
+                                // spawn a nostr server with our websocket
                                tokio::spawn(nostr_server(
-                                    pool, settings, ws_stream, broadcast, event_tx, shutdown,
+                                    pool,
+                                    client_info,
+                                    settings,
+                                    ws_stream,
+                                    broadcast,
+                                    event_tx,
+                                    shutdown,
                                ));
                            }
+                            // todo: trace, don't print...
                            Err(e) => println!(
                                "error when trying to upgrade connection \
                                 from address {} to websocket connection. \
@@ -148,6 +170,12 @@ async fn handle_web_request(
    }
 }

+fn get_header_string(header: &str, headers: &HeaderMap) -> Option<String> {
+    headers
+        .get(header)
+        .and_then(|x| x.to_str().ok().map(|x| x.to_string()))
+}
+
 // return on a control-c or internally requested shutdown signal
 async fn ctrl_c_or_signal(mut shutdown_signal: Receiver<()>) {
    let mut term_signal = tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
@@ -167,7 +195,6 @@ async fn ctrl_c_or_signal(mut shutdown_signal: Receiver<()>) {
        info!("Shutting down webserver due to SIGTERM");
        break;
        },
-
        }
    }
 }
@@ -382,10 +409,16 @@ fn make_notice_message(msg: &str) -> Message {
    Message::text(json!(["NOTICE", msg]).to_string())
 }

+struct ClientInfo {
+    remote_ip: String,
+    user_agent: Option<String>,
+}
+
 /// Handle new client connections.  This runs through an event loop
 /// for all client communication.
 async fn nostr_server(
    pool: db::SqlitePool,
+    client_info: ClientInfo,
    settings: Settings,
    mut ws_stream: WebSocketStream<Upgraded>,
    broadcast: Sender<Event>,
@@ -395,7 +428,8 @@ async fn nostr_server(
    // get a broadcast channel for clients to communicate on
    let mut bcast_rx = broadcast.subscribe();
    // Track internal client state
-    let mut conn = conn::ClientConn::new();
+    let mut conn = conn::ClientConn::new(client_info.remote_ip);
+    // Use the remote IP as the client identifier
    let cid = conn.get_client_prefix();
    // Create a channel for receiving query results from the database.
    // we will send out the tx handle to any query we generate.
@@ -407,7 +441,7 @@ async fn nostr_server(
    let mut last_message_time = Instant::now();

    // ping interval (every 5 minutes)
-    let default_ping_dur = Duration::from_secs(300);
+    let default_ping_dur = Duration::from_secs(settings.network.ping_interval_seconds.into());

    // disconnect after 20 minutes without a ping response or event.
    let max_quiet_time = Duration::from_secs(60 * 20);
@@ -424,11 +458,14 @@ async fn nostr_server(
    // and how many it received from queries.
    let mut client_published_event_count: usize = 0;
    let mut client_received_event_count: usize = 0;
-    info!("new connection for client: {:?}", cid);
+    debug!("new connection for client: {:?}, ip: {:?}", cid, conn.ip());
+    if let Some(ua) = client_info.user_agent {
+        debug!("client: {:?} has user-agent: {:?}", cid, ua);
+    }
    loop {
        tokio::select! {
            _ = shutdown.recv() => {
-        info!("Shutting client connection down due to shutdown: {:?}", cid);
+        info!("Shutting client connection down due to shutdown: {:?}, ip: {:?}", cid, conn.ip());
                // server shutting down, exit loop
                break;
            },
@@ -507,17 +544,17 @@ async fn nostr_server(
             Err(WsError::AlreadyClosed | WsError::ConnectionClosed |
                 WsError::Protocol(tungstenite::error::ProtocolError::ResetWithoutClosingHandshake)))
                        => {
-                        debug!("websocket close from client: {:?}",cid);
+                            debug!("websocket close from client: {:?}, ip: {:?}",cid, conn.ip());
                        break;
                    },
                    Some(Err(WsError::Io(e))) => {
                        // IO errors are considered fatal
-                        warn!("IO error (client: {:?}): {:?}", cid, e);
+                        warn!("IO error (client: {:?}, ip: {:?}): {:?}", cid, conn.ip(), e);
                        break;
                    }
                    x => {
                        // default condition on error is to close the client connection
-                        info!("unknown error (client: {:?}): {:?} (closing conn)", cid, x);
+                        info!("unknown error (client: {:?}, ip: {:?}): {:?} (closing conn)", cid, conn.ip(), x);
                        break;
                    }
                };
@@ -546,7 +583,7 @@ async fn nostr_server(
                }
                            },
                            Err(_) => {
-                                info!("client {:?} sent an invalid event", cid);
+                                info!("client: {:?} sent an invalid event", cid);
                                ws_stream.send(make_notice_message("event was invalid")).await.ok();
                            }
                        }
@@ -592,7 +629,7 @@ async fn nostr_server(
                            }
                    },
                    Err(Error::ConnError) => {
-                        debug!("got connection close/error, disconnecting client: {:?}",cid);
+                        debug!("got connection close/error, disconnecting client: {:?}, ip: {:?}",cid, conn.ip());
                        break;
                    }
                    Err(Error::EventMaxLengthError(s)) => {
@@ -615,7 +652,10 @@ async fn nostr_server(
        stop_tx.send(()).ok();
    }
    info!(
-        "stopping connection for client: {:?} (client sent {} event(s), received {})",
-        cid, client_published_event_count, client_received_event_count
+        "stopping connection for client: {:?}, ip: {:?} (client sent {} event(s), received {})",
+        cid,
+        conn.ip(),
+        client_published_event_count,
+        client_received_event_count
    );
 }
Author	SHA1	Message	Date
Greg Heartsfield	675662c7fb	improvement: upgrade docker builder and base images	2022-11-05 13:24:17 -05:00
Greg Heartsfield	505b0cb71f	improvement: upgrade multiple dependencies Updating anyhow v1.0.65 -> v1.0.66 Updating async-trait v0.1.57 -> v0.1.58 Updating axum v0.5.16 -> v0.5.17 Updating axum-core v0.2.8 -> v0.2.9 Updating base64 v0.13.0 -> v0.13.1 Updating bumpalo v3.11.0 -> v3.11.1 Updating cc v1.0.73 -> v1.0.74 Updating cxx v1.0.79 -> v1.0.80 Updating cxx-build v1.0.79 -> v1.0.80 Updating cxxbridge-flags v1.0.79 -> v1.0.80 Updating cxxbridge-macro v1.0.79 -> v1.0.80 Updating futures v0.3.24 -> v0.3.25 Updating futures-channel v0.3.24 -> v0.3.25 Updating futures-core v0.3.24 -> v0.3.25 Updating futures-executor v0.3.24 -> v0.3.25 Updating futures-io v0.3.24 -> v0.3.25 Updating futures-macro v0.3.24 -> v0.3.25 Updating futures-sink v0.3.24 -> v0.3.25 Updating futures-task v0.3.24 -> v0.3.25 Updating futures-util v0.3.24 -> v0.3.25 Updating getrandom v0.2.7 -> v0.2.8 Updating h2 v0.3.14 -> v0.3.15 Updating hyper v0.14.20 -> v0.14.22 Updating iana-time-zone v0.1.51 -> v0.1.53 Updating libc v0.2.135 -> v0.2.137 Updating mio v0.8.4 -> v0.8.5 Updating native-tls v0.2.10 -> v0.2.11 Updating num_cpus v1.13.1 -> v1.14.0 Updating once_cell v1.15.0 -> v1.16.0 Updating openssl-sys v0.9.76 -> v0.9.77 Updating parking_lot_core v0.9.3 -> v0.9.4 Updating pest v2.4.0 -> v2.4.1 Updating pest_derive v2.4.0 -> v2.4.1 Updating pest_generator v2.4.0 -> v2.4.1 Updating pest_meta v2.4.0 -> v2.4.1 Updating pkg-config v0.3.25 -> v0.3.26 Updating ppv-lite86 v0.2.16 -> v0.2.17 Updating prost v0.11.0 -> v0.11.2 Updating prost-derive v0.11.0 -> v0.11.2 Updating prost-types v0.11.1 -> v0.11.2 Updating serde v1.0.145 -> v1.0.147 Updating serde_derive v1.0.145 -> v1.0.147 Updating serde_json v1.0.86 -> v1.0.87 Updating syn v1.0.102 -> v1.0.103 Adding windows-sys v0.42.0 Adding windows_aarch64_gnullvm v0.42.0 Adding windows_aarch64_msvc v0.42.0 Adding windows_i686_gnu v0.42.0 Adding windows_i686_msvc v0.42.0 Adding windows_x86_64_gnu v0.42.0 Adding windows_x86_64_gnullvm v0.42.0 Adding windows_x86_64_msvc v0.42.0	2022-11-05 10:59:03 -05:00
Greg Heartsfield	e8aa450802	build: bump version to 0.7.1	2022-11-05 10:35:38 -05:00
Greg Heartsfield	5a8860bb09	feat: log user-agent if present	2022-11-05 10:29:25 -05:00
Greg Heartsfield	11e43eccf9	refactor: add unit to ping_interval config	2022-11-05 07:42:08 -05:00
William Casarin	50577b2dfa	feat: add network.ping_interval setting Add a ping interval setting that allows you to customize the websocket ping interval. The default of 5 minutes may be too high for some proxy servers that disconnect connections that are held open for too long.	2022-11-05 07:40:28 -05:00
William Casarin	a6cb6f8486	refactor: rename get_header_remote_ip -> get_header_string This function has nothing to do with remote ips!	2022-11-05 07:37:18 -05:00
Greg Heartsfield	ae5bf98d87	feat: retrieve client IP from header in config.toml If the config.toml has defined a HTTP header to look for a remote IP, that will be logged. Otherwise, the socket address IP will be used. closes: https://todo.sr.ht/~gheartsfield/nostr-rs-relay/47	2022-11-04 18:05:01 -05:00
William Casarin	1cf9d719f0	feat: look for proxied ip headers This enables support for using the proxied IP from cloudflare. The damus relay is behind cloudflare, so to get accurate remote ip logging we need to look at the headers instead of the socket address. Signed-off-by: William Casarin <jb55@jb55.com>	2022-11-04 17:09:28 -05:00
William Casarin	311f4b5283	refactor: switch new connections to debug log These are pretty spammy on busy relays. I've been using the info log to monitor spam attacks, and these are the least useful info log. Leave the "stopping connection" log because it at least provides useful sent/received information. Signed-off-by: William Casarin <jb55@jb55.com>	2022-11-04 07:59:53 -05:00
Greg Heartsfield	14b5a51e3a	fix: log ephemeral events after send	2022-11-04 07:55:38 -05:00
Greg Heartsfield	8ecce3f566	feat: show client IP in logs	2022-11-02 18:33:44 -05:00