build: bump version to 0.7.17

improvement: upgrade multiple dependencies
Updating crates.io index Updating async-trait v0.1.60 -> v0.1.61 Updating axum v0.6.1 -> v0.6.2 Updating axum-core v0.3.0 -> v0.3.1 Updating clap v4.0.32 -> v4.1.1 Updating clap_derive v4.0.21 -> v4.1.0 Updating clap_lex v0.3.0 -> v0.3.1 Updating cxx v1.0.85 -> v1.0.86 Updating cxx-build v1.0.85 -> v1.0.86 Updating cxxbridge-flags v1.0.85 -> v1.0.86 Updating cxxbridge-macro v1.0.85 -> v1.0.86 Updating io-lifetimes v1.0.3 -> v1.0.4 Updating nom v7.1.2 -> v7.1.3 Updating parking_lot_core v0.9.5 -> v0.9.6 Updating pest v2.5.2 -> v2.5.3 Updating pest_derive v2.5.2 -> v2.5.3 Updating pest_generator v2.5.2 -> v2.5.3 Updating pest_meta v2.5.2 -> v2.5.3 Updating prost v0.11.5 -> v0.11.6 Updating prost-derive v0.11.5 -> v0.11.6 Updating prost-types v0.11.5 -> v0.11.6 Updating regex v1.7.0 -> v1.7.1 Updating schannel v0.1.20 -> v0.1.21 Removing sha1 v0.10.5 Adding sha2 v0.10.6 Updating termcolor v1.1.3 -> v1.2.0 Updating tokio v1.23.1 -> v1.24.1 Updating try-lock v0.2.3 -> v0.2.4 Removing windows-sys v0.36.1 Updating windows_aarch64_gnullvm v0.42.0 -> v0.42.1 Removing windows_aarch64_msvc v0.36.1 Removing windows_aarch64_msvc v0.42.0 Adding windows_aarch64_msvc v0.42.1 Removing windows_i686_gnu v0.36.1 Removing windows_i686_gnu v0.42.0 Adding windows_i686_gnu v0.42.1 Removing windows_i686_msvc v0.36.1 Removing windows_i686_msvc v0.42.0 Adding windows_i686_msvc v0.42.1 Removing windows_x86_64_gnu v0.36.1 Removing windows_x86_64_gnu v0.42.0 Adding windows_x86_64_gnu v0.42.1 Updating windows_x86_64_gnullvm v0.42.0 -> v0.42.1 Removing windows_x86_64_msvc v0.36.1 Removing windows_x86_64_msvc v0.42.0 Adding windows_x86_64_msvc v0.42.1
2025-09-01 11:40:48 -04:00 · 2023-01-15 15:48:39 -06:00 · 2023-01-15 15:46:33 -06:00 · 2023-01-15 15:42:27 -06:00 · 2023-01-15 15:27:41 -06:00 · 2023-01-15 15:13:10 -06:00
14 changed files with 690 additions and 196 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -81,9 +81,9 @@ dependencies = [

 [[package]]
 name = "async-trait"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d1d8ab452a3936018a687b20e6f7cf5363d713b732b8884001317b0e48aa3"
+checksum = "705339e0e4a9690e2908d2b3d049d85682cf19fbd5782494498fbf7003a6a282"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -107,9 +107,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "axum"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48"
+checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e"
 dependencies = [
 "async-trait",
 "axum-core",
@@ -136,9 +136,9 @@ dependencies = [

 [[package]]
 name = "axum-core"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92"
+checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8"
 dependencies = [
 "async-trait",
 "bytes",
@@ -223,6 +223,43 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "clap"
+version = "4.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ec7a4128863c188deefe750ac1d1dfe66c236909f845af04beed823638dc1b2"
+dependencies = [
+ "bitflags",
+ "clap_derive",
+ "clap_lex",
+ "is-terminal",
+ "once_cell",
+ "strsim",
+ "termcolor",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8"
+dependencies = [
+ "heck",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "clap_lex"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade"
+dependencies = [
+ "os_str_bytes",
+]
+
 [[package]]
 name = "cloudabi"
 version = "0.0.3"
@@ -382,9 +419,9 @@ dependencies = [

 [[package]]
 name = "cxx"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd"
+checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579"
 dependencies = [
 "cc",
 "cxxbridge-flags",
@@ -394,9 +431,9 @@ dependencies = [

 [[package]]
 name = "cxx-build"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0"
+checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70"
 dependencies = [
 "cc",
 "codespan-reporting",
@@ -409,15 +446,15 @@ dependencies = [

 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59"
+checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c"

 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6"
+checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -462,6 +499,27 @@ version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797"

+[[package]]
+name = "errno"
+version = "0.2.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f639046355ee4f37944e44f60642c6f3a7efa3cf6b78c78a0d989a8ce6c396a1"
+dependencies = [
+ "errno-dragonfly",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "errno-dragonfly"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
+dependencies = [
+ "cc",
+ "libc",
+]
+
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -727,6 +785,12 @@ dependencies = [
 "num-traits",
 ]

+[[package]]
+name = "heck"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
+
 [[package]]
 name = "hermit-abi"
 version = "0.2.6"
@@ -890,6 +954,28 @@ dependencies = [
 "cfg-if",
 ]

+[[package]]
+name = "io-lifetimes"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7d6c6f8c91b4b9ed43484ad1a938e393caf35960fce7f82a040497207bd8e9e"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "is-terminal"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28dfb6c8100ccc63462345b67d1bbc3679177c75ee4bf59bf29c8b1d110b8189"
+dependencies = [
+ "hermit-abi",
+ "io-lifetimes",
+ "rustix",
+ "windows-sys",
+]
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -963,6 +1049,12 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"

+[[package]]
+name = "linux-raw-sys"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4"
+
 [[package]]
 name = "lock_api"
 version = "0.4.9"
@@ -1051,7 +1143,7 @@ dependencies = [
 "libc",
 "log",
 "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]

 [[package]]
@@ -1080,9 +1172,9 @@ checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"

 [[package]]
 name = "nom"
-version = "7.1.2"
+version = "7.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5507769c4919c998e69e49c839d9dc6e693ede4cc4290d6ad8b41d4f09c548c"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
 dependencies = [
 "memchr",
 "minimal-lexical",
@@ -1096,10 +1188,11 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"

 [[package]]
 name = "nostr-rs-relay"
-version = "0.7.16"
+version = "0.7.17"
 dependencies = [
 "anyhow",
 "bitcoin_hashes",
+ "clap",
 "config",
 "console-subscriber",
 "const_format",
@@ -1278,6 +1371,12 @@ dependencies = [
 "hashbrown 0.9.1",
 ]

+[[package]]
+name = "os_str_bytes"
+version = "6.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b7820b9daea5457c9f21c69448905d723fbd21136ccf521748f23fd49e723ee"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.1"
@@ -1290,15 +1389,15 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.9.5"
+version = "0.9.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff9f3fef3968a3ec5945535ed654cb38ff72d7495a25619e2247fb15a2ed9ba"
+checksum = "ba1ef8814b5c993410bb3adfad7a5ed269563e4a2f90c41f5d85be7fb47133bf"
 dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall",
 "smallvec",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]

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

 [[package]]
 name = "pest"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f6e86fb9e7026527a0d46bc308b841d73170ef8f443e1807f6ef88526a816d4"
+checksum = "4257b4a04d91f7e9e6290be5d3da4804dd5784fafde3a497d73eb2b4a158c30a"
 dependencies = [
 "thiserror",
 "ucd-trie",
@@ -1336,9 +1435,9 @@ dependencies = [

 [[package]]
 name = "pest_derive"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96504449aa860c8dcde14f9fba5c58dc6658688ca1fe363589d6327b8662c603"
+checksum = "241cda393b0cdd65e62e07e12454f1f25d57017dcc514b1514cd3c4645e3a0a6"
 dependencies = [
 "pest",
 "pest_generator",
@@ -1346,9 +1445,9 @@ dependencies = [

 [[package]]
 name = "pest_generator"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "798e0220d1111ae63d66cb66a5dcb3fc2d986d520b98e49e1852bfdb11d7c5e7"
+checksum = "46b53634d8c8196302953c74d5352f33d0c512a9499bd2ce468fc9f4128fa27c"
 dependencies = [
 "pest",
 "pest_meta",
@@ -1359,13 +1458,13 @@ dependencies = [

 [[package]]
 name = "pest_meta"
-version = "2.5.2"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "984298b75898e30a843e278a9f2452c31e349a073a0ce6fd950a12a74464e065"
+checksum = "0ef4f1332a8d4678b41966bb4cc1d0676880e84183a1ecc3f4b69f03e99c7a51"
 dependencies = [
 "once_cell",
 "pest",
- "sha1",
+ "sha2",
 ]

 [[package]]
@@ -1412,6 +1511,30 @@ version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"

+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.49"
@@ -1423,9 +1546,9 @@ dependencies = [

 [[package]]
 name = "prost"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c01db6702aa05baa3f57dec92b8eeeeb4cb19e894e73996b32a4093289e54592"
+checksum = "21dc42e00223fc37204bd4aa177e69420c604ca4a183209a8f9de30c6d934698"
 dependencies = [
 "bytes",
 "prost-derive",
@@ -1433,9 +1556,9 @@ dependencies = [

 [[package]]
 name = "prost-derive"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8842bad1a5419bca14eac663ba798f6bc19c413c2fdceb5f3ba3b0932d96720"
+checksum = "8bda8c0881ea9f722eb9629376db3d0b903b462477c1aafcb0566610ac28ac5d"
 dependencies = [
 "anyhow",
 "itertools",
@@ -1446,9 +1569,9 @@ dependencies = [

 [[package]]
 name = "prost-types"
-version = "0.11.5"
+version = "0.11.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "017f79637768cde62820bc2d4fe0e45daaa027755c323ad077767c6c5f173091"
+checksum = "a5e0526209433e96d83d750dd81a99118edbc55739e7e61a46764fd2ad537788"
 dependencies = [
 "bytes",
 "prost",
@@ -1665,9 +1788,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.7.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a"
+checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -1734,6 +1857,20 @@ dependencies = [
 "ordered-multimap",
 ]

+[[package]]
+name = "rustix"
+version = "0.36.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4feacf7db682c6c329c4ede12649cd36ecab0f3be5b7d74e6a20304725db4549"
+dependencies = [
+ "bitflags",
+ "errno",
+ "io-lifetimes",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.11"
@@ -1748,12 +1885,11 @@ checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde"

 [[package]]
 name = "schannel"
-version = "0.1.20"
+version = "0.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88d6731146462ea25d9244b2ed5fd1d716d25c52e4d54aa4fb0f3c4e9854dbe2"
+checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
 dependencies = [
- "lazy_static",
- "windows-sys 0.36.1",
+ "windows-sys",
 ]

 [[package]]
@@ -1865,10 +2001,10 @@ dependencies = [
 ]

 [[package]]
-name = "sha1"
-version = "0.10.5"
+name = "sha2"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
 dependencies = [
 "cfg-if",
 "cpufeatures",
@@ -1918,6 +2054,12 @@ dependencies = [
 "winapi",
 ]

+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
 [[package]]
 name = "syn"
 version = "1.0.107"
@@ -1951,9 +2093,9 @@ dependencies = [

 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
 dependencies = [
 "winapi-util",
 ]
@@ -2004,9 +2146,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.23.1"
+version = "1.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38a54aca0c15d014013256222ba0ebed095673f89345dd79119d912eb561b7a8"
+checksum = "1d9f76183f91ecfb55e1d7d5602bd1d979e38a3a522fe900241cf195624d67ae"
 dependencies = [
 "autocfg 1.1.0",
 "bytes",
@@ -2020,7 +2162,7 @@ dependencies = [
 "socket2",
 "tokio-macros",
 "tracing",
- "windows-sys 0.42.0",
+ "windows-sys",
 ]

 [[package]]
@@ -2287,9 +2429,9 @@ dependencies = [

 [[package]]
 name = "try-lock"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
+checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"

 [[package]]
 name = "tungstenite"
@@ -2516,19 +2658,6 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

-[[package]]
-name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "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"
@@ -2536,85 +2665,55 @@ 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_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
 "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_x86_64_msvc",
 ]

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.42.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"
+checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.42.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"
+checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.42.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"
+checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.42.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"
+checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.42.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.42.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"
+checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd"

 [[package]]
 name = "yaml-rust"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "nostr-rs-relay"
-version = "0.7.16"
+version = "0.7.17"
 edition = "2021"
 authors = ["Greg Heartsfield <scsibug@imap.cc>"]
 description = "A relay implementation for the Nostr protocol"
@@ -12,6 +12,7 @@ keywords = ["nostr", "server"]
 categories = ["network-programming", "web-programming"]

 [dependencies]
+clap = { version = "4.0.32", features = ["env", "default", "derive"]}
 tracing = "0.1.36"
 tracing-subscriber = "0.2.0"
 tokio = { version = "1", features = ["full", "tracing", "signal"] }
--- a/README.md
+++ b/README.md
@@ -148,3 +148,8 @@ To chat about `nostr-rs-relay` on `nostr` itself; visit our channel on [anigma](
 License
 ---
 This project is MIT licensed.
+
+External Documentation and Links
+---
+
+* [BlockChainCaffe's Nostr Relay Setup Guide](https://github.com/BlockChainCaffe/Nostr-Relay-Setup-Guide)
--- a/config.toml
+++ b/config.toml
@@ -18,7 +18,7 @@ description = "A newly created nostr-rs-relay.\n\nCustomize this with your own i

 [diagnostics]
 # Enable tokio tracing (for use with tokio-console)
-#tracing = true
+#tracing = false

 [database]
 # Directory for SQLite files.  Defaults to the current directory.  Can
--- a/reverse-proxy.md
+++ b/reverse-proxy.md
@@ -68,8 +68,25 @@ http {
        server_name relay.example.com;
        ssl_certificate /etc/letsencrypt/live/relay.example.com/fullchain.pem;
        ssl_certificate_key /etc/letsencrypt/live/relay.example.com/privkey.pem;
-        ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
-        ssl_ciphers HIGH:!aNULL:!MD5;
+        ssl_protocols TLSv1.3 TLSv1.2;
+        ssl_prefer_server_ciphers on;
+        ssl_ecdh_curve secp521r1:secp384r1;
+        ssl_ciphers EECDH+AESGCM:EECDH+AES256;
+
+        # Optional Diffie-Helmann parameters
+        # Generate with openssl dhparam -out /etc/ssl/certs/dhparam.pem 4096
+        #ssl_dhparam /etc/ssl/certs/dhparam.pem;
+
+        ssl_session_cache shared:TLS:2m;
+        ssl_buffer_size 4k;
+
+        # OCSP stapling
+        ssl_stapling on;
+        ssl_stapling_verify on;
+        resolver 1.1.1.1 1.0.0.1 [2606:4700:4700::1111] [2606:4700:4700::1001]; # Cloudflare
+
+        # Set HSTS to 365 days
+        add_header Strict-Transport-Security 'max-age=31536000; includeSubDomains; preload' always;
        keepalive_timeout 70;

        location / {
--- a/src/bin/bulkloader.rs
+++ b/src/bin/bulkloader.rs
@@ -0,0 +1,176 @@
+use std::io;
+use std::path::Path;
+use nostr_rs_relay::utils::is_lower_hex;
+use tracing::*;
+use nostr_rs_relay::config;
+use nostr_rs_relay::event::{Event,single_char_tagname};
+use nostr_rs_relay::error::{Error, Result};
+use nostr_rs_relay::db::build_pool;
+use nostr_rs_relay::schema::{curr_db_version, DB_VERSION};
+use rusqlite::{OpenFlags, Transaction};
+use nostr_rs_relay::db::PooledConnection;
+use std::sync::mpsc;
+use std::thread;
+use rusqlite::params;
+
+/// Bulk load JSONL data from STDIN to the database specified in config.toml (or ./nostr.db as a default).
+/// The database must already exist, this will not create a new one.
+/// Tested against schema v13.
+
+pub fn main() -> Result<()> {
+    let _trace_sub = tracing_subscriber::fmt::try_init();
+    println!("Nostr-rs-relay Bulk Loader");
+    // check for a database file, or create one.
+    let settings = config::Settings::new();
+    if !Path::new(&settings.database.data_directory).is_dir() {
+        info!("Database directory does not exist");
+        return Err(Error::DatabaseDirError);
+    }
+    // Get a database pool
+    let pool = build_pool("bulk-loader", &settings, OpenFlags::SQLITE_OPEN_READ_WRITE | OpenFlags::SQLITE_OPEN_CREATE, 1,4,false);
+    {
+	// check for database schema version
+	let mut conn: PooledConnection = pool.get()?;
+	let version = curr_db_version(&mut conn)?;
+	info!("current version is: {:?}", version);
+	// ensure the schema version is current.
+	if version != DB_VERSION {
+	    info!("version is not current, exiting");
+	    panic!("cannot write to schema other than v{}", DB_VERSION);
+	}
+    }
+    // this channel will contain parsed events ready to be inserted
+    let (event_tx, event_rx) = mpsc::sync_channel(100_000);
+    // Thread for reading events
+    let _stdin_reader_handler = thread::spawn(move || {
+	let stdin = io::stdin();
+	for readline in stdin.lines() {
+	    if let Ok(line) = readline {
+		// try to parse a nostr event
+		let eres: Result<Event, serde_json::Error> = serde_json::from_str(&line);
+		if let Ok(mut e) = eres {
+		    if let Ok(()) = e.validate() {
+			e.build_index();
+			//debug!("Event: {:?}", e);
+			event_tx.send(Some(e)).ok();
+		    } else {
+			info!("could not validate event");
+		    }
+		} else {
+		    info!("error reading event: {:?}", eres);
+		}
+	    } else {
+		// error reading
+		info!("error reading: {:?}", readline);
+	    }
+	}
+	info!("finished parsing events");
+	event_tx.send(None).ok();
+	let ok: Result<()> = Ok(());
+        return ok;
+    });
+    let mut conn: PooledConnection = pool.get()?;
+    let mut events_read = 0;
+    let event_batch_size =50_000;
+    let mut new_events = 0;
+    let mut has_more_events = true;
+    while has_more_events {
+	// begin a transaction
+	let tx = conn.transaction()?;
+	// read in batch_size events and commit
+	for _ in 0..event_batch_size {
+	    match event_rx.recv() {
+		Ok(Some(e)) => {
+		    events_read += 1;
+		    // ignore ephemeral events
+		    if !(e.kind >= 20000 && e.kind < 30000) {
+			match write_event(&tx, e) {
+			    Ok(c) => {
+				new_events += c;
+			    },
+			    Err(e) => {
+				info!("error inserting event: {:?}", e);
+			    }
+			}
+		    }
+		},
+		Ok(None) => {
+		    // signal that the sender will never produce more
+		    // events
+		    has_more_events=false;
+		    break;
+		},
+		Err(_) => {
+		    info!("sender is closed");
+		    // sender is done
+		}
+	    }
+	}
+	info!("committed {} events...", new_events);
+	tx.commit()?;
+	conn.execute_batch("pragma wal_checkpoint(truncate)")?;
+
+    }
+    info!("processed {} events", events_read);
+    info!("stored {} new events", new_events);
+    // get a connection for writing events
+    // read standard in.
+    info!("finished reading input");
+    Ok(())
+}
+
+/// Write an event and update the tag table.
+/// Assumes the event has its index built.
+fn write_event(tx: &Transaction, e: Event) -> Result<usize> {
+    let id_blob = hex::decode(&e.id).ok();
+    let pubkey_blob: Option<Vec<u8>> = hex::decode(&e.pubkey).ok();
+    let delegator_blob: Option<Vec<u8>> = e.delegated_by.as_ref().and_then(|d| hex::decode(d).ok());
+    let event_str = serde_json::to_string(&e).ok();
+    // ignore if the event hash is a duplicate.
+    let ins_count = tx.execute(
+	"INSERT OR IGNORE INTO event (event_hash, created_at, kind, author, delegated_by, content, first_seen, hidden) VALUES (?1, ?2, ?3, ?4, ?5, ?6, strftime('%s','now'), FALSE);",
+	params![id_blob, e.created_at, e.kind, pubkey_blob, delegator_blob, event_str]
+    )?;
+    if ins_count == 0 {
+	return Ok(0);
+    }
+    // we want to capture the event_id that had the tag, the tag name, and the tag hex value.
+    let event_id = tx.last_insert_rowid();
+    // look at each event, and each tag, creating new tag entries if appropriate.
+    for t in e.tags.iter().filter(|x| x.len() > 1) {
+        let tagname = t.get(0).unwrap();
+        let tagnamechar_opt = single_char_tagname(tagname);
+        if tagnamechar_opt.is_none() {
+	    continue;
+        }
+        // safe because len was > 1
+        let tagval = t.get(1).unwrap();
+        // insert as BLOB if we can restore it losslessly.
+        // this means it needs to be even length and lowercase.
+        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()],
+	    )?;
+        } else {
+	    // otherwise, insert as text
+	    tx.execute(
+                "INSERT INTO tag (event_id, name, value) VALUES (?1, ?2, ?3);",
+                params![event_id, tagname, &tagval],
+            )?;
+        }
+    }
+    if e.is_replaceable() {
+	//let query = "SELECT id FROM event WHERE kind=? AND author=? ORDER BY created_at DESC LIMIT 1;";
+	//let count: usize = tx.query_row(query, params![e.kind, pubkey_blob], |row| row.get(0))?;
+	//info!("found {} rows that /would/ be preserved", count);
+	match tx.execute(
+	    "DELETE FROM event WHERE kind=? and author=? and id NOT IN (SELECT id FROM event WHERE kind=? AND author=? ORDER BY created_at DESC LIMIT 1);",
+	    params![e.kind, pubkey_blob, e.kind, pubkey_blob],
+	) {
+	    Ok(_) => {},
+	    Err(x) => {info!("error deleting replaceable event: {:?}",x);}
+	}
+    }
+    Ok(ins_count)
+}
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -0,0 +1,14 @@
+use clap::Parser;
+
+#[derive(Parser)]
+#[command(about = "A nostr relay written in Rust", author = env!("CARGO_PKG_AUTHORS"), version = env!("CARGO_PKG_VERSION"))]
+pub struct CLIArgs {
+    #[arg(
+        short,
+        long,
+        help = "Use the <directory> as the location of the database",
+        default_value = ".",
+        required = false
+    )]
+    pub db: String,
+}
--- a/src/db.rs
+++ b/src/db.rs
@@ -210,8 +210,8 @@ pub async fn db_writer(
                // TODO: incorporate delegated pubkeys
                // if the event address is not in allowed_addrs.
                if !allowed_addrs.contains(&event.pubkey) {
-                    info!(
-                        "Rejecting event {}, unauthorized author",
+                    debug!(
+                        "rejecting event: {}, unauthorized author",
                        event.get_event_id_prefix()
                    );
                    notice_tx
@@ -228,9 +228,10 @@ pub async fn db_writer(
            let kinds_blacklist = &settings.limits.event_kind_blacklist.clone();
            if let Some(event_kind_blacklist) = kinds_blacklist {
                if event_kind_blacklist.contains(&event.kind) {
-                    info!(
-                        "Rejecting event {}, blacklisted kind",
-                        &event.get_event_id_prefix()
+                    debug!(
+                        "rejecting event: {}, blacklisted kind: {}",
+                        &event.get_event_id_prefix(),
+			&event.kind
                    );
                    notice_tx
                        .try_send(Notice::blocked(
@@ -307,7 +308,6 @@ pub async fn db_writer(
                );
                event_write = true
            } else {
-                log_pool_stats("writer", &pool);
                match write_event(&mut pool.get()?, &event) {
                    Ok(updated) => {
                        if updated == 0 {
@@ -315,8 +315,9 @@ pub async fn db_writer(
                            notice_tx.try_send(Notice::duplicate(event.id)).ok();
                        } else {
                            info!(
-                                "persisted event: {:?} from: {:?} in: {:?}",
+                                "persisted event: {:?} (kind: {}) from: {:?} in: {:?}",
                                event.get_event_id_prefix(),
+				event.kind,
                                event.get_author_prefix(),
                                start.elapsed()
                            );
@@ -374,6 +375,15 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
    let pubkey_blob: Option<Vec<u8>> = hex::decode(&e.pubkey).ok();
    let delegator_blob: Option<Vec<u8>> = e.delegated_by.as_ref().and_then(|d| hex::decode(d).ok());
    let event_str = serde_json::to_string(&e).ok();
+    // check for replaceable events that would hide this one; we won't even attempt to insert these.
+    if e.is_replaceable() {
+        let repl_count = tx.query_row(
+	    "SELECT e.id FROM event e INDEXED BY author_index WHERE e.author=? AND e.kind=? AND e.created_at > ? LIMIT 1;",
+	    params![pubkey_blob, e.kind, e.created_at], |row| row.get::<usize, usize>(0));
+	if repl_count.ok().is_some() {
+	    return Ok(0);
+	}
+    }
    // ignore if the event hash is a duplicate.
    let mut ins_count = tx.execute(
        "INSERT OR IGNORE INTO event (event_hash, created_at, kind, author, delegated_by, content, first_seen, hidden) VALUES (?1, ?2, ?3, ?4, ?5, ?6, strftime('%s','now'), FALSE);",
@@ -414,19 +424,19 @@ pub fn write_event(conn: &mut PooledConnection, e: &Event) -> Result<usize> {
            }
        }
    }
-    // if this event is replaceable update, hide every other replaceable
+    // if this event is replaceable update, remove other replaceable
    // event with the same kind from the same author that was issued
    // earlier than this.
-    if e.kind == 0 || e.kind == 3 || e.kind == 41 || (e.kind >= 10000 && e.kind < 20000) {
+    if e.is_replaceable() {
 	let author = hex::decode(&e.pubkey).ok();
 	// this is a backwards check - hide any events that were older.
        let update_count = tx.execute(
-            "UPDATE event SET hidden=TRUE WHERE hidden!=TRUE and kind=? and author=? and id NOT IN (SELECT id FROM event WHERE kind=? AND author=? ORDER BY created_at DESC LIMIT 1)",
+            "DELETE FROM event WHERE kind=? and author=? and id NOT IN (SELECT id FROM event INDEXED BY author_kind_index WHERE kind=? AND author=? ORDER BY created_at DESC LIMIT 1)",
            params![e.kind, author, e.kind, author],
        )?;
        if update_count > 0 {
            info!(
-                "hid {} older replaceable kind {} events for author: {:?}",
+                "removed {} older replaceable kind {} events for author: {:?}",
                update_count,
                e.kind,
                e.get_author_prefix()
@@ -501,8 +511,40 @@ fn repeat_vars(count: usize) -> String {
    s
 }

-/// Create a dynamic SQL subquery and params from a subscription filter.
-fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
+/// Decide if there is an index that should be used explicitly
+fn override_index(f: &ReqFilter) -> Option<String> {
+    // queries for multiple kinds default to kind_index, which is
+    // significantly slower than kind_created_at_index.
+    if let Some(ks) = &f.kinds {
+	if f.ids.is_none() &&
+	    ks.len() > 1 &&
+	    f.since.is_none() &&
+	    f.until.is_none() &&
+	    f.tags.is_none() &&
+	    f.authors.is_none() {
+		return Some("kind_created_at_index".into());
+	    }
+    }
+    // if there is an author, it is much better to force the authors index.
+    if let Some(_) = &f.authors {
+	if f.since.is_none() && f.until.is_none() {
+	    if f.kinds.is_none() {
+		// with no use of kinds/created_at, just author
+		return Some("author_index".into());
+	    } else {
+		// prefer author_kind if there are kinds
+		return Some("author_kind_index".into());
+	    }
+	} else {
+	    // finally, prefer author_created_at if time is provided
+	    return Some("author_created_at_index".into());
+	}
+    }
+    None
+}
+
+/// Create a dynamic SQL subquery and params from a subscription filter (and optional explicit index used)
+fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>, Option<String>) {
    // build a dynamic SQL query.  all user-input is either an integer
    // (sqli-safe), or a string that is filtered to only contain
    // hexadecimal characters.  Strings that require escaping (tag
@@ -513,10 +555,13 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
        let empty_query = "SELECT e.content, e.created_at FROM event e WHERE 1=0".to_owned();
        // query parameters for SQLite
        let empty_params: Vec<Box<dyn ToSql>> = vec![];
-        return (empty_query, empty_params);
+        return (empty_query, empty_params, None);
    }

-    let mut query = "SELECT e.content, e.created_at FROM event e".to_owned();
+    // check if the index needs to be overriden
+    let idx_name = override_index(f);
+    let idx_stmt = idx_name.as_ref().map_or_else(|| "".to_owned(), |i| format!("INDEXED BY {}",i));
+    let mut query = format!("SELECT e.content, e.created_at FROM event e {}", idx_stmt);
    // query parameters for SQLite
    let mut params: Vec<Box<dyn ToSql>> = vec![];

@@ -650,19 +695,23 @@ fn query_from_filter(f: &ReqFilter) -> (String, Vec<Box<dyn ToSql>>) {
    } else {
        query.push_str(" ORDER BY e.created_at ASC")
    }
-    (query, params)
+    (query, params, idx_name)
 }

 /// Create a dynamic SQL query string and params from a subscription.
-fn query_from_sub(sub: &Subscription) -> (String, Vec<Box<dyn ToSql>>) {
+fn query_from_sub(sub: &Subscription) -> (String, Vec<Box<dyn ToSql>>, Vec<String>) {
    // build a dynamic SQL query for an entire subscription, based on
    // SQL subqueries for filters.
    let mut subqueries: Vec<String> = Vec::new();
+    let mut indexes = vec![];
    // subquery params
    let mut params: Vec<Box<dyn ToSql>> = vec![];
    // for every filter in the subscription, generate a subquery
    for f in sub.filters.iter() {
-        let (f_subquery, mut f_params) = query_from_filter(f);
+        let (f_subquery, mut f_params, index) = query_from_filter(f);
+	if let Some(i) = index {
+	    indexes.push(i);
+	}
        subqueries.push(f_subquery);
        params.append(&mut f_params);
    }
@@ -672,7 +721,7 @@ fn query_from_sub(sub: &Subscription) -> (String, Vec<Box<dyn ToSql>>) {
        .map(|s| format!("SELECT distinct content, created_at FROM ({})", s))
        .collect();
    let query: String = subqueries_selects.join(" UNION ");
-    (query, params)
+    (query, params,indexes)
 }

 /// Check if the pool is fully utilized
@@ -792,8 +841,9 @@ pub async fn db_query(
        let start = Instant::now();
        let mut row_count: usize = 0;
        // generate SQL query
-        let (q, p) = query_from_sub(&sub);
+        let (q, p, idxs) = query_from_sub(&sub);
        let sql_gen_elapsed = start.elapsed();
+
        if sql_gen_elapsed > Duration::from_millis(10) {
            debug!("SQL (slow) generated in {:?}", start.elapsed());
        }
@@ -818,8 +868,8 @@ pub async fn db_query(
                slow_first_event = first_event_elapsed >= slow_cutoff;
                if first_result {
                    debug!(
-                        "first result in {:?} (cid: {}, sub: {:?})",
-                        first_event_elapsed, client_id, sub.id
+                        "first result in {:?} (cid: {}, sub: {:?}) [used indexes: {:?}]",
+                        first_event_elapsed, client_id, sub.id, idxs
                    );
                    first_result = false;
                }
@@ -834,7 +884,7 @@ pub async fn db_query(
 		// check if a checkpoint is trying to run, and abort
 		if row_count % 100 == 0 {
 		    {
-			if let Err(_) = safe_to_read.try_lock() {
+			if safe_to_read.try_lock().is_err() {
 			    // lock was held, abort this query
 			    debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
 			    return Ok(());
@@ -864,7 +914,7 @@ pub async fn db_query(
                            return ok;
                        }
 			// check if a checkpoint is trying to run, and abort
-			if let Err(_) = safe_to_read.try_lock() {
+			if safe_to_read.try_lock().is_err() {
 			    // lock was held, abort this query
 			    debug!("query aborted due to checkpoint (cid: {}, sub: {:?})", client_id, sub.id);
 			    return Ok(());
--- a/src/event.rs
+++ b/src/event.rs
@@ -120,6 +120,11 @@ impl Event {
        self.kind == 0
    }

+    /// Should this event be replaced with newer timestamps from same author?
+    pub fn is_replaceable(&self) -> bool {
+	self.kind == 0 || self.kind == 3 || self.kind == 41 || (self.kind >= 10000 && self.kind < 20000)
+    }
+
    /// Pull a NIP-05 Name out of the event, if one exists
    pub fn get_nip05_addr(&self) -> Option<nip05::Nip05Name> {
        if self.is_kind_metadata() {
@@ -176,11 +181,11 @@ impl Event {
    }

    /// Update delegation status
-    fn update_delegation(&mut self) {
+    pub fn update_delegation(&mut self) {
        self.delegated_by = self.delegated_author();
    }
    /// Build an event tag index
-    fn build_index(&mut self) {
+    pub fn build_index(&mut self) {
        // if there are no tags; just leave the index as None
        if self.tags.is_empty() {
            return;
@@ -499,4 +504,17 @@ mod tests {
        let expected = Some(expected_json.to_owned());
        assert_eq!(c, expected);
    }
+
+    #[test]
+    fn replaceable_event() {
+	let mut event = Event::simple_event();
+	event.kind=0;
+	assert!(event.is_replaceable());
+	event.kind=3;
+	assert!(event.is_replaceable());
+	event.kind=12000;
+	assert!(event.is_replaceable());
+
+    }
+
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod cli;
 pub mod close;
 pub mod config;
 pub mod conn;
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,69 +1,41 @@
 //! Server process
-
+use clap::Parser;
+use nostr_rs_relay::cli::*;
 use nostr_rs_relay::config;
 use nostr_rs_relay::server::start_server;
-use std::env;
 use std::sync::mpsc as syncmpsc;
 use std::sync::mpsc::{Receiver as MpscReceiver, Sender as MpscSender};
 use std::thread;
 use tracing::info;

+
 use console_subscriber::ConsoleLayer;

-/// Return a requested DB name from command line arguments.
-fn db_from_args(args: &[String]) -> Option<String> {
-    if args.len() == 3 && args.get(1) == Some(&"--db".to_owned()) {
-        return args.get(2).map(std::clone::Clone::clone);
-    }
-    None
-}
-
-fn print_version() {
-    println!("{} v{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION"));
-}
-
-fn print_help() {
-    println!("Usage: nostr-rs-relay [OPTION]...\n");
-    println!("Options:");
-    println!("  --help              Show this help message and exit");
-    println!("  --version           Show version information and exit");
-    println!("  --db <directory>    Use the <directory> as the location of the database");
-}

 /// Start running a Nostr relay server.
 fn main() {
-    // setup tracing
-    let _trace_sub = tracing_subscriber::fmt::try_init();
-    info!("Starting up from main");
-    // get database directory from args
-    let args: Vec<String> = env::args().collect();
-
-    let help_flag: bool = args.contains(&"--help".to_owned());
-    // if --help flag was passed, display help and exit
-    if help_flag {
-        print_help();
-        return;
-    }
-
-    let version_flag: bool = args.contains(&"--version".to_owned());
-    // if --version flag was passed, display version and exit
-    if version_flag {
-        print_version();
-        return;
-    }
-
-    let db_dir: Option<String> = db_from_args(&args);
    // configure settings from config.toml
    // replace default settings with those read from config.toml
    let mut settings = config::Settings::new();

+    // setup tracing
    if settings.diagnostics.tracing {
        // enable tracing with tokio-console
        ConsoleLayer::builder().with_default_env().init();
+    } else {
+	// standard logging
+	tracing_subscriber::fmt::try_init().unwrap();
    }
+    info!("Starting up from main");
+
+    let args = CLIArgs::parse();
+
+    // get database directory from args
+    let db_dir = args.db;
+
    // update with database location
-    if let Some(db) = db_dir {
-        settings.database.data_directory = db;
+    if db_dir.len() > 0 {
+        settings.database.data_directory = db_dir;
    }

    let (_, ctrl_rx): (MpscSender<()>, MpscReceiver<()>) = syncmpsc::channel();
--- a/src/schema.rs
+++ b/src/schema.rs
@@ -20,7 +20,7 @@ pragma mmap_size = 17179869184; -- cap mmap at 16GB
 "##;

 /// Latest database version
-pub const DB_VERSION: usize = 13;
+pub const DB_VERSION: usize = 15;

 /// Schema definition
 const INIT_SQL: &str = formatcp!(
@@ -50,10 +50,14 @@ content TEXT NOT NULL -- serialized json of event object
 -- Event Indexes
 CREATE UNIQUE INDEX IF NOT EXISTS event_hash_index ON event(event_hash);
 CREATE INDEX IF NOT EXISTS author_index ON event(author);
+CREATE INDEX IF NOT EXISTS kind_index ON event(kind);
 CREATE INDEX IF NOT EXISTS created_at_index ON event(created_at);
 CREATE INDEX IF NOT EXISTS delegated_by_index ON event(delegated_by);
 CREATE INDEX IF NOT EXISTS event_composite_index ON event(kind,created_at);
 CREATE INDEX IF NOT EXISTS kind_author_index ON event(kind,author);
+CREATE INDEX IF NOT EXISTS kind_created_at_index ON event(kind,created_at);
+CREATE INDEX IF NOT EXISTS author_created_at_index ON event(author,created_at);
+CREATE INDEX IF NOT EXISTS author_kind_index ON event(author,kind);

 -- Tag Table
 -- Tag values are stored as either a BLOB (if they come in as a
@@ -95,6 +99,20 @@ pub fn curr_db_version(conn: &mut Connection) -> Result<usize> {
    Ok(curr_version)
 }

+/// Determine event count
+pub fn db_event_count(conn: &mut Connection) -> Result<usize> {
+    let query = "SELECT count(*) FROM event;";
+    let count = conn.query_row(query, [], |row| row.get(0))?;
+    Ok(count)
+}
+
+/// Determine tag count
+pub fn db_tag_count(conn: &mut Connection) -> Result<usize> {
+    let query = "SELECT count(*) FROM tag;";
+    let count = conn.query_row(query, [], |row| row.get(0))?;
+    Ok(count)
+}
+
 fn mig_init(conn: &mut PooledConnection) -> Result<usize> {
    match conn.execute_batch(INIT_SQL) {
        Ok(()) => {
@@ -142,19 +160,15 @@ pub fn upgrade_db(conn: &mut PooledConnection) -> Result<()> {
            if curr_version == 1 {
                curr_version = mig_1_to_2(conn)?;
            }
-
            if curr_version == 2 {
                curr_version = mig_2_to_3(conn)?;
            }
-
            if curr_version == 3 {
                curr_version = mig_3_to_4(conn)?;
            }
-
            if curr_version == 4 {
                curr_version = mig_4_to_5(conn)?;
            }
-
            if curr_version == 5 {
                curr_version = mig_5_to_6(conn)?;
            }
@@ -179,6 +193,12 @@ pub fn upgrade_db(conn: &mut PooledConnection) -> Result<()> {
            if curr_version == 12 {
                curr_version = mig_12_to_13(conn)?;
            }
+            if curr_version == 13 {
+                curr_version = mig_13_to_14(conn)?;
+            }
+            if curr_version == 14 {
+                curr_version = mig_14_to_15(conn)?;
+            }

            if curr_version == DB_VERSION {
                info!(
@@ -206,6 +226,62 @@ pub fn upgrade_db(conn: &mut PooledConnection) -> Result<()> {
    Ok(())
 }

+pub fn rebuild_tags(conn: &mut PooledConnection) -> Result<()> {
+    // Check how many events we have to process
+    let count = db_event_count(conn)?;
+    let update_each_percent = 0.05;
+    let mut percent_done = 0.0;
+    let mut events_processed = 0;
+    let start = Instant::now();
+    let tx = conn.transaction()?;
+    {
+        // Clear out table
+        tx.execute("DELETE FROM tag;", [])?;
+        let mut stmt = tx.prepare("select id, content from event order by id;")?;
+        let mut tag_rows = stmt.query([])?;
+        while let Some(row) = tag_rows.next()? {
+	    if (events_processed as f32)/(count as f32) > percent_done {
+		info!("Tag update {}% complete...", (100.0*percent_done).round());
+		percent_done += update_each_percent;
+	    }
+            // we want to capture the event_id that had the tag, the tag name, and the tag hex value.
+            let event_id: u64 = row.get(0)?;
+            let event_json: String = row.get(1)?;
+            let event: Event = serde_json::from_str(&event_json)?;
+            // look at each event, and each tag, creating new tag entries if appropriate.
+            for t in event.tags.iter().filter(|x| x.len() > 1) {
+                let tagname = t.get(0).unwrap();
+                let tagnamechar_opt = single_char_tagname(tagname);
+                if tagnamechar_opt.is_none() {
+                    continue;
+                }
+                // safe because len was > 1
+                let tagval = t.get(1).unwrap();
+                // insert as BLOB if we can restore it losslessly.
+                // this means it needs to be even length and lowercase.
+                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()],
+                    )?;
+                } else {
+                    // otherwise, insert as text
+                    tx.execute(
+                        "INSERT INTO tag (event_id, name, value) VALUES (?1, ?2, ?3);",
+                        params![event_id, tagname, &tagval],
+                    )?;
+                }
+            }
+	    events_processed += 1;
+        }
+    }
+    tx.commit()?;
+    info!("rebuilt tags in {:?}", start.elapsed());
+    Ok(())
+}
+
+
+
 //// Migration Scripts

 fn mig_1_to_2(conn: &mut PooledConnection) -> Result<usize> {
@@ -337,7 +413,6 @@ fn mig_5_to_6(conn: &mut PooledConnection) -> Result<usize> {
        let mut stmt = tx.prepare("select id, content from event order by id;")?;
        let mut tag_rows = stmt.query([])?;
        while let Some(row) = tag_rows.next()? {
-            // we want to capture the event_id that had the tag, the tag name, and the tag hex value.
            let event_id: u64 = row.get(0)?;
            let event_json: String = row.get(1)?;
            let event: Event = serde_json::from_str(&event_json)?;
@@ -485,6 +560,7 @@ fn mig_11_to_12(conn: &mut PooledConnection) -> Result<usize> {
        // Lookup every replaceable event
        let mut stmt = tx.prepare("select kind,author from event where kind in (0,3,41) or (kind>=10000 and kind<20000) order by id;")?;
        let mut replaceable_rows = stmt.query([])?;
+	info!("updating replaceable events; this could take awhile...");
        while let Some(row) = replaceable_rows.next()? {
            // we want to capture the event_id that had the tag, the tag name, and the tag hex value.
            let event_kind: u64 = row.get(0)?;
@@ -524,3 +600,54 @@ PRAGMA user_version = 13;
    }
    Ok(13)
 }
+
+fn mig_13_to_14(conn: &mut PooledConnection) -> Result<usize> {
+    info!("database schema needs update from 13->14");
+    let upgrade_sql = r##"
+CREATE INDEX IF NOT EXISTS kind_index ON event(kind);
+CREATE INDEX IF NOT EXISTS kind_created_at_index ON event(kind,created_at);
+pragma optimize;
+PRAGMA user_version = 14;
+"##;
+    match conn.execute_batch(upgrade_sql) {
+        Ok(()) => {
+            info!("database schema upgraded v13 -> v14");
+        }
+        Err(err) => {
+            error!("update failed: {}", err);
+            panic!("database could not be upgraded");
+        }
+    }
+    Ok(14)
+}
+
+fn mig_14_to_15(conn: &mut PooledConnection) -> Result<usize> {
+    info!("database schema needs update from 14->15");
+    let upgrade_sql = r##"
+CREATE INDEX IF NOT EXISTS author_created_at_index ON event(author,created_at);
+CREATE INDEX IF NOT EXISTS author_kind_index ON event(author,kind);
+PRAGMA user_version = 15;
+"##;
+    match conn.execute_batch(upgrade_sql) {
+        Ok(()) => {
+            info!("database schema upgraded v14 -> v15");
+        }
+        Err(err) => {
+            error!("update failed: {}", err);
+            panic!("database could not be upgraded");
+        }
+    }
+    // clear out hidden events
+    let clear_hidden_sql = r##"DELETE FROM event WHERE HIDDEN=true;"##;
+    info!("removing hidden events; this may take awhile...");
+    match conn.execute_batch(clear_hidden_sql) {
+	Ok(()) => {
+	    info!("all hidden events removed");
+	},
+	Err(err) => {
+            error!("delete failed: {}", err);
+            panic!("could not remove hidden events");
+        }
+    }
+    Ok(15)
+}
--- a/src/server.rs
+++ b/src/server.rs
@@ -433,6 +433,10 @@ fn convert_to_msg(msg: String, max_bytes: Option<usize>) -> Result<NostrMessage>
    let parsed_res: Result<NostrMessage> = serde_json::from_str(&msg).map_err(|e| e.into());
    match parsed_res {
        Ok(m) => {
+	    if let NostrMessage::SubMsg(_) = m {
+		// note; this only prints the first 16k of a REQ and then truncates.
+		trace!("REQ: {:?}",msg);
+	    };
            if let NostrMessage::EventMsg(_) = m {
                if let Some(max_size) = max_bytes {
                    // check length, ensure that some max size is set.
@@ -444,8 +448,8 @@ fn convert_to_msg(msg: String, max_bytes: Option<usize>) -> Result<NostrMessage>
            Ok(m)
        }
        Err(e) => {
-            debug!("proto parse error: {:?}", e);
-            debug!("parse error on message: {}", msg.trim());
+            trace!("proto parse error: {:?}", e);
+            trace!("parse error on message: {:?}", msg.trim());
            Err(Error::ProtoParseError)
        }
    }
--- a/tests/cli.rs
+++ b/tests/cli.rs
@@ -0,0 +1,10 @@
+#[cfg(test)]
+mod tests {
+    use nostr_rs_relay::cli::CLIArgs;
+
+    #[test]
+    fn cli_tests() {
+        use clap::CommandFactory;
+        CLIArgs::command().debug_assert();
+    }
+}
Author	SHA1	Message	Date
Greg Heartsfield	cf3e67500f	build: bump version to 0.7.17	2023-01-15 15:48:39 -06:00
Greg Heartsfield	1d19442cfd	improvement: upgrade multiple dependencies Updating crates.io index Updating async-trait v0.1.60 -> v0.1.61 Updating axum v0.6.1 -> v0.6.2 Updating axum-core v0.3.0 -> v0.3.1 Updating clap v4.0.32 -> v4.1.1 Updating clap_derive v4.0.21 -> v4.1.0 Updating clap_lex v0.3.0 -> v0.3.1 Updating cxx v1.0.85 -> v1.0.86 Updating cxx-build v1.0.85 -> v1.0.86 Updating cxxbridge-flags v1.0.85 -> v1.0.86 Updating cxxbridge-macro v1.0.85 -> v1.0.86 Updating io-lifetimes v1.0.3 -> v1.0.4 Updating nom v7.1.2 -> v7.1.3 Updating parking_lot_core v0.9.5 -> v0.9.6 Updating pest v2.5.2 -> v2.5.3 Updating pest_derive v2.5.2 -> v2.5.3 Updating pest_generator v2.5.2 -> v2.5.3 Updating pest_meta v2.5.2 -> v2.5.3 Updating prost v0.11.5 -> v0.11.6 Updating prost-derive v0.11.5 -> v0.11.6 Updating prost-types v0.11.5 -> v0.11.6 Updating regex v1.7.0 -> v1.7.1 Updating schannel v0.1.20 -> v0.1.21 Removing sha1 v0.10.5 Adding sha2 v0.10.6 Updating termcolor v1.1.3 -> v1.2.0 Updating tokio v1.23.1 -> v1.24.1 Updating try-lock v0.2.3 -> v0.2.4 Removing windows-sys v0.36.1 Updating windows_aarch64_gnullvm v0.42.0 -> v0.42.1 Removing windows_aarch64_msvc v0.36.1 Removing windows_aarch64_msvc v0.42.0 Adding windows_aarch64_msvc v0.42.1 Removing windows_i686_gnu v0.36.1 Removing windows_i686_gnu v0.42.0 Adding windows_i686_gnu v0.42.1 Removing windows_i686_msvc v0.36.1 Removing windows_i686_msvc v0.42.0 Adding windows_i686_msvc v0.42.1 Removing windows_x86_64_gnu v0.36.1 Removing windows_x86_64_gnu v0.42.0 Adding windows_x86_64_gnu v0.42.1 Updating windows_x86_64_gnullvm v0.42.0 -> v0.42.1 Removing windows_x86_64_msvc v0.36.1 Removing windows_x86_64_msvc v0.42.0 Adding windows_x86_64_msvc v0.42.1	2023-01-15 15:46:33 -06:00
Greg Heartsfield	13cc24b5cd	improvement: log blacklisted events	2023-01-15 15:42:27 -06:00
Greg Heartsfield	f543957b34	improvement: clear out hidden events during schema upgrade	2023-01-15 15:27:41 -06:00
Greg Heartsfield	7021f102e8	improvement: delete replaceable events	2023-01-15 15:13:10 -06:00
Greg Heartsfield	fddbf321bc	perf: add indexes and force their use (authors)	2023-01-15 10:52:49 -06:00
Greg Heartsfield	3e7f2e21df	perf: force authors index to be used if possible	2023-01-15 10:23:46 -06:00
Greg Heartsfield	9d9c6c78d1	improvement: refuse to insert events that would automatically be hidden	2023-01-15 10:01:01 -06:00
Greg Heartsfield	703b2efe6e	refactor: replaceable check in event	2023-01-15 09:18:53 -06:00
Greg Heartsfield	0db6487ce3	fix: allow tokio tracing to be enabled fixes https://github.com/scsibug/nostr-rs-relay/issues/48	2023-01-14 09:47:23 -06:00
Rasmus Schlunsen	ba987d3212	docs: update example nginx configuration to ensure A+ rating config from https://www.ssllabs.com/ssltest/	2023-01-14 09:33:40 -06:00
Rasmus Schlunsen	73f4f60cc7	improvement: use clap for command line args	2023-01-14 09:22:11 -06:00
Greg Heartsfield	d06d227ebe	improvement: lower REQ logging and note possible truncation	2023-01-11 16:56:40 -06:00
Greg Heartsfield	3519488c4e	improvement: lower logging for failed REQ parses	2023-01-10 07:41:49 -06:00
Greg Heartsfield	fbd3315110	improvement: log REQ messages at debug level	2023-01-09 22:12:20 -06:00
Greg Heartsfield	3d3d1bde53	refactor: clippy suggestions	2023-01-09 22:12:04 -06:00
Greg Heartsfield	ed336111bb	improvement: alert before long-running migration	2023-01-09 22:11:25 -06:00
Greg Heartsfield	8aed572989	docs: add link to relay setup	2023-01-09 21:33:59 -06:00
Greg Heartsfield	62e8da689d	fix: do not force kind_created_at_index when there are tags	2023-01-06 12:57:48 -06:00
Greg Heartsfield	807d1aa384	improvement: log index names used	2023-01-06 12:50:52 -06:00
Greg Heartsfield	66a55b55b9	perf: new index, manually selected when appropriate	2023-01-06 12:17:30 -06:00
Greg Heartsfield	76c77c3e56	feat: bulk loading script for importing events	2023-01-06 12:16:19 -06:00
Greg Heartsfield	50daab8a6f	refactor: make a standalone re-tagging function	2023-01-06 06:57:56 -06:00