asonix/pict-rs-aggregator
1
0
Fork 0
Code Issues Pull requests Actions Projects Releases 35 Wiki Activity

Update to latest betas

Browse source
This commit is contained in:
asonix 2021-06-26 12:26:04 -05:00
parent 0103c601b4
commit 149cf34bd7
4 changed files with 89 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
Cargo.lock generated
View file

@ -20,9 +20,9 @@ dependencies = [
[[package]]
name = "actix-http"
version = "3.0.0-beta.7"
version = "3.0.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a6b8dd8ffcb0277cebef2c4b496821c888e0320817c1862a83359d4e384797a"
checksum = "3cd16d6b846983ffabfd081e1a67abd7698094fcbe7b3d9bcf1acbc6f546a516"
dependencies = [
"actix-codec",
"actix-rt",
@ -32,10 +32,12 @@ dependencies = [
"ahash",
"base64",
"bitflags",
"brotli2",
"bytes",
"bytestring",
"derive_more",
"encoding_rs",
"flate2",
"futures-core",
"futures-util",
"h2",
@ -152,9 +154,9 @@ dependencies = [
[[package]]
name = "actix-web"
version = "4.0.0-beta.7"
version = "4.0.0-beta.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "944b85410c2f6e22529d25e92506491f669c3336b8dc50ad2603f4f611ffdaf3"
checksum = "c503f726f895e55dac39adeafd14b5ee00cc956796314e9227fc7ae2e176f443"
dependencies = [
"actix-codec",
"actix-http",
@ -167,6 +169,7 @@ dependencies = [
"actix-web-codegen",
"ahash",
"bytes",
"cfg-if",
"derive_more",
"either",
"encoding_rs",
@ -200,6 +203,12 @@ dependencies = [
"syn",
]
[[package]]
name = "adler"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
[[package]]
name = "ahash"
version = "0.7.4"
@ -260,9 +269,9 @@ checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "awc"
version = "3.0.0-beta.6"
version = "3.0.0-beta.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15ffe93051a6e05151f310862b6097b58c40e873352083caa820c406392732b2"
checksum = "364ef81705bf38403a3c3da4fab9eeec1e1503cd72dd6cd7c4259d2a6b08aa98"
dependencies = [
"actix-codec",
"actix-http",
@ -270,6 +279,7 @@ dependencies = [
"actix-service",
"base64",
"bytes",
"cfg-if",
"derive_more",
"futures-core",
"itoa",
@ -298,9 +308,9 @@ checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
[[package]]
name = "bcrypt"
version = "0.9.0"
version = "0.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4d0faafe9e089674fc3efdb311ff5253d445c79d85d1d28bd3ace76d45e7164"
checksum = "1ff61734d6bd86e9739fe61bce08b753ae61ae76101dc2df8399eda2503d5a29"
dependencies = [
"base64",
"blowfish",
@ -336,15 +346,35 @@ dependencies = [
[[package]]
name = "blowfish"
version = "0.7.0"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32fa6a061124e37baba002e496d203e23ba3d7b73750be82dbfbc92913048a5b"
checksum = "fe3ff3fc1de48c1ac2e3341c4df38b0d1bfb8fdf04632a187c8b75aaa319a7ab"
dependencies = [
"byteorder",
"cipher",
"opaque-debug",
]
[[package]]
name = "brotli-sys"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4445dea95f4c2b41cde57cc9fee236ae4dbae88d8fcbdb4750fc1bb5d86aaecd"
dependencies = [
"cc",
"libc",
]
[[package]]
name = "brotli2"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0cb036c3eade309815c15ddbacec5b22c4d1f3983a774ab2eac2e3e9ea85568e"
dependencies = [
"brotli-sys",
"libc",
]
[[package]]
name = "bumpalo"
version = "3.7.0"
@ -395,9 +425,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "cipher"
version = "0.2.5"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7"
dependencies = [
"generic-array",
]
@ -431,9 +461,9 @@ checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
[[package]]
name = "cpufeatures"
version = "0.1.4"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed00c67cb5d0a7d64a44f6ad2668db7e7530311dd53ea79bcd4fb022c64911c8"
checksum = "66c99696f6c9dd7f35d486b9d04d7e6e202aa3e8c40d553f2fdf5e7e0c6a71ef"
dependencies = [
"libc",
]
@ -531,6 +561,18 @@ dependencies = [
"termcolor",
]
[[package]]
name = "flate2"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
dependencies = [
"cfg-if",
"crc32fast",
"libc",
"miniz_oxide",
]
[[package]]
name = "fnv"
version = "1.0.7"
@ -729,9 +771,9 @@ dependencies = [
[[package]]
name = "hermit-abi"
version = "0.1.18"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c"
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
dependencies = [
"libc",
]
@ -942,6 +984,16 @@ dependencies = [
"memchr",
]
[[package]]
name = "miniz_oxide"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
"autocfg",
]
[[package]]
name = "mio"
version = "0.7.13"
@ -966,9 +1018,9 @@ dependencies = [
[[package]]
name = "nom"
version = "6.2.0"
version = "6.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "046a595c7251e2f48b291c1b65d98ef1df51dbfbad46e99a1ff09729535a779e"
checksum = "9c5c51b9083a3c620fa67a2a635d1ce7d95b897e957d6b28ff9a5da960a103a6"
dependencies = [
"bitvec",
"funty",
@ -1142,9 +1194,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
version = "0.2.6"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
[[package]]
name = "pin-utils"
@ -1301,9 +1353,9 @@ dependencies = [
[[package]]
name = "rsass"
version = "0.19.0"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ba9686668e9ac9135a5f814f8882e6e872927d7f7bcf8a48b384c72aa7673f6"
checksum = "0521270960b3d962dc8cbb130f8ee6e79d574cf7dede1ce1f8a036d8d6b958eb"
dependencies = [
"lazy_static",
"nom",
@ -1317,9 +1369,9 @@ dependencies = [
[[package]]
name = "ructe"
version = "0.13.2"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5678e9cc1545f229509acb67cf34793802646f32c77e00bc470b518cfddea579"
checksum = "c6fd2f3b927021cc8586d365c36d16d82d91fdae0a3839819c12c8e86e0f929e"
dependencies = [
"base64",
"bytecount",

6
Cargo.toml
View file

@ -8,10 +8,10 @@ build = "src/build.rs"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
actix-web = { version = "4.0.0-beta.7", default-features = false }
actix-web = { version = "4.0.0-beta.8", default-features = false, features = ["compress-brotli", "compress-gzip"] }
anyhow = "1.0"
awc = { version = "3.0.0-beta.6", default-features = false, features = ["rustls"] }
bcrypt = "0.9"
awc = { version = "3.0.0-beta.7", default-features = false, features = ["rustls", "compress-brotli", "compress-gzip"] }
bcrypt = "0.10"
env_logger = "0.8.2"
futures = "0.3"
mime = "0.3"

7
src/lib.rs
View file

@ -172,8 +172,11 @@ pub fn state(config: Config, scope: &str, db: Db) -> Result<State, sled::Error>
pub fn service(client: Client, state: State) -> Scope {
web::scope(&state.scoped(""))
.data(Connection::new(state.upstream.clone(), client))
.data(state)
.app_data(web::Data::new(Connection::new(
state.upstream.clone(),
client,
)))
.app_data(web::Data::new(state))
.service(web::resource("/static/{filename}").route(web::get().to(static_files)))
.service(web::resource("404").route(web::get().to(not_found)))
.service(

6
src/main.rs
View file

@ -1,4 +1,7 @@
use actix_web::{middleware::Logger, App, HttpServer};
use actix_web::{
middleware::{Compress, Logger},
App, HttpServer,
};
use awc::Client;
use std::time::Duration;
use structopt::StructOpt;
@ -23,6 +26,7 @@ async fn main() -> Result<(), anyhow::Error> {
.finish();
App::new()
.wrap(Compress::default())
.wrap(Logger::default())
.service(pict_rs_aggregator::service(client, state.clone()))
})