diff --git a/Cargo.lock b/Cargo.lock
index 41e8f88..8ee7bcb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,7 +14,7 @@ dependencies = [
"futures-sink",
"memchr",
"pin-project-lite",
- "tokio 1.32.0",
+ "tokio 1.33.0",
"tokio-util",
"tracing",
]
@@ -81,7 +81,7 @@ dependencies = [
"actix-utils",
"ahash",
"base64 0.21.4",
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
"brotli",
"bytes 1.5.0",
"bytestring",
@@ -102,7 +102,7 @@ dependencies = [
"rand 0.8.5",
"sha1",
"smallvec 1.11.1",
- "tokio 1.32.0",
+ "tokio 1.33.0",
"tokio-util",
"tracing",
"zstd",
@@ -115,7 +115,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
dependencies = [
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -138,7 +138,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28f32d40287d3f402ae0028a9d54bef51af15c8769492826a69d28f81893151d"
dependencies = [
"futures-core",
- "tokio 1.32.0",
+ "tokio 1.33.0",
]
[[package]]
@@ -153,8 +153,8 @@ dependencies = [
"futures-core",
"futures-util",
"mio 0.8.8",
- "socket2 0.5.4",
- "tokio 1.32.0",
+ "socket2 0.5.5",
+ "tokio 1.33.0",
"tracing",
]
@@ -214,8 +214,8 @@ dependencies = [
"serde_json",
"serde_urlencoded 0.7.1",
"smallvec 1.11.1",
- "socket2 0.5.4",
- "time 0.3.29",
+ "socket2 0.5.5",
+ "time 0.3.30",
"url 2.4.1",
]
@@ -226,9 +226,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5"
dependencies = [
"actix-router",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -260,9 +260,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
dependencies = [
"memchr",
]
@@ -320,13 +320,13 @@ checksum = "9338790e78aa95a416786ec8389546c4b6a1dfc3dc36071ed9518a9413a542eb"
[[package]]
name = "async-trait"
-version = "0.1.73"
+version = "0.1.74"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
+checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -397,9 +397,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
[[package]]
name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
[[package]]
name = "block-buffer"
@@ -433,9 +433,9 @@ dependencies = [
[[package]]
name = "bstr"
-version = "1.6.2"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2f7349907b712260e64b0afe2f84692af14a454be26187d9df565c7f69266a"
+checksum = "c79ad7fb2dd38f3dabd76b09c6a5a20c038fc0213ef1e9afd30eb777f120f019"
dependencies = [
"memchr",
"serde",
@@ -455,9 +455,9 @@ checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7"
[[package]]
name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
[[package]]
name = "bytes"
@@ -496,9 +496,9 @@ dependencies = [
[[package]]
name = "cargo-platform"
-version = "0.1.3"
+version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfa25e60aea747ec7e1124f238816749faa93759c6ff5b31f1ccdda137f4479"
+checksum = "12024c4645c97566567129c204f65d5815a8c9aecf30fcbe682b2fe034996d36"
dependencies = [
"serde",
]
@@ -511,7 +511,7 @@ checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
dependencies = [
"camino",
"cargo-platform",
- "semver 1.0.19",
+ "semver 1.0.20",
"serde",
"serde_json",
]
@@ -624,7 +624,7 @@ dependencies = [
"futures-core",
"memchr",
"pin-project-lite",
- "tokio 1.32.0",
+ "tokio 1.33.0",
"tokio-util",
]
@@ -651,7 +651,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e859cd57d0710d9e06c381b550c06e76992472a8c6d527aecd2fc673dcc231fb"
dependencies = [
"percent-encoding 2.3.0",
- "time 0.3.29",
+ "time 0.3.30",
"version_check",
]
@@ -691,9 +691,9 @@ checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
[[package]]
name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "3fbc60abd742b35f2492f808e1abbb83d45f72db402e14c55057edc9c7b1e9e4"
dependencies = [
"libc",
]
@@ -864,7 +864,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -874,17 +874,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
dependencies = [
"cfg-if 1.0.0",
- "hashbrown 0.14.1",
- "lock_api 0.4.10",
+ "hashbrown 0.14.2",
+ "lock_api 0.4.11",
"once_cell",
- "parking_lot_core 0.9.8",
+ "parking_lot_core 0.9.9",
]
[[package]]
name = "deranged"
-version = "0.3.8"
+version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
+checksum = "0f32d04922c60427da6f9fef14d042d9edddef64cb9d4ce0d64d0685fbeb1fd3"
+dependencies = [
+ "powerfmt",
+]
[[package]]
name = "derive_more"
@@ -893,7 +896,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [
"convert_case",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
"rustc_version 0.4.0",
"syn 1.0.109",
@@ -992,25 +995,14 @@ dependencies = [
[[package]]
name = "errno"
-version = "0.3.4"
+version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
+checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
dependencies = [
- "errno-dragonfly",
"libc",
"windows-sys",
]
-[[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 = "error-chain"
version = "0.12.4"
@@ -1046,7 +1038,7 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
"syn 1.0.109",
"synstructure",
@@ -1071,9 +1063,9 @@ checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
[[package]]
name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
dependencies = [
"crc32fast",
"miniz_oxide",
@@ -1217,9 +1209,9 @@ version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -1359,7 +1351,7 @@ dependencies = [
"http 0.2.9",
"indexmap",
"slab",
- "tokio 1.32.0",
+ "tokio 1.33.0",
"tokio-util",
"tracing",
]
@@ -1393,9 +1385,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
[[package]]
name = "hashbrown"
-version = "0.14.1"
+version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
[[package]]
name = "hermit-abi"
@@ -1435,7 +1427,7 @@ dependencies = [
"log",
"mac",
"markup5ever 0.11.0",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
"syn 1.0.109",
]
@@ -1556,8 +1548,8 @@ dependencies = [
"httpdate",
"itoa 1.0.9",
"pin-project-lite",
- "socket2 0.4.9",
- "tokio 1.32.0",
+ "socket2 0.4.10",
+ "tokio 1.33.0",
"tower-service",
"tracing",
"want 0.3.1",
@@ -1573,7 +1565,7 @@ dependencies = [
"http 0.2.9",
"hyper 0.14.27",
"rustls",
- "tokio 1.32.0",
+ "tokio 1.33.0",
"tokio-rustls",
]
@@ -1643,9 +1635,9 @@ dependencies = [
[[package]]
name = "ipnet"
-version = "2.8.0"
+version = "2.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
[[package]]
name = "is-terminal"
@@ -1681,9 +1673,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
[[package]]
name = "jobserver"
-version = "0.1.26"
+version = "0.1.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d"
dependencies = [
"libc",
]
@@ -1721,9 +1713,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libc"
-version = "0.2.148"
+version = "0.2.149"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
[[package]]
name = "libmimalloc-sys"
@@ -1737,9 +1729,9 @@ dependencies = [
[[package]]
name = "linux-raw-sys"
-version = "0.4.8"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
+checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
[[package]]
name = "local-channel"
@@ -1769,9 +1761,9 @@ dependencies = [
[[package]]
name = "lock_api"
-version = "0.4.10"
+version = "0.4.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
dependencies = [
"autocfg 1.1.0",
"scopeguard",
@@ -2073,9 +2065,9 @@ checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
[[package]]
name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
dependencies = [
"autocfg 1.1.0",
]
@@ -2117,7 +2109,7 @@ version = "0.10.57"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
"cfg-if 1.0.0",
"foreign-types",
"libc",
@@ -2132,9 +2124,9 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2172,8 +2164,8 @@ version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
- "lock_api 0.4.10",
- "parking_lot_core 0.9.8",
+ "lock_api 0.4.11",
+ "parking_lot_core 0.9.9",
]
[[package]]
@@ -2193,13 +2185,13 @@ dependencies = [
[[package]]
name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
dependencies = [
"cfg-if 1.0.0",
"libc",
- "redox_syscall 0.3.5",
+ "redox_syscall 0.4.1",
"smallvec 1.11.1",
"windows-targets",
]
@@ -2251,9 +2243,9 @@ checksum = "bc9fc1b9e7057baba189b5c626e2d6f40681ae5b6eb064dc7c7834101ec8123a"
dependencies = [
"pest",
"pest_meta",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2353,9 +2345,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
"phf_generator 0.11.2",
"phf_shared 0.11.2",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2400,9 +2392,9 @@ version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -2451,6 +2443,12 @@ dependencies = [
"plotters-backend",
]
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
[[package]]
name = "ppv-lite86"
version = "0.2.17"
@@ -2474,9 +2472,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
dependencies = [
"unicode-ident",
]
@@ -2533,7 +2531,7 @@ version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
]
[[package]]
@@ -2727,8 +2725,8 @@ dependencies = [
"pin-project-lite",
"ryu",
"sha1_smol",
- "socket2 0.4.9",
- "tokio 1.32.0",
+ "socket2 0.4.10",
+ "tokio 1.33.0",
"tokio-retry",
"tokio-util",
"url 2.4.1",
@@ -2750,10 +2748,19 @@ dependencies = [
]
[[package]]
-name = "regex"
-version = "1.9.6"
+name = "redox_syscall"
+version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
dependencies = [
"aho-corasick",
"memchr",
@@ -2763,9 +2770,9 @@ dependencies = [
[[package]]
name = "regex-automata"
-version = "0.3.9"
+version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
dependencies = [
"aho-corasick",
"memchr",
@@ -2774,9 +2781,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "reqwest"
@@ -2841,7 +2848,7 @@ dependencies = [
"serde_json",
"serde_urlencoded 0.7.1",
"system-configuration",
- "tokio 1.32.0",
+ "tokio 1.33.0",
"tokio-rustls",
"tower-service",
"url 2.4.1",
@@ -2894,16 +2901,16 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
dependencies = [
- "semver 1.0.19",
+ "semver 1.0.20",
]
[[package]]
name = "rustix"
-version = "0.38.19"
+version = "0.38.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed"
+checksum = "67ce50cb2e16c2903e30d1cbccfd8387a74b9d4c938b6a4c5ec6cc7556f7a8a0"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
"errno",
"libc",
"linux-raw-sys",
@@ -3049,7 +3056,7 @@ version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
"cssparser",
"derive_more",
"fxhash",
@@ -3073,9 +3080,9 @@ dependencies = [
[[package]]
name = "semver"
-version = "1.0.19"
+version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+checksum = "836fa6a3e1e547f9a2c4040802ec865b5d85f4014efe00555d7090a3dcaa1090"
dependencies = [
"serde",
]
@@ -3088,22 +3095,22 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
-version = "1.0.188"
+version = "1.0.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.188"
+version = "1.0.189"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -3243,9 +3250,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.4.9"
+version = "0.4.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
dependencies = [
"libc",
"winapi 0.3.9",
@@ -3253,9 +3260,9 @@ dependencies = [
[[package]]
name = "socket2"
-version = "0.5.4"
+version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
+checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
dependencies = [
"libc",
"windows-sys",
@@ -3319,7 +3326,7 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
dependencies = [
"phf_generator 0.7.24",
"phf_shared 0.7.24",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
"string_cache_shared",
]
@@ -3332,7 +3339,7 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
"phf_generator 0.10.0",
"phf_shared 0.10.0",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
]
@@ -3359,18 +3366,18 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
"unicode-ident",
]
[[package]]
name = "syn"
-version = "2.0.37"
+version = "2.0.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
"unicode-ident",
]
@@ -3381,7 +3388,7 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
"syn 1.0.109",
"unicode-xid 0.2.4",
@@ -3459,22 +3466,22 @@ dependencies = [
[[package]]
name = "thiserror"
-version = "1.0.49"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -3495,12 +3502,13 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.29"
+version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
+checksum = "c4a34ab300f2dee6e562c10a046fc05e358b29f9bf92277f30c3c8d82275f6f5"
dependencies = [
"deranged",
"itoa 1.0.9",
+ "powerfmt",
"serde",
"time-core",
"time-macros",
@@ -3567,9 +3575,9 @@ dependencies = [
[[package]]
name = "tokio"
-version = "1.32.0"
+version = "1.33.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
+checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653"
dependencies = [
"backtrace",
"bytes 1.5.0",
@@ -3579,7 +3587,7 @@ dependencies = [
"parking_lot 0.12.1",
"pin-project-lite",
"signal-hook-registry",
- "socket2 0.5.4",
+ "socket2 0.5.5",
"tokio-macros",
"windows-sys",
]
@@ -3632,9 +3640,9 @@ version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
]
[[package]]
@@ -3664,7 +3672,7 @@ checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
dependencies = [
"pin-project",
"rand 0.8.5",
- "tokio 1.32.0",
+ "tokio 1.33.0",
]
[[package]]
@@ -3674,7 +3682,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
dependencies = [
"rustls",
- "tokio 1.32.0",
+ "tokio 1.33.0",
]
[[package]]
@@ -3740,7 +3748,7 @@ dependencies = [
"futures-core",
"futures-sink",
"pin-project-lite",
- "tokio 1.32.0",
+ "tokio 1.33.0",
"tracing",
]
@@ -3761,11 +3769,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
dependencies = [
- "cfg-if 1.0.0",
"log",
"pin-project-lite",
"tracing-core",
@@ -3773,9 +3780,9 @@ dependencies = [
[[package]]
name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
dependencies = [
"once_cell",
]
@@ -3977,9 +3984,9 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
"wasm-bindgen-shared",
]
@@ -4011,9 +4018,9 @@ version = "0.2.87"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
dependencies = [
- "proc-macro2 1.0.67",
+ "proc-macro2 1.0.69",
"quote 1.0.33",
- "syn 2.0.37",
+ "syn 2.0.38",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -4042,7 +4049,7 @@ checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc"
[[package]]
name = "websurfx"
-version = "1.2.3"
+version = "1.2.4"
dependencies = [
"actix-cors",
"actix-files",
@@ -4072,7 +4079,7 @@ dependencies = [
"serde_json",
"smallvec 1.11.1",
"tempfile",
- "tokio 1.32.0",
+ "tokio 1.33.0",
]
[[package]]
@@ -4246,11 +4253,10 @@ dependencies = [
[[package]]
name = "zstd-sys"
-version = "2.0.8+zstd.1.5.5"
+version = "2.0.9+zstd.1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5556e6ee25d32df2586c098bbfa278803692a20d0ab9565e049480d52707ec8c"
+checksum = "9e16efa8a874a0481a574084d34cc26fdb3b99627480f785888deb6386506656"
dependencies = [
"cc",
- "libc",
"pkg-config",
]
diff --git a/Cargo.toml b/Cargo.toml
index aa4a97d..cf509bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
[package]
name = "websurfx"
-version = "1.2.3"
+version = "1.2.4"
edition = "2021"
description = "An open-source alternative to Searx that provides clean, ad-free, and organic results with incredible speed while keeping privacy and security in mind."
repository = "https://github.com/neon-mmd/websurfx"
diff --git a/docs/README.md b/docs/README.md
index b092778..c811f87 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -15,5 +15,6 @@
# Developers
+- [Developing](./developing.md)
- [**Contribute**](https://github.com/neon-mmd/websurfx/blob/master/CONTRIBUTING.md)
- [**Coding style**](https://rust-lang.github.io/api-guidelines/naming.html)
diff --git a/docs/developing.md b/docs/developing.md
new file mode 100644
index 0000000..9883a6b
--- /dev/null
+++ b/docs/developing.md
@@ -0,0 +1,629 @@
+# Developing
+
+This page of the docs outlines how to get **Websurfx** up and running in a development environment, and outlines the common worflow, different ways to work on the project, a high level overview of how the project works, project structure and the best pratices that should be followed when working on the project.
+
+
+ Table of Contents
+
+
+- [Setting up the Development Environment](#setting-up-the-development-environment)
+ - [Local Development](#local-development-)
+ - [Gitpod](#gitpod-)
+ - [NixOS Dev Shell using Nix Flake](#nixos-dev-shell-using-nix-flake-)
+ - [Local Development with Docker Compose](#local-development-with-docker-compose-)
+ - [Project Commands](#project-commands)
+ - [Environmental Variables](#environmental-variables)
+- [Git Strategy](#git-strategy)
+ - [Flow](#git-flow)
+ - [Branches](#git-branch-naming)
+ - [Commit emojis](#commit-emojis)
+ - [PR Guidelines](#pr-guidelines)
+- [Resources for Beginners](#resources-for-beginners)
+- [App Info](#app-info)
+- [Code Style Guide](#style-guide)
+- [Application Structure](#application-structure)
+- [Development Tools](#development-tools)
+- [Misc / Notes](#notes)
+
+
+
+
+## Setting up the Development Environment
+
+By default, we provide four different ways to work on the project. Which are as follows:
+
+- [Local Development](#local-development-)
+- [Gitpod](#gitpod-)
+- [NixOS Dev Shell using Nix Flake](#nixos-dev-shell-using-nix-flake-)
+- [Local Development with Docker Compose](#local-development-with-docker-compose-)
+
+The diferent methods are explained in depth below.
+
+### Local Development
+
+This section covers how to setup the project for development on your local machine (bare metal).
+
+#### Prerequisites
+
+Before you start working on the project. You will need the following packages installed on your system:
+
+- A latest version of `cargo` installed on your system which is required to manage building and running the project. The installation instruction for this can be found [here](https://doc.rust-lang.org/cargo/getting-started/installation.html).
+- A latest version of `npm` installed on your system which is required to allow the installation of other tools necessary for the project. The installation for this can be found [here](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm).
+- A latest version of `redis` installed on your system which will be used to avoid introducing unexpected issue when working on the project. The installation for this can be found [here](https://redis.io/docs/getting-started/installation/).
+- A latest version of `stylelint` should be installed on your system which will be used by the pre-commit checks to lint the code before a commit can be made to ensure better code quality. Before you install `stylelint` on your system, make sure you have `npm` installed on you system. To install `stylelint` run the following command:
+
+```shell
+$ npm i -g stylelint
+```
+
+> **Note**
+> In the above command the dollar sign(**$**) refers to running the command in privilaged mode by using utilities `sudo`, `doas`, `pkgexec` or any other privilage access methods.
+
+- `Cargo-watch` installed on your system which will allow to auto build the project when any checks occur in the source code files in the codebase (`websurfx` directory). Before you install `cargo-watch` on your system, make sure you have `cargo` installed on your system. To install `cargo-watch` run the following command:
+
+```shell
+cargo install cargo-watch
+```
+
+- `Git` installed on your system. The installation instruction for this can be found [here](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
+- Finally, A latest version of `Docker` installed on your system which will be used to avoid introducing unexpected issue when working on the project. The installation instructions for this can be found [here](https://docs.docker.com/engine/install/).
+
+> **Note**
+> For **rolling release linux distributions (distros)**, the above mentioned all required packages except for `stylelint` and `cargo-watch` can also be installed via the distro specific package manager.
+>
+> **For Example:**
+>
+> On `arch linux` the following packages could be installed by following link to the installation instructions provided down below:
+>
+> - `Cargo`: https://wiki.archlinux.org/title/rust
+> - `Npm`: https://wiki.archlinux.org/title/Node.js
+> - `Redis`: https://wiki.archlinux.org/title/redis
+> - `Git`: https://wiki.archlinux.org/title/git
+> - `Docker`: https://wiki.archlinux.org/title/docker
+>
+> But we do not recommend this method for **stable release linux distros** as they tend to not provide very up to date versions of the required packages.
+
+#### Setting up Pre-commit Checks
+
+Before you setup `pre-commit` checks, you will first need to clone **your fork of the project** and navigate into the cloned repository by running the following command:
+
+```shell
+git clone https://github.com//websurfx.git
+cd websurfx
+```
+
+Once you have done finished running the above commands then run the following command to setup the `pre-commit` checks:
+
+```shell
+cargo test
+```
+
+By the running the above mentioned command, it will automatically setup all the pre-commit checks in the project.
+
+#### Running the Project
+
+If you have followed the above section then you should have a cloned repository folder present on your system. In the same directory run the following command to run the project:
+
+```shell
+cargo watch -q -x "run" -w "."
+```
+
+This will compile the app by default with the **In-Memory caching** feature. To compile, run and test the app with other features then follow the build options listed below:
+
+##### Hybrid Cache
+
+To build and run the app with the `Hybrid caching` feature. Run the following command:
+
+```shell
+cargo watch -q -x "run --features redis-cache" -w .
+```
+
+##### No Cache
+
+To build and run the search engine with the `No caching` feature. Run the following command:
+
+```shell
+cargo watch -q -x "run --no-default-features" -w .
+```
+
+##### Redis Cache
+
+To build the search engine with the `Redis caching` feature. Run the following command:
+
+```shell
+cargo watch -q -x "run --no-default-features --features redis-cache" -w .
+```
+
+> Optionally, If you have build and run the app with the `Redis cache`or `Hybrid cache` feature (as mentioned above) then you will need to start the redis server alongside the app which can be done so by running the following command:
+>
+> ```shell
+> redis-server --port 8082 &
+> ```
+
+Once you have finished running the above command, Websurfx should now be served on the address http://127.0.0.1:8080. Hot reload is enabled, so making changes to any of the files will trigger the project to being rebuilt.
+
+> For more info on all the project commands. See: [**Project Commands**](#project-commands-)
+
+### Gitpod
+
+This section covers on how to use and setup the Gitpod development environment for working on the project.
+
+> **Note**
+> By default the project only supports the Vscode **IDE/Editor** for Gitpod.
+
+#### Launching Gitpod
+
+> For a full guide on how to fork the project. See: [**Forking**](#)
+
+To launch gitpod and start working on the project from your fork of the Websurfx, Just navigate to the following link:
+
+```text
+https://gitpod.io/#https://github.com//websurfx
+```
+
+> For a full guide on how to use it and how to use it in different ways. See [**Learn Gitpod**](https://piped.kavin.rocks/playlist?list=PL3TSF5whlprXVp-7Br2oKwQgU4bji1S7H)
+
+#### Default Plugins
+
+The project by default provides a set of pre-installed plugins for gitpod which is done to improve productivity and efficiency while working on the project. Also to make working on the project more fun and engaging which can be customized from within the `Gitpod` instance.
+
+The list of all the pre-installed plugins are listed down below:
+
+**Productivity**
+
+- [CodeLLDB](https://open-vsx.org/extension/vadimcn/vscode-lldb): Provides a native debugger for rust programming langauge.
+- [GitHub Actions](https://open-vsx.org/extension/cschleiden/vscode-github-actions): Provides an easy to work with github actions.
+- [rust-analyzer](https://open-vsx.org/extension/rust-lang/rust-analyzer): Provides a language server for rust programming langauge.
+- [better-toml](https://open-vsx.org/extension/bungcip/better-toml): Provides support for toml files.
+- [crates](https://open-vsx.org/extension/serayuzgur/crates): Makes managing rust dependencies easier.
+- [Error Lens](https://open-vsx.org/extension/usernamehw/errorlens): Provides better highlighting of errors.
+- [markdownlint](https://open-vsx.org/extension/DavidAnson/vscode-markdownlint): Provides a linter for linting markdown documents.
+- [Prettier](https://open-vsx.org/extension/esbenp/prettier-vscode): Provides a code formatter.
+- [Stylelint](https://open-vsx.org/extension/stylelint/vscode-stylelint): Provides a linter for CSS files.
+- [ESLint](https://open-vsx.org/extension/dbaeumer/vscode-eslint): Provides a linter for JS files.
+- [Syntax Highlighter](https://open-vsx.org/extension/evgeniypeshkov/syntax-highlighter): A better syntax highlighting for code.
+- [Docker](https://open-vsx.org/extension/ms-azuretools/vscode-docker): Makes handling docker files easier.
+- [indent-rainbow](https://open-vsx.org/extension/oderwat/indent-rainbow): Highlightes code idents for better visualization.
+- [Auto Rename Tag](https://open-vsx.org/extension/formulahendry/auto-rename-tag): Provides a way to easily and quickly rename html tags.
+- [Rust Test Explorer](https://open-vsx.org/extension/Swellaby/vscode-rust-test-adapter): View and run cargo tests easily from a convenient sidebar.
+- [Search crates-io](https://open-vsx.org/extension/belfz/search-crates-io): Provides crates suggestions in the `cargo.toml` file.
+- [Test Adapter Converter](https://open-vsx.org/extension/hbenl/test-adapter-converter): A vscode native way to view and run tests.
+- [Test Explorer UI](https://open-vsx.org/extension/hbenl/vscode-test-explorer): Provides a way to run any test from a convenient sidebar.
+- [GitLens](https://open-vsx.org/extension/eamodio/gitlens): Provides a better and more efficient way to manage common git workflows.
+
+> Optionally, if you prefer more keyboard centric workflow then we would recommend using the following extension:
+>
+> - [VSCode Neovim](https://open-vsx.org/extension/asvetliakov/vscode-neovim): Provides complete vim emulation for vscode.
+
+**Theming**
+
+- [Catppuccin for VSCode](https://open-vsx.org/extension/Catppuccin/catppuccin-vsc): Provides the catpuccin theme for vscode.
+- [Material Icon Theme](https://open-vsx.org/extension/PKief/material-icon-theme): Provides material design icons for files dependening on the file extension.
+
+> If you have more ideas and ways to improve Gitpod for development purposes then feel free to do so by contributing a PR to this project [**here**](https://github.com/neon-mmd/websurfx/pulls).
+
+### NixOS Dev Shell using Nix Flake
+
+This section covers on how to setup the project for development using the `NixOS dev-shell`.
+
+#### Pre Setup Requirements
+
+Before you start working on the project. You will need the following packages installed on your system:
+
+- `Git` installed on your system. The installation instruction for this can be found [here](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
+- Finally, A latest version of `Docker` installed on your system which will be used to avoid introducing unexpected issue when working on the project. The installation instructions for this can be found [here](https://docs.docker.com/engine/install/).
+
+> Optionally, On `NixOS` the above mentioned all required packages except for `stylelint` and `cargo-watch` could also be installed by following link to the installation instructions provided down below:
+>
+> - `Git`: https://search.nixos.org/packages?channel=23.05&show=git&from=0&size=50&sort=relevance&type=packages&query=git
+> - `Docker`: https://search.nixos.org/packages?channel=23.05&show=docker&from=0&size=50&sort=relevance&type=packages&query=docker
+
+#### Setting up Pre-commit Checks
+
+Before you setup `pre-commit` checks, you will first need to clone **your fork of the project** and navigate into the cloned repository by running the following command:
+
+```shell
+git clone https://github.com//websurfx.git
+cd websurfx
+```
+
+Then run the following command to setup the `NixOS dev-shell`:
+
+```shell
+nix develop
+```
+
+Once you have done finished running the above commands then run the following command to setup the `pre-commit` checks:
+
+```shell
+cargo test
+```
+
+By the running the above mentioned command, it will automatically setup all the pre-commit checks in the project.
+
+#### Post Setup Requirements
+
+After you have done setting up pre-commit checks, then you may need to fullfill a few more requirements to finish setting up the development environment with `NixOS dev-shell`. These include:
+
+- `Cargo-watch` installed on your system which will allow to auto build the project when any checks occur in the source code files in the codebase (`websurfx` directory). Before you install `cargo-watch` on your system, make sure you have `cargo` installed on your system. To install `cargo-watch` run the following command:
+
+```shell
+cargo install cargo-watch
+```
+
+#### Running the Project
+
+If you have followed the above section then you should now be inside a `dev-shell` environment. In the same environment run the following command to run the project:
+
+```shell
+cargo watch -q -x "run" -w "."
+```
+
+This will compile the app by default with the **In-Memory caching** feature. To compile, run and test the app with other features then follow the build options listed below:
+
+##### Hybrid Cache
+
+To build and run the app with the `Hybrid caching` feature. Run the following command:
+
+```shell
+cargo watch -q -x "run --features redis-cache" -w .
+```
+
+##### No Cache
+
+To build and run the search engine with the `No caching` feature. Run the following command:
+
+```shell
+cargo watch -q -x "run --no-default-features" -w .
+```
+
+##### Redis Cache
+
+To build the search engine with the `Redis caching` feature. Run the following command:
+
+```shell
+cargo watch -q -x "run --no-default-features --features redis-cache" -w .
+```
+
+> Optionally, If you have build and run the app with the `Redis cache`or `Hybrid cache` feature (as mentioned above) then you will need to start the redis server alongside the app which can be done so by running the following command:
+>
+> ```shell
+> redis-server --port 8082 &
+> ```
+
+Once you have finished running the above command, Websurfx should now be served on the address http://127.0.0.1:8080. Hot reload is enabled, so making changes to any of the files will trigger the project to being rebuilt.
+
+### Local Development with Docker Compose
+
+This section covers how to setup the project for development on your local machine (bare metal) using `docker compose`.
+
+#### Prerequisites
+
+Before you start working on the project. You will need the following packages installed on your system:
+
+- A latest version of `cargo` installed on your system which is required to manage building and running the project. The installation instruction for this can be found [here](https://doc.rust-lang.org/cargo/getting-started/installation.html).
+- A latest version of `npm` installed on your system which is required to allow the installation of other tools necessary for the project. The installation for this can be found [here](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm).
+- A latest version of `stylelint` should be installed on your system which will be used by the pre-commit checks to lint the code before a commit can be made to ensure better code quality. Before you install `stylelint` on your system, make sure you have `npm` installed on you system. To install `stylelint` run the following command:
+
+```shell
+$ npm i -g stylelint
+```
+
+> **Note**
+> In the above command the dollar sign(**$**) refers to running the command in privilaged mode by using utilities `sudo`, `doas`, `pkgexec` or any other privilage access methods.
+
+- `Git` installed on your system. The installation instruction for this can be found [here](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git).
+- Finally, A latest version of `Docker` installed on your system which will be used to avoid introducing unexpected issue when working on the project. The installation instructions for this can be found [here](https://docs.docker.com/engine/install/).
+
+> **Note**
+> For **rolling release linux distributions (distros)**, the above mentioned all required packages can also be installed via the distro specific package manager.
+>
+> **For Example:**
+>
+> On `arch linux` the following packages could be installed by following link to the installation instructions provided down below:
+>
+> - `Cargo`: https://wiki.archlinux.org/title/rust
+> - `Npm`: https://wiki.archlinux.org/title/Node.js
+> - `Git`: https://wiki.archlinux.org/title/git
+> - `Docker`: https://wiki.archlinux.org/title/docker
+>
+> But we do not recommend this method for **stable release linux distros** as they tend to not provide very up to date versions of the required packages.
+
+#### Setting up Pre-commit Checks
+
+Before you setup `pre-commit` checks, you will first need to clone **your fork of the project** and navigate into the cloned repository by running the following command:
+
+```shell
+git clone https://github.com//websurfx.git
+cd websurfx
+```
+
+Once you have done finished running the above commands then run the following command to setup the `pre-commit` checks:
+
+```shell
+cargo test
+```
+
+By the running the above mentioned command, it will automatically setup all the pre-commit checks in the project.
+
+#### Running the Project
+
+If you have followed the above section then you should have a cloned repository folder present on your system. In the same directory, edit the `dev.docker-compose.yml` file as required before running the following command to run the project:
+
+```shell
+$ docker compose -f dev.docker-compose.yml up
+```
+
+> **Note**
+> In the above command the dollar sign(**$**) refers to running the command in privilaged mode by using utilities `sudo`, `doas`, `pkgexec` or any other privilage access methods.
+
+Once you have finished running the above command, Websurfx should now be served on the address http://127.0.0.1:8080. Hot reload is enabled, so making changes to any of the files will trigger the project to being rebuilt.
+
+### Project Commands
+
+#### Basics
+
+- `cargo build`: Builds the project.
+
+> **Note**
+> When you build the project first time with the above command it will require the app to compile every dependency in the project which will then be cached on your system. So when you compile the app next time it will only compile for the new changes.
+
+- `cargo run`: Starts the app and serves the project on http://127.0.0.1:8080.
+
+> **Important**
+> You must run the build command first.
+
+#### Development
+
+- `cargo watch -q -x "run" -w .`: Starts the development server with hot reloading.
+- `cargo fmt -- --check`: Checks the code for proper formatting.
+- `cargo clippy`: Lints code to ensure it follows a consistent, neat style.
+- `cargo test`: Runs unit tests, integrations tests and doc tests.
+
+### Environment Variables
+
+All environmental variables are optional. Currently there are not many environmental variables used, as most of the user preferences are stored under the `websurfx` folder (located under the codebase (`websurfx` directory)) in the `config.lua` file.
+
+The list of all the available environment variables are listed down below:
+
+- `PKG_ENV`: Sets the logging level for the app to **Trace** which can be useful for better debugging of the app. This environment variables accept two values `dev` or `prod` as strings.
+- `RUST_BACKTRACE`: Rust specific environment variable useful for getting more elaborate error messages with an error stack to better diagnose the issue. This environment variable accepts three values `0` (off), `1` (on) and `full` (for long error stack to being printed out).
+
+## Git Strategy
+
+### Git Flow
+
+Like most Git repos, we are following the [Github Flow](https://guides.github.com/introduction/flow) standard.
+
+1. Create a branch (or fork if you don'd have write access)
+2. Code some awesome stuff 🧑💻
+3. Add, commit and push your changes to your branch/ fork
+4. Head over to GitHub and create a Pull Request
+5. Fill in the required sections in the template, and hit submit
+6. Follow up with any reviews on your code
+7. Merge 🎉
+
+### Git Branch Naming
+
+The format of your branch name should be something similar to: `[TYPE]/[TICKET]_[TITLE]`
+For example, `FEATURE/420_Awesome-feature` or `FIX/690_login-server-error`
+
+### Commit Emojis
+
+Using a single emoji at the start of each commit message, issue title, and pull request title, to indicate the type task, makes the commit ledger, issue and pull request easier to understand, plus it looks cool.
+
+- 🎨 `:art:` - Improve structure / format of the code.
+- ⚡️ `:zap:` - Improve performance.
+- 🔥 `:fire:` - Remove code or files.
+- 🐛 `:bug:` - Fix a bug.
+- 🚑️ `:ambulance:` - Critical hotfix
+- ✨ `:sparkles:` - Introduce new features.
+- 📝 `:memo:` - Add or update documentation.
+- 🚀 `:rocket:` - Deploy stuff.
+- 💄 `:lipstick:` - Add or update the UI and style files.
+- 🎉 `:tada:` - Begin a project.
+- ✅ `:white_check_mark:` - Add, update, or pass tests.
+- 🔒️ `:lock:` - Fix security issues.
+- 🔖 `:bookmark:` - Make a Release or Version tag.
+- 🚨 `:rotating_light:` - Fix compiler / linter warnings.
+- 🚧 `:construction:` - Work in progress.
+- ⬆️ `:arrow_up:` - Upgrade dependencies.
+- 👷 `:construction_worker:` - Add or update CI build system.
+- ♻️ `:recycle:` - Refactor code.
+- 🩹 `:adhesive_bandage:` - Simple fix for a non-critical issue.
+- 🔧 `:wrench:` - Add or update configuration files.
+- 🍱 `:bento:` - Add or update assets.
+- 🗃️ `:card_file_box:` - Perform database schema related changes.
+- ✏️ `:pencil2:` - Fix typos.
+- 🌐 `:globe_with_meridians:` - Internationalization and translations.
+
+For a full list of options, see [gitmoji.dev](https://gitmoji.dev/)
+
+### PR Guidelines
+
+Once you've made your changes, and pushed them to your fork or branch, you're ready to open a pull request!
+
+For a pull request to be merged, it must:
+
+- The build, lint and tests (run by GH actions) must pass
+- There must not be any merge conflicts
+
+When you submit your pull request, include the required info, by filling out the pull request template. Including:
+
+- A brief description of your changes.
+- The issue or ticket number (if applicable).
+- For UI related updates include a screenshot.
+- If any dependencies were added, explain why it was needed, state the cost. associated, and confirm it does not introduce any security, privacy or speed issues
+- Optionally, provide a checklist of all the changes that was included in the pull request.
+
+> **Important**
+> Make sure to fill all the required/mandatory sections of the pull request as by filling them it helps us distinguish between spam pull requests and legitimate pull requests.
+
+> **Note**
+> The pull request template contains comments in the following form `` which are used to provide a guide on what should be provided under each heading of the template. These comments are never rendered when the pull request is either created or updated and hence anything provided in such comments is never displayed.
+
+## Resources for Beginners
+
+New to Web Development? Or New to GitHub? Glad to see you're here!! :slightly_smiling_face: Websurfx is a pretty simple app, so it should make a good candidate for your first PR. The following articles (which has been divided into parts for convenience) should point you in the right direction for getting up to speed with the technologies used in this project:
+
+**Development**
+
+- [Basics of Rust](https://piped.kavin.rocks/playlist?list=PLai5B987bZ9CoVR-QEIN9foz4QCJ0H2Y8)
+- [Introduction and deep dive into async/await in rust](https://piped.kavin.rocks/watch?v=ThjvMReOXYM)
+- [Getting Started to Actix Guide](https://actix.rs/docs/getting-started)
+- [Basics of Lua](https://learn.coregames.com/courses/intro-to-lua/)
+- [Complete course on CSS](https://piped.kavin.rocks/watch?v=1Rs2ND1ryYc)
+- [Complete course on JS](https://piped.kavin.rocks/playlist?list=PL_c9BZzLwBRLVh9OdCBYFEql6esA6aRsi)
+- [Responsive web design](https://piped.kavin.rocks/watch?v=srvUrASNj0s)
+- [Complete beginners guide to Docker](https://docker-curriculum.com/)
+- [Docker Classroom - Interactive Tutorials](https://training.play-with-docker.com/)
+- [Docker Compose Tutorial](https://docs.docker.com/compose/gettingstarted/)
+- [ES6 Tutorial](https://piped.kavin.rocks/watch?v=nZ1DMMsyVyI)
+- [Cargo Guide Book](https://doc.rust-lang.org/cargo/index.html)
+
+**GitHub**
+
+- [Complete Guide to Open Source - How to Contribute](https://piped.kavin.rocks/watch?v=yzeVMecydCE)
+- [Forking a Project](https://piped.kavin.rocks/watch?v=FnxFwyzm4Z4)
+- [A Tutorial on Git](https://piped.kavin.rocks/playlist?list=PL4lTrYcDuAfxAgSefXftJXbhw0qvjfOFo)
+- [Git cheat sheet](http://git-cheatsheet.com/)
+
+For Rust, CSS, JS, Html, Git and Docker- you'll need an IDE (e.g. [VSCode](https://code.visualstudio.com/) or [Neovim](https://neovim.io/) and a terminal (Windows users may find [WSL](https://docs.microsoft.com/en-us/windows/wsl/) more convenient).
+
+## App Info
+
+### Style Guides
+
+Linting is done using [Cargo Clippy](https://doc.rust-lang.org/clippy/) and [StyleLint](https://stylelint.io/) or [ESLint](https://eslint.org/). Also, linting is run as a git pre-commit hook.
+
+> **Important**
+> All lint checks must pass before any PR can be merged.
+
+Styleguides to follow:
+
+- [Rust API Guidelines](https://rust-lang.github.io/api-guidelines/naming.html)
+- [Airbnb JS Guidelines](https://github.com/airbnb/javascript)
+- [Google's Html and CSS Guidelines](https://google.github.io/styleguide/htmlcssguide.html)
+
+## Application Structure
+
+> **Important**
+> We follow the unix style naming conventions for all the file and folders in the project (except for all files under the `themes` and `colorschemes` folder in the frontend's source code which requires that the names of the files and folders should be in lowercase and the words be seperated with a hyphen.) which includes the name of the files and folders should be in lowercase and every word should be seperated with an underscore.
+
+**Files in the root of the codebase:** `./`
+
+```
+./
+├── .dockerignore # Docker ignore file to ignore stuff being included in the file docker image.
+├── .gitignore # Git ignore file to ignore stuff from being
+├── Cargo.lock # Auto-generated list of current packages and version numbers.
+├── Cargo.toml # Project meta-data and dependencies.
+├── Dockerfile # The blueprint for building the Docker container.
+├── LICENSE # License for use.
+├── README.md # Readme, basic info for getting started.
+├── dev.Dockerfile # The blueprint for building the Docker container for development purposes.
+├── dev.docker-compose.yml # A Docker run command for development environments.
+├── docker-compose.yml # A Docker run command.
+├── flake.lock # NixOS auto-generated flake configuration.
+├── flake.nix # Nix flake package configuration.
+├── docs # Markdown documentation
+├── public # Project front-end source code
+├── src # Project back-end source code
+├── tests # Project integration tests for the back-end source code.
+└── websurfx # Project folder containing config files for the app.
+```
+
+**Frontend Source:** `./public/`
+
+```
+./public/
+├── robots.txt # Robots file for the Website.
+├── images # Images for the Website.
+├── static # The directory containing all the UI handlers.
+│ ├── cookies.js # Handles the loading of saved cookies.
+│ ├── error_box.js # Handles the toggling functionality of the error box on the search page.
+│ ├── index.js # Functions to handle the searching functionality of the search bar.
+│ ├── pagination.js # Functions to handle the navigation between previous and next page in the search page.
+│ ├── search_area_options.js # Changes the search options under the search bar in the search page according to the safe search level set using the url safesearch parameter.
+│ ├── settings.js # Handles the getting and saving of all the settings page options as a cookie.
+│ ├── colorschemes # A folder containing all the popular colorscheme files as CSS files.
+│ └── themes # A folder containing all the popular theme files as CSS files.
+└── templates # Folder containing all the template files for the different pages on the website.
+ ├── 404.html # A 404 page template.
+ ├── about.html # An about page template.
+ ├── bar.html # A template for the search bar.
+ ├── cookies_tab.html # A template for the cookies tab for the settings page.
+ ├── engines_tab.html # A template for the engines tab for the settings page.
+ ├── footer.html # A footer template for all page.
+ ├── general_tab.html # A template for the general tab for the settings page.
+ ├── header.html # A header template for all page.
+ ├── index.html # A home page template.
+ ├── navbar.html # A navbar template for the header template.
+ ├── search.html # A search page template.
+ ├── search_bar.html # A search bar template specifically for the search page.
+ ├── settings.html # A settings page template.
+ └── user_interface_tab.html # A template for the user interface tab for the settings page.
+```
+
+**Backend Source:** `./src/`
+
+```
+./src/
+├── lib.rs # A library file for the rust project.
+├── bin # A folder containing the source code that would produce the binary file when compiled.
+│ └── websurfx.rs # A file that would be compiled into binary file.
+├── cache # A folder that contains code to handle the caching functionality of the search engine.
+│ ├── cacher.rs # Handles the different caching features.
+│ ├── error.rs # Provides custom error messages for different types of caches and their related errors.
+│ ├── mod.rs # A module file for the rust project.
+│ └── redis_cacher.rs # Provides custom asynchronous pool implementation with auto background reconnection functionality.
+├── config # A folder that holds the code to help parse the lua config file that would be used in the app.
+│ ├── mod.rs # A module file for the rust project.
+│ └── parser.rs # Provides the code to parse the config file.
+├── engines # A folder that holds code to handle fetching data from different upstream engines.
+│ ├── brave.rs # Provides code to fetch and remove unnecessary or waste results from the fetched results from the brave search engine.
+│ ├── duckduckgo.rs # Provides code to fetch and remove unnecessary or waste results from the fetched results from the duckduckgo search engine.
+│ ├── mod.rs # A module file for the rust project.
+│ ├── search_result_parser.rs # Provides helper function to help ease the process of defining different result selection selectors.
+│ └── searx.rs # Provides code to fetch and remove unnecessary or waste results from the fetched results from the searx engine.
+├── handler # A folder that provides helper code to provide a proper path to the public (theme) folder, config file, blocklist file and allowlist file based on where they are located.
+│ ├── mod.rs # A module file for the rust project.
+│ └── paths.rs # Provides helper code to handle different paths.
+├── models # A folder that provides different models for the different modules in the backend code.
+│ ├── aggregation_models.rs # Provides different models (enums, structs) for handling and standardizing different parts in the "results" module code.
+│ ├── engine_models.rs # Provides different models (enums, structs) for handling and standardizing different parts in the "engines" module code.
+│ ├── mod.rs # A module file for the rust project.
+│ ├── parser_models.rs # Provides different models (enums, structs) for handling and standardizing different parts in the "config" module code.
+│ └── server_models.rs # Provides different models (enums, structs) for handling and standardizing different parts in the "server" module code.
+├── results # A folder that provides code to handle the feching and aggregating of results from the upstream search engines.
+│ ├── aggregator.rs # Provides code aggregate and fetch results from the upstream engines.
+│ ├── mod.rs # A module file for the rust project.
+│ └── user_agent.rs # Provides a helper function to provide random user-agents to pass in the server request code to improve user privacy and avoiding detected as a bot.
+└── server # A folder that holds code to handle the routes for the search engine website.
+ ├── mod.rs # A module file for the rust project.
+ ├── router.rs # Provides functions to handle the different routes on the website.
+ └── routes # A folder that contains code to handle the bigger route for the website.
+ ├── mod.rs # A module file for the rust project.
+ └── search.rs # Provides the function to handle the search route.
+```
+
+## Development Tools
+
+### Performance - Lighthouse
+
+The easiest method of checking performance is to use Chromium's build in auditing tool, Lighthouse. To run the test, open Developer Tools (usually F12) --> Lighthouse and click on the 'Generate Report' button at the bottom.
+
+## Notes
+
+### Known warnings
+
+When running the build command, a warning appear. These is not an error, and do not affect the security or performance of the application. They will be addressed soon in a future update.
+
+```shell
+warning: the following packages contain code that will be rejected by a future version of Rust: html5ever v0.23.0
+note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 2`
+```
+
+These warning just means that any dependencies or code using the `html5ever` code would be deprecated and rejected in the futures versions of the rust lanaguage. So right now these dependencies can be used as these has not happened yet.
+
+[⬅️ Go back to Home](./README.md)