Compare commits

...
Author SHA1 Message Date
Brandon Thomas 41e021fcf5 fix cargo tomls 2026-02-22 09:39:17 +07:00
Brandon Thomas e45c7886eb cleanup 2026-02-22 09:37:33 +07:00
Brandon Thomas 163464c3ee Fix OpenSSL/BoringSSL conflicts 2026-02-22 09:34:17 +07:00
9 changed files with 281 additions and 118 deletions
Generated
+236 -98
View File
@@ -548,7 +548,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f39be698127218cca460cb624878c9aa4e2b47dba3b277963d2bf00bad263b"
dependencies = [
"android_log-sys",
"env_filter",
"env_filter 0.1.0",
"log",
]
@@ -618,9 +618,9 @@ checksum = "70033777eb8b5124a81a1889416543dddef2de240019b674c81285a2635a7e1e"
[[package]]
name = "anyhow"
version = "1.0.98"
version = "1.0.102"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c"
[[package]]
name = "arbitrary"
@@ -1239,6 +1239,28 @@ dependencies = [
"url",
]
[[package]]
name = "aws-lc-rs"
version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9a7b350e3bb1767102698302bc37256cbd48422809984b98d292c40e2579aa9"
dependencies = [
"aws-lc-sys",
"zeroize",
]
[[package]]
name = "aws-lc-sys"
version = "0.37.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b092fe214090261288111db7a2b2c2118e5a7f30dc2569f1732c4069a6840549"
dependencies = [
"cc",
"cmake",
"dunce",
"fs_extra",
]
[[package]]
name = "aws-region"
version = "0.26.0"
@@ -1452,7 +1474,7 @@ dependencies = [
"bitflags 2.11.0",
"cexpr",
"clang-sys",
"itertools 0.13.0",
"itertools 0.11.0",
"proc-macro2",
"quote",
"regex",
@@ -1956,7 +1978,7 @@ checksum = "a1d8af896b707212cd0e99c112a78c9497dd32994192a463ed2f7419d29bd8c6"
dependencies = [
"serde",
"thiserror 2.0.12",
"toml 0.8.22",
"toml 0.8.23",
]
[[package]]
@@ -1989,7 +2011,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257"
dependencies = [
"serde",
"toml 0.8.22",
"toml 0.8.23",
]
[[package]]
@@ -2208,7 +2230,7 @@ dependencies = [
"bucket_paths",
"crockford",
"easyenv",
"env_logger 0.11.8",
"env_logger 0.11.9",
"errors",
"filesys",
"hashing",
@@ -3349,7 +3371,7 @@ dependencies = [
"libc",
"option-ext",
"redox_users",
"windows-sys 0.60.2",
"windows-sys 0.61.2",
]
[[package]]
@@ -3400,7 +3422,7 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
dependencies = [
"libloading 0.8.6",
"libloading 0.7.4",
]
[[package]]
@@ -3605,7 +3627,7 @@ name = "easyenv"
version = "0.1.0"
dependencies = [
"dotenv",
"env_logger 0.11.8",
"env_logger 0.11.9",
"log",
"storyteller_root",
"workspace-build-acceleration",
@@ -3810,7 +3832,7 @@ dependencies = [
"cc",
"memchr",
"rustc_version 0.4.0",
"toml 0.8.22",
"toml 0.8.23",
"vswhom",
"winreg 0.52.0",
]
@@ -3868,7 +3890,7 @@ dependencies = [
"sqlx-core",
"sqlx-mysql",
"strum",
"toml 0.8.22",
"toml 0.8.23",
"utoipa",
"workspace-build-acceleration",
]
@@ -3882,7 +3904,7 @@ dependencies = [
"serde_derive",
"serde_json",
"strum",
"toml 0.8.22",
"toml 0.8.23",
"utoipa",
"workspace-build-acceleration",
]
@@ -3906,6 +3928,16 @@ dependencies = [
"regex",
]
[[package]]
name = "env_filter"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a1c3cc8e57274ec99de65301228b537f1e4eedc1b8e0f9411c6caac8ae7308f"
dependencies = [
"log",
"regex",
]
[[package]]
name = "env_logger"
version = "0.7.1"
@@ -3921,13 +3953,13 @@ dependencies = [
[[package]]
name = "env_logger"
version = "0.11.8"
version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13c863f0904021b108aa8b2f55046443e6b1ebde8fd4a15c399893aae4fa069f"
checksum = "b2daee4ea451f429a58296525ddf28b45a3b64f1acf6587e2067437bb11e218d"
dependencies = [
"anstream",
"anstyle",
"env_filter",
"env_filter 1.0.0",
"jiff",
"log",
]
@@ -4601,7 +4633,7 @@ dependencies = [
"serde",
"serde_json",
"tokio",
"toml 0.8.22",
"toml 0.8.23",
"tracing",
"tracing-subscriber",
]
@@ -4863,7 +4895,7 @@ dependencies = [
"cloudflare_mitigation",
"cookie_store 0.0.1",
"env",
"env_logger 0.11.8",
"env_logger 0.11.9",
"errors",
"filesys",
"futures 0.3.31",
@@ -5459,7 +5491,7 @@ dependencies = [
"hyper 1.6.0",
"hyper-util",
"log",
"rustls 0.23.13",
"rustls 0.23.36",
"rustls-native-certs 0.8.0",
"rustls-pki-types",
"tokio",
@@ -5514,7 +5546,7 @@ dependencies = [
"libc",
"percent-encoding",
"pin-project-lite",
"socket2 0.5.10",
"socket2 0.6.2",
"system-configuration 0.6.1",
"tokio",
"tower-service",
@@ -6420,7 +6452,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
dependencies = [
"cfg-if",
"windows-targets 0.52.6",
"windows-targets 0.48.5",
]
[[package]]
@@ -6595,11 +6627,11 @@ checksum = "9374ef4228402d4b7e403e5838cb880d9ee663314b0a900d5a6aabf0c213552e"
[[package]]
name = "log"
version = "0.4.27"
version = "0.4.29"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897"
dependencies = [
"serde",
"serde_core",
"value-bag",
]
@@ -6642,7 +6674,7 @@ dependencies = [
name = "logging"
version = "0.0.1"
dependencies = [
"env_logger 0.11.8",
"env_logger 0.11.9",
"log",
"workspace-build-acceleration",
]
@@ -6667,6 +6699,12 @@ dependencies = [
"workspace-build-acceleration",
]
[[package]]
name = "lru-slab"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
[[package]]
name = "lru_time_cache"
version = "0.11.11"
@@ -6955,7 +6993,7 @@ dependencies = [
"sqlx",
"tokens",
"tokio",
"toml 0.8.22",
"toml 0.8.23",
"workspace-build-acceleration",
]
@@ -7198,17 +7236,17 @@ dependencies = [
[[package]]
name = "native-tls"
version = "0.2.14"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2"
dependencies = [
"libc",
"log",
"openssl",
"openssl-probe",
"openssl-probe 0.2.1",
"openssl-sys",
"schannel",
"security-framework",
"security-framework 3.7.0",
"security-framework-sys",
"tempfile",
]
@@ -7896,7 +7934,7 @@ dependencies = [
"testing",
"thiserror 2.0.12",
"tokio",
"toml 0.8.22",
"toml 0.8.23",
"url",
"workspace-build-acceleration",
"wreq",
@@ -7928,15 +7966,15 @@ dependencies = [
"testing",
"thiserror 2.0.12",
"tokio",
"toml 0.8.22",
"toml 0.8.23",
"workspace-build-acceleration",
]
[[package]]
name = "openssl"
version = "0.10.71"
version = "0.10.75"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd"
checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328"
dependencies = [
"bitflags 2.11.0",
"cfg-if",
@@ -7964,6 +8002,12 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
[[package]]
name = "openssl-probe"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe"
[[package]]
name = "openssl-src"
version = "300.4.2+3.4.1"
@@ -7975,9 +8019,9 @@ dependencies = [
[[package]]
name = "openssl-sys"
version = "0.9.106"
version = "0.9.111"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd"
checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321"
dependencies = [
"cc",
"libc",
@@ -8958,37 +9002,44 @@ dependencies = [
[[package]]
name = "quinn"
version = "0.11.5"
version = "0.11.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c7c5fdde3cdae7203427dc4f0a68fe0ed09833edc525a03456b153b79828684"
checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
dependencies = [
"bytes",
"cfg_aliases 0.2.1",
"pin-project-lite",
"quinn-proto",
"quinn-udp",
"rustc-hash",
"rustls 0.23.13",
"socket2 0.5.10",
"thiserror 1.0.63",
"rustls 0.23.36",
"socket2 0.6.2",
"thiserror 2.0.12",
"tokio",
"tracing",
"web-time",
]
[[package]]
name = "quinn-proto"
version = "0.11.8"
version = "0.11.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fadfaed2cd7f389d0161bb73eeb07b7b78f8691047a6f3e73caaeae55310a4a6"
checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
dependencies = [
"aws-lc-rs",
"bytes",
"rand 0.8.5",
"getrandom 0.3.1",
"lru-slab",
"rand 0.9.2",
"ring",
"rustc-hash",
"rustls 0.23.13",
"rustls 0.23.36",
"rustls-pki-types",
"slab",
"thiserror 1.0.63",
"thiserror 2.0.12",
"tinyvec",
"tracing",
"web-time",
]
[[package]]
@@ -9335,7 +9386,7 @@ dependencies = [
"pin-project-lite",
"r2d2",
"rand 0.9.2",
"rustls 0.23.13",
"rustls 0.23.36",
"rustls-native-certs 0.8.0",
"ryu",
"sha1_smol",
@@ -9429,9 +9480,9 @@ dependencies = [
[[package]]
name = "regex"
version = "1.12.2"
version = "1.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276"
dependencies = [
"aho-corasick",
"memchr",
@@ -9554,7 +9605,7 @@ dependencies = [
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls 0.23.13",
"rustls 0.23.36",
"rustls-native-certs 0.8.0",
"rustls-pki-types",
"serde",
@@ -9591,20 +9642,21 @@ dependencies = [
"http-body-util",
"hyper 1.6.0",
"hyper-rustls 0.27.3",
"hyper-tls",
"hyper-util",
"js-sys",
"log",
"native-tls",
"percent-encoding",
"pin-project-lite",
"quinn",
"rustls 0.23.36",
"rustls-pki-types",
"rustls-platform-verifier",
"serde",
"serde_json",
"serde_urlencoded",
"sync_wrapper 1.0.2",
"tokio",
"tokio-native-tls",
"tokio-rustls 0.26.0",
"tower 0.5.3",
"tower-http",
"tower-service",
@@ -9640,7 +9692,7 @@ dependencies = [
"serde_derive",
"sqlx",
"sqlx-core",
"toml 0.8.22",
"toml 0.8.23",
"workspace-build-acceleration",
]
@@ -9786,7 +9838,7 @@ dependencies = [
"testing",
"thiserror 2.0.12",
"tokio",
"toml 0.8.22",
"toml 0.8.23",
"workspace-build-acceleration",
]
@@ -9963,15 +10015,16 @@ dependencies = [
[[package]]
name = "rustls"
version = "0.23.13"
version = "0.23.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b"
dependencies = [
"aws-lc-rs",
"log",
"once_cell",
"ring",
"rustls-pki-types",
"rustls-webpki 0.102.8",
"rustls-webpki 0.103.9",
"subtle",
"zeroize",
]
@@ -9982,10 +10035,10 @@ version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
dependencies = [
"openssl-probe",
"openssl-probe 0.1.5",
"rustls-pemfile 1.0.4",
"schannel",
"security-framework",
"security-framework 2.10.0",
]
[[package]]
@@ -9994,11 +10047,11 @@ version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcaf18a4f2be7326cd874a5fa579fae794320a0f388d365dca7e480e55f83f8a"
dependencies = [
"openssl-probe",
"openssl-probe 0.1.5",
"rustls-pemfile 2.1.2",
"rustls-pki-types",
"schannel",
"security-framework",
"security-framework 2.10.0",
]
[[package]]
@@ -10026,9 +10079,37 @@ version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
dependencies = [
"web-time",
"zeroize",
]
[[package]]
name = "rustls-platform-verifier"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d99feebc72bae7ab76ba994bb5e121b8d83d910ca40b36e0921f53becc41784"
dependencies = [
"core-foundation 0.10.0",
"core-foundation-sys",
"jni 0.21.1",
"log",
"once_cell",
"rustls 0.23.36",
"rustls-native-certs 0.8.0",
"rustls-platform-verifier-android",
"rustls-webpki 0.103.9",
"security-framework 3.7.0",
"security-framework-sys",
"webpki-root-certs",
"windows-sys 0.61.2",
]
[[package]]
name = "rustls-platform-verifier-android"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f"
[[package]]
name = "rustls-webpki"
version = "0.101.7"
@@ -10050,6 +10131,18 @@ dependencies = [
"untrusted",
]
[[package]]
name = "rustls-webpki"
version = "0.103.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53"
dependencies = [
"aws-lc-rs",
"ring",
"rustls-pki-types",
"untrusted",
]
[[package]]
name = "rustversion"
version = "1.0.14"
@@ -10101,11 +10194,11 @@ dependencies = [
[[package]]
name = "schannel"
version = "0.1.23"
version = "0.1.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
dependencies = [
"windows-sys 0.52.0",
"windows-sys 0.61.2",
]
[[package]]
@@ -10260,15 +10353,59 @@ dependencies = [
]
[[package]]
name = "security-framework-sys"
version = "2.10.0"
name = "security-framework"
version = "3.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d"
dependencies = [
"bitflags 2.11.0",
"core-foundation 0.10.0",
"core-foundation-sys",
"libc",
"security-framework-sys",
]
[[package]]
name = "security-framework-sys"
version = "2.17.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6ce2691df843ecc5d231c0b14ece2acc3efb62c0a398c7e1d875f3983ce020e3"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "seedance2-pro-job"
version = "0.0.1"
dependencies = [
"actix-web",
"actix_helpers",
"anyhow",
"bootstrap",
"bucket_paths",
"cloud_storage",
"concurrency",
"config",
"easyenv",
"enums",
"errors",
"hashing",
"jobs_common",
"log",
"mysql_queries",
"reqwest 0.12.23",
"seedance2pro",
"serde",
"serde_derive",
"serde_json",
"server_environment",
"sqlx",
"tokens",
"tokio",
"workspace-build-acceleration",
]
[[package]]
name = "seedance2pro"
version = "0.0.1"
@@ -10276,7 +10413,7 @@ dependencies = [
"chrono",
"cloudflare_errors",
"env",
"env_logger 0.11.8",
"env_logger 0.11.9",
"errors",
"log",
"rand 0.9.2",
@@ -10544,9 +10681,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
version = "0.6.8"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
dependencies = [
"serde",
]
@@ -11386,6 +11523,7 @@ dependencies = [
"resend-rs",
"reusable_types",
"rust-s3",
"rustls 0.23.36",
"seedance2pro",
"serde",
"serde_derive",
@@ -11402,7 +11540,7 @@ dependencies = [
"time",
"tokens",
"tokio",
"toml 0.8.22",
"toml 0.8.23",
"tts_common",
"url",
"url_config",
@@ -11850,7 +11988,7 @@ dependencies = [
"cfg-expr",
"heck 0.5.0",
"pkg-config",
"toml 0.8.22",
"toml 0.8.23",
"version-compare",
]
@@ -12272,7 +12410,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56eaa45f707bedf34d19312c26d350bc0f3c59a47e58e8adbeecdc850d2c13a0"
dependencies = [
"embed-resource",
"toml 0.8.22",
"toml 0.8.23",
]
[[package]]
@@ -12599,7 +12737,7 @@ version = "0.26.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
dependencies = [
"rustls 0.23.13",
"rustls 0.23.36",
"rustls-pki-types",
"tokio",
]
@@ -12647,22 +12785,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
dependencies = [
"serde",
"serde_spanned 0.6.8",
"toml_datetime 0.6.9",
"serde_spanned 0.6.9",
"toml_datetime 0.6.11",
"toml_edit 0.19.15",
]
[[package]]
name = "toml"
version = "0.8.22"
version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
dependencies = [
"indexmap 2.9.0",
"serde",
"serde_spanned 0.6.8",
"toml_datetime 0.6.9",
"toml_edit 0.22.26",
"serde_spanned 0.6.9",
"toml_datetime 0.6.11",
"toml_edit 0.22.27",
]
[[package]]
@@ -12682,9 +12820,9 @@ dependencies = [
[[package]]
name = "toml_datetime"
version = "0.6.9"
version = "0.6.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
dependencies = [
"serde",
]
@@ -12706,8 +12844,8 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
dependencies = [
"indexmap 2.9.0",
"serde",
"serde_spanned 0.6.8",
"toml_datetime 0.6.9",
"serde_spanned 0.6.9",
"toml_datetime 0.6.11",
"winnow 0.5.40",
]
@@ -12718,7 +12856,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
dependencies = [
"indexmap 2.9.0",
"toml_datetime 0.6.9",
"toml_datetime 0.6.11",
"winnow 0.5.40",
]
@@ -12729,20 +12867,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
dependencies = [
"indexmap 2.9.0",
"toml_datetime 0.6.9",
"toml_datetime 0.6.11",
"winnow 0.5.40",
]
[[package]]
name = "toml_edit"
version = "0.22.26"
version = "0.22.27"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
dependencies = [
"indexmap 2.9.0",
"serde",
"serde_spanned 0.6.8",
"toml_datetime 0.6.9",
"serde_spanned 0.6.9",
"toml_datetime 0.6.11",
"toml_write",
"winnow 0.7.13",
]
@@ -12758,9 +12896,9 @@ dependencies = [
[[package]]
name = "toml_write"
version = "0.1.1"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
[[package]]
name = "toml_writer"
@@ -13421,9 +13559,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
[[package]]
name = "value-bag"
version = "1.10.0"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2"
checksum = "7ba6f5989077681266825251a52748b8c1d8a4ad098cc37e440103d0ea717fc0"
[[package]]
name = "vcpkg"
@@ -14785,7 +14923,7 @@ dependencies = [
"rustls-pki-types",
"schemars",
"scopeguard",
"security-framework",
"security-framework 2.10.0",
"semver 1.0.23",
"serde",
"serde_json",
@@ -14837,7 +14975,7 @@ dependencies = [
"cloudflare_mitigation",
"cookie_store 0.0.1",
"env",
"env_logger 0.11.8",
"env_logger 0.11.9",
"errors",
"filesys",
"futures 0.3.31",
+8 -7
View File
@@ -117,7 +117,7 @@ members = [
"crates/service/job/email_sender_job",
"crates/service/job/es-update-job",
"crates/service/job/inference_job",
#"crates/service/job/seedance2_pro_job",
"crates/service/job/seedance2_pro_job",
"crates/service/job/tts_download_job",
"crates/service/job/tts_inference_job",
"crates/service/job/w2l_download_job",
@@ -261,24 +261,24 @@ actix-utils = "3.0.1"
actix-web = "4.7.0" # TODO(bt): We're behind and need to bump versions.
actix-web-actors = "4.3.1+deprecated"
actix-web-lab = "0.20.2"
anyhow = "1.0.98"
anyhow = "1.0.102"
base64 = "0.22.1"
bstr = "1.12.1"
bytes = "1.10.1"
chrono = { version = "0.4.41", features = ["serde"] }
cookie = "0.18.1"
env = "1.0.1"
env_logger = "0.11.8"
env_logger = "0.11.9"
futures = { version = "0.3.31" }
hex-literal = "1.0.0"
indexmap = "2.9.0"
log = "0.4.27"
log = "0.4.29"
md-5 = "0.10.6" # insecure but used for gravatar
once_cell = "1.21.3"
r2d2 = "0.8.10"
rand = "0.9.1"
redis = { version = "1.0.2", features = ["r2d2", "tokio-rustls-comp", "tokio-comp", "cluster-async", "aio"] }
regex = "1.12.2"
regex = "1.12.3"
reqwest = { version = "0.12.23", default-features = false, features = [ "charset", "http2", "system-proxy", "json", "cookies", "rustls-tls", "gzip" ] }
reqwest-websocket = { version = "0.5.0" }
serde = { version = "1.0.219", features = ["derive"] }
@@ -296,7 +296,7 @@ tempdir = "0.3.7"
tempfile = "3.20.0"
thiserror = "2.0.12"
tokio = { version = "1.45.1", features = ["macros"] }
toml = "0.8.22"
toml = "0.8.23"
url = { version = "2.5.4", features = ["serde"] }
uuid = "1.18.1"
@@ -310,5 +310,6 @@ uuid = "1.18.1"
# choco install pkgconfiglite -y
# choco install llvm -y
# choco install nasm -y
wreq = { version = "6.0.0-rc.28", features = ["json", "multipart", "cookies", "ws", "stream", "query", "form", "gzip"] }
wreq-util = "3.0.0-rc.10"
wreq = { version = "6.0.0-rc.28", features = ["json", "query", "multipart", "cookies", "ws", "stream", "gzip", "form"] }
+12 -4
View File
@@ -33,7 +33,7 @@ RUN apt-get update \
FROM ubuntu:jammy as rust-base
# NB: This can be "stable" or another version.
ARG RUST_TOOLCHAIN="1.86.0"
ARG RUST_TOOLCHAIN="1.93.0"
WORKDIR /tmp
@@ -44,13 +44,16 @@ WORKDIR /tmp
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install -y \
build-essential \
clang \
cmake \
curl \
ffmpeg \
fontconfig \
git \
libclang-dev \
libfontconfig1-dev \
libssl-dev \
musl-tools \
perl \
pkg-config
# NB: Fix for fontconfig (servo-fontconfig-sys): https://github.com/alacritty/alacritty/issues/4423#issuecomment-727277235
@@ -129,12 +132,17 @@ RUN du -hsc * | sort -hr
# Build all the binaries.
RUN SQLX_OFFLINE=true \
RUST_BACKTRACE=full \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build -vv \
$HOME/.cargo/bin/cargo build \
--release \
--bin storyteller-web
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
--release \
--bin seedance2-pro-job
RUN SQLX_OFFLINE=true \
LD_LIBRARY_PATH=/usr/lib:${LD_LIBRARY_PATH} \
$HOME/.cargo/bin/cargo build \
@@ -36,11 +36,11 @@ sha3.workspace = true
thiserror.workspace = true
#tokio.workspace = true
toml.workspace = true
url.workspace = true
tokio = { version = "1", features = ["full"] }
wreq-util.workspace = true
wreq.workspace = true
url.workspace = true
[dev-dependencies]
testing = { path = "../../lib/testing" }
+1 -1
View File
@@ -26,8 +26,8 @@ rand.workspace = true
serde.workspace = true
serde_derive.workspace = true
serde_json.workspace = true
wreq.workspace = true
wreq-util.workspace = true
wreq.workspace = true
url.workspace = true
[dev-dependencies]
@@ -117,7 +117,7 @@ pub async fn poll_orders(args: PollOrdersArgs<'_>) -> Result<PollOrdersResponse,
let cookie = args.session.cookies.as_str();
let response = client.get(GET_ORDERS_BASE_URL)
let request = client.get(GET_ORDERS_BASE_URL)
.query(&[("batch", "1"), ("input", input_json.as_str())])
.header("User-Agent", FIREFOX_USER_AGENT)
.header("Accept", "*/*")
@@ -133,7 +133,10 @@ pub async fn poll_orders(args: PollOrdersArgs<'_>) -> Result<PollOrdersResponse,
.header("Sec-Fetch-Site", "same-origin")
.header("Priority", "u=4")
.header("TE", "trailers")
.send()
.build()
.map_err(|err| Seedance2ProClientError::WreqClientError(err))?;
let response = client.execute(request)
.await
.map_err(|err| Seedance2ProGenericApiError::WreqError(err))?;
@@ -12,8 +12,10 @@ normal = ["workspace-build-acceleration"]
# Workspace hack (faster compile times)
workspace-build-acceleration.workspace = true
# External
# Internal
easyenv = { path = "../../lib/easyenv" }
# External
log.workspace = true
reqwest = { version = "0.12.4", default-features = false, features = [ "charset", "http2", "system-proxy", "rustls-tls" ] }
serde_json.workspace = true
@@ -54,7 +54,6 @@ enums_public.workspace = true
errors.workspace = true
fal_client.workspace = true
filesys.workspace = true
seedance2pro.workspace = true
google_sign_in = { path = "../../../api_clients/google_sign_in" }
hashing = { path = "../../../lib/files/hashing" }
http_server_common = { path = "../../../lib/deprecated/http_server_common" }
@@ -66,7 +65,6 @@ memory_caching = { path = "../../../lib/caching/memory_caching" }
migration = { path = "../../../lib/migration" }
mimetypes.workspace = true
mysql_queries = { path = "../../../schema/database/mysql_queries" }
#openai_sora_client = { path = "../../../api_clients/openai_sora_client" }
password = { path = "../../../lib/password" }
primitives = { path = "../../../lib/data/primitives" }
prompt_engineering = { path = "../../../lib/machine_learning/prompt_engineering" }
@@ -74,6 +72,7 @@ redis_caching = { path = "../../../lib/caching/redis_caching" }
redis_common = { path = "../../../schema/database/redis_common" }
redis_schema = { path = "../../../schema/database/redis_schema" }
reusable_types = { path = "../../../schema/public/reusable_types" }
seedance2pro.workspace = true
server_environment = { path = "../../../lib/server_environment" }
thumbnail_generator = { path = "../../../api_clients/thumbnail_generator" }
tokens.workspace = true
@@ -100,7 +99,7 @@ once_cell.workspace = true
rand.workspace = true
regex.workspace = true
strum_macros = "0.26.4"
time = "0.3.30"
time = "0.3.36"
url.workspace = true
# Money
@@ -116,7 +115,12 @@ language-tags = "0.3.2" # Parsing single tags richly
wreq.workspace = true
# Email
resend-rs = "0.21.0"
resend-rs = { version = "0.21.0", default-features = false, features = ["rustls-tls"] }
# NB: Both ring (via reqwest 0.12/hyper-rustls) and aws-lc-rs (via quinn/resend-rs)
# are features of rustls 0.23 in this binary. rustls requires an explicit default
# provider when multiple crypto providers are compiled in.
rustls = { version = "0.23", features = ["ring"], default-features = false }
# Runtime
tokio.workspace = true
@@ -124,6 +124,13 @@ const LOG_FORMAT : &str =
#[actix_web::main]
async fn main() -> AnyhowResult<()> {
// NB: Both ring (via reqwest 0.12/hyper-rustls) and aws-lc-rs (via quinn/resend-rs)
// are compiled into this binary as rustls crypto providers. rustls 0.23 panics at
// runtime if it can't auto-select a single provider, so we install ring explicitly.
rustls::crypto::ring::default_provider()
.install_default()
.expect("Failed to install rustls crypto provider");
let container_environment = bootstrap(BootstrapArgs {
app_name: "storyteller-web",
default_logging_override: Some(DEFAULT_RUST_LOG),