diff --git a/server/Cargo.lock b/server/Cargo.lock index 7c788018f..beae438d3 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -667,9 +667,9 @@ dependencies = [ [[package]] name = "either" -version = "1.9.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" [[package]] name = "encoding_rs" @@ -1120,15 +1120,6 @@ version = "1.70.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -1463,7 +1454,7 @@ dependencies = [ [[package]] name = "parser" -version = "0.2.0" +version = "0.2.1" dependencies = [ "allocative", "bincode", @@ -1477,7 +1468,7 @@ dependencies = [ "divan", "fastrand", "inferno", - "itertools 0.13.0", + "itertools", "leveldb", "memory-stats", "nohash", @@ -1854,18 +1845,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", @@ -1907,13 +1898,13 @@ dependencies = [ [[package]] name = "server" -version = "0.2.0" +version = "0.2.1" dependencies = [ "axum", "bincode", "color-eyre", "derive_deref", - "itertools 0.12.1", + "itertools", "parser", "regex", "reqwest", diff --git a/server/Cargo.toml b/server/Cargo.toml index ab4264eb7..9fd2974b9 100644 --- a/server/Cargo.toml +++ b/server/Cargo.toml @@ -1,16 +1,16 @@ [package] name = "server" -version = "0.2.0" +version = "0.2.1" edition = "2021" [dependencies] axum = "0.7.5" color-eyre = "0.6.3" -itertools = "0.12.1" +itertools = "0.13.0" regex = "1.10.5" bincode = { git = "https://github.com/bincode-org/bincode.git" } reqwest = { version = "0.12.5", features = ["json"] } -serde = { version = "1.0.203", features = ["derive"] } +serde = { version = "1.0.204", features = ["derive"] } serde_json = { version = "1.0.120" } tokio = { version = "1.38.0", features = ["full"] } tower-http = { version = "0.5.2", features = ["compression-full"] } diff --git a/server/run.sh b/server/run.sh index d992d4401..ea7b3817d 100755 --- a/server/run.sh +++ b/server/run.sh @@ -1,16 +1,6 @@ -# Restart cloudflared -# Sometimes it's acting up -if command -v cloudflared &> /dev/null; then - # For Mac OS users - if [ "$(uname)" == "Darwin" ]; then - echo "Restarting cloudflared..." - - sudo launchctl stop com.cloudflare.cloudflared - sudo launchctl unload /Library/LaunchDaemons/com.cloudflare.cloudflared.plist - sudo launchctl load /Library/LaunchDaemons/com.cloudflare.cloudflared.plist - sudo launchctl start com.cloudflare.cloudflared - fi +if cargo watch --help &> /dev/null; then + cargo watch -w "./src" -w "./run.sh" -w "../datasets/disk_path_to_type.json" -x "run -r" + # cargo watch -w "./src" -w "./run.sh" -x "run -r" +else + cargo run -r fi - -cargo watch -w "./src" -w "./run.sh" -x "run -r" -# cargo watch -w "./src" -w "./run.sh" -w "../datasets/disk_path_to_type.json" -x "run -r"