0
0
mirror of https://github.com/neon-mmd/websurfx.git synced 2024-11-22 14:08:23 -05:00

Compare commits

..

No commits in common. "8790f5f719e21292e5d74cbd405c5eb0f45add58" and "a92550e050dc6bc08fb53ef4c96f785b327cb752" have entirely different histories.

4 changed files with 109 additions and 119 deletions

View File

@ -34,7 +34,7 @@ jobs:
uses: docker/setup-buildx-action@v3
# Set buildx cache
- name: Cache register
uses: actions/cache@v4
uses: actions/cache@v3
with:
path: /tmp/.buildx-cache
key: buildx-cache

View File

@ -25,12 +25,12 @@ jobs:
fetch-depth: 0
- name: Bump version and push tag
id: version-bump
uses: hennejg/github-tag-action@v4.4.0
uses: hennejg/github-tag-action@v4.3.1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
release_branches: rolling
- name: create branch
uses: peterjgrainger/action-create-branch@v2.4.0
uses: peterjgrainger/action-create-branch@v2.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:

212
Cargo.lock generated
View File

@ -31,20 +31,21 @@ dependencies = [
"futures-util",
"log",
"once_cell",
"smallvec 1.13.1",
"smallvec 1.11.2",
]
[[package]]
name = "actix-files"
version = "0.6.5"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf0bdd6ff79de7c9a021f5d9ea79ce23e108d8bfc9b49b5b4a2cf6fad5a35212"
checksum = "d832782fac6ca7369a70c9ee9a20554623c5e51c76e190ad151780ebea1cf689"
dependencies = [
"actix-http",
"actix-service",
"actix-utils",
"actix-web",
"bitflags 2.4.1",
"askama_escape",
"bitflags 1.3.2",
"bytes 1.5.0",
"derive_more",
"futures-core",
@ -54,7 +55,6 @@ dependencies = [
"mime_guess",
"percent-encoding 2.3.1",
"pin-project-lite",
"v_htmlescape",
]
[[package]]
@ -99,7 +99,7 @@ dependencies = [
"pin-project-lite",
"rand 0.8.5",
"sha1",
"smallvec 1.13.1",
"smallvec 1.11.2",
"tokio 1.35.1",
"tokio-util",
"tracing",
@ -111,8 +111,8 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e01ed3140b2f8d422c68afa1ed2e85d996ea619c988ac834d255db32138655cb"
dependencies = [
"quote 1.0.35",
"syn 2.0.48",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -210,7 +210,7 @@ dependencies = [
"serde",
"serde_json",
"serde_urlencoded 0.7.1",
"smallvec 1.13.1",
"smallvec 1.11.2",
"socket2",
"time 0.3.31",
"url 2.5.0",
@ -223,9 +223,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eb1f50ebbb30eca122b188319a4398b3f7bb4a8cdf50ecfb73bfc6a3c3ce54f5"
dependencies = [
"actix-router",
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -346,6 +346,12 @@ version = "0.7.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
[[package]]
name = "askama_escape"
version = "0.10.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "619743e34b5ba4e9703bba34deac3427c72507c7159f5fd030aea8cac0cfe341"
[[package]]
name = "async-compression"
version = "0.4.5"
@ -372,9 +378,9 @@ version = "0.1.76"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "531b97fb4cd3dfdce92c35dedbfdc1f0b9d8091c8ca943d6dae340ef5012d514"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -738,8 +744,8 @@ version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 1.0.109",
]
@ -950,7 +956,7 @@ dependencies = [
"dtoa-short",
"itoa 1.0.10",
"phf 0.11.2",
"smallvec 1.13.1",
"smallvec 1.11.2",
]
[[package]]
@ -963,7 +969,7 @@ dependencies = [
"dtoa-short",
"itoa 1.0.10",
"phf 0.11.2",
"smallvec 1.13.1",
"smallvec 1.11.2",
]
[[package]]
@ -981,8 +987,8 @@ version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
dependencies = [
"quote 1.0.35",
"syn 2.0.48",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -1020,8 +1026,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
dependencies = [
"convert_case",
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"rustc_version 0.4.0",
"syn 1.0.109",
]
@ -1094,22 +1100,12 @@ dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "env_filter"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
dependencies = [
"log",
]
[[package]]
name = "env_logger"
version = "0.11.1"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05e7cf40684ae96ade6232ed84582f40ce0a66efcd43a5117aef610534f8e0b8"
checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
dependencies = [
"env_filter",
"log",
]
@ -1174,8 +1170,8 @@ version = "0.1.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 1.0.109",
"synstructure",
]
@ -1345,9 +1341,9 @@ version = "0.3.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -1452,7 +1448,7 @@ dependencies = [
"parking_lot 0.12.1",
"quanta",
"rand 0.8.5",
"smallvec 1.13.1",
"smallvec 1.11.2",
]
[[package]]
@ -1558,8 +1554,8 @@ dependencies = [
"log",
"mac",
"markup5ever 0.11.0",
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 1.0.109",
]
@ -1864,9 +1860,9 @@ dependencies = [
[[package]]
name = "lightningcss"
version = "1.0.0-alpha.52"
version = "1.0.0-alpha.51"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "771a62dedf5ec563bbfea9760f6c6a6bc546e67355eba0cd7d00c0dc34b11d90"
checksum = "99d6ad516c08b24c246b339159dc2ee2144c012e8ebdf4db4bddefb8734b2b69"
dependencies = [
"ahash 0.7.7",
"bitflags 2.4.1",
@ -1879,7 +1875,7 @@ dependencies = [
"parcel_selectors",
"paste",
"pathdiff",
"smallvec 1.13.1",
"smallvec 1.11.2",
]
[[package]]
@ -2020,8 +2016,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0be95d66c3024ffce639216058e5bae17a83ecaf266ffc6e4d060ad447c9eed2"
dependencies = [
"proc-macro-error",
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 1.0.109",
]
@ -2081,7 +2077,7 @@ dependencies = [
"crossbeam-utils 0.8.18",
"dashmap",
"skeptic",
"smallvec 1.13.1",
"smallvec 1.11.2",
"tagptr",
"triomphe",
]
@ -2305,9 +2301,9 @@ version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -2341,7 +2337,7 @@ dependencies = [
"phf 0.10.1",
"phf_codegen 0.10.0",
"precomputed-hash",
"smallvec 1.13.1",
"smallvec 1.11.2",
]
[[package]]
@ -2389,7 +2385,7 @@ dependencies = [
"cfg-if 1.0.0",
"libc",
"redox_syscall 0.4.1",
"smallvec 1.13.1",
"smallvec 1.11.2",
"windows-targets 0.48.5",
]
@ -2516,9 +2512,9 @@ checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
dependencies = [
"phf_generator 0.11.2",
"phf_shared 0.11.2",
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -2563,9 +2559,9 @@ version = "1.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -2622,8 +2618,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
dependencies = [
"proc-macro-error-attr",
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 1.0.109",
"version_check",
]
@ -2634,8 +2630,8 @@ version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"version_check",
]
@ -2650,9 +2646,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
version = "1.0.78"
version = "1.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
dependencies = [
"unicode-ident",
]
@ -2705,11 +2701,11 @@ dependencies = [
[[package]]
name = "quote"
version = "1.0.35"
version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
dependencies = [
"proc-macro2 1.0.78",
"proc-macro2 1.0.71",
]
[[package]]
@ -3212,7 +3208,7 @@ dependencies = [
"phf_codegen 0.10.0",
"precomputed-hash",
"servo_arc",
"smallvec 1.13.1",
"smallvec 1.11.2",
]
[[package]]
@ -3241,22 +3237,22 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "serde"
version = "1.0.196"
version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "870026e60fa08c69f064aa766c10f10b1d62db9ccd4d0abb206472bee0ce3b32"
checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.196"
version = "1.0.193"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -3370,9 +3366,9 @@ dependencies = [
[[package]]
name = "smallvec"
version = "1.13.1"
version = "1.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
dependencies = [
"serde",
]
@ -3445,8 +3441,8 @@ checksum = "f0f45ed1b65bf9a4bf2f7b7dc59212d1926e9eaf00fa998988e420fd124467c6"
dependencies = [
"phf_generator 0.7.24",
"phf_shared 0.7.24",
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"string_cache_shared",
]
@ -3458,8 +3454,8 @@ checksum = "6bb30289b722be4ff74a408c3cc27edeaad656e06cb1fe8fa9231fa59c728988"
dependencies = [
"phf_generator 0.10.0",
"phf_shared 0.10.0",
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
]
[[package]]
@ -3491,19 +3487,19 @@ version = "1.0.109"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"unicode-ident",
]
[[package]]
name = "syn"
version = "2.0.48"
version = "2.0.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
checksum = "ee659fb5f3d355364e1f3e5bc10fb82068efbf824a1e9d1c9504244a6469ad53"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"unicode-ident",
]
@ -3513,8 +3509,8 @@ version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 1.0.109",
"unicode-xid 0.2.4",
]
@ -3737,9 +3733,9 @@ version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]
@ -4012,12 +4008,6 @@ dependencies = [
"rand 0.6.5",
]
[[package]]
name = "v_htmlescape"
version = "0.15.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e8257fbc510f0a46eb602c10215901938b5c2a7d5e70fc11483b1d3c9b5b18c"
[[package]]
name = "vcpkg"
version = "0.2.15"
@ -4091,9 +4081,9 @@ dependencies = [
"bumpalo",
"log",
"once_cell",
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
"wasm-bindgen-shared",
]
@ -4115,7 +4105,7 @@ version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0162dbf37223cd2afce98f3d0785506dcb8d266223983e4b5b525859e6e182b2"
dependencies = [
"quote 1.0.35",
"quote 1.0.33",
"wasm-bindgen-macro-support",
]
@ -4125,9 +4115,9 @@ version = "0.2.89"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@ -4190,7 +4180,7 @@ dependencies = [
"scraper",
"serde",
"serde_json",
"smallvec 1.13.1",
"smallvec 1.11.2",
"tempfile",
"tokio 1.35.1",
]
@ -4427,9 +4417,9 @@ version = "0.7.32"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
dependencies = [
"proc-macro2 1.0.78",
"quote 1.0.35",
"syn 2.0.48",
"proc-macro2 1.0.71",
"quote 1.0.33",
"syn 2.0.43",
]
[[package]]

View File

@ -15,15 +15,15 @@ path = "src/bin/websurfx.rs"
[dependencies]
reqwest = {version="0.11.22", default-features=false, features=["rustls-tls","brotli", "gzip"]}
tokio = {version="1.32.0",features=["rt-multi-thread","macros"], default-features = false}
serde = {version="1.0.196", default-features=false, features=["derive"]}
serde = {version="1.0.190", default-features=false, features=["derive"]}
serde_json = {version="1.0.109", default-features=false}
maud = {version="0.25.0", default-features=false, features=["actix-web"]}
scraper = {version="0.18.1", default-features = false}
actix-web = {version="4.4.0", features = ["cookies", "macros", "compress-brotli"], default-features=false}
actix-files = {version="0.6.5", default-features=false}
actix-files = {version="0.6.2", default-features=false}
actix-cors = {version="0.6.4", default-features=false}
fake-useragent = {version="0.1.3", default-features=false}
env_logger = {version="0.11.1", default-features=false}
env_logger = {version="0.10.0", default-features=false}
log = {version="0.4.20", default-features=false}
mlua = {version="0.9.1", features=["luajit", "vendored"], default-features=false}
redis = {version="0.24.0", features=["tokio-comp","connection-manager"], default-features = false, optional = true}
@ -31,7 +31,7 @@ blake3 = {version="1.5.0", default-features=false}
error-stack = {version="0.4.0", default-features=false, features=["std"]}
async-trait = {version="0.1.76", default-features=false}
regex = {version="1.9.4", features=["perf"], default-features = false}
smallvec = {version="1.13.1", features=["union", "serde"], default-features=false}
smallvec = {version="1.11.0", features=["union", "serde"], default-features=false}
futures = {version="0.3.28", default-features=false}
dhat = {version="0.3.2", optional = true, default-features=false}
mimalloc = { version = "0.1.38", default-features = false }
@ -50,7 +50,7 @@ criterion = {version="0.5.1", default-features=false}
tempfile = {version="3.8.0", default-features=false}
[build-dependencies]
lightningcss = {version="1.0.0-alpha.52", default-features=false, features=["grid"]}
lightningcss = {version="1.0.0-alpha.50", default-features=false, features=["grid"]}
minify-js = {version="0.6.0", default-features=false}
[profile.dev]