From c8b6dc4c23a66bf973afbace028c853e591330b8 Mon Sep 17 00:00:00 2001 From: alyssa Date: Fri, 1 Nov 2024 06:32:40 +0900 Subject: [PATCH] chore: bump deps --- Cargo.lock | 411 +++++------------- Cargo.toml | 4 +- lib/libpk/Cargo.toml | 10 +- lib/libpk/src/_config.rs | 2 + lib/libpk/src/db/mod.rs | 9 +- services/api/Cargo.toml | 9 +- services/api/src/main.rs | 2 +- services/api/src/middleware/ratelimit.rs | 14 +- services/avatars/Cargo.toml | 15 +- services/dispatch/Cargo.toml | 2 +- services/gateway/Cargo.toml | 1 + services/gateway/src/discord/gateway.rs | 2 +- .../gateway/src/discord/identify_queue.rs | 2 +- services/gateway/src/discord/shard_state.rs | 2 +- services/gateway/src/main.rs | 2 +- 15 files changed, 152 insertions(+), 335 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5e711b9..b103416c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,7 +41,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if", - "getrandom", "once_cell", "version_check", "zerocopy", @@ -108,15 +107,9 @@ dependencies = [ [[package]] name = "arc-swap" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" - -[[package]] -name = "arcstr" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f907281554a3d0312bb7aab855a8e0ef6cbf1614d06de54105039ca8b34460e" +checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" [[package]] name = "async-trait" @@ -160,17 +153,6 @@ dependencies = [ "webpki-roots 0.22.6", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -387,15 +369,6 @@ dependencies = [ "serde", ] -[[package]] -name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" -dependencies = [ - "generic-array", -] - [[package]] name = "block-buffer" version = "0.10.3" @@ -441,13 +414,13 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.98" +version = "1.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41c270e7540d725e65ac7f1b212ac8ce349719624d7bcff99f8e2e488e8cf03f" +checksum = "c2e7962b54006dcfcc61cb72735f4d89bb97061dd6a7ed882ec6b8ee53714c6f" dependencies = [ "jobserver", "libc", - "once_cell", + "shlex", ] [[package]] @@ -476,6 +449,15 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "config" version = "0.14.0" @@ -646,7 +628,7 @@ dependencies = [ "hashbrown 0.12.3", "lock_api", "once_cell", - "parking_lot_core 0.9.7", + "parking_lot_core", ] [[package]] @@ -676,22 +658,13 @@ dependencies = [ "serde", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ - "block-buffer 0.10.3", + "block-buffer", "const-oid", "crypto-common", "subtle", @@ -789,19 +762,6 @@ dependencies = [ "syn 2.0.66", ] -[[package]] -name = "env_logger" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "equivalent" version = "1.0.1" @@ -831,9 +791,14 @@ dependencies = [ [[package]] name = "event-listener" -version = "2.5.3" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" +checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] [[package]] name = "fastrand" @@ -869,9 +834,9 @@ dependencies = [ [[package]] name = "float-cmp" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1267f4ac4f343772758f7b1bdcbe767c218bbab93bb432acbf5162bbf85a6c4" +checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4" dependencies = [ "num-traits", ] @@ -904,31 +869,42 @@ dependencies = [ [[package]] name = "fred" -version = "5.2.0" +version = "9.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6be0137d9045288f9c0a0659da3b74c196ad0263d2eafa0f5a73785a907bad14" +checksum = "0ac76d6e24da83723c1d118a1d3b794d883eec94715eeaa611698558d5547048" dependencies = [ "arc-swap", - "arcstr", "async-trait", "bytes", "bytes-utils", - "cfg-if", + "crossbeam-queue", "float-cmp", + "fred-macros", "futures", - "lazy_static", "log", - "parking_lot 0.11.2", - "pretty_env_logger", + "parking_lot", "rand", "redis-protocol", "semver", "sha-1", + "socket2 0.5.7", "tokio", "tokio-stream", - "tokio-util 0.6.10", + "tokio-util", "tracing", "url", + "urlencoding", +] + +[[package]] +name = "fred-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1458c6e22d36d61507034d5afecc64f105c1d39712b7ac6ec3b352c423f715cc" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.66", ] [[package]] @@ -981,7 +957,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f" dependencies = [ "futures-core", "lock_api", - "parking_lot 0.12.1", + "parking_lot", ] [[package]] @@ -1043,6 +1019,7 @@ dependencies = [ "futures", "lazy_static", "libpk", + "metrics", "prost", "serde_json", "signal-hook", @@ -1065,16 +1042,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "gethostname" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a329e22866dd78b35d2c639a4a23d7b950aeae300dfd79f4fb19f74055c2404" -dependencies = [ - "libc", - "windows", -] - [[package]] name = "getrandom" version = "0.2.15" @@ -1123,7 +1090,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util", "tracing", ] @@ -1142,7 +1109,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.7.12", + "tokio-util", "tracing", ] @@ -1163,9 +1130,9 @@ checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash 0.8.11", "allocator-api2", @@ -1173,11 +1140,11 @@ dependencies = [ [[package]] name = "hashlink" -version = "0.8.4" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" dependencies = [ - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] @@ -1185,9 +1152,6 @@ name = "heck" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -dependencies = [ - "unicode-segmentation", -] [[package]] name = "heck" @@ -1195,15 +1159,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.2.6" @@ -1283,7 +1238,7 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -1295,17 +1250,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "hostname" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" -dependencies = [ - "libc", - "match_cfg", - "winapi", -] - [[package]] name = "http" version = "0.2.8" @@ -1380,15 +1324,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" -[[package]] -name = "humantime" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" -dependencies = [ - "quick-error", -] - [[package]] name = "hyper" version = "0.14.24" @@ -1570,16 +1505,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", + "hashbrown 0.14.5", ] [[package]] @@ -1666,7 +1592,6 @@ dependencies = [ "anyhow", "config", "fred", - "gethostname", "lazy_static", "metrics", "metrics-exporter-prometheus", @@ -1678,7 +1603,6 @@ dependencies = [ "time", "tokio", "tracing", - "tracing-gelf", "tracing-subscriber", "twilight-model", "uuid", @@ -1696,9 +1620,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.27.0" +version = "0.30.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4e226dcd58b4be396f7bd3c20da8fdee2911400705297ba7d2d7cc2c30f716" +checksum = "2e99fb7a497b1e3339bc746195567ed8d3e24945ecd636e3619d20b9de9e9149" dependencies = [ "cc", "pkg-config", @@ -1750,18 +1674,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.17" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "match_cfg" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "matchers" @@ -1796,7 +1711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ "cfg-if", - "digest 0.10.7", + "digest", ] [[package]] @@ -1858,7 +1773,7 @@ checksum = "4259040465c955f9f2f1a4a8a16dc46726169bca0f88e8fb2dbeced487c3e828" dependencies = [ "crossbeam-epoch", "crossbeam-utils", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "metrics", "num_cpus", "quanta", @@ -2021,12 +1936,6 @@ version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -[[package]] -name = "opaque-debug" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" - [[package]] name = "openssl-probe" version = "0.1.5" @@ -2069,15 +1978,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] -name = "parking_lot" -version = "0.11.2" +name = "parking" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" -dependencies = [ - "instant", - "lock_api", - "parking_lot_core 0.8.6", -] +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" [[package]] name = "parking_lot" @@ -2086,21 +1990,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", - "parking_lot_core 0.9.7", -] - -[[package]] -name = "parking_lot_core" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" -dependencies = [ - "cfg-if", - "instant", - "libc", - "redox_syscall 0.2.16", - "smallvec", - "winapi", + "parking_lot_core", ] [[package]] @@ -2287,16 +2177,6 @@ version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" -[[package]] -name = "pretty_env_logger" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "926d36b9553851b8b0005f1275891b392ee4d2d833852c417ed025477350fb9d" -dependencies = [ - "env_logger", - "log", -] - [[package]] name = "prettyplease" version = "0.2.20" @@ -2384,12 +2264,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" - [[package]] name = "quick-xml" version = "0.26.0" @@ -2508,9 +2382,9 @@ dependencies = [ [[package]] name = "redis-protocol" -version = "4.1.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c31deddf734dc0a39d3112e73490e88b61a05e83e074d211f348404cee4d2c6" +checksum = "65deb7c9501fbb2b6f812a30d59c0253779480853545153a51d8e9e444ddc99f" dependencies = [ "bytes", "bytes-utils", @@ -2625,7 +2499,7 @@ dependencies = [ "system-configuration", "tokio", "tokio-rustls 0.24.1", - "tokio-util 0.7.12", + "tokio-util", "tower-service", "url", "wasm-bindgen", @@ -2741,7 +2615,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d0e5124fcb30e76a7e79bfee683a2746db83784b86289f6251b54b7950a0dfc" dependencies = [ "const-oid", - "digest 0.10.7", + "digest", "num-bigint-dig", "num-integer", "num-traits", @@ -3091,15 +2965,13 @@ dependencies = [ [[package]] name = "sha-1" -version = "0.9.8" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6" +checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ - "block-buffer 0.9.0", "cfg-if", "cpufeatures", - "digest 0.9.0", - "opaque-debug", + "digest", ] [[package]] @@ -3110,7 +2982,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -3127,7 +2999,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -3139,6 +3011,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "signal-hook" version = "0.3.17" @@ -3164,7 +3042,7 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de" dependencies = [ - "digest 0.10.7", + "digest", "rand_core", ] @@ -3200,6 +3078,9 @@ name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +dependencies = [ + "serde", +] [[package]] name = "socket2" @@ -3258,9 +3139,9 @@ dependencies = [ [[package]] name = "sqlx" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a2ccff1a000a5a59cd33da541d9f2fdcd9e6e8229cc200565942bff36d0aaa" +checksum = "93334716a037193fac19df402f8571269c84a00852f6a7066b5d2616dcd64d3e" dependencies = [ "sqlx-core", "sqlx-macros", @@ -3271,11 +3152,10 @@ dependencies = [ [[package]] name = "sqlx-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ba59a9342a3d9bab6c56c118be528b27c9b60e490080e9711a04dccac83ef6" +checksum = "d4d8060b456358185f7d50c55d9b5066ad956956fddec42ee2e8567134a8936e" dependencies = [ - "ahash 0.8.11", "atoi", "byteorder", "bytes", @@ -3288,6 +3168,7 @@ dependencies = [ "futures-intrusive", "futures-io", "futures-util", + "hashbrown 0.14.5", "hashlink", "hex", "indexmap", @@ -3312,26 +3193,26 @@ dependencies = [ [[package]] name = "sqlx-macros" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea40e2345eb2faa9e1e5e326db8c34711317d2b5e08d0d5741619048a803127" +checksum = "cac0692bcc9de3b073e8d747391827297e075c7710ff6276d9f7a1f3d58c6657" dependencies = [ "proc-macro2", "quote", "sqlx-core", "sqlx-macros-core", - "syn 1.0.107", + "syn 2.0.66", ] [[package]] name = "sqlx-macros-core" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5833ef53aaa16d860e92123292f1f6a3d53c34ba8b1969f152ef1a7bb803f3c8" +checksum = "1804e8a7c7865599c9c79be146dc8a9fd8cc86935fa641d3ea58e5f0688abaa5" dependencies = [ "dotenvy", "either", - "heck 0.4.1", + "heck 0.5.0", "hex", "once_cell", "proc-macro2", @@ -3343,7 +3224,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 1.0.107", + "syn 2.0.66", "tempfile", "tokio", "url", @@ -3351,17 +3232,17 @@ dependencies = [ [[package]] name = "sqlx-mysql" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed31390216d20e538e447a7a9b959e06ed9fc51c37b514b46eb758016ecd418" +checksum = "64bb4714269afa44aef2755150a0fc19d756fb580a67db8885608cf02f47d06a" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.5.0", "byteorder", "bytes", "crc", - "digest 0.10.7", + "digest", "dotenvy", "either", "futures-channel", @@ -3395,12 +3276,12 @@ dependencies = [ [[package]] name = "sqlx-postgres" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c824eb80b894f926f89a0b9da0c7f435d27cdd35b8c655b114e58223918577e" +checksum = "6fa91a732d854c5d7726349bb4bb879bb9478993ceb764247660aee25f67c2f8" dependencies = [ "atoi", - "base64 0.21.7", + "base64 0.22.1", "bitflags 2.5.0", "byteorder", "crc", @@ -3435,9 +3316,9 @@ dependencies = [ [[package]] name = "sqlx-sqlite" -version = "0.7.4" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b244ef0a8414da0bed4bb1910426e890b19e5e9bccc27ada6b797d05c55ae0aa" +checksum = "d5b2cf34a45953bfd3daaf3db0f7a7878ab9b7a6b91b422d24a7a9e4c857b680" dependencies = [ "atoi", "flume", @@ -3450,11 +3331,11 @@ dependencies = [ "log", "percent-encoding", "serde", + "serde_urlencoded", "sqlx-core", "time", "tracing", "url", - "urlencoding", "uuid", ] @@ -3545,15 +3426,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" -dependencies = [ - "winapi-util", -] - [[package]] name = "thiserror" version = "1.0.64" @@ -3659,7 +3531,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.1", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", @@ -3721,20 +3593,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.12" @@ -3768,7 +3626,7 @@ dependencies = [ "simdutf8", "tokio", "tokio-rustls 0.25.0", - "tokio-util 0.7.12", + "tokio-util", "tracing", ] @@ -3904,35 +3762,6 @@ dependencies = [ "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-gelf" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7c0170f1bf67b749d4377c2da1d99d6e722600051ee53870cfb6f618611e29e" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "hostname", - "serde_json", - "thiserror", - "tokio", - "tokio-util 0.7.12", - "tracing-core", - "tracing-futures", - "tracing-subscriber", -] - [[package]] name = "tracing-log" version = "0.1.3" @@ -4374,36 +4203,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows" -version = "0.43.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244" -dependencies = [ - "windows_aarch64_gnullvm 0.42.1", - "windows_aarch64_msvc 0.42.1", - "windows_i686_gnu 0.42.1", - "windows_i686_msvc 0.42.1", - "windows_x86_64_gnu 0.42.1", - "windows_x86_64_gnullvm 0.42.1", - "windows_x86_64_msvc 0.42.1", -] - [[package]] name = "windows-core" version = "0.52.0" diff --git a/Cargo.toml b/Cargo.toml index 11ef9be6..314c0cee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ axum = "0.7.5" axum-macros = "0.4.1" bytes = "1.6.0" chrono = "0.4" -fred = { version = "5.2.0", default-features = false, features = ["tracing", "pool-prefer-active"] } +fred = { version = "9.3.0", default-features = false, features = ["tracing", "i-keys", "i-hashes", "i-scripts", "sha-1"] } futures = "0.3.30" lazy_static = "1.4.0" metrics = "0.23.0" @@ -21,7 +21,7 @@ reqwest = { version = "0.12.7" , default-features = false, features = ["rustls-t serde = { version = "1.0.196", features = ["derive"] } serde_json = "1.0.117" signal-hook = "0.3.17" -sqlx = { version = "0.7.4", features = ["runtime-tokio", "postgres", "time", "macros", "uuid"] } +sqlx = { version = "0.8.2", features = ["runtime-tokio", "postgres", "time", "macros", "uuid"] } time = "0.3.34" tokio = { version = "1.36.0", features = ["full"] } tracing = "0.1.40" diff --git a/lib/libpk/Cargo.toml b/lib/libpk/Cargo.toml index e3fb52da..5a4b8eb5 100644 --- a/lib/libpk/Cargo.toml +++ b/lib/libpk/Cargo.toml @@ -5,24 +5,22 @@ edition = "2021" [dependencies] anyhow = { workspace = true } -config = "0.14.0" fred = { workspace = true } -gethostname = "0.4.1" lazy_static = { workspace = true } metrics = { workspace = true } -metrics-exporter-prometheus = { version = "0.15.3", default-features = false, features = ["tokio", "http-listener", "tracing"] } +prost = { workspace = true } +prost-types = { workspace = true } serde = { workspace = true } sqlx = { workspace = true } time = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } -tracing-gelf = "0.7.1" tracing-subscriber = { workspace = true} twilight-model = { workspace = true } uuid = { workspace = true } -prost = { workspace = true } -prost-types = { workspace = true } +config = "0.14.0" +metrics-exporter-prometheus = { version = "0.15.3", default-features = false, features = ["tokio", "http-listener", "tracing"] } [build-dependencies] prost-build = { workspace = true } diff --git a/lib/libpk/src/_config.rs b/lib/libpk/src/_config.rs index d112eacd..c92bcd31 100644 --- a/lib/libpk/src/_config.rs +++ b/lib/libpk/src/_config.rs @@ -111,6 +111,8 @@ impl PKConfig { } } +// todo: consider passing this down instead of making it global +// especially since we have optional discord/api/avatars/etc config lazy_static! { #[derive(Debug)] pub static ref CONFIG: Arc = { diff --git a/lib/libpk/src/db/mod.rs b/lib/libpk/src/db/mod.rs index 56feaa4f..49bd1524 100644 --- a/lib/libpk/src/db/mod.rs +++ b/lib/libpk/src/db/mod.rs @@ -1,4 +1,4 @@ -use fred::pool::RedisPool; +use fred::clients::RedisPool; use sqlx::postgres::{PgConnectOptions, PgPool, PgPoolOptions}; use std::str::FromStr; use tracing::info; @@ -8,13 +8,16 @@ pub mod types; pub async fn init_redis() -> anyhow::Result { info!("connecting to redis"); - let redis = fred::pool::RedisPool::new( + let redis = RedisPool::new( fred::types::RedisConfig::from_url_centralized(crate::config.db.data_redis_addr.as_ref()) .expect("redis url is invalid"), + None, + None, + Some(Default::default()), 10, )?; - let redis_handle = redis.connect(Some(fred::types::ReconnectPolicy::default())); + let redis_handle = redis.connect_pool(); tokio::spawn(async move { redis_handle }); Ok(redis) diff --git a/services/api/Cargo.toml b/services/api/Cargo.toml index 0a7b21c5..e77eaab5 100644 --- a/services/api/Cargo.toml +++ b/services/api/Cargo.toml @@ -7,17 +7,18 @@ edition = "2021" anyhow = { workspace = true } axum = { workspace = true } fred = { workspace = true } -hyper = { version = "1.3.1", features = ["http1"] } -hyper-util = { version = "0.1.5", features = ["client", "client-legacy", "http1"] } lazy_static = { workspace = true } libpk = { path = "../../lib/libpk" } metrics = { workspace = true } prost = { workspace = true } -reverse-proxy-service = { version = "0.2.1", features = ["axum"] } serde = { workspace = true } serde_json = { workspace = true } sqlx = { workspace = true } tokio = { workspace = true } +tracing = { workspace = true } + +hyper = { version = "1.3.1", features = ["http1"] } +hyper-util = { version = "0.1.5", features = ["client", "client-legacy", "http1"] } +reverse-proxy-service = { version = "0.2.1", features = ["axum"] } tower = "0.4.13" tower-http = { version = "0.5.2", features = ["catch-panic"] } -tracing = { workspace = true } diff --git a/services/api/src/main.rs b/services/api/src/main.rs index b47c9218..dbd2d46f 100644 --- a/services/api/src/main.rs +++ b/services/api/src/main.rs @@ -20,7 +20,7 @@ mod util; #[derive(Clone)] pub struct ApiContext { pub db: sqlx::postgres::PgPool, - pub redis: fred::pool::RedisPool, + pub redis: fred::clients::RedisPool, rproxy_uri: String, rproxy_client: Client, diff --git a/services/api/src/middleware/ratelimit.rs b/services/api/src/middleware/ratelimit.rs index e5da214d..921f7088 100644 --- a/services/api/src/middleware/ratelimit.rs +++ b/services/api/src/middleware/ratelimit.rs @@ -6,7 +6,7 @@ use axum::{ middleware::{FromFnLayer, Next}, response::Response, }; -use fred::{pool::RedisPool, prelude::LuaInterface, types::ReconnectPolicy, util::sha1_hash}; +use fred::{clients::RedisPool, prelude::LuaInterface, util::sha1_hash, interfaces::ClientLike}; use metrics::counter; use tracing::{debug, error, info, warn}; @@ -27,21 +27,25 @@ pub fn ratelimiter(f: F) -> FromFnLayer, T> { .ratelimit_redis_addr .as_ref() .map(|val| { - let r = fred::pool::RedisPool::new( + // todo: this should probably use the global pool + let r = RedisPool::new( fred::types::RedisConfig::from_url_centralized(val.as_ref()) .expect("redis url is invalid"), + None, + None, + Some(Default::default()), 10, ) .expect("failed to connect to redis"); - let handle = r.connect(Some(ReconnectPolicy::default())); + let handle = r.connect(); tokio::spawn(async move { handle }); let rscript = r.clone(); tokio::spawn(async move { if let Ok(()) = rscript.wait_for_connect().await { - match rscript.script_load(LUA_SCRIPT).await { + match rscript.script_load::(LUA_SCRIPT.to_string()).await { Ok(_) => info!("connected to redis for request rate limiting"), Err(err) => error!("could not load redis script: {}", err), } @@ -155,6 +159,8 @@ pub async fn do_request_ratelimited( // local rate = ARGV[1] // local period = ARGV[2] // return {remaining, tostring(retry_after), reset_after} + + // todo: check if error is script not found and reload script let resp = redis .evalsha::<(i32, String, u64), String, Vec, Vec>( LUA_SCRIPT_SHA.to_string(), diff --git a/services/avatars/Cargo.toml b/services/avatars/Cargo.toml index b4f9e22b..c9f9ab96 100644 --- a/services/avatars/Cargo.toml +++ b/services/avatars/Cargo.toml @@ -11,19 +11,20 @@ path = "src/cleanup.rs" libpk = { path = "../../lib/libpk" } anyhow = { workspace = true } axum = { workspace = true } -data-encoding = "2.5.0" -form_urlencoded = "1.2.1" futures = { workspace = true } -gif = "0.13.1" -image = { version = "0.24.8", default-features = false, features = ["gif", "jpeg", "png", "webp", "tiff"] } reqwest = { workspace = true } -rust-s3 = { version = "0.33.0", default-features = false, features = ["tokio-rustls-tls"] } -sha2 = "0.10.8" serde = { workspace = true } sqlx = { workspace = true } -thiserror = "1.0.56" time = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } uuid = { workspace = true } + +data-encoding = "2.5.0" +gif = "0.13.1" +image = { version = "0.24.8", default-features = false, features = ["gif", "jpeg", "png", "webp", "tiff"] } +form_urlencoded = "1.2.1" +rust-s3 = { version = "0.33.0", default-features = false, features = ["tokio-rustls-tls"] } +sha2 = "0.10.8" +thiserror = "1.0.56" webp = "0.2.6" diff --git a/services/dispatch/Cargo.toml b/services/dispatch/Cargo.toml index 656cd50c..81e35811 100644 --- a/services/dispatch/Cargo.toml +++ b/services/dispatch/Cargo.toml @@ -6,6 +6,7 @@ edition = "2021" [dependencies] anyhow = { workspace = true } axum = { workspace = true } +reqwest = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } tokio = { workspace = true } @@ -13,4 +14,3 @@ tracing = { workspace = true } tracing-subscriber = { workspace = true } hickory-client = "0.24.1" -reqwest = { workspace = true } diff --git a/services/gateway/Cargo.toml b/services/gateway/Cargo.toml index ac6e457b..b1a2daa7 100644 --- a/services/gateway/Cargo.toml +++ b/services/gateway/Cargo.toml @@ -12,6 +12,7 @@ fred = { workspace = true } futures = { workspace = true } lazy_static = { workspace = true } libpk = { path = "../../lib/libpk" } +metrics = { workspace = true } prost = { workspace = true } serde_json = { workspace = true } signal-hook = { workspace = true } diff --git a/services/gateway/src/discord/gateway.rs b/services/gateway/src/discord/gateway.rs index 723bcc89..15d5ac80 100644 --- a/services/gateway/src/discord/gateway.rs +++ b/services/gateway/src/discord/gateway.rs @@ -28,7 +28,7 @@ pub fn cluster_config() -> ClusterSettings { }) } -pub fn create_shards(redis: fred::pool::RedisPool) -> anyhow::Result>> { +pub fn create_shards(redis: fred::clients::RedisPool) -> anyhow::Result>> { let intents = Intents::GUILDS | Intents::DIRECT_MESSAGES | Intents::DIRECT_MESSAGE_REACTIONS diff --git a/services/gateway/src/discord/identify_queue.rs b/services/gateway/src/discord/identify_queue.rs index 33865b8f..30266a18 100644 --- a/services/gateway/src/discord/identify_queue.rs +++ b/services/gateway/src/discord/identify_queue.rs @@ -1,7 +1,7 @@ use fred::{ error::RedisError, interfaces::KeysInterface, - pool::RedisPool, + clients::RedisPool, types::{Expiration, SetOptions}, }; use std::fmt::Debug; diff --git a/services/gateway/src/discord/shard_state.rs b/services/gateway/src/discord/shard_state.rs index 8c2369ca..b7fe4a44 100644 --- a/services/gateway/src/discord/shard_state.rs +++ b/services/gateway/src/discord/shard_state.rs @@ -1,5 +1,5 @@ use bytes::Bytes; -use fred::{interfaces::HashesInterface, pool::RedisPool}; +use fred::{interfaces::HashesInterface, clients::RedisPool}; use prost::Message; use tracing::info; use twilight_gateway::Event; diff --git a/services/gateway/src/main.rs b/services/gateway/src/main.rs index 7ac18fa3..9d3c0eb7 100644 --- a/services/gateway/src/main.rs +++ b/services/gateway/src/main.rs @@ -1,5 +1,5 @@ use chrono::Timelike; -use fred::{interfaces::*, pool::RedisPool}; +use fred::{interfaces::*, clients::RedisPool}; use signal_hook::{ consts::{SIGINT, SIGTERM}, iterator::Signals,